Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationTransition/SterilizationTransition.java =================================================================== diff -u --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationTransition/SterilizationTransition.java (revision 0) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationTransition/SterilizationTransition.java (revision 22146) @@ -0,0 +1,128 @@ +package com.forgon.disinfectsystem.entity.sterilizationTransition; + +import java.util.Date; + +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; + +import org.hibernate.annotations.Cache; +import org.hibernate.annotations.CacheConcurrencyStrategy; + +/** + * 灭菌交接 + * @author Chenjiaru 2018-01-18 + * + */ +@Entity +@Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE) +public class SterilizationTransition { + + /** + * id属性 + */ + private Long id; + + /** + * 交接单号 + */ + private String serialNumber; + + /** + * 交接时间 + */ + private Date transitionTime; + + /** + * 交接人编码 + */ + private String handoverCode; + + /** + * 交接人名称 + */ + private String handover; + + /** + * 接收人编码 + */ + private String takeoverCode; + + /** + * 接收人名称 + */ + private String takeover; + + /** + * 交接的总包数 + */ + private Integer totalAmount; + + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getSerialNumber() { + return serialNumber; + } + + public void setSerialNumber(String serialNumber) { + this.serialNumber = serialNumber; + } + + public Date getTransitionTime() { + return transitionTime; + } + + public void setTransitionTime(Date transitionTime) { + this.transitionTime = transitionTime; + } + + public String getHandoverCode() { + return handoverCode; + } + + public void setHandoverCode(String handoverCode) { + this.handoverCode = handoverCode; + } + + public String getHandover() { + return handover; + } + + public void setHandover(String handover) { + this.handover = handover; + } + + public String getTakeoverCode() { + return takeoverCode; + } + + public void setTakeoverCode(String takeoverCode) { + this.takeoverCode = takeoverCode; + } + + public String getTakeover() { + return takeover; + } + + public void setTakeover(String takeover) { + this.takeover = takeover; + } + + public Integer getTotalAmount() { + return totalAmount; + } + + public void setTotalAmount(Integer totalAmount) { + this.totalAmount = totalAmount; + } + +} Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/action/SterilizationTransitionAction.java =================================================================== diff -u --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/action/SterilizationTransitionAction.java (revision 0) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/action/SterilizationTransitionAction.java (revision 22146) @@ -0,0 +1,71 @@ +package com.forgon.disinfectsystem.sterilizationmanager.sterilizationTransition.action; + +import net.sf.json.JSONObject; + +import org.apache.struts2.convention.annotation.Action; +import org.apache.struts2.convention.annotation.Namespace; +import org.apache.struts2.convention.annotation.ParentPackage; + +import com.forgon.disinfectsystem.entity.sterilizationTransition.SterilizationTransition; +import com.forgon.disinfectsystem.sterilizationmanager.sterilizationTransition.service.SterilizationTransitionManager; +import com.forgon.entity.ExtJsEntity; +import com.forgon.tools.StrutsParamUtils; +import com.forgon.tools.StrutsResponseUtils; +import com.forgon.tools.db.DatabaseUtil; +import com.forgon.tools.string.StringTools; +import com.forgon.tools.util.ExtJsUtil; +import com.forgon.util.ExtGridUtils; +import com.opensymphony.xwork2.ModelDriven; +import com.opensymphony.xwork2.Preparable; +/** + * 灭菌交接的Action + * @author Chenjiaru 2018-01-18 + * + */ +@ParentPackage(value = "default") +@Namespace(value = "/disinfectSystem/sterilizationTransition") +@Action(value = "sterilizationTransitionAction") +public class SterilizationTransitionAction implements Preparable, +ModelDriven{ + + private SterilizationTransition sterilizationTransition; + private SterilizationTransitionManager sterilizationTransitionManager; + private ExtGridUtils extGridUtils; + + public void setExtGridUtils(ExtGridUtils extGridUtils) { + this.extGridUtils = extGridUtils; + } + + public void setSterilizationTransitionManager( + SterilizationTransitionManager sterilizationTransitionManager) { + this.sterilizationTransitionManager = sterilizationTransitionManager; + } + + @Override + public SterilizationTransition getModel() { + return sterilizationTransition; + } + + @Override + public void prepare() throws Exception { + Long id = StrutsParamUtils.getPraramLongValue("id", 0L); + if (DatabaseUtil.isPoIdValid(id)) { + sterilizationTransition = sterilizationTransitionManager.get(id); + } else { + sterilizationTransition = new SterilizationTransition(); + } + } + + /** + * 加载灭菌交接记录的数据. + */ + public void loadSterilizationTransitionList() { + String select = "select * "; + String where = "from SterilizationTransition where 1=1 "; + ExtJsEntity entity = ExtJsUtil.buildSQLEntity(select, where, ""); + JSONObject result = extGridUtils.getPagedResult(entity); + StrutsResponseUtils.output(result); + } + + +} Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationTransition/sterilizationTransitionForm.js =================================================================== diff -u --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationTransition/sterilizationTransitionForm.js (revision 0) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationTransition/sterilizationTransitionForm.js (revision 22146) @@ -0,0 +1,10 @@ +var windowObj; //窗口 +var formObj; //表单 + +/** + * 新增或者修改 + * @param id 灭菌交接记录id + */ +function addOrUpdateRecord(id) { + alert(id); +} \ No newline at end of file Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationTransition/SterilizationTransitionItem.java =================================================================== diff -u --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationTransition/SterilizationTransitionItem.java (revision 0) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationTransition/SterilizationTransitionItem.java (revision 22146) @@ -0,0 +1,132 @@ +package com.forgon.disinfectsystem.entity.sterilizationTransition; + +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import org.hibernate.annotations.Cache; +import org.hibernate.annotations.CacheConcurrencyStrategy; + + +/** + * 灭菌交接的明细 + * @author Chenjiaru 2018-01-18 + * + */ +@Entity +@Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE) +public class SterilizationTransitionItem { + + /** + * id属性 + */ + private Long id; + + /** + * 灭菌交接记录 + */ + private SterilizationTransition sterilizationTransition; + + /** + * 器械包实例id + */ + private Long tousseInstanceId; + + /** + * 配包人编码 + */ + private String packerCode; + + /** + * 配包人 + */ + private String packer; + + /** + * 审核人编码 + */ + private String reviewerCode; + + /** + * 审核人 + */ + private String reviewer; + + /** + * 数量 + */ + private Integer amount; + + + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + @ManyToOne + @JoinColumn + public SterilizationTransition getSterilizationTransition() { + return sterilizationTransition; + } + + public void setSterilizationTransition( + SterilizationTransition sterilizationTransition) { + this.sterilizationTransition = sterilizationTransition; + } + + public Integer getAmount() { + return amount; + } + + public void setAmount(Integer amount) { + this.amount = amount; + } + + public Long getTousseInstanceId() { + return tousseInstanceId; + } + + public void setTousseInstanceId(Long tousseInstanceId) { + this.tousseInstanceId = tousseInstanceId; + } + + public String getPackerCode() { + return packerCode; + } + + public void setPackerCode(String packerCode) { + this.packerCode = packerCode; + } + + public String getPacker() { + return packer; + } + + public void setPacker(String packer) { + this.packer = packer; + } + + public String getReviewerCode() { + return reviewerCode; + } + + public void setReviewerCode(String reviewerCode) { + this.reviewerCode = reviewerCode; + } + + public String getReviewer() { + return reviewer; + } + + public void setReviewer(String reviewer) { + this.reviewer = reviewer; + } + +} Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationTransition/sterilizationTransitionView.jsp =================================================================== diff -u --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationTransition/sterilizationTransitionView.jsp (revision 0) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationTransition/sterilizationTransitionView.jsp (revision 22146) @@ -0,0 +1,22 @@ +<%@page language="java" contentType="text/html; charset=UTF-8"%> +<%-- 引入JSP标签 --%> +<%@include file="/common/taglibs.jsp"%> +<%-- 引入ExtJs4.2.5框架 --%> +<%@include file="/common/include_ForgonGrid4.2.5_css.jsp"%> +<%@include file="/common/include_ForgonGrid4.2.5_Js.jsp"%> +<%@include file="/common/include_UseForgonGrid4_Js.jsp"%> + + + + <%-- 引入common.js --%> + + + <%-- 引入本身的js --%> + + + 灭菌交接记录 + + + + + \ No newline at end of file Index: ssts-web/src/main/resources/spring/applicationContext-disinfectsystem-service.xml =================================================================== diff -u -r21982 -r22146 --- ssts-web/src/main/resources/spring/applicationContext-disinfectsystem-service.xml (.../applicationContext-disinfectsystem-service.xml) (revision 21982) +++ ssts-web/src/main/resources/spring/applicationContext-disinfectsystem-service.xml (.../applicationContext-disinfectsystem-service.xml) (revision 22146) @@ -2352,6 +2352,23 @@ + + + + + + + + + + PROPAGATION_REQUIRED + + + + + + + Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationTransition/sterilizationTransitionView.js =================================================================== diff -u --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationTransition/sterilizationTransitionView.js (revision 0) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationTransition/sterilizationTransitionView.js (revision 22146) @@ -0,0 +1,89 @@ +var entityName = '灭菌交接记录'; +var grid; + +/** + * 修改灭菌解决记录 + * @param grid grid对象 + * @returns {Boolean} + */ +function loadFormDataAndUpdate(grid) { + var records = grid.getSelectionModel().selected.items;// extjs4.2.5版本选择多行写法 + if (records == null || records == "" || records == undefined + || records.length == 0) { + showResult("请选择要修改的记录！"); + return false; + } + if (records.length > 1) { + showResult('一次只能修改一条记录！'); + return false; + } + var id = records[0].data['id']; + addOrUpdateRecord(id); +} + +Ext4.onReady(function() { + var fields = [{ + name : 'id', mapping : 'id' + },{ + name : 'serialNumber', mapping : 'serialNumber' + },{ + name : 'transitionTime', mapping : 'transitionTime' + },{ + name : 'handover', mapping : 'handover' + },{ + name : 'takeover', mapping : 'takeover' + },{ + name : 'totalAmount', mapping : 'totalAmount' + }]; + + var columns = [{ + header: '流水号', dataIndex: 'serialNumber', width: 70, minWidth:70, maxWidth:70, filterable: true, filter: {type: 'string'}, + renderer : function(value, metaData, record, rowIndex, colIndex, store, view) { + var id = record.data.id; + return "" + value + ""; + } + },{ + header: '交接时间', dataIndex: 'transitionTime', width: 150, minWidth: 150, filterable: true, filter: {type: 'date'}, + renderer : function(value, metaData, record, rowIndex, colIndex, store, view) { + if (value) { + return Ext4.Date.format(new Date(value.time), 'Y-m-d H:i:s'); + } else { + return ''; + } + } + },{ + header: '交接人', dataIndex: 'handover', width: 70, minWidth:70, maxWidth:70, filterable: true, filter: {type: 'string'} + },{ + header: '接收人', dataIndex: 'takeover', width: 70, minWidth:70, maxWidth:70, filterable: true, filter: {type: 'string'} + },{ + header: '器械包总数量', dataIndex: 'totalAmount', width: 70, minWidth: 70, filterable: true, filter: {type: 'numeric'} + }]; + + grid = Ext4.create('ExtJs.forgon4.Grid', { + title : entityName, + dataUrl : WWWROOT + '/disinfectSystem/sterilizationTransition/sterilizationTransitionAction!loadSterilizationTransitionList.do', + fields : fields, + columns : columns, + sorters : { property : 'id', direction: 'DESC'}, + extraParams : {}, //如果你要自定义参数，这里一定要先给一个空的对象，要不然会报空异常 + showRightClick : false, + tbar : [{ + text : '添加', + iconCls : 'btn_edit', + handler : function() { + addOrUpdateRecord(null); + } + },{ + text : '修改', + iconCls : 'btn_edit', + handler : function() { + loadFormDataAndUpdate(grid); + } + }] + }); + + var viewport = Ext4.create('Ext4.Viewport', { + layout : 'fit', + items : grid + }); +}); \ No newline at end of file Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java =================================================================== diff -u -r21975 -r22146 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java (.../TousseInstance.java) (revision 21975) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java (.../TousseInstance.java) (revision 22146) @@ -118,13 +118,14 @@ private String washEndTime = ""; // 清洗完成时间 /** - * 配包人 + * 包装人（有配置项的） */ - private String operator; + private String wrapper; + /** - * 包装人 + * 配包人 */ - private String wrapper; + private String operator; /** * 配包人编码 Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/packing/PackingRecord.java =================================================================== diff -u -r21804 -r22146 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/packing/PackingRecord.java (.../PackingRecord.java) (revision 21804) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/packing/PackingRecord.java (.../PackingRecord.java) (revision 22146) @@ -122,7 +122,7 @@ */ private String inspector; /** - * 包装人 + * 包装人（有配置项的） */ private String wrapper; Index: ssts-web/src/main/webapp/homepage/menuconfigure.js =================================================================== diff -u -r22051 -r22146 --- ssts-web/src/main/webapp/homepage/menuconfigure.js (.../menuconfigure.js) (revision 22051) +++ ssts-web/src/main/webapp/homepage/menuconfigure.js (.../menuconfigure.js) (revision 22146) @@ -214,45 +214,55 @@ DisinfectsystemTreeData[6].children[i] = link1; } } +var sterilizationIndex = sterilerGroupList.length ? sterilerGroupList.length : 0; + +var sterilizationTransition = new Object(); +sterilizationTransition.hidden = true; +sterilizationTransition.text = '灭菌交接'; +sterilizationTransition.href = WWWROOT+'/disinfectsystem/sterilizationmanager/sterilizationTransition/sterilizationTransitionView.jsp'; +sterilizationTransition.hrefTarget = linkTarget; +sterilizationTransition.leaf = true; +DisinfectsystemTreeData[6].children[sterilizationIndex++] = sterilizationTransition; + var sterilLoading = new Object(); sterilLoading.hidden = SSTS_Sterilization_Loading_Menu; sterilLoading.text = '灭菌物品装载'; sterilLoading.href = WWWROOT+'/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationLoadingView.jsp'; sterilLoading.hrefTarget = linkTarget; sterilLoading.leaf = true; -DisinfectsystemTreeData[6].children[sterilerGroupList.length] = sterilLoading; +DisinfectsystemTreeData[6].children[sterilizationIndex++] = sterilLoading; var todaySterilingLink = new Object(); todaySterilingLink.hidden = SSTS_Sterilization_Menu; todaySterilingLink.text = '当天灭菌记录管理'; todaySterilingLink.href = WWWROOT+'/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.jsp?editMode=true&type=today'; todaySterilingLink.hrefTarget = linkTarget; todaySterilingLink.leaf = true; -DisinfectsystemTreeData[6].children[sterilerGroupList.length+1] = todaySterilingLink; +DisinfectsystemTreeData[6].children[sterilizationIndex++] = todaySterilingLink; var historySterilizationLink = new Object(); historySterilizationLink.hidden = SSTS_Sterilization_Menu; historySterilizationLink.text = '历史灭菌记录管理'; historySterilizationLink.href = WWWROOT+'/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.jsp?editMode=true'; historySterilizationLink.hrefTarget = linkTarget; historySterilizationLink.leaf = true; -DisinfectsystemTreeData[6].children[sterilerGroupList.length+2] = historySterilizationLink; +DisinfectsystemTreeData[6].children[sterilizationIndex++] = historySterilizationLink; var ProxyDisinfectionLink = new Object(); ProxyDisinfectionLink.hidden = SSTS_ProxyDisinfection_Menu; ProxyDisinfectionLink.text = '代理灭菌管理'; ProxyDisinfectionLink.href = WWWROOT+'/disinfectsystem/sterilizationmanager/sterilizationrecord/proxyDisinfectionView.jsp'; ProxyDisinfectionLink.hrefTarget = linkTarget; ProxyDisinfectionLink.leaf = true; -DisinfectsystemTreeData[6].children[sterilerGroupList.length+3] = ProxyDisinfectionLink; +DisinfectsystemTreeData[6].children[sterilizationIndex++] = ProxyDisinfectionLink; var foreignSterilizationLink = new Object(); foreignSterilizationLink.hidden = SSTS_ForeignProxyDisinfection_Menu; foreignSterilizationLink.text = '外部代理灭菌管理'; foreignSterilizationLink.href = WWWROOT+'/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.jsp?editMode=true'; foreignSterilizationLink.hrefTarget = linkTarget; foreignSterilizationLink.leaf = true; -DisinfectsystemTreeData[6].children[sterilerGroupList.length+4] = foreignSterilizationLink; +DisinfectsystemTreeData[6].children[sterilizationIndex++] = foreignSterilizationLink; Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/service/SterilizationTransitionManager.java =================================================================== diff -u --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/service/SterilizationTransitionManager.java (revision 0) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/service/SterilizationTransitionManager.java (revision 22146) @@ -0,0 +1,9 @@ +package com.forgon.disinfectsystem.sterilizationmanager.sterilizationTransition.service; + +import com.forgon.disinfectsystem.entity.sterilizationTransition.SterilizationTransition; +import com.forgon.tools.hibernate.BasePoManager; + +public interface SterilizationTransitionManager extends + BasePoManager { + +} Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/service/SterilizationTransitionManagerImpl.java =================================================================== diff -u --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/service/SterilizationTransitionManagerImpl.java (revision 0) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationTransition/service/SterilizationTransitionManagerImpl.java (revision 22146) @@ -0,0 +1,10 @@ +package com.forgon.disinfectsystem.sterilizationmanager.sterilizationTransition.service; + +import com.forgon.disinfectsystem.entity.sterilizationTransition.SterilizationTransition; +import com.forgon.tools.hibernate.BasePoManagerImpl; + +public class SterilizationTransitionManagerImpl extends + BasePoManagerImpl implements + SterilizationTransitionManager { + +}