From ad5fef776eb9d66a0fcfc2ddf89698c5642e0eec Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期五, 06 三月 2026 08:36:24 +0800
Subject: [PATCH] 增加一个定时任务。如果拣货出库过程中，相同料箱号，存在(199 ，200)的任务 并且同时存在 101,196的任务 则101和196的任务会 自动变成199
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WkOrderItem.java | 35 ++++++++++++++++++++++++++++-------
1 files changed, 28 insertions(+), 7 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WkOrderItem.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WkOrderItem.java
index 22baa15..c39cd58 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WkOrderItem.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WkOrderItem.java
@@ -40,8 +40,7 @@
* ASN涓诲崟鏍囪瘑
*/
@ApiModelProperty(value= "ASN涓诲崟鏍囪瘑")
- private Long asnId;
-
+ private Long orderId;
/**
* 骞冲彴鏍囪瘑锛堣鍙凤級
@@ -76,10 +75,10 @@
private Double workQty;
/**
- * ASN鍗曞彿
+ * WMS鍗曞彿
*/
- @ApiModelProperty(value= "ASN鍗曞彿")
- private String asnCode;
+ @ApiModelProperty(value= "WMS鍗曞彿")
+ private String orderCode;
/**
* PO鍗曟槑缁嗘爣璇�
@@ -129,6 +128,11 @@
@ApiModelProperty(value= "閫佽揣鏁伴噺")
private Double anfme;
+ /** 缁勬墭鏁伴噺锛堥潪鎸佷箙鍖栵紝鍒楄〃灞曠ず锛氳鏄庣粏 WaitPakinItem.anfme 姹囨�伙級 */
+ @ApiModelProperty(value = "缁勬墭鏁伴噺")
+ @TableField(exist = false)
+ private Double palletQty;
+
/**
* 搴撳瓨鍗曚綅
*/
@@ -146,6 +150,23 @@
*/
@ApiModelProperty("搴撳瓨鎵规")
private String batch;
+
+ @ApiModelProperty("璁″垝璺熻釜鍙凤紙8.3 planNo锛�")
+ @com.baomidou.mybatisplus.annotation.TableField("plan_no")
+ private String planNo;
+
+ @ApiModelProperty("鎵樼洏鐮侊紙8.3 palletId锛�")
+ @com.baomidou.mybatisplus.annotation.TableField("pallet_id")
+ private String palletId;
+
+ @ApiModelProperty("寤鸿鍏ュ簱浠撳簱锛�8.3 targetWareHouseId锛�")
+ @com.baomidou.mybatisplus.annotation.TableField("target_ware_house_id")
+ private String targetWareHouseId;
+
+ @ApiModelProperty("寤鸿鍑哄簱浠撳簱锛�8.3 sourceWareHouseId锛�")
+ @com.baomidou.mybatisplus.annotation.TableField("source_ware_house_id")
+ private String sourceWareHouseId;
+
/**
* 閲囪喘鍗曚綅
*/
@@ -283,8 +304,8 @@
public WkOrderItem() {}
public WkOrderItem(Long asnId, String asnCode, Long poDetlId, String matnrCode, String poCode, Long matnrId, String matnk, Double anfme, String stockUnit, Double purQty, String purUnit, Double qty, String splrCode, String splrName, String qrcode, String barcode, String packName, Integer status, Integer ntyStatus, Integer deleted, Integer tenantId, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) {
- this.asnId = asnId;
- this.asnCode = asnCode;
+ this.orderId = asnId;
+ this.orderCode = asnCode;
this.poDetlId = poDetlId;
this.matnrCode = matnrCode;
this.poCode = poCode;
--
Gitblit v1.9.1