Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java =================================================================== diff -u -r28403 -r28489 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java (.../ForeignTousseApplicationManagerImpl.java) (revision 28403) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java (.../ForeignTousseApplicationManagerImpl.java) (revision 28489) @@ -1426,6 +1426,7 @@ data.put("tousseItemId", tousseItem.getId()); data.put("tousseName", td.getName()); data.put("supplierName", td.getSupplierName()); + data.put("packageType", td.getPackageType()); rows.add(data); } } Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java =================================================================== diff -u -r28488 -r28489 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 28488) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 28489) @@ -6210,6 +6210,11 @@ if(recyclingRecord != null){ tousseInstance.setRecyclingTime(ForgonDateUtils.safelyFormatDate(recyclingRecord.getRecyclingTime(), ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMM, null)); } + tousseInstance.setDepart(originalTousseInstance.getDepart()); + tousseInstance.setDepartCoding(originalTousseInstance.getDepartCoding()); + tousseInstance.setSettleAccountsDepart(originalTousseInstance.getSettleAccountsDepart()); + tousseInstance.setSettleAccountsDepartCode(originalTousseInstance.getSettleAccountsDepartCode()); + tousseInstance.setSettleAccountsDepartCoding(originalTousseInstance.getSettleAccountsDepartCoding()); return tousseInstance; }