Merge remote-tracking branch 'origin/master'

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/stock/impl/StockTransferServiceImpl.java

@@ -291,12 +291,10 @@ public class StockTransferServiceImpl extends ServiceImpl<StockTransferMapper, S
         stockJournal.setType(JournalType.ADJUSTING_OUT.getDetailType());//调仓入库
         stockJournal.setWarehouseId(stockTransferDto.getOutWarehouseId());
         stockJournal.setBusinessId(stockTransferDto.getId());
-        //        stockJournal.setToWarehouseId(stockDto.getToWarehouseId());
-        //保存出入库记录
         stockJournalService.save(stockJournal);
         List<StockJournalDetails> stockJournalDetailsList = new ArrayList<>();
         for (StockTransferDetails stockTransferDetails : stockTransferDetailsList) {
-            //创建出入库明细
+            //创建出库明细
             StockJournalDetails stockJournalDetails = new StockJournalDetailsDto();
             stockJournalDetails.setStockJournalId(stockJournal.getId());
             stockJournalDetails.setProductId(stockTransferDetails.getProductId());
@@ -306,23 +304,26 @@ public class StockTransferServiceImpl extends ServiceImpl<StockTransferMapper, S
         }
         //操作库存
         stockService.ModifyInventory(2, stockList, stockTransferDto.getOutWarehouseId());
-        //保存出入库明细
+        //保存出库记录明细
         stockJournalDetailsService.saveBatch(stockJournalDetailsList);
 
         //创建入库记录
         StockJournal stockJournal1 = new StockJournal();
         stockJournal1.setCode(stockTransferDto.getCode());
-        stockJournal.setBusinessId(stockTransferDto.getId());
+        stockJournal1.setBusinessId(stockTransferDto.getId());
         stockJournal1.setOpType(1);//入库
         stockJournal1.setType(JournalType.ADJUSTING_IN.getDetailType());//调仓出库
         stockJournal1.setWarehouseId(stockTransferDto.getInWarehouseId());
-//        stockJournal1.setToWarehouseId(stockDto.getToWarehouseId());
-        //保存出入库记录
         stockJournalService.save(stockJournal1);
-
         //入库操作
         stockService.ModifyInventory(1, stockList, stockTransferDto.getInWarehouseId());
-        //保存出入库明细
+        //保存入库记录明细
+        for (StockJournalDetails stockJournalDetails : stockJournalDetailsList) {
+            //清空id再插入一份入库记录
+            stockJournalDetails.setId(null);
+            //赋值入库流水主表id
+            stockJournalDetails.setStockJournalId(stockJournal1.getId());
+        }
         stockJournalDetailsService.saveBatch(stockJournalDetailsList);
     }