feat(入库模块,申请模块): 修改导入申请的合并父子集合

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

@@ -799,8 +799,13 @@ public class DeviceApplyController {
     @Transactional(rollbackFor = Exception.class)
     public ResponseEntity removeSameSeq(@RequestBody RemoveSameSeqVo removeSameSeqVo) {
         ApplyRemoveSeqVo applyRemoveSeqVo = new ApplyRemoveSeqVo();
-        if (removeSameSeqVo!=null){
+        if (removeSameSeqVo.getRemoveSameSeq() != null){
             applyRemoveSeqVo = deviceApplyBillService.removeSameSeq(removeSameSeqVo);
+        }else {
+            //没有重复的
+            List<String> list = DeviceSeqUtil.selectDeviceSeqs(removeSameSeqVo.getSeqNumberList());
+            applyRemoveSeqVo.setSeqList(list);
+            applyRemoveSeqVo.setCount(list.size());
         }
         return ResponseEntity.ok(applyRemoveSeqVo);
     }

dev-apply/src/main/java/com/tykj/dev/device/apply/subject/vo/ApplyRemoveSeqVo.java

 package com.tykj.dev.device.apply.subject.vo;
 
-import com.tykj.dev.device.apply.subject.domin.DeviceApplyBill;
-import com.tykj.dev.device.library.subject.domin.DeviceLibrary;
-import com.tykj.dev.device.packing.subject.domin.PackingLibrary;
-import com.tykj.dev.device.task.subject.vo.TaskLogUserVo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -23,5 +19,4 @@ public class ApplyRemoveSeqVo {
     @ApiModelProperty(name = "区间数量")
     private Integer count;
 
-
 }

dev-library/src/main/java/com/tykj/dev/device/library/controller/DeviceLibraryPositionController.java

@@ -59,4 +59,11 @@ public class DeviceLibraryPositionController {
         deviceLibraryPositionService.updateDeviceLibraryPosition(deviceLibraryPosition);
         return ResponseEntity.ok("修改成功");
     }
+
+    @GetMapping("/findById")
+    @ApiOperation(value = "根据id查询")
+    public ResponseEntity<DeviceLibraryPosition> findById(Integer id){
+        DeviceLibraryPosition deviceLibraryPosition = deviceLibraryPositionService.findById(id);
+        return ResponseEntity.ok(deviceLibraryPosition);
+    }
 }

dev-library/src/main/java/com/tykj/dev/device/library/service/DeviceLibraryPositionService.java

@@ -17,4 +17,6 @@ public interface DeviceLibraryPositionService {
     void batchDeviceLibraryPositions(List<DeviceLibraryPosition> deviceLibraryPositions);
 
     List<DeviceLibraryPosition> findByStorageLocationId(Integer StorageLocationId);
+
+    DeviceLibraryPosition findById(Integer id);
 }

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

@@ -61,6 +61,7 @@ public class PackingLibraryController {
     @ApiOperation(value = "申请后入库获取父子结构列装（去除已入库序列号）", notes = "获取父子结构列装")
     @PostMapping("/merge")
     public ResponseEntity merge(@RequestBody List<PackingLibrary> packingLibraries){
+        List<MergeVo> mergeVos = new ArrayList<>();
         Map<String,DeviceLibrary> map = deviceLibraryService.getAllDeviceSeqMap();
         packingLibraries.forEach(packingLibrary -> {
             List<String> inputSeqs = DeviceSeqUtil.selectDeviceSeqs(packingLibrary.getSeq());
@@ -72,8 +73,14 @@ public class PackingLibraryController {
 //            });
 //            packingLibrary.setSeq(StringSplitUtil.stringListToString(DeviceSeqUtil.getContinuousSeqs(outputSeqs)));
             packingLibrary.setSeq(StringSplitUtil.stringListToString(DeviceSeqUtil.getContinuousSeqs(inputSeqs)));
-
+            MergeVo mergeVo = new MergeVo();
+            mergeVo.setStorageCount(packingLibrary.getWaitNum());
+//            mergeVo.setPackingLibrary(packingLibrary);
+            mergeVo.setSeqInterval(packingLibrary.getSeq());
+            mergeVo.setSeqList(inputSeqs);
+            packingLibrary.setMergeVo(mergeVo);
         });
+
         //返回父子结构
         Map<Integer, PackingLibrary> nodeCollect =
                 packingLibraries.stream().collect(Collectors.toMap(PackingLibrary::getId, packingLibrary -> packingLibrary));

dev-packing/src/main/java/com/tykj/dev/device/packing/subject/domin/PackingLibrary.java

@@ -3,6 +3,7 @@ package com.tykj.dev.device.packing.subject.domin;
 import com.tykj.dev.config.cache.ConfigCache;
 import com.tykj.dev.device.file.entity.FileRet;
 import com.tykj.dev.device.file.service.FilesUtil;
+import com.tykj.dev.device.packing.subject.vo.MergeVo;
 import com.tykj.dev.misc.utils.SpringUtils;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -304,6 +305,10 @@ public class PackingLibrary {
     @ApiModelProperty(value = "等级")
     private Integer level;
 
+    @Transient
+    @ApiModelProperty(value = "merge")
+    private MergeVo mergeVo;
+
 
     public void addChildNode(PackingLibrary packingLibraryEntity) {
         childs.add(packingLibraryEntity);

dev-packing/src/main/java/com/tykj/dev/device/packing/subject/vo/MergeVo.java

+package com.tykj.dev.device.packing.subject.vo;
+
+
+import com.tykj.dev.device.packing.subject.domin.PackingLibrary;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.stereotype.Repository;
+import java.util.List;
+
+/**
+ * @author dengdiyi
+ */
+@Data
+@ApiModel("合并vo")
+@Repository
+public class MergeVo {
+    @ApiModelProperty(name = "列装对象")
+    private PackingLibrary packingLibrary;
+
+    @ApiModelProperty(name = "入库数量",example = "1")
+    private Integer storageCount;
+
+    @ApiModelProperty(name = "生成的序列号区间",example = "1")
+    private String seqInterval;
+
+    @ApiModelProperty(name = "生成的序列号集合")
+    private List<String> seqList;
+}