问题处理

hx-wms/src/main/java/com/fjhx/wms/entity/stock/vo/StockJournalVo.java

@@ -4,6 +4,7 @@ import com.fjhx.wms.entity.stock.po.StockJournal;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -20,8 +21,8 @@ public class StockJournalVo extends StockJournal {
      * 仓库名称
      */
     private String warehouseName;
-    /**调仓库目标仓库名称*/
-    private String toWarehouseName;
+//    /**调仓库目标仓库名称*/
+//    private String toWarehouseName;
 
     /**
      * 操作人名称
@@ -31,4 +32,7 @@ public class StockJournalVo extends StockJournal {
     /**手动入库商品明细*/
     private List<StockVo> list;
 
+    /**数量*/
+    private BigDecimal quantity;
+
 }

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

@@ -22,7 +22,6 @@
         <id property="id" column="id"/>
         <result property="warehouseName" column="warehouseName"/>
         <result property="type" column="type"/>
-        <result property="toWarehouseId" column="to_warehouse_id"/>
         <collection property="list" javaType="java.util.ArrayList" ofType="com.fjhx.wms.entity.stock.vo.StockVo">
             <id property="id" column="stockJournalDetailsId"/>
             <result property="productId" column="product_id"/>
@@ -33,7 +32,6 @@
         SELECT
             sj.id,
             sj.type,
-            sj.to_warehouse_id,
             w.`name` warehouseName,
             sjd.id stockJournalDetailsId,
             sjd.product_id,