From ccdcd79a48aabb15d9ce9525a3535c01e69475c8 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期五, 31 十月 2025 11:34:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jshdwcs' into jshdwcs
---
src/main/java/com/zy/asrs/entity/param/CombParam.java | 6 +++++-
1 files changed, 5 insertions(+), 1 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..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,7 +78,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