FeiDaBaoKai/wms_serve_xugongteji
13
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
15066119699 2025-03-13 11:01:16 +08:00
parent 7952af7b81
commit 9a5ce38c19
4 changed files with 62 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ruoyi-system/src/main/java/com/ruoyi/app/domain/AppPmsOrderOut.java
View File

@ -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;

19
ruoyi-system/src/main/java/com/ruoyi/app/domain/AppPmsOrderOutBak.java
View File

@ -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;

12
ruoyi-system/src/main/resources/mapper/app/AppPmsOrderOutBakMapper.xml
View File

@ -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>

13
ruoyi-system/src/main/resources/mapper/app/AppPmsOrderOutMapper.xml
View File

@ -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}