Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

chenlu

2025-11-26 53bc276bdc4aaefc2a2ecadc472f2c2f18e93490

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

@@ -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);