Эх сурвалжийг харах

手动出库添加工单绑定 待出库,手动出库添加 出库人和接收人

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

+ 14 - 0
hx-wms/src/main/java/com/fjhx/wms/entity/stock/dto/StockDto.java

@@ -33,4 +33,18 @@ public class StockDto extends Stock {
      * 业务id
      * 业务id
      */
      */
     private Long businessId;
     private Long businessId;
+
+    /**
+     * 工单id
+     */
+    private Long workOrderId;
+
+    /**
+     * 出库人
+     */
+    private String exWarehousePerson;
+    /**
+     * 接收人
+     */
+    private String receivingPerson;
 }
 }

+ 9 - 0
hx-wms/src/main/java/com/fjhx/wms/entity/stock/dto/StockWaitDetailsDto.java

@@ -32,4 +32,13 @@ public class StockWaitDetailsDto extends StockWaitDetails {
      * 物流编号
      * 物流编号
      */
      */
     private String logisticsCode;
     private String logisticsCode;
+
+    /**
+     * 出库人
+     */
+    private String exWarehousePerson;
+    /**
+     * 接收人
+     */
+    private String receivingPerson;
 }
 }

+ 9 - 0
hx-wms/src/main/java/com/fjhx/wms/entity/stock/dto/StockWaitDto.java

@@ -58,4 +58,13 @@ public class StockWaitDto extends StockWait {
      */
      */
     private String address;
     private String address;
 
 
+    /**
+     * 出库人
+     */
+    private String exWarehousePerson;
+    /**
+     * 接收人
+     */
+    private String receivingPerson;
+
 }
 }

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

@@ -51,4 +51,13 @@ public class StockJournal extends BasePo {
      */
      */
     private Long businessId;
     private Long businessId;
 
 
+    /**
+     * 出库人
+     */
+    private String exWarehousePerson;
+    /**
+     * 接收人
+     */
+    private String receivingPerson;
+
 }
 }

+ 4 - 1
hx-wms/src/main/java/com/fjhx/wms/service/stock/impl/StockServiceImpl.java

@@ -377,7 +377,10 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
         stockJournal.setCode(stockDto.getType() == 1 ? CodeEnum.SIN_CODE.getCode() : CodeEnum.SOUT_CODE.getCode());
         stockJournal.setCode(stockDto.getType() == 1 ? CodeEnum.SIN_CODE.getCode() : CodeEnum.SOUT_CODE.getCode());
         stockJournal.setType(stockDto.getType());
         stockJournal.setType(stockDto.getType());
         stockJournal.setWarehouseId(stockDto.getWarehouseId());
         stockJournal.setWarehouseId(stockDto.getWarehouseId());
-        stockJournal.setBusinessId(stockDto.getBusinessId());
+        stockJournal.setBusinessId(stockDto.getWorkOrderId());
+        stockJournal.setExWarehousePerson(stockDto.getExWarehousePerson());
+        stockJournal.setReceivingPerson(stockDto.getReceivingPerson());
+
         //保存出入库记录
         //保存出入库记录
         stockJournalService.save(stockJournal);
         stockJournalService.save(stockJournal);
         //操作库存
         //操作库存

+ 4 - 0
hx-wms/src/main/java/com/fjhx/wms/service/stock/impl/StockWaitServiceImpl.java

@@ -315,6 +315,10 @@ public class StockWaitServiceImpl extends ServiceImpl<StockWaitMapper, StockWait
         stockJournal.setCode(stockWait.getType() == 1 ? CodeEnum.SIN_CODE.getCode() : CodeEnum.SOUT_CODE.getCode());
         stockJournal.setCode(stockWait.getType() == 1 ? CodeEnum.SIN_CODE.getCode() : CodeEnum.SOUT_CODE.getCode());
         stockJournal.setWarehouseId(stockWaitDto.getWarehouseId());
         stockJournal.setWarehouseId(stockWaitDto.getWarehouseId());
         stockJournal.setBusinessId(stockWaitDto.getId());
         stockJournal.setBusinessId(stockWaitDto.getId());
+
+        stockJournal.setExWarehousePerson(stockWaitDto.getExWarehousePerson());
+        stockJournal.setReceivingPerson(stockWaitDto.getReceivingPerson());
+
         //保存出入库记录
         //保存出入库记录
         stockJournalService.save(stockJournal);
         stockJournalService.save(stockJournal);
         List<StockJournalDetails> stockJournalDetailsList = new ArrayList<>();
         List<StockJournalDetails> stockJournalDetailsList = new ArrayList<>();