修改入库

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

@@ -103,8 +103,10 @@ public class StorageBillController {
                 PackingLibrary packingLibraryEntity = new PackingLibrary();
                 BeanUtils.copyProperties(packingLibraryService.getOne(s.getPackingId()), packingLibraryEntity);
                 packingLibraryEntity.setCorresponding(count);
+                if (!strings.isEmpty()) {
                     packingLibraryEntity.setSeq(strings.get(0));
                     strings.remove(0);
+                }
                 libraryEntities.add(packingLibraryEntity);
                 if (s.getList() != null && s.getList().size() != 0) {
                     for (int j = 0;j<s.getList().size();j++) {
@@ -116,8 +118,10 @@ public class StorageBillController {
                         List<String> strings2 = sons.get(j);
                         if (s2.getStorageCount() >= count) {
                             packingLibraryEntity.setCorresponding(count);
+                            if (!strings2.isEmpty()) {
                                 packingLibraryEntity.setSeq(strings2.get(0));
                                 strings2.remove(0);
+                            }
                             libraryEntities.add(packingLibraryEntity);
                         }
                         if (s2.getStorageCount()-strings2.size()==deviceNum) {
@@ -125,8 +129,10 @@ public class StorageBillController {
                             for (int i = 0;i<s2.getStorageCount()-deviceNum;i++){
                                 packingLibraryEntity = packingLibraryService.getOne(s2.getPackingId());
                                 packingLibraryEntity.setCorresponding(0);
+                                if (!strings2.isEmpty()) {
                                     packingLibraryEntity.setSeq(strings2.get(0));
                                     strings2.remove(0);
+                                }
                                 packingLibraries.add(packingLibraryEntity);
                             }
                             map.put(s2.getPackingId(), packingLibraries);