From 16a09540001bd00f01b848f0ca125d16bf314450 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期五, 29 八月 2025 15:45:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop' 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