From 5ae3b6c3d604f16c2ecc5057d720d5d79c8c091b Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期日, 23 十一月 2025 14:21:33 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/param/CombParam.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 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 c485ceb..71758ef 100644
--- a/src/main/java/com/zy/asrs/entity/param/CombParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/CombParam.java
@@ -51,7 +51,7 @@
// 瑙勬牸
private String specs = "";
- private String supp = "";
+// private String supp = "";
// sku
private String sku = "";
@@ -63,12 +63,13 @@
}
public CombMat(BasArmMast basArmMast) {
this.orderNo = basArmMast.getOrderNo();
- this.matnr = basArmMast.getSku();
+ this.matnr = basArmMast.getMatnr();
// this.batch = basArmMast.getCreateTime().toString();
this.anfme = basArmMast.getCtns().doubleValue();
this.standby1 = basArmMast.getPo();
this.standby2 = basArmMast.getUpc();
- this.supp = basArmMast.getSupplier();
+ this.standby3 = basArmMast.getSku();
+// this.supp = basArmMast.getSupplier();
}
}
@@ -78,7 +79,11 @@
public CombParam(List<BasArmMast> basArmMastList) {
this.orderNo = basArmMastList.get(0).getOrderNo();
this.combMats = new ArrayList<>();
- this.barcode = basArmMastList.get(0).getBarcode();
+ if (basArmMastList.size()>1){
+ this.barcode = basArmMastList.get(1).getBarcode();
+ } else {
+ this.barcode = basArmMastList.get(0).getBarcode();
+ }
List<BasArmMast> basArmMasts = new ArrayList<>();
for (BasArmMast basArmMast : basArmMastList) {
if (basArmMasts.isEmpty()){
--
Gitblit v1.9.1