From 56dfd7750c2ff9339ba028b8f613c82b5b8d3d1d Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期四, 20 十一月 2025 16:42:43 +0800
Subject: [PATCH] *启用

---
 src/main/java/com/zy/asrs/entity/param/CombParam.java |    5 +++++
 1 files changed, 5 insertions(+), 0 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 65ddcd2..5f9bb44 100644
--- a/src/main/java/com/zy/asrs/entity/param/CombParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/CombParam.java
@@ -78,6 +78,11 @@
     public CombParam(List<BasArmMast> basArmMastList) {
         this.orderNo = basArmMastList.get(0).getOrderNo();
         this.combMats = new ArrayList<>();
+        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