yzc 1 жил өмнө
parent
commit
1bc3cc822c

+ 4 - 1
hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/deliver/impl/DeliverGoodsServiceImpl.java

@@ -420,7 +420,10 @@ public class DeliverGoodsServiceImpl extends ServiceImpl<DeliverGoodsMapper, Del
 
             for (StockJournalDetailsVo stockJournalDetailsVo : stockJournalDetailsVos) {
                 StockJournal stockJournal = stockJournalService.getById(stockJournalDetailsVo.getStockJournalId());
-                StockWaitDetails stockWaitDetails = stockWaitDetailsService.getOne(q -> q.eq(StockWaitDetails::getStockWaitId, stockJournal.getBusinessId()));
+                StockWaitDetails stockWaitDetails = stockWaitDetailsService.getOne(q -> q
+                        .eq(StockWaitDetails::getStockWaitId, stockJournal.getBusinessId())
+                        .eq(StockWaitDetails::getProductId,stockJournalDetailsVo.getProductId())
+                );
 
                 Long businessDetailsId = stockWaitDetails.getBusinessDetailsId();
                 ArrivalDetail arrivalDetail1 = arrivalDetailService.getById(businessDetailsId);