Index: forgon-core/src/main/java/com/forgon/Constants.java =================================================================== diff -u -r16230 -r16258 --- forgon-core/src/main/java/com/forgon/Constants.java (.../Constants.java) (revision 16230) +++ forgon-core/src/main/java/com/forgon/Constants.java (.../Constants.java) (revision 16258) @@ -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.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"};// 版本列表 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-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/toussedefinition/service/TousseDefinitionUtils.java =================================================================== diff -u -r15549 -r16258 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/toussedefinition/service/TousseDefinitionUtils.java (.../TousseDefinitionUtils.java) (revision 15549) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/toussedefinition/service/TousseDefinitionUtils.java (.../TousseDefinitionUtils.java) (revision 16258) @@ -126,4 +126,11 @@ } return false; } + + public static boolean getBoolIsPrintOnDirectPacking(TousseDefinition td) { + if(TousseDefinition.STR_YES.equals(td.getIsPrintOnDirectPacking())){ + return true; + } + return false; + } } Index: ssts-web/src/main/webapp/dataUpdater/sqls/4.4.8_4.4.9.sql =================================================================== diff -u --- ssts-web/src/main/webapp/dataUpdater/sqls/4.4.8_4.4.9.sql (revision 0) +++ ssts-web/src/main/webapp/dataUpdater/sqls/4.4.8_4.4.9.sql (revision 16258) @@ -0,0 +1 @@ +update TousseDefinition set isPrintOnDirectPacking=isPrint where isPrintOnDirectPacking is null and isPrint is not null; \ No newline at end of file Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java =================================================================== diff -u -r15921 -r16258 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java (.../TousseDefinition.java) (revision 15921) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java (.../TousseDefinition.java) (revision 16258) @@ -144,6 +144,8 @@ private String isPrint = STR_YES; //是否打印标签 + private String isPrintOnDirectPacking = STR_NO; // 自定义装配是否打印标签 + private String isPrintOrg = STR_NO; //是否打印科室(默认不打印,省医提出问题) private String isTraceable = STR_YES; //是否追溯 @@ -775,6 +777,14 @@ this.isPrint = isPrint; } + public String getIsPrintOnDirectPacking() { + return isPrintOnDirectPacking; + } + + public void setIsPrintOnDirectPacking(String isPrintOnDirectPacking) { + this.isPrintOnDirectPacking = isPrintOnDirectPacking; + } + public String getIsPrintOrg() { return isPrintOrg; } Index: ssts-web/src/main/webapp/disinfectsystem/packing/directPacking.js =================================================================== diff -u -r16212 -r16258 --- ssts-web/src/main/webapp/disinfectsystem/packing/directPacking.js (.../directPacking.js) (revision 16212) +++ ssts-web/src/main/webapp/disinfectsystem/packing/directPacking.js (.../directPacking.js) (revision 16258) @@ -1180,21 +1180,21 @@ return; } showResult('保存成功'); - var isPrint = action.result.isPrint; + var isPrint = action.result.isPrintOnDirectPacking; var isTraceable = action.result.isTraceable; var fixedBarcode = action.result.fixedBarcode; var idCardDefinitionUseAmount = action.result.idCardDefinitionUseAmount; //此处改为不管器械包定义是否打印,都打印标签 - /*if(isPrint){*/ + if(isPrint){ if(action.result.isDisinfection){//是否为消毒物品 printBarcodeOfDisinfection(action.result.barcode, action.result.disinfectionItem,isTraceable,fixedBarcode,expirationDate,action.result.packageTypeAbbreviation); }else{ printBarcode(action.result.barcode,action.result.virtualSeqNums,disinfectionDate,isTraceable,fixedBarcode,idCardDefinitionUseAmount); } - /*}else{ + }else{ showResult("此器械包不打印标签！"); - }*/ + } Ext.getCmp('tousseName').setValue(); Ext.getCmp('tempTousseType').setValue(); Ext.getCmp('packAmount').setValue(); Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java =================================================================== diff -u -r16250 -r16258 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 16250) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 16258) @@ -53,6 +53,7 @@ import com.forgon.disinfectsystem.basedatamanager.goodsstock.service.GoodsStockManager; import com.forgon.disinfectsystem.basedatamanager.sterilisation.service.SterilisationManager; import com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager; +import com.forgon.disinfectsystem.basedatamanager.toussedefinition.service.TousseDefinitionUtils; import com.forgon.disinfectsystem.basedatamanager.toussedefinition.service.TousseInstanceUtils; import com.forgon.disinfectsystem.basedatamanager.warehouse.service.WareHouseManager; import com.forgon.disinfectsystem.common.CssdUtils; @@ -5191,6 +5192,7 @@ retObj.put("barcode", barcodes); retObj.put("virtualSeqNums", virtualSeqNums); retObj.put("isPrint", isPrint); + retObj.put("isPrintOnDirectPacking", TousseDefinitionUtils.getBoolIsPrintOnDirectPacking(td)); retObj.put("isTraceable", isTraceable); retObj.put("idCardDefinitionUseAmount", idCardDefinitionUseAmount); retObj.put("fixedBarcode", fixedBarcode); Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js =================================================================== diff -u -r16232 -r16258 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js (.../tousseForm.js) (revision 16232) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js (.../tousseForm.js) (revision 16258) @@ -1136,6 +1136,28 @@ columnWidth : .25, layout : 'form', items:[{ + xtype : 'combo', + fieldLabel : '自定义装配打印标签', + id : 'isPrintOnDirectPacking', + name : 'isPrintOnDirectPacking', + valueField : 'value', + displayField : 'value', + store : new Ext.data.SimpleStore( { + fields : [ 'value'], + data : [['是'],['否']] + }), + editable : false, + forceSelection : true, + allowBlank : false, + value : '否', + mode : 'local', + triggerAction : 'all', + anchor : '100%' + }] + },{ + columnWidth : .25, + layout : 'form', + items:[{ xtype : 'numberfield', fieldLabel : "打印份数", allowBlank : false,