Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java =================================================================== diff -u -r16298 -r16305 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 16298) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 16305) @@ -789,6 +789,16 @@ toolAndImplantAmount.optInt("implantAmount"),department, isPrintOrg,idCardDefinitionUseAmount,objectDao,td.getBarcodePaperType(),tousseInstance.getWashOperator(),tousseInstance.getWashOperatorCode(), tousseInstance.getWeight(),td.getPrintAmount()); + // 特殊单的包实例处理 + if(tousseInstance.getForeignProxyItem_id() != null){ + ForeignProxyDisinfection foreignProxyDisinfection = tousseInstance.getForeignProxyDisinfection(objectDao); + if(foreignProxyDisinfection != null){ + + obj.put("maker", foreignProxyDisinfection.getMaker()); + obj.put("assistant", foreignProxyDisinfection.getAssistant()); + obj.put("depart", foreignProxyDisinfection.getDepart()); + } + } array.add(obj); } }