合并分支 'bug' 到 'master'

dev-apply/src/main/java/com/tykj/dev/device/apply/controller/DeviceApplyController.java

@@ -457,7 +457,8 @@ public class DeviceApplyController {
             }
             if (uploadApplyFile.getApplyBillDetailVos() != null && uploadApplyFile.getApplyBillDetailVos().size() > 0) {
                 for (ApplyBillDetailVo a : uploadApplyFile.getApplyBillDetailVos()) {
-                    ResponseEntity responseEntity = packingController.seqsNotExist(a.getPackingId(), a.getStorageCount(), a.getSeqInterval());
+//                    ResponseEntity responseEntity = packingController.seqsNotExist(a.getPackingId(), a.getStorageCount(), a.getSeqInterval());
+                    ResponseEntity responseEntity = packingController.seqsNotExist(a.getPackingId(), a.getWaitNum(), a.getSeqInterval());
                     if (!"ok".equals(responseEntity.getBody())) {
                         return responseEntity;
                     }

dev-packing/src/main/java/com/tykj/dev/device/packing/controller/PackingController.java

@@ -764,6 +764,8 @@ public class PackingController {
 //            packingLogService.add(packingLog);
 //            packingLibrary.setMatchingRange(packingLibraryUpdateVo.getMatchingRange());
             updatePacking(packingLibrary,packingLibraryUpdateVo);
+
+            List<PackingLibrary> currentChild = getCurrentChild(packingLibrary);
             //修改子列装
 //            List<PackingLibrary> packingLibraryChilds = packingLibrary.getChilds();
 //            if(packingLibraryChilds.size()>0){
@@ -779,7 +781,10 @@ public class PackingController {
 //            }
 
             //从而修改装备
-            List<DeviceLibrary> deviceLibraries = deviceLibraryService.findDevicesByPacking(packingLibrary.getId());
+            //修改自己和子集
+            currentChild.forEach(packingLibrary1 -> {
+//                List<DeviceLibrary> deviceLibraries = deviceLibraryService.findDevicesByPacking(packingLibrary.getId());
+                List<DeviceLibrary> deviceLibraries = deviceLibraryService.findDevicesByPacking(packingLibrary1.getId());
                 List<DeviceLibrary> deviceLibraryList = new ArrayList<>();
                 if(deviceLibraries.size()>0){
                     deviceLibraries.forEach(deviceLibrary -> {
@@ -792,7 +797,8 @@ public class PackingController {
                     if(ids.size()>0){
                         deviceLibraryDao.updateMatchingRange2(packingLibraryUpdateVo.getMatchingRange(),ids);
                         List<DeviceLog> logDtos=new ArrayList<>();
-                    String remark = "将原配用范围"+packingLibrary.getMatchingRangeName()+"修改为"+packingLibraryUpdateVo.getMatchingRangeName();
+//                        String remark = "将原配用范围"+packingLibrary.getMatchingRangeName()+"修改为"+packingLibraryUpdateVo.getMatchingRangeName();
+                        String remark = "将原配用范围"+packingLibrary1.getMatchingRangeName()+"修改为"+packingLibraryUpdateVo.getMatchingRangeName();
                         ids.forEach(integer -> {
                             logDtos.add(new DeviceLogDto(integer,remark,null,userId,null).toDo());
                         });
@@ -802,6 +808,8 @@ public class PackingController {
                         });
                     }
                 }
+            });
+
             deviceLibraryDao.upDateMatchingRange(packingLibrary.getMatchingRange(),packingLibrary.getId());
         }
         if (packingLibraryUpdateVo.getInvisibleRange()!=null&&!packingLibraryUpdateVo.getInvisibleRange().equals(packingLibrary.getInvisibleRange())){
@@ -987,4 +995,20 @@ public class PackingController {
             });
         }
     }
+
+    /**
+     * 递归查询下面所有的子   如 1  23  3:45
+     * @param packingLibrary 装备或者配件
+     */
+    public List<PackingLibrary> getCurrentChild(PackingLibrary packingLibrary){
+        List<PackingLibrary> packingLibraries = new ArrayList<>();
+        packingLibraries.add(packingLibrary);
+        //查询所有的第一级子
+        List<PackingLibrary> byParentId = packingLibraryService.findByParentId(packingLibrary.getId());
+        if (byParentId.size()>0){
+            byParentId.forEach(this::getCurrentChild);
+            packingLibraries.addAll(byParentId);
+        }
+        return packingLibraries;
+    }
 }

dev-packing/src/main/java/com/tykj/dev/device/packing/service/impl/PackingLibraryServiceImpl.java

@@ -359,12 +359,21 @@ public class PackingLibraryServiceImpl implements PackingLibraryService {
             if (ids.size() > 0) {
                 ids.forEach(integer -> {
                     if (deviceLibraryDao.getAllByPackingId(integer).stream().allMatch(deviceLibrary ->
-                            status.contains(deviceLibrary.getLifeStatus()))) {
+                            !status.contains(deviceLibrary.getLifeStatus()))) {
                         throw new ApiException(ResponseEntity.status(20000).body("该列装型号已有装备,请进行退装操作"));
                     }
                     deleteAll(integer);
                 });
             }
+//            if (ids.size() > 0) {
+//                ids.forEach(integer -> {
+//                    if (deviceLibraryDao.getAllByPackingId(integer).stream().allMatch(deviceLibrary ->
+//                            status.contains(deviceLibrary.getLifeStatus()))) {
+//                        throw new ApiException(ResponseEntity.status(20000).body("该列装型号已有装备,请进行退装操作"));
+//                    }
+//                    deleteAll(integer);
+//                });
+//            }
             //发送阅知信息
             List<Integer> userIds = userPublicService.findOtherUser(userUtils.getCurrentUserId());
             MessageBto messageBto = new MessageBto(0, 1, "手动删除列装", userIds, 0);