APS二开服务业务数据转换模型数据

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsBlankOrderServiceImpl.java

@@ -382,11 +382,23 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
 
                                     // 上道工序
                                     if(StringUtils.isNotBlank(processOperationM.getPreviousprocessid())){
-                                        processes.getPreviousProcessesIds().addAll(Arrays.asList(processOperationM.getPreviousprocessid().split(",")));
+                                        if(processes.getPreviousProcessesIds() == null){
+                                            List<String> list = new ArrayList<>();
+                                            list.addAll(Arrays.asList(processOperationM.getPreviousprocessid().split(",")));
+                                            processes.setPreviousProcessesIds(list);
+                                        }else{
+                                            processes.getPreviousProcessesIds().addAll(new ArrayList<>(Arrays.asList(processOperationM.getPreviousprocessid().split(","))));
+                                        }
                                     }
                                     // 下道工序
                                     if(StringUtils.isNotBlank(processOperationM.getNextprocessid())){
-                                        processes.getNextProcessesIds().addAll(Arrays.asList(processOperationM.getNextprocessid().split(",")));
+                                        if(processes.getNextProcessesIds() == null){
+                                            List<String> list = new ArrayList<>();
+                                            list.addAll(Arrays.asList(processOperationM.getNextprocessid().split(",")));
+                                            processes.setNextProcessesIds(list);
+                                        }else{
+                                            processes.getNextProcessesIds().addAll(new ArrayList<>(Arrays.asList(processOperationM.getNextprocessid().split(","))));
+                                        }
                                     }
                                     // 单次加工时长
                                     if(processes.getUnitProduceTime() == null){
@@ -460,11 +472,11 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                                         processes.setProduceTime(processOperationM.getOnceprocessmin().intValue());
                                         // 上道工序
                                         if(StringUtils.isNotBlank(processOperationM.getPreviousprocessid())){
-                                            processes.setPreviousProcessesIds(Arrays.asList(processOperationM.getPreviousprocessid().split(",")));
+                                            processes.setPreviousProcessesIds(new ArrayList<>(Arrays.asList(processOperationM.getPreviousprocessid().split(","))));
                                         }
                                         // 下道工序
                                         if(StringUtils.isNotBlank(processOperationM.getNextprocessid())){
-                                            processes.setNextProcessesIds(Arrays.asList(processOperationM.getNextprocessid().split(",")));
+                                            processes.setNextProcessesIds(new ArrayList<>(Arrays.asList(processOperationM.getNextprocessid().split(","))));
                                         }
                                         processesList.add(processes);