From 53bc276bdc4aaefc2a2ecadc472f2c2f18e93490 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期三, 26 十一月 2025 16:53:57 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/service/pp/GlassOptimizeService.java | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/GlassOptimizeService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/GlassOptimizeService.java
index aaaa877..d845c66 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/GlassOptimizeService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/GlassOptimizeService.java
@@ -935,6 +935,10 @@
Map<String, Integer> rackMap = new HashMap<>();
int rackCounter = 1;
+ // 濡傛灉涓虹┖娴佺▼鍗★紝鍒欏皢 type 璁剧疆涓� 1
+ if (flowCardList == null || flowCardList.isEmpty()) {
+ type = 1;
+ }
for (FlowCard flowCard : flowCardList) {
// 涓烘瘡涓敮涓�鐨� processId-technologyNumber 缁勫悎鍒嗛厤 rack 缂栧彿
String key = flowCard.getProcessId() + "-" + flowCard.getTechnologyNumber();
@@ -968,6 +972,7 @@
}else if(state1==1&&state2==1){
type=2;
}
+
int index = optionVal.indexOf("mm");
// 鑾峰彇 "mm" 鍓嶉潰鐨勯儴鍒�
String glass_thickness = optionVal.substring(0, index);
--
Gitblit v1.8.0