Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java =================================================================== diff -u -r16348 -r16384 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 16348) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 16384) @@ -1630,20 +1630,8 @@ itemVo.setDateTime(new SimpleDateFormat( "yyyy-MM-dd HH:mm").format(startDate)); } - // 如果是外来器械包，包装类型和灭菌程序为空，获取默认的 - if(td.isForeignTousse() && supplyRoomConfig!= null){ - String method = supplyRoomConfig.getFtDefaultSterilingMethod(); - if( !"无".equals(method) ){ - itemVo.setSterilingMethod(method); - } - String pType = supplyRoomConfig.getFtDefaultPackageType(); - if( !"无".equals(pType) ){ - itemVo.setPackageType(pType); - } - }else{ - itemVo.setPackageType(td.getPackageType()); - itemVo.setSterilingMethod(td.getSterilingMethod()); - } + itemVo.setPackageType(td.getPackageType()); + itemVo.setSterilingMethod(td.getSterilingMethod()); itemVo.setIsTraceable(td.getIsTraceable()); itemVo.setIsPrint(td.getIsPrint()); itemVo.setIsReview(td.getIsReview()); @@ -1667,20 +1655,8 @@ vo.setAmount(task.getUnPackAmount()); vo.setUrgentAmount(task.getUrgentAmount()); vo.setText(nodeText); - // 如果是外来器械包，包装类型和灭菌程序为空，获取默认的 - if(td.isForeignTousse() && supplyRoomConfig!= null){ - String method = supplyRoomConfig.getFtDefaultSterilingMethod(); - if( !"无".equals(method) ){ - vo.setSterilingMethod(method); - } - String pType = supplyRoomConfig.getFtDefaultPackageType(); - if( !"无".equals(pType) ){ - vo.setPackageType(pType); - } - }else{ - vo.setPackageType(td.getPackageType()); - vo.setSterilingMethod(td.getSterilingMethod()); - } + vo.setPackageType(td.getPackageType()); + vo.setSterilingMethod(td.getSterilingMethod()); vo.setTousseType(td.getTousseType()); vo.setIsTraceable(td.getIsTraceable()); vo.setIsPrint(td.getIsPrint()); Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/foreignTousseView.js =================================================================== diff -u -r14800 -r16384 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/foreignTousseView.js (.../foreignTousseView.js) (revision 14800) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/foreignTousseView.js (.../foreignTousseView.js) (revision 16384) @@ -136,6 +136,7 @@ {header : "器械包名称",width : 180,dataIndex : 'name', renderer : renderName}, {header : "器械包名称",width : 180,dataIndex : 'name', renderer : modifyRecord,hidden:true}, {header : "器械包类别",width : 100,dataIndex : 'tousseType'}, + {header : "包装类型",width : 100,dataIndex : 'packageType'}, {header : "供应商",width : 180,dataIndex : 'supplierName'}, // {header : "打印标签类型",width : 100,dataIndex : 'barcodePaperType'}, {header : "拼音码",width : 80,dataIndex : 'spelling'}, @@ -146,6 +147,7 @@ {name : 'id'}, {name : 'name'}, {name : 'tousseType'}, + {name : 'packageType'}, {name : 'spelling'}, // {name : 'barcodePaperType'}, {name : 'wbCode'}, @@ -157,6 +159,7 @@ {type : 'string',dataIndex : 'name'}, {type : 'string',dataIndex : 'tousseType'}, {type : 'string',dataIndex : 'supplierName'}, + {type : 'string',dataIndex : 'packageType'}, {type : 'string',dataIndex : 'spelling'}, {type : 'string',dataIndex : 'wbCode'} ] Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/foreigntoussedefinition/foreignTousseDefinitionForm.js =================================================================== diff -u -r16351 -r16384 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/foreigntoussedefinition/foreignTousseDefinitionForm.js (.../foreignTousseDefinitionForm.js) (revision 16351) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/foreigntoussedefinition/foreignTousseDefinitionForm.js (.../foreignTousseDefinitionForm.js) (revision 16384) @@ -283,6 +283,12 @@ var browseImage = showTousseImage.findById('browseImage'); var url = WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!getToussePic.do?id=' + id + '&page=' + 1 +'&time='+new Date();; browseImage.autoEl.src=url; + + var packageTypeStore = new Ext.data.SimpleStore({ + fields : [ 'typeName','validDate','validDateUnit','warningDate' ], + url : WWWROOT + '/disinfectSystem/baseData/expirationDateInfoAction!getPackageTypeAndExpirationDateInfo.do', + baseParams :{addNullValue:true} + }); formObj = new top.Ext.FormPanel({ id : 'foreignTousseDefinitionForm', @@ -321,7 +327,7 @@ items : [{ columnWidth : .5, layout : 'form', - labelWidth : 70, + labelWidth : 80, items : [{ xtype : 'textfield', fieldLabel : "器械包名称", @@ -335,7 +341,7 @@ }, { columnWidth : .5, layout : 'form', - labelWidth : 70, + labelWidth : 80, items : [{ xtype : 'combo', fieldLabel : "供应商", @@ -359,7 +365,7 @@ }, { columnWidth : .5, layout : 'form', - labelWidth : 70, + labelWidth : 80, items : [{ xtype : 'textfield', fieldLabel : "拼音码", @@ -373,7 +379,7 @@ }, { columnWidth : .5, layout : 'form', - labelWidth : 70, + labelWidth : 80, items : [{ xtype : 'textfield', fieldLabel : "五笔码", @@ -385,10 +391,28 @@ anchor : '100%' }] },{ - columnWidth : 1, + columnWidth : .5, layout : 'form', - labelWidth : 70, + labelWidth : 80, items:[{ + xtype : 'combo', + fieldLabel : '默认包装类型', + id : 'packageType', + name : 'packageType', + valueField : 'typeName', + displayField : 'typeName', + store : packageTypeStore, + forceSelection : true, + allowBlank : true, + editable : false, + triggerAction : 'all', + anchor : '95%' + }] + },{ + columnWidth : .5, + layout : 'form', + labelWidth : 80, + items:[{ xtype : 'numberfield', fieldLabel : "打印份数", allowBlank : false, Index: ssts-web/src/main/webapp/dataUpdater/sqls/4.5.3_4.5.4.sql =================================================================== diff -u --- ssts-web/src/main/webapp/dataUpdater/sqls/4.5.3_4.5.4.sql (revision 0) +++ ssts-web/src/main/webapp/dataUpdater/sqls/4.5.3_4.5.4.sql (revision 16384) @@ -0,0 +1 @@ +update TousseDefinition set packageType = (select c.ftDefaultPackageType from SupplyRoomConfig c where c.supplyRoomType = 0) where tousseType = '外来器械包' and forDisplay = 1 and packageType is null; \ No newline at end of file Index: forgon-core/src/main/java/com/forgon/Constants.java =================================================================== diff -u -r16353 -r16384 --- forgon-core/src/main/java/com/forgon/Constants.java (.../Constants.java) (revision 16353) +++ forgon-core/src/main/java/com/forgon/Constants.java (.../Constants.java) (revision 16384) @@ -19,7 +19,7 @@ "3.3.0","3.3.8", "3.3.9", "3.3.10","3.3.12","3.3.13","3.8.0","3.9.0","3.9.1","3.9.2","4.0.2","4.0.3","4.0.4", "4.0.5","4.0.6","4.0.44","4.0.45","4.1.0","4.1.1","4.1.2","4.1.3","4.1.4","4.1.5","4.1.6","4.1.7","4.1.8","4.1.9","4.2.0","4.2.1","4.2.2", "4.2.3","4.2.4","4.2.5","4.2.6","4.2.7","4.2.8","4.2.9","4.3.0","4.3.1","4.3.2","4.3.3","4.3.4","4.3.5","4.3.6","4.3.7","4.3.8","4.3.9", - "4.4.0","4.4.1","4.4.2","4.4.3","4.4.4","4.4.5","4.4.6","4.4.7","4.4.8","4.4.9","4.5.0","4.5.1","4.5.2","4.5.3"};// 版本列表 + "4.4.0","4.4.1","4.4.2","4.4.3","4.4.4","4.4.5","4.4.6","4.4.7","4.4.8","4.4.9","4.5.0","4.5.1","4.5.2","4.5.3","4.5.4"};// 版本列表 public final static List SOFTWARE_VERSION_LIST = Arrays .asList(SOFTWARE_VERSION_ARRAY); public final static String SOFTWARE_VERSION = SOFTWARE_VERSION_ARRAY[SOFTWARE_VERSION_ARRAY.length - 1];// 软件最新版本 Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java =================================================================== diff -u -r15369 -r16384 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java (.../ForeignTousseApplicationManagerImpl.java) (revision 15369) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java (.../ForeignTousseApplicationManagerImpl.java) (revision 16384) @@ -16,29 +16,23 @@ import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.apache.commons.lang3.ArrayUtils; -import org.apache.cxf.ws.addressing.MAPAggregator; import org.hibernate.Query; import org.hibernate.Session; import com.forgon.Constants; import com.forgon.directory.acegi.tools.AcegiHelper; import com.forgon.directory.model.OrgUnit; import com.forgon.directory.service.OrgUnitManager; -import com.forgon.disinfectsystem.basedata.becleanitem.service.BeCleanItemManager; -import com.forgon.disinfectsystem.basedatamanager.container.service.ContainerManager; import com.forgon.disinfectsystem.basedatamanager.goodsstock.service.GoodsStockManager; import com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager; import com.forgon.disinfectsystem.basedatamanager.toussedefinition.service.TousseInstanceUtils; import com.forgon.disinfectsystem.basedatamanager.warehouse.service.WareHouseManager; import com.forgon.disinfectsystem.common.CssdUtils; -import com.forgon.disinfectsystem.entity.basedatamanager.container.Container; import com.forgon.disinfectsystem.entity.basedatamanager.materialdefinition.MaterialDefinition; import com.forgon.disinfectsystem.entity.basedatamanager.materialinstance.MaterialInstance; import com.forgon.disinfectsystem.entity.basedatamanager.supplyroomconfig.SupplyRoomConfig; import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition; import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseInstance; -import com.forgon.disinfectsystem.entity.becleanitem.ClassifiedItem; -import com.forgon.disinfectsystem.entity.becleanitem.ClassifyBasket; import com.forgon.disinfectsystem.entity.foreigntousseapplication.ForeignTousseApplication; import com.forgon.disinfectsystem.entity.goodsstock.GoodsStock; import com.forgon.disinfectsystem.entity.invoicemanager.InvoicePlan; @@ -83,10 +77,6 @@ private PackingManager packingManager; - private BeCleanItemManager beCleanItemManager; - - private ContainerManager containerManager; - private TousseInstanceManager tousseInstanceManager; private WareHouseManager wareHouseManager; @@ -124,18 +114,10 @@ this.tousseInstanceManager = tousseInstanceManager; } - public void setContainerManager(ContainerManager containerManager) { - this.containerManager = containerManager; - } - public void setPackingManager(PackingManager packingManager) { this.packingManager = packingManager; } - public void setBeCleanItemManager(BeCleanItemManager beCleanItemManager) { - this.beCleanItemManager = beCleanItemManager; - } - public void setSerialNumManager(SerialNumManager serialNumManager) { this.serialNumManager = serialNumManager; } @@ -312,60 +294,7 @@ } } - - private Container getContaner(String basketBarcode) { - if(StringUtils.isBlank(basketBarcode)){ - throw new RuntimeException("请扫描篮筐条码！"); - } - Container container = containerManager - .getContainerByBarcode(basketBarcode); - if(container == null){ - throw new RuntimeException(basketBarcode + ",篮筐条码以不存在！"); - } - return container; - } - - private void addTousseIntoBasket( - ForeignTousseApplication foreignTousseApplication, - TousseDefinition tousseDefinition,Integer amount, Container container) { - if (StringUtils.isNotBlank(container.getBarcode())) { - //根据篮筐条码查找没洗过的篮筐 - ClassifyBasket classifyBasket = beCleanItemManager - .getUnWashedBasketByBarcode(container.getBarcode()); - if (classifyBasket == null) { - classifyBasket = new ClassifyBasket(); - classifyBasket.setContainerBarcode(container.getBarcode()); - classifyBasket.setClassfiedItems(new HashSet()); - } - ClassifiedItem item = new ClassifiedItem(); - item.setAmount(amount); - item.setName(tousseDefinition.getName()); - item.setItemType(ClassifiedItem.TYPE_FOREIGN_TOUSSE); - item.setClassifyBasket(classifyBasket); - item.setOrgUnitName(foreignTousseApplication.getDepart()); - item.setTousseDefinition(tousseDefinition); - item.setTousseDefinitionID(tousseDefinition.getId()); - item.setInvoicePlanID(foreignTousseApplication.getId()); - classifyBasket.getClassfiedItems().add(item); - classifyBasket.getContainerBarcode(); - beCleanItemManager.saveOrUpdate(classifyBasket); - classifyBasket.setContainerName(container.getContainerName()); - classifyBasket.setRecyclingTime(foreignTousseApplication.getReceiveTime()); - //篮筐状态更改为清洗装载 - container.setStatus(Container.CONTAINER_STATUS_WASHLOADING); - containerManager.saveOrUpdate(container); - - String remark = foreignTousseApplication.getRemark(); - if(StringUtils.isBlank(remark)){ - remark = container.getBarcode(); - }else{ - remark += ";" + container.getBarcode(); - } - foreignTousseApplication.setRemark(remark); - } - } - /** * 为外来器械申请单设置外来器械包、权限。若是修改，则删除旧的外来器械包【TousseItem】 * @param foreignTousseApplication @@ -586,6 +515,16 @@ } tousseDefinition.setAncestorID(ancestorTD.getId()); tousseDefinition.setPrintAmount(ancestorTD.getPrintAmount()); + String defaultPackageType = ancestorTD.getPackageType(); + if(StringUtils.isBlank(defaultPackageType)){ + defaultPackageType = config.getFtDefaultPackageType(); + } + tousseDefinition.setPackageType(defaultPackageType); + String defaultSterilingMethod = ancestorTD.getSterilingMethod(); + if(StringUtils.isBlank(defaultSterilingMethod)){ + defaultSterilingMethod = config.getFtDefaultSterilingMethod(); + } + tousseDefinition.setSterilingMethod(defaultSterilingMethod); tousseDefinitionManager.saveOrUpdate(tousseDefinition); obj.put("tousseDefinitionId", tousseDefinition.getId()); @@ -647,6 +586,10 @@ tousseDefinition.setSupplierName(supplierName); tousseDefinition.setIsCleanedEntirely(cleanedEntirely); tousseDefinition.setIsReview(config.getForeignTousseNeedReview()); + if(forDisplay){ + tousseDefinition.setPackageType(config.getFtDefaultPackageType()); + tousseDefinition.setSterilingMethod(config.getFtDefaultSterilingMethod()); + } List foreignMaterialDefinitions = new ArrayList(); JSONArray materialsJsonArray = obj.optJSONArray("materials");