From 9afd96fe86606ad397abf487d3b2216ff3a99878 Mon Sep 17 00:00:00 2001
From: Huluwa22 <2667400744@qq.com>
Date: Fri, 21 Feb 2025 15:07:05 +0800
Subject: [PATCH] =?UTF-8?q?feat(stock):=20=E5=BA=93=E5=AD=98=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=8D=95=E9=87=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/wms/entity/table/Stock.java | 12 ++++++++++++
 src/main/resources/mapper/StockMapper.xml     |  9 +++++++--
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/wms/entity/table/Stock.java b/src/main/java/com/wms/entity/table/Stock.java
index c46c656..d00b436 100644
--- a/src/main/java/com/wms/entity/table/Stock.java
+++ b/src/main/java/com/wms/entity/table/Stock.java
@@ -156,6 +156,18 @@ public class Stock extends BaseEntity {
     @ExcelExport("保质期")
     private Double shelfLife;
 
+
+    @ExcelExport("单重")
+    private Double singleWeight;
+
+    public Double getSingleWeight() {
+        return singleWeight;
+    }
+
+    public void setSingleWeight(Double singleWeight) {
+        this.singleWeight = singleWeight;
+    }
+
     public Stock() {
 
     }
diff --git a/src/main/resources/mapper/StockMapper.xml b/src/main/resources/mapper/StockMapper.xml
index 62728b7..2b00a8c 100644
--- a/src/main/resources/mapper/StockMapper.xml
+++ b/src/main/resources/mapper/StockMapper.xml
@@ -27,12 +27,13 @@
         <result property="currentLocation" column="current_location"/>
         <result property="shelfLife" column="shelf_life"/>
         <result property="warehouseName" column="warehouse_name"/>
+        <result property="singleWeight" column="single_weight"/>
     </resultMap>
 
     <sql id="selectAll">
         select stock_id, warehouse_name, location_id, vehicle_id, goods_id, goods_name, batch_no, available_num, remain_num, real_num, provider_id,
                provider_name, production_date, expiration_date, stock_status, goods_status, create_time, last_update_time, last_update_user, remark,
-               is_inventory, inventory_task_id, current_location, shelf_life
+               is_inventory, inventory_task_id, current_location, shelf_life,single_weight
         from tbl_app_stock
     </sql>
 
@@ -59,7 +60,7 @@
     <select id="selStocksByLocationId" parameterType="string" resultMap="StockMap">
         select stock_id, warehouse_name, location_id, vehicle_id, goods_id, goods_name, batch_no, available_num, remain_num, real_num, provider_id,
                provider_name, production_date, expiration_date, stock_status, goods_status, create_time, last_update_time, last_update_user, remark,
-               is_inventory, inventory_task_id, current_location, shelf_life
+               is_inventory, inventory_task_id, current_location, shelf_life,singleWeight
         from tbl_app_stock
         <where>
             <if test="locationId != null and locationId != ''"> and location_id = #{locationId}</if>
@@ -112,6 +113,7 @@
             <if test="inventoryTaskId != null and inventoryTaskId != ''"> and inventory_task_id = #{inventoryTaskId}</if>
             <if test="currentLocation != null and currentLocation != ''"> and current_location = #{currentLocation}</if>
             <if test="shelfLife != null"> and shelf_life = #{shelfLife}</if>
+            <if test="singleWeight != null"> and single_weight = #{singleWeight}</if>
         </where>
         order by goods_status desc,  available_num asc , create_time asc
     </select>
@@ -143,6 +145,7 @@
             <if test="inventoryTaskId != null">inventory_task_id,</if>
             <if test="currentLocation != null">current_location,</if>
             <if test="shelfLife != null">shelf_life,</if>
+            <if test="singleWeight != null"> single_weight</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="stockId != null">#{stockId},</if>
@@ -169,6 +172,7 @@
             <if test="inventoryTaskId != null">#{inventoryTaskId},</if>
             <if test="currentLocation != null">#{currentLocation},</if>
             <if test="shelfLife != null">#{shelfLife},</if>
+            <if test="singleWeight != null"> #{singleWeight}</if>
         </trim>
     </insert>
 
@@ -197,6 +201,7 @@
             <if test="inventoryTaskId != null">inventory_task_id = #{inventoryTaskId},</if>
             <if test="currentLocation != null">current_location = #{currentLocation},</if>
             <if test="shelfLife != null">shelf_life = #{shelfLife},</if>
+            <if test="singleWeight != null">single_weight = #{singleWeight},</if>
         </trim>
         where stock_id = #{stockId}
     </update>