Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceOptimizeManagerImpl.java =================================================================== diff -u -r29356 -r29387 --- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceOptimizeManagerImpl.java (.../InvoiceOptimizeManagerImpl.java) (revision 29356) +++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceOptimizeManagerImpl.java (.../InvoiceOptimizeManagerImpl.java) (revision 29387) @@ -6282,6 +6282,8 @@ } return false; }).map(Entry::getKey).findFirst().orElse(null); + //发货单id + Long invoiceId = invoice == null ? null : invoice.getId(); entry0.getValue().entrySet().forEach(entry1 -> { DisposableGoodsIdentification identi = entry1.getKey(); Integer amount = entry1.getValue(); @@ -6292,8 +6294,8 @@ Long dgId = idToDisposableGoodsBatchMap.get(batchId).getDiposableGoods().getId(); dgIdToAmountMap.put(dgId, MathTools.add(dgIdToAmountMap.get(dgId), amount).intValue()); allIdentiToAmountEntryList.add(entry1); + invoiceIdListOfAllIdentiToAmountEntry.add(invoiceId); }); - invoiceIdListOfAllIdentiToAmountEntry.add(invoice == null ? null : invoice.getId()); }); } //根据定义id及批次定义id查找相应的库存及批次库存对象(加锁)