aps-换线等操作，换到不在可选设备上时自动添加可选设备时，拼接设备名称时，增加车间拼接

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

@@ -563,7 +563,13 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
                                 needUpdateProcess.setCanchoosedeviceid(String.join(",", canChooseDeviceIdList));
                                 String chooseEqu = apsProcessOperationDo.getChooseequ();
                                 LinkedList<String> chooseEquList = new LinkedList<>(Arrays.asList(chooseEqu.split(",")));
-                                chooseEquList.add(changingWiresVo.getEquName());
+                                //根据设备ID查询车间
+                                AspCheckItemsDo aspCheckItemsDo = equList.stream().filter(item -> item.getId().equals(changingWiresVo.getEquId())).findFirst().orElse(null);
+                                String workShopName = "";
+                                if (aspCheckItemsDo != null) {
+                                    workShopName = aspCheckItemsDo.getUsedeptname();
+                                }
+                                chooseEquList.add(workShopName + "-" + changingWiresVo.getEquName());
                                 needUpdateProcess.setChooseequ(String.join(",", chooseEquList));
                                 apsProcessOperationService.updateById(needUpdateProcess);
                             }
@@ -1280,11 +1286,11 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
             newEquDo.setId(id);
             newEquDo.setPlanstartdate(changeStartTimeVo.getPlanStartTime());
             newEquDo.setPlanenddate(changeStartTimeVo.getPlanEndTime());
-            if (StringUtils.isNotBlank(changeStartTimeVo.getEquId())){
+            if (StringUtils.isNotBlank(changeStartTimeVo.getEquId())) {
                 newEquDo.setProcessdeviceid(changeStartTimeVo.getEquId());
                 newEquDo.setProcessdevicecode(equCode);
             }
-            if (StringUtils.isNotBlank(changeStartTimeVo.getEquName())){
+            if (StringUtils.isNotBlank(changeStartTimeVo.getEquName())) {
                 newEquDo.setProcessdevice(changeStartTimeVo.getEquName());
             }
             apsEquLogService.saveEquLog(processEquDo, newEquDo, currentUser, httpServletRequest.getRequestURI());
@@ -1705,7 +1711,13 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
                             needUpdateProcess.setCanchoosedeviceid(String.join(",", canChooseDeviceIdList));
                             String chooseEqu = currentProcessOperationDo.getChooseequ();
                             LinkedList<String> chooseEquList = new LinkedList<>(Arrays.asList(chooseEqu.split(",")));
-                            chooseEquList.add(data.getEquName());
+                            //根据设备ID查询车间
+                            AspCheckItemsDo aspCheckItemsDo = equList.stream().filter(item -> item.getId().equals(data.getEquId())).findFirst().orElse(null);
+                            String workShopName = "";
+                            if (aspCheckItemsDo != null) {
+                                workShopName = aspCheckItemsDo.getUsedeptname();
+                            }
+                            chooseEquList.add(workShopName + "-" + data.getEquName());
                             needUpdateProcess.setChooseequ(String.join(",", chooseEquList));
                             apsProcessOperationService.updateById(needUpdateProcess);
                         }
@@ -2618,7 +2630,7 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
                 nextStartDate = needUpdate.getPlanenddate();
 //            needUpdateList.add(needUpdate);
                 apsProcessOperationProcessEquService.updateById(needUpdate);
-                apsEquLogService.saveEquLog(apsProcessOperationProcessEquDo, needUpdate, currentUser,httpServletRequest.getRequestURI());
+                apsEquLogService.saveEquLog(apsProcessOperationProcessEquDo, needUpdate, currentUser, httpServletRequest.getRequestURI());
                 if (StringUtils.isNotBlank(needInsert.getId())) {
                     apsProcessOperationEquService.save(needInsert);
                     ApsProcessOperationDo needUpdateProcess = new ApsProcessOperationDo();
@@ -2627,7 +2639,13 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
                     needUpdateProcess.setCanchoosedeviceid(String.join(",", canChooseDeviceIdList));
                     String chooseEqu = apsProcessOperationDo.getChooseequ();
                     LinkedList<String> chooseEquList = new LinkedList<>(Arrays.asList(chooseEqu.split(",")));
-                    chooseEquList.add(req.getEquName());
+                    //根据设备ID查询车间
+                    AspCheckItemsDo aspCheckItemsDo = equList.stream().filter(item -> item.getId().equals(req.getEquId())).findFirst().orElse(null);
+                    String workShopName = "";
+                    if (aspCheckItemsDo != null) {
+                        workShopName = aspCheckItemsDo.getUsedeptname();
+                    }
+                    chooseEquList.add(workShopName + "-" + req.getEquName());
                     needUpdateProcess.setChooseequ(String.join(",", chooseEquList));
                     apsProcessOperationService.updateById(needUpdateProcess);
                 }