Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java =================================================================== diff -u -r22574 -r22583 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 22574) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 22583) @@ -5761,6 +5761,7 @@ tousse.put("isPrint", isPrint); tousse.put("isPrintOnDirectPacking", TousseDefinitionUtils.getBoolIsPrintOnDirectPacking(td)); tousse.put("isTraceable", isTraceable); + tousse.put("wrapper", tousseInstance.getWrapper()); tousse.put("idCardDefinitionUseAmount", idCardDefinitionUseAmount); tousse.put("fixedBarcode", fixedBarcode); tousse.put("isDisinfection", isDisinfection); Index: ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource.js =================================================================== diff -u -r21305 -r22583 --- ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource.js (.../dataSource.js) (revision 21305) +++ ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource.js (.../dataSource.js) (revision 22583) @@ -167,6 +167,10 @@ displayName: '配包人', textForPreview: '张三' }),new ObjectDataSourceProperty({ + propName: 'wrapper', + displayName: '包装人', + textForPreview: '张三' + }),new ObjectDataSourceProperty({ propName: 'reviewer', displayName: '审核人', textForPreview: '李四' Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/CssdUtils.java =================================================================== diff -u -r21321 -r22583 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/CssdUtils.java (.../CssdUtils.java) (revision 21321) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/CssdUtils.java (.../CssdUtils.java) (revision 22583) @@ -1232,6 +1232,7 @@ obj.put("operatorToPrint", names.optString("operatorToPrint")); obj.put("reviewerToPrint", names.optString("reviewerToPrint")); + obj.put("wrapper", tousseInstance.getWrapper()); obj.put("sterilizationUserToPrint", names.optString("sterilizationUserToPrint")); obj.put("washOperator", names.optString("washOperatorToPrint"));