更新

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

@@ -178,7 +178,7 @@ public class DeviceLibraryServiceImpl implements DeviceLibraryService {
                 deviceLibraries.forEach(DeviceLibrary::setConfigName);
                 return deviceLibraries;
             } else {
-                throw new ApiException(ResultUtil.failed("区域等级只能为1，2，3"));
+                throw new ApiException(ResultUtil.failed("区域等级只能为1，2，3，4"));
             }
         }
     }

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

@@ -257,6 +257,62 @@ public class StorageBillController {
                                 }
                                 map.put(s2.getPackingId(), packingLibraries);
                             }
+//                            if (s2.getList() != null && s2.getList().size() != 0) {
+//                                for (int k = 0; k < s2.getList().size(); k++) {
+//                                    StorageBillDetailVo s3 = s.getList().get(k);
+//                                    if (k >= sons.size()) {
+//                                        sons.add(DeviceSeqUtil.createDeviceSeqs(s3.getSeqInterval(), s3.getStorageCount()));
+//                                        sons2.add(DeviceSeqUtil.createDeviceSeqs(s3.getProdInterval(), s3.getStorageCount()));
+//                                    }
+//                                    packingLibraryEntity = packingLibraryService.getOne(s3.getPackingId());
+//                                    List<String> strings4 = sons.get(k);
+//                                    List<String> strings5 = sons2.get(k);
+//                                    if (s3.getStorageCount() >= count) {
+//                                        packingLibraryEntity.setCorresponding(count);
+//                                        if (!strings4.isEmpty()) {
+//                                            if (deviceLibraryDao.getAllBySeqNumber(strings4.get(0)).size() > 0) {
+//                                                throw new ApiException("序列号" + strings4.get(0) + "已存在");
+//                                            }
+//                                            if (seqs.contains(strings4.get(0))){
+//                                                throw new ApiException("序列号" + strings4.get(0) + "不能重复");
+//                                            }
+//                                            packingLibraryEntity.setSeq(strings4.get(0));
+//                                            strings4.remove(0);
+//                                        }
+//                                        if (!strings5.isEmpty()) {
+//                                            packingLibraryEntity.setProdNumber(strings5.get(0));
+//                                            strings5.remove(0);
+//                                        }
+//                                        seqs.add(packingLibraryEntity.getSeq());
+//                                        libraryEntities.add(packingLibraryEntity);
+//                                    }
+//                                    if (s3.getStorageCount() - strings4.size() == deviceNum) {
+//                                        List<PackingLibrary> packingLibraries = new ArrayList<>();
+//                                        for (int i = 0; i < s3.getStorageCount() - deviceNum; i++) {
+//                                            packingLibraryEntity = packingLibraryService.getOne(s3.getPackingId());
+//                                            packingLibraryEntity.setCorresponding(0);
+//                                            if (!strings4.isEmpty()) {
+//                                                if (deviceLibraryDao.getAllBySeqNumber(strings4.get(0)).size() > 0) {
+//                                                    throw new ApiException("序列号" + strings4.get(0) + "已存在");
+//                                                }
+//                                                if (seqs.contains(strings4.get(0))){
+//                                                    throw new ApiException("序列号" + strings4.get(0) + "不能重复");
+//                                                }
+//                                                packingLibraryEntity.setSeq(strings4.get(0));
+//                                                strings4.remove(0);
+//                                            }
+//                                            if (!strings5.isEmpty()) {
+//                                                packingLibraryEntity.setProdNumber(strings5.get(0));
+//                                                strings5.remove(0);
+//                                            }
+//                                            seqs.add(packingLibraryEntity.getSeq());
+//                                            packingLibraries.add(packingLibraryEntity);
+//                                        }
+//                                        map.put(s3.getPackingId(), packingLibraries);
+//                                    }
+//                                }
+//
+//                            }
                         }
 
                     }

dev-task/src/main/java/com/tykj/dev/device/task/subject/bto/TaskBto.java

@@ -135,6 +135,7 @@ public class TaskBto {
         //set vo字段
         if (userPublicService != null && this.createUserId != null) {
             taskUserVo.setStartUnit(userPublicService.findUnitsNameByUserId(this.createUserId));
+            taskUserVo.setCreateUser(userPublicService.getOne(this.createUserId).getName());
         }
 //        log.info("----{}",this.billStatus);
         taskUserVo.setStatus(GlobalMap.getStatusEnumMap().get(this.billStatus).name);

dev-task/src/main/java/com/tykj/dev/device/task/subject/vo/TaskUserVo.java

@@ -99,4 +99,7 @@ public class TaskUserVo {
 
     @ApiModelProperty(value = "备注")
     private String remark;
+
+    @ApiModelProperty(value = "创建用户")
+    private String createUser;
 }