From 848994667cd647002c352482c411c4570ccbbf7e Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期四, 25 九月 2025 17:06:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jshdwcs' into jshdwcs
---
src/main/java/com/zy/asrs/entity/param/CombParam.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/param/CombParam.java b/src/main/java/com/zy/asrs/entity/param/CombParam.java
index 0580fb9..41c2728 100644
--- a/src/main/java/com/zy/asrs/entity/param/CombParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/CombParam.java
@@ -62,11 +62,12 @@
}
public CombMat(BasArmMast basArmMast) {
this.orderNo = basArmMast.getOrderNo();
- this.matnr = basArmMast.getMatnr();
+ this.matnr = basArmMast.getSku();
// this.batch = basArmMast.getCreateTime().toString();
this.anfme = basArmMast.getCtns().doubleValue();
- this.specs = basArmMast.getOrderNo();
- this.sku = basArmMast.getSku();
+ this.specs = basArmMast.getPo();
+ this.brand = basArmMast.getUpc();
+ this.standby1 = basArmMast.getSupplier();
}
}
--
Gitblit v1.9.1