Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/packing/PackingTask.java =================================================================== diff -u -r36371 -r36914 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/packing/PackingTask.java (.../PackingTask.java) (revision 36371) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/packing/PackingTask.java (.../PackingTask.java) (revision 36914) @@ -223,6 +223,10 @@ */ private Long rpInvoicePlanId; /** + * 重新装配生成的装配任务,申请项的id + */ + private Long rpTousseItemId; + /** * 重新装配清洗篮筐的所有id,以分号分开 */ private String classifyBasketIds; @@ -707,5 +711,13 @@ UrgentAdditionalInfo urgentAdditionalInfo) { this.urgentAdditionalInfo = urgentAdditionalInfo; } + + public Long getRpTousseItemId() { + return rpTousseItemId; + } + + public void setRpTousseItemId(Long rpTousseItemId) { + this.rpTousseItemId = rpTousseItemId; + } } Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java =================================================================== diff -u -r36833 -r36914 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 36833) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 36914) @@ -7345,6 +7345,9 @@ if(!DatabaseUtil.isPoIdValid(tousseInstance.getInvoicePlanID())){ tousseInstance.setInvoicePlanID(currentPackingTask.getRpInvoicePlanId()); } + if(DatabaseUtil.isPoIdValid(currentPackingTask.getRpTousseItemId())){ + tousseInstance.setForeignProxyItem_id(currentPackingTask.getRpTousseItemId()); + } } return tousseInstance; @@ -7837,6 +7840,7 @@ packingTask.setSettleAccountsDepartCoding(tousseInstance.getSettleAccountsDepartCoding()); packingTask.setRpInvoicePlanId(tousseInstance.getInvoicePlanID()); } + packingTask.setRpTousseItemId(tousseInstance.getForeignProxyItem_id()); // SourceId 要么是回收单id,要么是申请单id,没有回收单时,用申请单id. if(packingTask.getSourceId() == null){ packingTask.setSourceId(tousseInstance.getInvoicePlanID());