From 9a5ce38c19eb863b0f60f0b1c9792294429c4f98 Mon Sep 17 00:00:00 2001
From: 15066119699 <bo.wu@finesys.com.cn>
Date: Thu, 13 Mar 2025 11:01:16 +0800
Subject: [PATCH] 1

---
 .../com/ruoyi/app/domain/AppPmsOrderOut.java  | 20 +++++++++++++++++++
 .../ruoyi/app/domain/AppPmsOrderOutBak.java   | 19 ++++++++++++++++++
 .../mapper/app/AppPmsOrderOutBakMapper.xml    | 12 ++++++++++-
 .../mapper/app/AppPmsOrderOutMapper.xml       | 13 +++++++++++-
 4 files changed, 62 insertions(+), 2 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/app/domain/AppPmsOrderOut.java b/ruoyi-system/src/main/java/com/ruoyi/app/domain/AppPmsOrderOut.java
index 83abf5fa..4450f0fa 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/app/domain/AppPmsOrderOut.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/app/domain/AppPmsOrderOut.java
@@ -77,6 +77,26 @@ public class AppPmsOrderOut extends BaseEntity
     /** 是否锁定 */
     @Excel(name = "是否锁定",type = Excel.Type.EXPORT)
     private String isLock;
+    // 是否生成波次
+    private Integer generateWave;
+    // 波次号
+    private String orderWave;
+
+    public Integer getGenerateWave() {
+        return generateWave;
+    }
+
+    public void setGenerateWave(Integer generateWave) {
+        this.generateWave = generateWave;
+    }
+
+    public String getOrderWave() {
+        return orderWave;
+    }
+
+    public void setOrderWave(String orderWave) {
+        this.orderWave = orderWave;
+    }
 
     public String getIsLock() {
         return isLock;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/app/domain/AppPmsOrderOutBak.java b/ruoyi-system/src/main/java/com/ruoyi/app/domain/AppPmsOrderOutBak.java
index 877f49ae..9da886ea 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/app/domain/AppPmsOrderOutBak.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/app/domain/AppPmsOrderOutBak.java
@@ -78,7 +78,26 @@ public class AppPmsOrderOutBak extends BaseEntity
     /** 是否锁定 */
     @Excel(name = "是否锁定")
     private String isLock;
+    // 是否生成波次
+    private Integer generateWave;
+    // 波次号
+    private String orderWave;
 
+    public Integer getGenerateWave() {
+        return generateWave;
+    }
+
+    public void setGenerateWave(Integer generateWave) {
+        this.generateWave = generateWave;
+    }
+
+    public String getOrderWave() {
+        return orderWave;
+    }
+
+    public void setOrderWave(String orderWave) {
+        this.orderWave = orderWave;
+    }
     public void setRecordId(String recordId)
     {
         this.recordId = recordId;
diff --git a/ruoyi-system/src/main/resources/mapper/app/AppPmsOrderOutBakMapper.xml b/ruoyi-system/src/main/resources/mapper/app/AppPmsOrderOutBakMapper.xml
index 9a2d1422..89123a02 100644
--- a/ruoyi-system/src/main/resources/mapper/app/AppPmsOrderOutBakMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/app/AppPmsOrderOutBakMapper.xml
@@ -24,10 +24,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="createTime"    column="create_time"    />
         <result property="createBy"    column="create_by"    />
         <result property="updateTime"    column="update_time"    />
+        <result property="generateWave"    column="generate_wave"    />
+        <result property="orderWave"    column="order_wave" />
     </resultMap>
 
     <sql id="selectAppPmsOrderOutBakVo">
-        select record_id, order_id, list_id, order_type, customer_id, goods_id, goods_num, pick_num, tr_num, shelves_num, stock_num, goods_desc, spare1, spare2, order_status, is_lock, create_time, create_by, update_time from app_pms_order_out_bak
+        select record_id, order_id, list_id, order_type, customer_id, goods_id, goods_num, pick_num, tr_num, shelves_num, stock_num, goods_desc, spare1, spare2, order_status, is_lock, create_time, create_by, update_time ,
+               generate_wave, order_wave from app_pms_order_out_bak
     </sql>
 
     <select id="selectAppPmsOrderOutBakList" parameterType="AppPmsOrderOutBak" resultMap="AppPmsOrderOutBakResult">
@@ -37,6 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="listId != null  and listId != ''"> and list_id = #{listId}</if>
             <if test="orderType != null "> and order_type = #{orderType}</if>
             <if test="goodsDesc != null  and goodsDesc != ''"> and goods_desc = #{goodsDesc}</if>
+            <if test="orderWave != null  and orderWave != ''"> and order_wave = #{orderWave}</if>
         </where>
     </select>
 
@@ -67,6 +71,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time,</if>
             <if test="createBy != null">create_by,</if>
             <if test="updateTime != null">update_time,</if>
+            <if test="generateWave != null">generate_wave,</if>
+            <if test="orderWave != null">order_wave,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="recordId != null">#{recordId},</if>
@@ -88,6 +94,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">#{createTime},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
+            <if test="generateWave != null">#{generateWave},</if>
+            <if test="orderWave != null">#{orderWave},</if>
          </trim>
     </insert>
 
@@ -112,6 +120,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="generateWave != null">generate_wave = #{generateWave},</if>
+            <if test="orderWave != null">order_wave = #{orderWave},</if>
         </trim>
         where record_id = #{recordId}
     </update>
diff --git a/ruoyi-system/src/main/resources/mapper/app/AppPmsOrderOutMapper.xml b/ruoyi-system/src/main/resources/mapper/app/AppPmsOrderOutMapper.xml
index eadd6c04..124e0025 100644
--- a/ruoyi-system/src/main/resources/mapper/app/AppPmsOrderOutMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/app/AppPmsOrderOutMapper.xml
@@ -24,11 +24,14 @@
         <result property="createTime"    column="create_time"    />
         <result property="createBy"    column="create_by"    />
         <result property="updateTime"    column="update_time"    />
+        <result property="generateWave"    column="generate_wave"    />
+        <result property="orderWave"    column="order_wave"    />
 
     </resultMap>
 
     <sql id="selectAppPmsOrderOutVo">
-        select record_id, list_id, order_type, customer_id, goods_id, goods_num, goods_desc, spare1, spare2,pick_num,tr_num,shelves_num,stock_num,order_status,is_lock,order_id,create_time,create_by,update_time from app_pms_order_out
+        select record_id, list_id, order_type, customer_id, goods_id, goods_num, goods_desc, spare1, spare2,pick_num,tr_num,shelves_num,stock_num,order_status,is_lock,order_id,create_time,create_by,update_time,
+               generate_wave, order_wave from app_pms_order_out
     </sql>
 
     <select id="selectAppPmsOrderOutList" parameterType="AppPmsOrderOut" resultMap="AppPmsOrderOutResult">
@@ -42,6 +45,8 @@
             <if test="orderStatus != null  and orderStatus != ''"> and order_status = #{orderStatus}</if>
             <if test="isLock != null  and isLock != ''"> and is_lock = #{isLock}</if>
             <if test="orderId != null  and orderId != ''"> and order_id = #{orderId}</if>
+            <if test="generateWave != null "> and generate_wave = #{generateWave}</if>
+            <if test="orderWave != null  and orderWave != ''"> and order_wave = #{orderWave}</if>
         </where>
         order by create_time desc
     </select>
@@ -73,6 +78,8 @@
             <if test="createTime != null">create_time,</if>
             <if test="createBy != null">create_by,</if>
             <if test="updateTime != null">update_time,</if>
+            <if test="generateWave != null">generate_wave,</if>
+            <if test="orderWave != null">order_wave,</if>
 
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -95,6 +102,8 @@
             <if test="createTime != null">#{createTime},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
+            <if test="generateWave != null">#{generateWave},</if>
+            <if test="orderWave != null">#{orderWave},</if>
 
          </trim>
     </insert>
@@ -118,6 +127,8 @@
             <if test="orderId != null">order_id = #{orderId},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="orderStatus != null">order_status = #{orderStatus},</if>
+            <if test="generateWave != null">generate_wave = #{generateWave},</if>
+            <if test="orderWave != null">order_wave = #{orderWave},</if>
 
         </trim>
         where record_id = #{recordId}