From d6d44df438c1cffef6b7514771db600c663f4f97 Mon Sep 17 00:00:00 2001
From: lizhenhua <1075222162@qq.com>
Date: Thu, 7 Aug 2025 17:08:37 +0800
Subject: [PATCH] =?UTF-8?q?bug=20=E9=A3=9F=E5=A0=82=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/ims/ProductionPlanDetailMapper.xml        |  7 ++++---
 .../mapper/ims/ProductionPurchaseOrderMapper.xml     | 10 +++++-----
 .../resources/mapper/ims/WarehouseInfoMapper.xml     | 12 ++++++------
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/ProductionPlanDetailMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/ProductionPlanDetailMapper.xml
index c86c600..5eebfbe 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/ProductionPlanDetailMapper.xml
+++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/ProductionPlanDetailMapper.xml
@@ -54,7 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="goodsType != null "> and ippd.goods_type = #{goodsType}</if>
         </where>
     </select>
-    
+
     <select id="selectProductionPlanDetailByProductionDetailId" parameterType="Long" resultMap="ProductionPlanDetailResult">
         <include refid="selectProductionPlanDetailVo"/>
         where ippd.production_detail_id = #{productionDetailId} and ippd.del_flag = '0'
@@ -63,8 +63,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectProductionPlanDetailByProductionId" parameterType="Long" resultMap="ProductionPlanDetailResult">
         <include refid="selectProductionPlanDetailVo"/>
         where ippd.production_plan_id = #{productionId} and ippd.del_flag = '0'
+        order by ippd.detail_date
     </select>
-        
+
     <insert id="insertProductionPlanDetail" parameterType="com.bonus.canteen.core.ims.domain.ProductionPlanDetail" useGeneratedKeys="true" keyProperty="productionDetailId">
         insert into ims_production_plan_detail
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -135,4 +136,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{productionPlanId}
         </foreach>
     </delete>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/ProductionPurchaseOrderMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/ProductionPurchaseOrderMapper.xml
index 5e56c5f..2048c99 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/ProductionPurchaseOrderMapper.xml
+++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/ProductionPurchaseOrderMapper.xml
@@ -24,7 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectProductionPurchaseOrderList" parameterType="com.bonus.canteen.core.ims.domain.ProductionPurchaseOrder" resultMap="ProductionPurchaseOrderResult">
         <include refid="selectProductionPurchaseOrderVo"/>
-        <where>  
+        <where>
             <if test="productionPlanId != null  and productionPlanId != ''"> and production_plan_id = #{productionPlanId}</if>
             <if test="purchasePlanId != null  and purchasePlanId != ''"> and purchase_plan_id = #{purchasePlanId}</if>
             <if test="goodsOrderId != null  and goodsOrderId != ''"> and goods_order_id = #{goodsOrderId}</if>
@@ -44,12 +44,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             </if>
         </where>
     </select>
-    
+
     <select id="selectProductionPurchaseOrderById" parameterType="Long" resultMap="ProductionPurchaseOrderResult">
         <include refid="selectProductionPurchaseOrderVo"/>
         where id = #{id}
     </select>
-        
+
     <insert id="insertProductionPurchaseOrder" parameterType="com.bonus.canteen.core.ims.domain.ProductionPurchaseOrder" useGeneratedKeys="true" keyProperty="id">
         insert into ims_production_purchase_order
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -110,9 +110,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteProductionPurchaseOrderByIds" parameterType="String">
-        delete from ims_production_purchase_order where id in 
+        delete from ims_production_purchase_order where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>
     </delete>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/WarehouseInfoMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/WarehouseInfoMapper.xml
index d797154..4567ae7 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/WarehouseInfoMapper.xml
+++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/WarehouseInfoMapper.xml
@@ -43,7 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectImsWarehouseInfoList" parameterType="com.bonus.canteen.core.ims.domain.WarehouseInfo" resultMap="ImsWarehouseInfoResult">
         <include refid="selectImsWarehouseInfoVo"/>
-        <where>  
+        <where>
             <if test="parentId != null "> and iwi.parent_id = #{parentId}</if>
             <if test="categoryId != null "> and iwi.category_id = #{categoryId}</if>
             <if test="areaId != null "> and iwi.area_id = #{areaId}</if>
@@ -62,7 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="ifUseWarehouseLocation != null "> and iwi.if_use_warehouse_location = #{ifUseWarehouseLocation}</if>
         </where>
     </select>
-    
+
     <select id="selectImsWarehouseInfoByWarehouseId" parameterType="Long" resultMap="ImsWarehouseInfoResult">
         <include refid="selectImsWarehouseInfoVo"/>
         where iwi.warehouse_id = #{warehouseId}
@@ -76,7 +76,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{areaId}
         </foreach>
     </select>
-        
+
     <insert id="insertImsWarehouseInfo" parameterType="com.bonus.canteen.core.ims.domain.WarehouseInfo" useGeneratedKeys="true" keyProperty="warehouseId">
         insert into ims_warehouse_info
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -140,7 +140,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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="managerPhone != null">managerPhone = #{managerPhone},</if>
+            <if test="managerPhone != null">manager_phone = #{managerPhone},</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>
@@ -163,9 +163,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteImsWarehouseInfoByWarehouseIds" parameterType="String">
-        delete from ims_warehouse_info where warehouse_id in 
+        delete from ims_warehouse_info where warehouse_id in
         <foreach item="warehouseId" collection="array" open="(" separator="," close=")">
             #{warehouseId}
         </foreach>
     </delete>
-</mapper>
\ No newline at end of file
+</mapper>