更新

dev-library/src/main/java/com/tykj/dev/device/library/subject/vo/ScriptSaveVo.java

@@ -45,6 +45,9 @@ public class ScriptSaveVo {
     @ApiModelProperty(value = "维修记录Id")
     private Integer detailId;
 
+    @ApiModelProperty(value = "配发类型数字")
+    private String allotTypeNum;
+
     public String toJson(){
         return JacksonUtil.toJSon(this);
     }

dev-packing/src/main/java/com/tykj/dev/device/packing/repository/PackingLibraryDao.java

@@ -21,7 +21,7 @@ public interface PackingLibraryDao extends JpaRepository<PackingLibrary, Integer
 
     List<PackingLibrary> findAllByIsRootAndPackingStatus(Integer isRoot,Integer packingStatus);
 
-    List<PackingLibrary> findAllByPartParentIdAndMatchingRangeAndPackingStatus(Integer partParentId,Integer matchingRange,Integer packingStatus);
+    List<PackingLibrary> findAllByPartParentIdAndMatchingRangeAndPackingStatusAndName(Integer partParentId,Integer matchingRange,Integer packingStatus,String name);
 
     List<PackingLibrary> findAllByDeleteTag(Integer deleteTag);
 }

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

@@ -591,7 +591,7 @@ public class PackingLibraryServiceImpl implements PackingLibraryService {
      */
     @Override
     public PackingLibrary findSamePacking(Integer parentId,Integer matchingRange,Integer type,Integer style,String name,Integer secretLevel,Integer invisibleRange) {
-        List<PackingLibrary> packingLibraries = packingLibraryDao.findAllByPartParentIdAndMatchingRangeAndPackingStatus(parentId,matchingRange,2);
+        List<PackingLibrary> packingLibraries = packingLibraryDao.findAllByPartParentIdAndMatchingRangeAndPackingStatusAndName(parentId,matchingRange,2,name);
         if (packingLibraries.isEmpty()){
             return null;
         }
@@ -624,11 +624,7 @@ public class PackingLibraryServiceImpl implements PackingLibraryService {
         PredicateBuilder<PackingLibrary> predicateBuilder = Specifications.and();
         predicateBuilder.eq("isRoot", 0);
         predicateBuilder.eq("partParentId", parentId);
-        predicateBuilder.eq("type",type);
-        predicateBuilder.eq("style",style);
         predicateBuilder.eq("name",name);
-        predicateBuilder.eq("secretLevel",secretLevel);
-        predicateBuilder.eq("invisibleRange",invisibleRange);
         return packingLibraryDao.findAll(predicateBuilder.build()).size()>0;
     }
 

dev-repair/src/main/java/com/tykj/dev/device/repair/controller/RepairBillSelectController.java

@@ -87,15 +87,21 @@ public class RepairBillSelectController {
     @ApiOperation(value = "查询工作台维修装备数量", notes = "可以通过这个接口查询工作台维修装备数量")
     @GetMapping(value = "/repairNum")
     public ResponseEntity getRepairNum(){
+        //返回数量对象
         RepairNum repairNum = new RepairNum();
+        //查询器
         RepairTaskSelectVo repairTaskSelectVo = new RepairTaskSelectVo(1,null);
         repairTaskSelectVo.setPage(0);
         repairTaskSelectVo.setSize(Integer.MAX_VALUE);
+        //type=1的记录
         Page<RepairDetail> repairDetails = (Page)repairController.getRepairList(repairTaskSelectVo).getBody();
+        //type=2的记录
         repairTaskSelectVo.setType(2);
         Page<RepairDetail> repairDetails2 = (Page)repairController.getRepairList(repairTaskSelectVo).getBody();
+        //type=3的记录
         repairTaskSelectVo.setType(3);
         Page<RepairDetail> repairDetails3 = (Page)repairController.getRepairList(repairTaskSelectVo).getBody();
+        //set数量
         repairNum.setNum1(Long.valueOf(repairDetails.getTotalElements()).intValue());
         repairNum.setNum2(Long.valueOf(repairDetails2.getTotalElements()).intValue());
         repairNum.setNum3(Long.valueOf(repairDetails3.getTotalElements()).intValue());
@@ -106,7 +112,9 @@ public class RepairBillSelectController {
     @PostMapping(value = "/repair")
     public ResponseEntity selectRepairTasks(@RequestBody TaskSelectVo taskSelectVo){
         List<TaskUserVo> taskUserVos;
+        //如果是待办
         if (taskSelectVo.getSelectNum()==2){
+            //筛选出状态为维修或领取待上传签收单的状态，状态为704或804
             taskUserVos = taskService.getManageList(taskSelectVo).stream().filter(taskUserVo -> taskUserVo.getBillStatus()==704||taskUserVo.getBillStatus()==804).collect(Collectors.toList());
         }
         else {

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

@@ -423,6 +423,7 @@ public class StorageBillController {
                 //如果是单独的配件，不用设置父装备id
                 else {
                     saveEntity = deviceLibraryService.addEntity(deviceLibraryEntity);
+                    parentId = saveEntity.getId();
                 }
                 saveEntities.add(saveEntity);
                 stringBuffer.append(saveEntity.getId());

dev-taskselect/src/main/java/com/tykj/dev/device/taskselect/controller/TaskSelectController.java

@@ -291,7 +291,13 @@ public class TaskSelectController {
                 list.add(selfExaminationBillEntity);
                 String str3 = selfExaminationBillEntity.getCheckDetail();
                 String str4 = selfExaminationBillEntity.getNewDeviceDetail();
-                String[] split = str3.split("x");
+                String[] split;
+                if (str3!=null) {
+                    split = str3.split("x");
+                }
+                else {
+                    split = new String[0];
+                }
                 if (str4 != null) {
                     String[] split2 = str4.split("\\.");
                     List<DeviceLibrary> newDeviceList = new ArrayList<>();