From beb003f8e8cd5ae31a0ac55d0624ed2b2ad862bb Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 14 八月 2025 11:21:49 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WkOrderItem.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 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..6ffd890 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;
/**
* 骞冲彴鏍囪瘑锛堣鍙凤級
@@ -79,7 +78,7 @@
* ASN鍗曞彿
*/
@ApiModelProperty(value= "ASN鍗曞彿")
- private String asnCode;
+ private String orderCode;
/**
* PO鍗曟槑缁嗘爣璇�
@@ -283,8 +282,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