Merge remote-tracking branch 'origin/master'

business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ZhcxProjectManageServiceImpl.java

@@ -2025,6 +2025,7 @@ public class ZhcxProjectManageServiceImpl extends ServiceImpl<ZhcxProjectManageD
         if (ObjectUtil.isEmpty(projectIdObj) || ObjectUtil.isEmpty(machinenoObj)) {
             throw new CustomException("参数必填");
         }
+        String pid = (String) projectIdObj;
         //List<String> strings = zhcxProjectManageDao.searchData(map);
         //List<String> machinenoList = (List<String>) machinenoObj;
         // 创建一个新的列表来保存非交集部分
@@ -2036,8 +2037,18 @@ public class ZhcxProjectManageServiceImpl extends ServiceImpl<ZhcxProjectManageD
 //
 //            zhcxProjectManageDao.generateRectifyData(map);
 //        }
-        zhcxProjectManageDao.deleteSnap(map);
-        zhcxProjectManageDao.generateRectifyData(map);
+        List<String> machinelist = projectDeviceNumberService.list(Wrappers.<ZhcxProjectDeviceNumberDo>lambdaQuery()
+                        .eq(ZhcxProjectDeviceNumberDo::getDeleted, "0")
+                        .eq(ZhcxProjectDeviceNumberDo::getPid, pid)
+                        .ne(ZhcxProjectDeviceNumberDo::getStatus, "发运")
+                        .in(ZhcxProjectDeviceNumberDo::getDeviceNumber, (List<String>) machinenoObj))
+                .stream().map(ZhcxProjectDeviceNumberDo::getDeviceNumber)
+                .collect(Collectors.toList());
+        map.put("machineno",machinelist);
+        if (machinelist.size() > 0) {
+            zhcxProjectManageDao.deleteSnap(map);
+            zhcxProjectManageDao.generateRectifyData(map);
+        }
         return R.ok();
     }