Forráskód Böngészése

手动出入库添加备注字段

yzc 1 éve
szülő
commit
ba4f85577a

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

@@ -33,4 +33,9 @@ public class StockDto extends Stock {
      * 业务id
      */
     private Long businessId;
+
+    /**
+     * 备注
+     */
+    private String remarks;
 }

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

@@ -1,10 +1,7 @@
 package com.fjhx.wms.entity.stock.po;
 
-import com.ruoyi.common.core.domain.BasePo;
 import com.baomidou.mybatisplus.annotation.TableName;
-
-import java.util.Date;
-
+import com.ruoyi.common.core.domain.BasePo;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -51,4 +48,9 @@ public class StockJournal extends BasePo {
      */
     private String linkCode;
 
+    /**
+     * 备注
+     */
+    private String remarks;
+
 }

+ 5 - 0
hx-wms/src/main/java/com/fjhx/wms/entity/stock/vo/StockJournalDetailsVo.java

@@ -80,4 +80,9 @@ public class StockJournalDetailsVo extends StockJournalDetails {
      * 关联单号
      */
     private String linkCode;
+
+    /**
+     * 备注
+     */
+    private String remarks;
 }

+ 2 - 0
hx-wms/src/main/java/com/fjhx/wms/service/stock/impl/StockServiceImpl.java

@@ -490,6 +490,7 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
         stockJournal.setCode(stockDto.getType() == 1 ? CodeEnum.SIN_CODE.getCode() : CodeEnum.SOUT_CODE.getCode());
         stockJournal.setWarehouseId(stockDto.getWarehouseId());
         stockJournal.setBusinessId(stockDto.getBusinessId());
+        stockJournal.setRemarks(stockDto.getRemarks());
         //保存出入库记录
         stockJournalService.save(stockJournal);
         //操作库存
@@ -508,6 +509,7 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
         stockJournal.setType(stockDto.getType());
         stockJournal.setWarehouseId(stockDto.getWarehouseId());
         stockJournal.setBusinessId(stockDto.getBusinessId());
+        stockJournal.setRemarks(stockDto.getRemarks());
         //保存出入库记录
         stockJournalService.save(stockJournal);
         //操作库存

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

@@ -14,7 +14,8 @@
             sjd.quantity,
             sjd.create_time,
             sjd.create_user,
-            sj.business_id
+            sj.business_id,
+            sj.remarks
         FROM
             stock_journal sj
                 JOIN stock_journal_details sjd ON sjd.stock_journal_id = sj.id