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

出库任务增加订单号

Browse Source
This commit is contained in:
15066119699 2025-03-07 10:12:00 +08:00
parent 48f43a810a
commit e3a8fc2bda
3 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppTaskController.java
View File

@ -907,6 +907,10 @@ public class AppTaskController extends BaseController
appTask.setCkType(tMiStock1.getCkType());
appTask.setTaskPriority(1);
appTask.setDestination("127");
//wms生成的统一编号
appTask.setOrderId(orderId);
//库存编号
appTask.setStockId(tMiStock1.getStockId());
appTaskService.insertAppTask(appTask);
}

12
ruoyi-system/src/main/java/com/ruoyi/app/domain/AppTask.java
View File

@ -20,7 +20,7 @@ public class AppTask extends BaseEntity
/** 任务号 */
private String taskId;
//订单号
private String orderId;
public String getOrderId() {
@ -89,6 +89,16 @@ public class AppTask extends BaseEntity
@Excel(name = "库位号")
private String locationId;
// @Excel(name = "库存编号")
private String stockId;
public String getStockId() {
return stockId;
}
public void setStockId(String stockId) {
this.stockId = stockId;
}
//1.零捡 2：全量
private Integer ckType;

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

@ -21,10 +21,11 @@
<result property="orderStatus" column="order_status" />
<result property="isLock" column="is_lock" />
<result property="orderId" column="order_id" />
<result property="stockId" column="stock_id" />
</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 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,stock_id from app_pms_order_out
</sql>
<select id="selectAppPmsOrderOutList" parameterType="AppPmsOrderOut" resultMap="AppPmsOrderOutResult">
@ -38,6 +39,7 @@
<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="stockId != null and stockId != ''"> and stock_id = #{stockId}</if>
</where>
</select>
@ -65,6 +67,7 @@
<if test="orderStatus != null">order_status,</if>
<if test="isLock != null">is_lock,</if>
<if test="orderId != null">order_id,</if>
<if test="stockId != null">stock_id,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="recordId != null">#{recordId},</if>
@ -83,6 +86,7 @@
<if test="orderStatus != null">#{orderStatus},</if>
<if test="isLock != null">#{isLock},</if>
<if test="orderId != null">#{orderId},</if>
<if test="stockId != null">#{stockId},</if>
</trim>
</insert>
@ -102,6 +106,8 @@
<if test="shelvesNum != null">shelves_num = #{shelvesNum},</if>
<if test="stockNum != null">stock_num = #{stockNum},</if>
<if test="isLock != null">is_lock = #{isLock},</if>
<if test="orderId != null">order_id = #{orderId},</if>
<if test="stockId != null">stock_id = #{stockId},</if>
</trim>
where record_id = #{recordId}
</update>