更新

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

@@ -346,6 +346,12 @@ public class BackController {
         ids.forEach(integer -> {
             DeviceLogDto deviceLogDto = new DeviceLogDto(integer, "上传退回单", fileVoList);
             deviceLogService.addLog(deviceLogDto);
+            DeviceLibrary deviceLibrary = deviceLibraryService.getOne(integer);
+            deviceLibrary.setLocationUnit(allotBackBill.getReceiveUnit());
+            deviceLibrary.setLifeStatus(2);
+            deviceLibrary.setOwnUnit(allotBackBill.getReceiveUnit());
+            deviceLibrary.setManageStatus(1);
+            deviceLibraryService.update(deviceLibrary);
         });
         if (idList.size()>0) {
             MessageBto messageBto = new MessageBto(taskBto.getId(), taskBto.getBusinessType(), "被选为经办人", idList, 1);

dev-library/src/main/java/com/tykj/dev/device/library/subject/domin/DeviceChange.java

@@ -60,4 +60,7 @@ public class DeviceChange {
 
     @ApiModelProperty(value = "区块链记录id")
     private String recordId;
+
+    @Column(name = "change_files",columnDefinition = "TEXT")
+    private String changeFiles;
 }

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

@@ -34,4 +34,5 @@ public class DeviceEditVo {
     @Min(value = 1,message = "id不能小于1")
     @ApiModelProperty(value = "换新维修详情id", example = "1")
     private Integer id;
+
 }

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

@@ -36,12 +36,15 @@ public class ScriptSaveVo {
     @ApiModelProperty(value = "数量")
     private Integer num;
 
-    @ApiModelProperty(value = "列装Id")
+    @ApiModelProperty(value = "列装Id/维修装备Id")
     private Integer id;
 
     @ApiModelProperty(value = "备注")
     private String remark;
 
+    @ApiModelProperty(value = "维修记录Id")
+    private Integer detailId;
+
     public String toJson(){
         return JacksonUtil.toJSon(this);
     }

dev-misc/src/main/java/com/tykj/dev/misc/base/StatusEnum.java

@@ -194,7 +194,7 @@ public enum StatusEnum {
     /**
      * 待盖章出库
      */
-    WAIT_SIGN(341,"待盖章出库"),
+    WAIT_SIGN(341,"等待盖章"),
 
     /**
      * 待自查
@@ -237,22 +237,22 @@ public enum StatusEnum {
     WAIT_RECEIVE(701, "等待接收维修装备"),
     REPAIR_RECEIVE_CONFIRM(702, "接收维修装备待审核"),
     REPAIRING(703, "维修中"),
-    WAIT_UPLOAD_FILE(704, "等待上传送修单"),
-    WAIT_UPLOAD_SEND_FILE(722, "等待上传送修单"),
+    WAIT_UPLOAD_FILE(704, "等待上传签收单"),
+    WAIT_UPLOAD_SEND_FILE(722, "等待上传回执单"),
     COUNTRY_REPAIRING(777, "等待接收维修退回装备"),
     REPAIR_SEND_DRAFT(788,"草稿"),
     REPAIR_SEND_SIGN_WAIT_CONFIRM(790,"申请签章待审核"),
-    REPAIR_SEND_WAIT_SIGN(791,"待盖章出库"),
+    REPAIR_SEND_WAIT_SIGN(791,"等待盖章"),
     /**
      * 维修完成退回状态
      */
     REPAIR_BACK_CONFIRM(800, "维修退回装备出库待审核"),
     WAIT_BACK_RECEIVE(801, "等待接收维修退回装备"),
     REPAIR_BACK_RECEIVE_CONFIRM(802, "接收维修退回装备待审核"),
-    WAIT_UPLOAD_BACK_FILE(804, "等待上传回执单"),
-    WAIT_UPLOAD_BACK_SEND_FILE(810, "等待上传领取单"),
+    WAIT_UPLOAD_BACK_FILE(804, "等待上传签收单"),
+    WAIT_UPLOAD_BACK_SEND_FILE(810, "等待上传回执单"),
     REPAIR_BACK_SIGN_WAIT_CONFIRM(820,"申请签章待审核"),
-    REPAIR_BACK_WAIT_SIGN(821,"待盖章出库"),
+    REPAIR_BACK_WAIT_SIGN(821,"等待盖章"),
     REPAIR_BACK_DRAFT(888,"草稿"),
 
     /**
@@ -264,7 +264,7 @@ public enum StatusEnum {
     WAIT_UPLOAD_BACK_FILE_2(911, "待上传退回单"),
     BACK_DRAFT(922,"草稿"),
     BACK_SIGN_WAIT_CONFIRM(930,"申请签章待审核"),
-    BACK_WAIT_SIGN(931,"待盖章出库"),
+    BACK_WAIT_SIGN(931,"等待盖章"),
 
     /**
      * 报废状态

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

@@ -398,12 +398,12 @@ public class PackingController {
                 map.put("error","型号"+packingModelEdit.getModel()+"已存在");
                 return ResponseEntity.ok(map);
             }
-            BeanUtils.copyProperties(packingModelEdit,packingLibrary);
             if (packingModelEdit.getModel()!=null&&!packingModelEdit.getModel().equals(packingLibrary.getModel())){
                 packingLibrary.setModel(packingModelEdit.getModel());
                 packingLibrary.setName(packingModelEdit.getModel());
                 packingLibraryService.changeAllModel(packingLibrary.getId(),packingModelEdit.getModel());
             }
+            BeanUtils.copyProperties(packingModelEdit,packingLibrary);
             packingLibraryService.update(packingLibrary);
             //发送阅知信息
             List<Integer> userIds = userPublicService.findOtherUser(userUtils.getCurrentUserId());
@@ -420,6 +420,9 @@ public class PackingController {
     @PostMapping("/update/device")
     public ResponseEntity updateDevice(@RequestBody @Validated PackingLibraryUpdateVo packingLibraryUpdateVo){
         PackingLibrary packingLibrary = packingLibraryService.getOne(packingLibraryUpdateVo.getPackingId());
+        if (!packingLibraryUpdateVo.getMatchingRange().equals(packingLibrary.getMatchingRange())&&packingLibraryService.matchingRangeIsExist(packingLibrary.getPartParentId(),packingLibraryUpdateVo.getMatchingRange())){
+            throw new ApiException("该型号下已存在配用范围为"+configCache.getMatchingRangeMap().get(packingLibraryUpdateVo.getMatchingRange())+"的装备");
+        }
         //复制相同的字段
         if (packingLibraryUpdateVo.getName()!=null&&!packingLibraryUpdateVo.getName().equals(packingLibrary.getName())&&!packingLibraryService.nameIsExist(packingLibrary.getModel(),packingLibraryUpdateVo.getName())){
             //添加列装日志

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> findAllByPartParentIdAndMatchingRange(Integer partParentId,Integer matchingRange);
+    List<PackingLibrary> findAllByPartParentIdAndMatchingRangeAndPackingStatus(Integer partParentId,Integer matchingRange,Integer packingStatus);
 
     List<PackingLibrary> findAllByDeleteTag(Integer deleteTag);
 }

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

@@ -576,7 +576,7 @@ public class PackingLibraryServiceImpl implements PackingLibraryService {
      */
     @Override
     public PackingLibrary findSamePacking(Integer parentId,Integer matchingRange) {
-        List<PackingLibrary> packingLibraries = packingLibraryDao.findAllByPartParentIdAndMatchingRange(parentId,matchingRange);
+        List<PackingLibrary> packingLibraries = packingLibraryDao.findAllByPartParentIdAndMatchingRangeAndPackingStatus(parentId,matchingRange,2);
         if (packingLibraries.isEmpty()){
             return null;
         }

dev-repair/src/main/java/com/tykj/dev/device/repair/subject/domin/RepairDetail.java

@@ -81,7 +81,6 @@ public class RepairDetail {
      * 所在单位
      */
     @ApiModelProperty(value = "所在单位")
-    @Transient
     private String locationUnit;
     /**
      * 所属单位

dev-repair/src/main/java/com/tykj/dev/device/repair/subject/vo/DeviceEditVo.java

+package com.tykj.dev.device.repair.subject.vo;
+
+import com.tykj.dev.device.file.entity.FileRet;
+import com.tykj.dev.device.library.subject.vo.DeviceLibraryUpdateVo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+/**
+ * @author dengdiyi
+ */
+@Data
+@ApiModel("装备编辑类")
+public class DeviceEditVo {
+
+    @ApiModelProperty(value = "装备库更新信息")
+    private DeviceLibraryUpdateVo updateVoList;
+
+    @ApiModelProperty(value = "新增配件信息列表")
+    private List<Integer> partAddIdList;
+
+    @ApiModelProperty(value = "删除相关配件id")
+    private List<Integer> partIdDeleteList;
+
+    @NotNull(message = "deviceId不能为空")
+    @Min(value = 1,message = "deviceId不能小于1")
+    @ApiModelProperty(value = "装备id", example = "1")
+    private Integer deviceId;
+
+    @Min(value = 1,message = "id不能小于1")
+    @ApiModelProperty(value = "换新维修详情id", example = "1")
+    private Integer id;
+
+    @ApiModelProperty(value = "换新单")
+    private List<FileRet> sendFiles;
+}

dev-statistical/src/main/java/com/tykj/dev/statistical/service/impl/StatisticalServiceImpl.java

@@ -499,11 +499,14 @@ public class StatisticalServiceImpl implements StatisticalService {
         workBench.setSelfDeviceNum(Long.valueOf(deviceLibraries.stream().filter(deviceLibrary -> deviceLibrary.getOwnUnit().equals(unitName)).count()).intValue());
         workBench.setMatchingDeviceNum(new Long(matchingDeviceLibraryDao.count()).intValue());
         workBench.setDailyDeviceNum(Long.valueOf(deviceLibraries.stream().filter(deviceLibrary -> deviceLibrary.getOwnUnit().equals(unitName)&&Arrays.asList(2,14).contains(deviceLibrary.getLifeStatus())).count()).intValue());
-        List<Task> tasks = taskDao.findAllByBusinessType(7);
+        List<Task> allTasks = taskDao.findAll();
+        List<Task> tasks = allTasks.stream().filter(task -> task.getBusinessType()==7).collect(Collectors.toList());
+        List<Task> tasks2 = allTasks.stream().filter(task -> task.getBusinessType()==4).collect(Collectors.toList());
         workBench.setCheckNum(Long.valueOf(tasks.stream().filter(task -> "check".equals(task.getCustomInfo())).count()).intValue());
         workBench.setCompleteCheckNum(Long.valueOf(tasks.stream().filter(task -> task.getBillStatus()==9999&&"check".equals(task.getCustomInfo())).count()).intValue());
         workBench.setExamNum(Long.valueOf(tasks.stream().filter(task -> task.getParentTaskId()==0&&"exam".equals(task.getCustomInfo())&&task.getOwnUnit().equals(unit)).count()).intValue());
         workBench.setExamCompleteNum(Long.valueOf(tasks.stream().filter(task -> task.getBillStatus()==9999&&task.getParentTaskId()==0&&"exam".equals(task.getCustomInfo())&&task.getOwnUnit().equals(unit)).count()).intValue());
+        workBench.setSelfCheckNum(Long.valueOf(tasks2.stream().filter(task -> task.getBillStatus()==9999&&unit.equals(task.getOwnUnit())).count()).intValue());
         return workBench;
     }
 

dev-statistical/src/main/java/com/tykj/dev/statistical/vo/WorkBench.java

@@ -38,4 +38,6 @@ public class WorkBench {
     private Integer lossNum = 0;
 
     private Integer foundNum = 0;
+
+    private Integer selfCheckNum;
 }