Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java =================================================================== diff -u -r40674 -r40681 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 40674) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 40681) @@ -8238,7 +8238,9 @@ // 质量监测重新装配 sourceId要么是回收id,要么是申请单id,回收id优先. tousseInstance.setRecyclingRecordId(currentPackingTask.getRpRecyclingRecordId()); if(!DatabaseUtil.isPoIdValid(tousseInstance.getInvoicePlanID())){ - tousseInstance.setInvoicePlanID(currentPackingTask.getRpInvoicePlanId()); + //tousseInstance.setInvoicePlanID(currentPackingTask.getRpInvoicePlanId()); + //针对DGSETYY-121问题,应改为将InvoicePlanID字段赋值为退货记录关联的新生成的申请人为"退货重发"的申请单 + tousseInstance.setInvoicePlanID(currentPackingTask.getRtInvoicePlanId()); } if(DatabaseUtil.isPoIdValid(currentPackingTask.getRpTousseItemId())){ tousseInstance.setForeignProxyItem_id(currentPackingTask.getRpTousseItemId());