更新

dev-allot/src/main/java/com/tykj/dev/device/allot/controller/BackController.java

@@ -132,8 +132,16 @@ public class BackController {
         userIds.add(userId);
         userIds.add(0);
         TaskBto saveEntity;
-        TaskBto taskBto = new TaskBto(StatusEnum.ALLOT_BACKING.id, "退回业务", null, ".", billId, 22, userPublicService.findUnitIdByName(allotBillSaveVo.getReceiveUnit()), 1, null, userIds);
-        saveEntity = taskService.start(taskBto);
+        if (allotBillSaveVo.getTaskId()==null) {
+            TaskBto taskBto = new TaskBto(StatusEnum.ALLOT_BACKING.id, "退回业务", null, ".", billId, 22, userPublicService.findUnitIdByName(allotBillSaveVo.getReceiveUnit()), 1, null, userIds);
+            saveEntity = taskService.start(taskBto);
+        }
+        else {
+            TaskBto taskBto = taskService.get(allotBillSaveVo.getTaskId());
+            TaskBto taskBto1 = taskService.addInvolveUser(taskBto,userId);
+            taskBto1.setOwnUnit(userPublicService.findUnitIdByName(allotBillSaveVo.getReceiveUnit()));
+            saveEntity = taskService.moveToSpecial(taskBto1,StatusEnum.ALLOT_BACKING,0);
+        }
         TaskBto taskBto2 = new TaskBto(StatusEnum.WAIT_UPLOAD_BACK_FILE_2.id, "退回业务", saveEntity.getId(), saveEntity.getNodeIdDetail() + saveEntity.getId() + ".", saveEntity.getBillId(), 22, userPublicService.findUnitIdByName(allotBackBill1.getSendUnit()), 0, null, Collections.singletonList(0));
         taskService.start(taskBto2);
         List<FileVo> fileVoList = new ArrayList<>();

dev-excel/src/main/java/com/tykj/dev/device/excel/controller/ExeclController.java

@@ -33,8 +33,6 @@ import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
-
-
 /**
  * @author zjm
  */
@@ -56,10 +54,28 @@ public class ExeclController {
     @GetMapping(value ="/test")
     @ApiOperation(value = "下载培训excel", notes = "下载培训excel")
     public ResponseEntity saveDeviceDestroyBill(HttpServletRequest request, HttpServletResponse response){
-        List<DeviceExcel> excelList=deviceLibraryDao.findAll().stream().map(DeviceLibrary::parseExcel)
+        List<DeviceExcel> excelList=deviceLibraryDao.findAll().stream()
+                .filter(deviceLibrary -> deviceLibrary.getLifeStatus()!=12)
+                .map(DeviceLibrary::parseExcel)
                 .sorted(Comparator.comparing(DeviceExcel::getSeqNumber,Comparator.nullsLast(String::compareTo)).thenComparing(DeviceExcel::getName))
                 .collect(Collectors.toList());
-
+//        Map<String,List<DeviceExcel>> map = excelList.stream().collect(groupingBy(DeviceExcel::getSeqNumber));
+//        List<DeviceExcel> deviceExcels= new ArrayList<>();
+//        for (String s : map.keySet()){
+//            List<DeviceExcel> deviceExcelList= map.get(s);
+//            if (deviceExcelList.size()>1){
+//                deviceExcels.addAll(deviceExcelList);
+//            }
+//            else {
+//                DeviceExcel deviceExcel = deviceExcelList.get(0);
+//                if (deviceExcel.getSeqNumber().length()<=5||deviceExcel.getSeqNumber().equals(deviceExcel.getProdNumber())){
+//                    deviceExcels.add(deviceExcel);
+//                }
+//            }
+//        }
+//        deviceExcels = deviceExcels.stream()
+//                .sorted(Comparator.comparing(DeviceExcel::getSeqNumber,Comparator.nullsLast(String::compareTo)).thenComparing(DeviceExcel::getName))
+//                .collect(Collectors.toList());
 
         ExportParams exportParams = new ExportParams("xxx","xxx", ExcelType.XSSF);
         exportParams.setStyle(ExcelStyleUtil.class);

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

@@ -55,9 +55,15 @@ public class DeviceExcel {
      */
     @ApiModelProperty(value = "装备序列号")
     @Excel(name = "装备序列号", orderNum = "1", width = 30, needMerge = true)
-
     private String seqNumber;
 
+    /**
+     * 生产序列号
+     */
+    @ApiModelProperty(value = "生产序列号")
+    @Excel(name = "生产序列号", orderNum = "1", width = 30, needMerge = true)
+    private String prodNumber;
+
     /**
      * rfid表面号
      */

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

@@ -47,6 +47,20 @@ public class PackingLibraryController {
     @Autowired
     PackingLibraryDao packingLibraryDao;
 
+    @ApiOperation(value = "获取父子结构列装", notes = "获取父子结构列装")
+    @PostMapping("/merge")
+    public ResponseEntity merge(@RequestBody List<PackingLibrary> packingLibraries){
+        //返回父子结构
+        Map<Integer, PackingLibrary> nodeCollect =
+                packingLibraries.stream().collect(Collectors.toMap(PackingLibrary::getId, packingLibrary -> packingLibrary));
+        return ResponseEntity.ok(GetTreeUtils.parseTreeFromDown(
+                packingLibraries,
+                PackingLibrary::getId,
+                packingLibrary -> Optional.ofNullable(nodeCollect.get(packingLibrary.getPartParentId())),
+                PackingLibrary::addChildNode
+        ));
+    }
+
     @ApiOperation(value = "获取装备单据显示", notes = "获取装备单据显示")
     @PostMapping("/getAllotScript")
     public ResponseEntity getAllotScript(@RequestBody List<Integer> ids){

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

@@ -160,7 +160,7 @@ public class PackingLibrary {
      * 退装时间
      */
     @ApiModelProperty(value = "退装时间")
-    private java.sql.Timestamp exitTime;
+    private Date exitTime;
 
 
     @ApiModelProperty(value = "区块链记录id")

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

@@ -497,6 +497,7 @@ public class RepairController {
         if (repairReceiveVo.getStartUserbId()!=null){
             repairSendBill.setStartUserbId(repairReceiveVo.getStartUserbId());
             repairSendBill.setAgent(userPublicService.getOne(repairReceiveVo.getStartUserbId()).getName());
+            repairBill.setStartUserB(repairSendBill.getAgent());
         }
         deviceRepairBillService.update(repairBill);
         repairSendBill.setRepairStatus(5);

dev-selfcheck/src/main/java/com/tykj/dev/device/selfcheck/controller/SelfCheckController.java

@@ -38,10 +38,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.concurrent.ScheduledFuture;
 
 /**
@@ -256,7 +253,7 @@ public class SelfCheckController {
         else {
             compareResultVo.setNewList(newList);
             for (DeviceLibrary d:deviceLibraryEntities) {
-                d.setCheckResult(1);
+                d.setCheckResult(0);
                 resultList.add(d);
             }
             compareResultVo.setResultList(resultList);
@@ -557,6 +554,10 @@ public class SelfCheckController {
             list.add(JacksonUtil.readValue(selfExaminationBillEntity.getUnStockDetail(), new TypeReference<List<DeviceLibrary>>() {
             }));
         }
+        else {
+            list.add(new ArrayList<>());
+        }
+        list.add(taskBto.toVo());
         return ResultUtil.success(list);
     }
 }