修改入库

dev-misc/src/main/java/com/tykj/dev/misc/utils/DeviceSeqUtil.java

@@ -23,19 +23,24 @@ public class DeviceSeqUtil {
             //按,分隔多个区间
             String[] strings = s.split(",");
             if (strings.length==1){
+                if (isSingle(strings[0])) {
                     String num1 = strings[0].replaceAll(".*[^\\d](?=(\\d+))", "");
                     int minSeq = Integer.parseInt(num1);
-                for (int i =0;i<num;i++){
+                    for (int i = 0; i < num; i++) {
                         StringBuffer stringBuffer = new StringBuffer();
                         //拼接数字之前的字符串
-                    stringBuffer.append(s, 0, s.length()-num1.length());
+                        stringBuffer.append(s, 0, s.length() - num1.length());
                         //将数字按长度格式化，缺位补0
-                    String codeFormat = "%0"+ num1.length() +"d";
-                    stringBuffer.append(String.format(codeFormat,minSeq));
+                        String codeFormat = "%0" + num1.length() + "d";
+                        stringBuffer.append(String.format(codeFormat, minSeq));
                         seqs.add(stringBuffer.toString());
                         minSeq++;
                     }
                 }
+                else {
+                    seqs.addAll(getIntervalSeqs(strings[0]));
+                }
+            }
             else {
                 for (String str : strings) {
                     if (str.length() > 0) {

dev-storage/src/main/java/com/tykj/dev/device/storage/controller/StorageBillController.java

@@ -93,24 +93,43 @@ public class StorageBillController {
     @PostMapping(value = "/addStorageDetail")
     public ResponseEntity addStorageDetail(@RequestBody List<StorageBillDetailVo> list) {
         List<PackingLibrary> libraryEntities = new ArrayList<>();
-        Map<Integer, Integer> map = new HashMap<>();
+        Map<Integer, List<PackingLibrary>> map = new HashMap<>();
         for (StorageBillDetailVo s : list) {
+            List<String> strings = DeviceSeqUtil.createDeviceSeqs(s.getSeqInterval(),s.getStorageCount());
+            List<List<String>> sons = new ArrayList<>();
             int count = 1;
             Integer deviceNum = s.getStorageCount();
             while (deviceNum >= count) {
                 PackingLibrary packingLibraryEntity = new PackingLibrary();
                 BeanUtils.copyProperties(packingLibraryService.getOne(s.getPackingId()), packingLibraryEntity);
                 packingLibraryEntity.setCorresponding(count);
+                packingLibraryEntity.setSeq(strings.get(0));
+                strings.remove(0);
                 libraryEntities.add(packingLibraryEntity);
                 if (s.getList() != null && s.getList().size() != 0) {
-                    for (StorageBillDetailVo s2 : s.getList()) {
+                    for (int j = 0;j<s.getList().size();j++) {
+                        StorageBillDetailVo s2 = s.getList().get(j);
+                        if (j>=sons.size()){
+                            sons.add(DeviceSeqUtil.createDeviceSeqs(s2.getSeqInterval(),s2.getStorageCount()));
+                        }
                         packingLibraryEntity = packingLibraryService.getOne(s2.getPackingId());
+                        List<String> strings2 = sons.get(j);
                         if (s2.getStorageCount() >= count) {
                             packingLibraryEntity.setCorresponding(count);
+                            packingLibraryEntity.setSeq(strings2.get(0));
+                            strings2.remove(0);
                             libraryEntities.add(packingLibraryEntity);
                         }
-                        if (s2.getStorageCount() > deviceNum) {
-                            map.put(s2.getPackingId(), s2.getStorageCount() - deviceNum);
+                        if (s2.getStorageCount()-strings2.size()==deviceNum) {
+                            List<PackingLibrary> packingLibraries = new ArrayList<>();
+                            for (int i = 0;i<s2.getStorageCount()-deviceNum;i++){
+                                packingLibraryEntity = packingLibraryService.getOne(s2.getPackingId());
+                                packingLibraryEntity.setCorresponding(0);
+                                packingLibraryEntity.setSeq(strings2.get(0));
+                                strings2.remove(0);
+                                packingLibraries.add(packingLibraryEntity);
+                            }
+                            map.put(s2.getPackingId(), packingLibraries);
                         }
                     }
 
@@ -119,11 +138,7 @@ public class StorageBillController {
             }
         }
         for (Integer i : map.keySet()) {
-            for (int j = 1; j <= map.get(i); j++) {
-                PackingLibrary packingLibraryEntity = packingLibraryService.getOne(i);
-                packingLibraryEntity.setCorresponding(0);
-                libraryEntities.add(packingLibraryEntity);
-            }
+            libraryEntities.addAll(map.get(i));
         }
         return ResultUtil.success(libraryEntities);
     }

dev-storage/src/main/java/com/tykj/dev/device/storage/subject/vo/StorageBillDetailVo.java

@@ -19,4 +19,6 @@ public class StorageBillDetailVo {
     private Integer packingId;
     @ApiModelProperty(value = "入库数量")
     private Integer storageCount;
+    @ApiModelProperty(value = "序列号区间")
+    private String seqInterval;
 }