From 336de40460366c926ca414010d902f9299400fe5 Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Mon, 26 May 2025 17:02:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E5=8D=95=E4=BD=8D-=E4=BB=93?=
 =?UTF-8?q?=E5=BA=93=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../canteen/core/supply/domain/SupplyProductUnit.java |  5 ++++-
 .../core/supply/domain/SupplyWarehouseInfo.java       |  5 +++++
 .../mapper/supply/SupplyProductUnitMapper.xml         |  7 ++++++-
 .../mapper/supply/SupplyWarehouseInfoMapper.xml       | 11 ++++++++++-
 4 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/domain/SupplyProductUnit.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/domain/SupplyProductUnit.java
index f6e3234..7b678da 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/domain/SupplyProductUnit.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/domain/SupplyProductUnit.java
@@ -33,5 +33,8 @@ public class SupplyProductUnit extends BaseEntity {
     @ApiModelProperty(value = "换算比率(换算成g)")
     private BigDecimal rate;
 
-
+    /** 单位类型(1-按份,2-称重) */
+    @Excel(name = "单位类型(1-按份,2-称重)")
+    @ApiModelProperty(value = "单位类型(1-按份,2-称重)")
+    private Integer weighType;
 }
diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/domain/SupplyWarehouseInfo.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/domain/SupplyWarehouseInfo.java
index 5ce9cd3..04d16a8 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/domain/SupplyWarehouseInfo.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/domain/SupplyWarehouseInfo.java
@@ -57,6 +57,11 @@ public class SupplyWarehouseInfo extends BaseEntity {
     @ApiModelProperty(value = "仓库管理员id")
     private Long userId;
 
+    /** 仓库管理员 */
+    @Excel(name = "仓库管理员")
+    @ApiModelProperty(value = "仓库管理员")
+    private String manager;
+
     /** 领取人id */
     @Excel(name = "领取人id")
     @ApiModelProperty(value = "领取人id")
diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/supply/SupplyProductUnitMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/supply/SupplyProductUnitMapper.xml
index daceee4..ab59a6c 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/supply/SupplyProductUnitMapper.xml
+++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/supply/SupplyProductUnitMapper.xml
@@ -7,6 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="unitId"    column="unit_id"    />
         <result property="unitName"    column="unit_name"    />
         <result property="rate"    column="rate"    />
+        <result property="weighType"    column="weigh_type"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
@@ -14,7 +15,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectSupplyProductUnitVo">
-        select unit_id, unit_name, rate, create_by, create_time, update_by, update_time from supply_product_unit
+        select unit_id, unit_name, rate, weigh_type, create_by, create_time, update_by, update_time
+        from supply_product_unit
     </sql>
 
     <select id="selectSupplyProductUnitList" parameterType="com.bonus.canteen.core.supply.domain.SupplyProductUnit" resultMap="SupplyProductUnitResult">
@@ -35,6 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="unitName != null and unitName != ''">unit_name,</if>
             <if test="rate != null">rate,</if>
+            <if test="weighType != null">weigh_type,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
@@ -43,6 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="unitName != null and unitName != ''">#{unitName},</if>
             <if test="rate != null">#{rate},</if>
+            <if test="weighType != null">#{weighType},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
@@ -55,6 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="SET" suffixOverrides=",">
             <if test="unitName != null and unitName != ''">unit_name = #{unitName},</if>
             <if test="rate != null">rate = #{rate},</if>
+            <if test="weighType != null">weigh_type = #{weighType},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/supply/SupplyWarehouseInfoMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/supply/SupplyWarehouseInfoMapper.xml
index 034abfa..9defeaf 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/supply/SupplyWarehouseInfoMapper.xml
+++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/supply/SupplyWarehouseInfoMapper.xml
@@ -12,6 +12,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="warehouseCode"    column="warehouse_code"    />
         <result property="warehouseName"    column="warehouse_name"    />
         <result property="userId"    column="user_id"    />
+        <result property="manager"    column="manager"    />
         <result property="fetchUserId"    column="fetch_user_id"    />
         <result property="regionProvince"    column="region_province"    />
         <result property="regionCity"    column="region_city"    />
@@ -27,7 +28,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectSupplyWarehouseInfoVo">
-        select warehouse_id, parent_id, category_id, area_id, canteen_id, warehouse_code, warehouse_name, user_id, fetch_user_id, region_province, region_city, region_district, address, warehouse_type, if_use_warehouse_area, if_use_warehouse_location, create_by, create_time, update_by, update_time from supply_warehouse_info
+        select warehouse_id, parent_id, category_id, area_id, canteen_id, warehouse_code,
+               warehouse_name, user_id, manager, fetch_user_id, region_province, region_city,
+               region_district, address, warehouse_type, if_use_warehouse_area,
+               if_use_warehouse_location, create_by, create_time, update_by, update_time
+        from supply_warehouse_info
     </sql>
 
     <select id="selectSupplyWarehouseInfoList" parameterType="com.bonus.canteen.core.supply.domain.SupplyWarehouseInfo" resultMap="SupplyWarehouseInfoResult">
@@ -40,6 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="warehouseCode != null  and warehouseCode != ''"> and warehouse_code = #{warehouseCode}</if>
             <if test="warehouseName != null  and warehouseName != ''"> and warehouse_name like concat('%', #{warehouseName}, '%')</if>
             <if test="userId != null "> and user_id = #{userId}</if>
+            <if test="manager != null "> and manager = #{manager}</if>
             <if test="fetchUserId != null "> and fetch_user_id = #{fetchUserId}</if>
             <if test="regionProvince != null  and regionProvince != ''"> and region_province = #{regionProvince}</if>
             <if test="regionCity != null  and regionCity != ''"> and region_city = #{regionCity}</if>
@@ -75,6 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="warehouseCode != null">warehouse_code,</if>
             <if test="warehouseName != null and warehouseName != ''">warehouse_name,</if>
             <if test="userId != null">user_id,</if>
+            <if test="manager != null">manager,</if>
             <if test="fetchUserId != null">fetch_user_id,</if>
             <if test="regionProvince != null">region_province,</if>
             <if test="regionCity != null">region_city,</if>
@@ -96,6 +103,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="warehouseCode != null">#{warehouseCode},</if>
             <if test="warehouseName != null and warehouseName != ''">#{warehouseName},</if>
             <if test="userId != null">#{userId},</if>
+            <if test="manager != null">#{manager},</if>
             <if test="fetchUserId != null">#{fetchUserId},</if>
             <if test="regionProvince != null">#{regionProvince},</if>
             <if test="regionCity != null">#{regionCity},</if>
@@ -121,6 +129,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="warehouseCode != null">warehouse_code = #{warehouseCode},</if>
             <if test="warehouseName != null and warehouseName != ''">warehouse_name = #{warehouseName},</if>
             <if test="userId != null">user_id = #{userId},</if>
+            <if test="manager != null">manager = #{manager},</if>
             <if test="fetchUserId != null">fetch_user_id = #{fetchUserId},</if>
             <if test="regionProvince != null">region_province = #{regionProvince},</if>
             <if test="regionCity != null">region_city = #{regionCity},</if>