From a00e1b3a8ff8cdadb7f8d897742097b30a5924fc Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期三, 03 十二月 2025 17:16:16 +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 | 8 +++++++-
1 files changed, 7 insertions(+), 1 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..a3f2b8e 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
@@ -47,7 +47,7 @@
@Autowired
SysErrorService sysErrorService;
- @Value("${mesIp:localhost}") // 娉ㄥ叆mesIp閰嶇疆锛岄粯璁ゅ�间负10.153.19.31
+ @Value("${mesIp:localhost}")
private String mesIp;
RabbitMQUtil rabbitMQUtil;
@@ -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);
@@ -1251,6 +1256,7 @@
public Boolean issuingProjects(String projectNo) throws JsonProcessingException {
boolean saveState=false;
try {
+ System.out.println(mesIp);
// 1. 鍒涘缓URL瀵硅薄
URL url = new URL("http://" + mesIp + ":88/api/loadGlass/engineering/importEngineer");
--
Gitblit v1.8.0