更新

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

@@ -8,9 +8,7 @@ import com.tykj.dev.device.packing.repository.PackingLibraryDao;
 import com.tykj.dev.device.packing.service.PackingLibraryService;
 import com.tykj.dev.device.packing.subject.domin.PackingLibrary;
 import com.tykj.dev.device.packing.subject.vo.*;
-import com.tykj.dev.misc.utils.GetTreeUtils;
-import com.tykj.dev.misc.utils.PageUtil;
-import com.tykj.dev.misc.utils.ResultUtil;
+import com.tykj.dev.misc.utils.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.BeanUtils;
@@ -47,9 +45,20 @@ public class PackingLibraryController {
     @Autowired
     PackingLibraryDao packingLibraryDao;
 
-    @ApiOperation(value = "获取父子结构列装", notes = "获取父子结构列装")
+    @ApiOperation(value = "申请后入库获取父子结构列装（去除已入库序列号）", notes = "获取父子结构列装")
     @PostMapping("/merge")
     public ResponseEntity merge(@RequestBody List<PackingLibrary> packingLibraries){
+        Map<String,DeviceLibrary> map = deviceLibraryService.getAllDeviceSeqMap();
+        packingLibraries.forEach(packingLibrary -> {
+            List<String> inputSeqs = DeviceSeqUtil.selectDeviceSeqs(packingLibrary.getSeq());
+            List<String> outputSeqs = new ArrayList<>();
+            inputSeqs.forEach(s -> {
+                if (map.get(s)==null){
+                    outputSeqs.add(s);
+                }
+            });
+            packingLibrary.setSeq(StringSplitUtil.stringListToString(DeviceSeqUtil.getContinuousSeqs(outputSeqs)));
+        });
         //返回父子结构
         Map<Integer, PackingLibrary> nodeCollect =
                 packingLibraries.stream().collect(Collectors.toMap(PackingLibrary::getId, packingLibrary -> packingLibrary));

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

@@ -286,11 +286,11 @@ public class PackingLibraryServiceImpl implements PackingLibraryService {
     public void deleteAll(Integer id) {
         PackingLibrary packingLibrary = getOne(id);
         if (deviceLibraryDao.getAllByPackingId(id).size()>0){
-            throw new ApiException(ResponseEntity.status(303).body("该列装型号已有装备,请进行退装操作"));
+            throw new ApiException(ResponseEntity.status(20000).body("该列装型号已有装备,请进行退装操作"));
         }
         if (packingLibrary.getIsRoot()==1) {
             if (packingLibraryDao.findAllByPartParentIdAndPackingStatus(id,2).size()>0){
-                throw new ApiException(ResponseEntity.status(303).body("该列装型号目录下存在列装装备"));
+                throw new ApiException(ResponseEntity.status(20000).body("该列装型号目录下存在列装装备"));
             }
             Integer order = packingLibrary.getShowOrder();
             getInsertList(new SelectPack()).forEach(packingLibrary1 -> {
@@ -305,7 +305,7 @@ public class PackingLibraryServiceImpl implements PackingLibraryService {
         if (ids.size()>0){
             ids.forEach(integer -> {
                 if (deviceLibraryDao.getAllByPackingId(integer).size()>0){
-                    throw new ApiException(ResponseEntity.status(303).body("该列装型号已有装备,请进行退装操作"));
+                    throw new ApiException(ResponseEntity.status(20000).body("该列装型号已有装备,请进行退装操作"));
                 }
                 deleteAll(integer);
             });
@@ -412,7 +412,7 @@ public class PackingLibraryServiceImpl implements PackingLibraryService {
         for (Script s:conList) {
             addScript(scriptList,s);
         }
-        return scriptList;
+        return scriptList.stream().sorted(Comparator.comparing(Script::getSeqNumber).reversed()).collect(Collectors.toList());
     }
 
     @Override
@@ -453,7 +453,7 @@ public class PackingLibraryServiceImpl implements PackingLibraryService {
             addScript(scriptList,s);
         }
         scriptList.forEach(script -> script.setChilds(null));
-        return scriptList;
+        return scriptList.stream().sorted(Comparator.comparing(Script::getSeqNumber).reversed()).collect(Collectors.toList());
     }
 
     private void addScript(List<Script> scripts,Script script){