Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java =================================================================== diff -u -r25568 -r25569 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 25568) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 25569) @@ -5750,6 +5750,8 @@ boolean isPrint = true; boolean isTraceable = true; String idCardDefinitionUseAmount = ""; + String idCardDefinitionIdNumber = ""; + String idCardDefinitionDescription = ""; // 修改装配数量 Integer packAmount = Integer.parseInt(packAmountStr); @@ -5987,7 +5989,7 @@ tousseInstanceManager.save(tousseInstance); tousseInstanceList.add(tousseInstance); - // 器械包标志牌处理 + // 器械包标识牌处理 // 如果找到对应的器械包标识牌实例,则该器械包实例与标识牌实例关联,并退出循环,因为这里是1对1的关系 if (StringUtils.isNotBlank(idCardInstanceId)) { if (addTousseInstanceToIdCardInstance(idCardDefinitionId, @@ -5996,6 +5998,13 @@ if (useAmount != null) { idCardDefinitionUseAmount = useAmount.toString(); } + + IDCardDefinition idCardDefinition = getIDCardDefinition(Long.parseLong(idCardInstanceId)); + if (idCardDefinition != null){ + idCardDefinitionIdNumber = idCardDefinition.getIdNumber(); + idCardDefinitionDescription = idCardDefinition.getDescription(); + } + break; } } @@ -6033,6 +6042,9 @@ tousse.put("isTraceable", isTraceable); tousse.put("wrapper", tousseInstance.getWrapper()); tousse.put("idCardDefinitionUseAmount", idCardDefinitionUseAmount); + tousse.put("idCardDefinitionIdNumber", idCardDefinitionIdNumber); + tousse.put("idCardDefinitionDescription", idCardDefinitionDescription); + tousse.put("fixedBarcode", fixedBarcode); tousse.put("isDisinfection", isDisinfection); tousse.put("disinfectionItem", materials); @@ -6051,6 +6063,8 @@ retObj.put("isPrintOnDirectPacking", TousseDefinitionUtils.getBoolIsPrintOnDirectPacking(ancestorTD)); retObj.put("isTraceable", isTraceable); retObj.put("idCardDefinitionUseAmount", idCardDefinitionUseAmount); + retObj.put("idCardDefinitionIdNumber", idCardDefinitionIdNumber); + retObj.put("idCardDefinitionDescription", idCardDefinitionDescription); retObj.put("fixedBarcode", fixedBarcode); retObj.put("isDisinfection", isDisinfection); retObj.put("disinfectionItem", materials);