Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java =================================================================== diff -u -r17266 -r17278 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 17266) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 17278) @@ -5625,8 +5625,15 @@ for (TousseInstance tousseInstance : tousseInstanceList) { JSONObject tousse = new JSONObject(); + JSONArray materialsJsonArray = new JSONArray(); // 消毒物品明细 + if (td.isDisinfection()) { + materialsJsonArray = tousseDefinitionManager.getMaterialsOfDisinfectionGoods(td, true); + } + tousse.put("tousseName", tousseName); tousse.put("barcode", tousseInstance.getBarcode()); + tousse.put("tousseType", td.getTousseType()); + tousse.put("materialsJsonArray", materialsJsonArray); tousse.put("virtualSeqNums", StringUtils.defaultIfEmpty(tousseInstance.getVirtualBasketSeqNum(), "")); tousse.put("isPrint", isPrint); tousse.put("isPrintOnDirectPacking", TousseDefinitionUtils.getBoolIsPrintOnDirectPacking(td)); Index: ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js =================================================================== diff -u -r17276 -r17278 --- ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js (.../cssdUtils.js) (revision 17276) +++ ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js (.../cssdUtils.js) (revision 17278) @@ -220,7 +220,6 @@ if(isUndefinedOrNullOrEmpty(pageType)){ pageType = tousseObj.pageType; } - if(isPageTypeConfigured(tousseObj.tousseType,pageType) || isTemplatePageType(pageType)){ // alert(tousseObj.isTraceable) // if(!tousseObj.isTraceable){