From 7cefeee8ebf28abf429c3654a0520da2469207f1 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期二, 14 十月 2025 14:24:00 +0800
Subject: [PATCH] *

---
 src/main/java/com/zy/asrs/entity/param/CombParam.java |    8 +++++---
 1 files changed, 5 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 41c2728..c485ceb 100644
--- a/src/main/java/com/zy/asrs/entity/param/CombParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/CombParam.java
@@ -51,6 +51,7 @@
 
         // 瑙勬牸
         private String specs = "";
+        private String supp = "";
 
         // sku
         private String sku = "";
@@ -65,9 +66,9 @@
             this.matnr = basArmMast.getSku();
 //            this.batch = basArmMast.getCreateTime().toString();
             this.anfme = basArmMast.getCtns().doubleValue();
-            this.specs = basArmMast.getPo();
-            this.brand = basArmMast.getUpc();
-            this.standby1 = basArmMast.getSupplier();
+            this.standby1 = basArmMast.getPo();
+            this.standby2 = basArmMast.getUpc();
+            this.supp = basArmMast.getSupplier();
         }
     }
 
@@ -77,6 +78,7 @@
     public CombParam(List<BasArmMast> basArmMastList) {
         this.orderNo = basArmMastList.get(0).getOrderNo();
         this.combMats = new ArrayList<>();
+        this.barcode = basArmMastList.get(0).getBarcode();
         List<BasArmMast> basArmMasts = new ArrayList<>();
         for (BasArmMast basArmMast : basArmMastList) {
             if (basArmMasts.isEmpty()){

--
Gitblit v1.9.1