bug修改

rw-aps-server/src/main/java/com/rongwei/rwapsserver/aps/service/impl/ApsServiceImpl.java

@@ -1017,13 +1017,18 @@ public class ApsServiceImpl implements ApsService {
             Map<String,List<ProductionProcesses>> thproMap = new HashMap<>();
             for (ProductionProcesses process : orderpss) {
                 if("成退".equals(process.getProcessType()) || "中退".equals(process.getProcessType()) || "小卷成退".equals(process.getProcessType())){
-                    String bsproid = process.getBsProcessesId().get(0);
-                    List<ProductionProcesses> bsprocess = thproMap.get(bsproid);
-                    if(bsprocess == null){
-                        bsprocess = new ArrayList<>();
+                    // 锁定的不参与合并
+                    if(process.getIfLock()){
+                        mergeprocesses.add(process);
+                    }else{
+                        String bsproid = process.getBsProcessesId().get(0);
+                        List<ProductionProcesses> bsprocess = thproMap.get(bsproid);
+                        if(bsprocess == null){
+                            bsprocess = new ArrayList<>();
+                        }
+                        bsprocess.add(process);
+                        thproMap.put(bsproid,bsprocess);
                     }
-                    bsprocess.add(process);
-                    thproMap.put(bsproid,bsprocess);
                 }else{
                     mergeprocesses.add(process);