From e596214d84efa77d0cf316563548f1b1d7643a37 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期一, 24 十一月 2025 08:40:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jshdasrs' into jshdasrs
---
src/main/java/com/zy/asrs/entity/param/OrderToLine.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/param/OrderToLine.java b/src/main/java/com/zy/asrs/entity/param/OrderToLine.java
index d0c0b14..4999bae 100644
--- a/src/main/java/com/zy/asrs/entity/param/OrderToLine.java
+++ b/src/main/java/com/zy/asrs/entity/param/OrderToLine.java
@@ -26,6 +26,9 @@
@Data
public static class MatList {
+ // Sku\鍨嬪彿\鍒嗘嫞灞炴��1\涓嶅彲涓虹┖\鎵爜鍙幏鍙�
+ private String item;
+
// Sku\瀹汉鍨嬪彿\鍒嗘嫞灞炴��1\涓嶅彲涓虹┖\鎵爜鍙幏鍙�
private String sku;
@@ -43,8 +46,8 @@
//0锛氫笉鍒嗘嫞锛屽湪绾夸綋寰幆
private Integer sign;
- //璐ф簮\闈炲垎鎷ｅ睘鎬э紙涓嶄笅鍙戯紝鏁版嵁鍦ㄦ潯鐮佷腑锛岄渶涓婃姤锛�
- private String supplier;
+ //璐ф簮\闈炲垎鎷ｅ睘鎬э紙涓嶄笅鍙戯紝鏁版嵁鍦ㄦ潯鐮佷腑锛岄渶涓婃姤锛� 搴熷純
+// private String supplier;
//缁戝畾鏍囪锛堟爣璇嗙浉鍚屽繀椤诲幓鍚屼竴涓垎鎷ｅ彛锛�
private Long bindingTags;
@@ -55,13 +58,13 @@
this.sku = sku;
this.po = po;
}
- public MatList(String sku, String po, Double ctns, String upc, Integer sign, String supplier, Long bindingTags) {
+ public MatList(String item, String sku, String po, Double ctns, String upc, Integer sign, Long bindingTags) {
+ this.item = item;
this.sku = sku;
this.po = po;
this.ctns = ctns;
this.upc = upc;
this.sign = sign;
- this.supplier = supplier;
this.bindingTags = bindingTags;
}
}
--
Gitblit v1.9.1