问题处理

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/jd/impl/JdOrderServiceImpl.java

@@ -374,8 +374,8 @@ public class JdOrderServiceImpl extends ServiceImpl<JdOrderMapper, JdOrder> impl
         stockJournal.setOpType(1);
         stockJournal.setType(JournalType.ADJUSTING_IN.getDetailType());
         stockJournal.setCode(stockTransfer.getCode());
-        stockJournal.setWarehouseId(stockTransfer.getOutWarehouseId());
-        stockJournal.setToWarehouseId(stockTransfer.getInWarehouseId());
+        stockJournal.setWarehouseId(stockTransfer.getInWarehouseId());
+//        stockJournal.setToWarehouseId(stockTransfer.getInWarehouseId());
         stockJournal.setBusinessId(stockTransfer.getId());
         //保存人库记录
         stockJournalService.save(stockJournal);
@@ -386,7 +386,7 @@ public class JdOrderServiceImpl extends ServiceImpl<JdOrderMapper, JdOrder> impl
         stockJournal1.setType(JournalType.ADJUSTING_OUT.getDetailType());
         stockJournal1.setCode(stockTransfer.getCode());
         stockJournal1.setWarehouseId(stockTransfer.getOutWarehouseId());
-        stockJournal1.setToWarehouseId(stockTransfer.getInWarehouseId());
+//        stockJournal1.setToWarehouseId(stockTransfer.getInWarehouseId());
         stockJournal1.setBusinessId(stockTransfer.getId());
         //保存出库记录
         stockJournalService.save(stockJournal1);

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

@@ -196,8 +196,8 @@ public class StockTransferServiceImpl extends ServiceImpl<StockTransferMapper, S
         stockJournal.setOpType(1);
         stockJournal.setType(JournalType.ADJUSTING_IN.getDetailType());
         stockJournal.setCode(stockTransfer.getCode());
-        stockJournal.setWarehouseId(stockTransfer.getOutWarehouseId());
-        stockJournal.setToWarehouseId(stockTransfer.getInWarehouseId());
+        stockJournal.setWarehouseId(stockTransfer.getInWarehouseId());
+//        stockJournal.setToWarehouseId(stockTransfer.getInWarehouseId());
         stockJournal.setBusinessId(stockTransfer.getId());
         //保存人库记录
         stockJournalService.save(stockJournal);
@@ -208,7 +208,7 @@ public class StockTransferServiceImpl extends ServiceImpl<StockTransferMapper, S
         stockJournal1.setType(JournalType.ADJUSTING_OUT.getDetailType());
         stockJournal1.setCode(stockTransfer.getCode());
         stockJournal1.setWarehouseId(stockTransfer.getOutWarehouseId());
-        stockJournal1.setToWarehouseId(stockTransfer.getInWarehouseId());
+//        stockJournal1.setToWarehouseId(stockTransfer.getInWarehouseId());
         stockJournal1.setBusinessId(stockTransfer.getId());
         //保存出库记录
         stockJournalService.save(stockJournal1);

hx-wms/src/main/java/com/fjhx/wms/entity/stock/po/StockJournal.java

@@ -41,10 +41,10 @@ public class StockJournal extends BasePo {
      */
     private Long warehouseId;
 
-    /**
-     * 调仓目标仓库id
-     */
-    private Long toWarehouseId;
+//    /**
+//     * 调仓目标仓库id
+//     */
+//    private Long toWarehouseId;
 
     /**
      * 业务id

hx-wms/src/main/java/com/fjhx/wms/service/stock/impl/StockJournalServiceImpl.java

@@ -58,9 +58,9 @@ public class StockJournalServiceImpl extends ServiceImpl<StockJournalMapper, Sto
         //根据id赋值操作人名称
         UserUtil.assignmentNickName(records, StockJournalVo::getCreateUser, StockJournalVo::setUserName);
         //如果为调参类型记录赋值目标仓库名称
-        warehouseService.attributeAssign(records, StockJournalVo::getToWarehouseId, (item, warehouse) -> {
-            item.setToWarehouseName(warehouse.getName());
-        });
+//        warehouseService.attributeAssign(records, StockJournalVo::getToWarehouseId, (item, warehouse) -> {
+//            item.setToWarehouseName(warehouse.getName());
+//        });
         return page;
     }
 
@@ -85,11 +85,11 @@ public class StockJournalServiceImpl extends ServiceImpl<StockJournalMapper, Sto
         }
 
         //如果为调参记录
-        if (result.getType() == 3) {
-            //赋值目标仓库名称
-            Warehouse byId = warehouseService.getById(result.getToWarehouseId());
-            result.setToWarehouseName(byId.getName());
-        }
+//        if (result.getType() == 3) {
+//            //赋值目标仓库名称
+//            Warehouse byId = warehouseService.getById(result.getToWarehouseId());
+//            result.setToWarehouseName(byId.getName());
+//        }
 
         return result;
     }

hx-wms/src/main/resources/mapper/stock/StockJournalDetailsMapper.xml

@@ -9,7 +9,6 @@
             sj.`code`,
             sj.warehouse_id,
             w.`name` warehouseName,
-            sj.to_warehouse_id,
             sjd.product_id,
             sjd.quantity,
             sjd.create_time,

hx-wms/src/main/resources/mapper/stock/StockJournalMapper.xml

@@ -9,7 +9,6 @@
             sj.code,
             sj.warehouse_id,
             w.NAME warehouseName,
-            sj.to_warehouse_id,
             sj.create_user,
             sj.create_time,
             sj.update_user,