廖井涛
2025-08-18 b99b4b3d1c3ce067175e088b682be740f5b4b6ed
north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java
@@ -159,12 +159,12 @@
            //判断夹胶和夹胶后工序
            //Objects.equals(basicData.getNickname(), "stepA") || Objects.equals(basicData.getNickname(), "stepC")
            if(Objects.equals(basicData.getNickname(), "stepA") || Objects.equals(basicData.getNickname(), "stepC")){
                clos.put(uniqueList.get(i).get("process"), 15+i);
                clos.put(uniqueList.get(i).get("process"), 16+i);
            }
            //判断中空和中空后工序
            //Objects.equals(basicData.getNickname(), "stepB") || Objects.equals(basicData.getNickname(), "stepD")
            if(Objects.equals(basicData.getNickname(), "stepB") || Objects.equals(basicData.getNickname(), "stepD")){
                columns.add(15+i);
                columns.add(16+i);
            }
        }