Merge branch 'dev' into read-dev

dev-config/src/main/java/com/tykj/dev/config/LogType.java

@@ -238,7 +238,7 @@ public enum LogType {
     DESTROY_LOG_1(100301,DESTROY.id, ORIGIN_STATUS.id, DESTROY_2.id, "发起装备销毁"),
     DESTROY_LOG_2(100302,DESTROY.id, DESTROY_2.id, END.id, "上传销毁单据,任务结束"),
     DESTROY_LOG_3(100303,DESTROY.id, ORIGIN_STATUS.id, DESTROY_0.id, "发起了销毁任务的草稿"),
-    DESTROY_LOG_4(100304,DESTROY.id, DESTROY_0.id, DESTROY_2.id, "发起了销毁任务"),
+    DESTROY_LOG_4(100304,DESTROY.id, DESTROY_0.id, DESTROY_2.id, "发起销毁任务"),
 
     //重新入库
     AGAINSTORAGE_01(100901,AGAINSTORAGE.id, ORIGIN_STATUS.id,END.id , "发起了装备生命状态转换"),
@@ -261,7 +261,7 @@ public enum LogType {
     LOSS_3(9002,LOSS.id,LOSS1300.id,END.id,"确认了装备丢失报告,报告任务结束"),
     LOSS_4(9003,LOSS.id,ORIGIN_STATUS.id,END.id,"省装备丢失报告发起记录"),
     LOSS_5(9004,LOSS.id,ORIGIN_STATUS.id,LOSS1301.id,"发起丢失装备上报"),
-    LOSS_6(9005,LOSS.id,LOSS1301.id,END.id,"省确认了装备丢失报告,报告任务结束"),
+    LOSS_6(9005,LOSS.id,LOSS1301.id,END.id,"省已确认装备丢失报告,报告任务结束"),
 
 
 

dev-confirmcheck/src/main/java/com/tykj/dev/device/confirmcheck/controller/DeviceCheckController.java

@@ -343,8 +343,9 @@ public class DeviceCheckController {
     @GetMapping("/detail/{id}")
     public ResponseEntity<ResultObj<CheckDetailVo>> findDetail(@PathVariable Integer id) {
 
-        DeviceCheckDetail detail = detailRepo.findById(id).orElseThrow(() -> new ApiException("给出的bill id 不存在"));
-        if (CHECK_DETAIL_REGION_0.equals(detail.getCheckStatus()) || CHECK_DETAIL_CITY_0.equals((detail.getCheckStatus()))) {
+        Task task = taskRepo.findByBillIdAndBusinessType(id, 8).orElseThrow(() -> new ApiException("给出的bill id 不存在"));
+        if (task.getBillStatus() == 140 || task.getBillStatus() == 160) {
+            log.info("[核查] 刷新在库/不在库，bill id ：{}", id);
             refreshDetail(id);
         }
 

dev-decommissioning/src/main/java/com/tykj/dev/device/decommissioning/service/impl/DeviceDecommissioningBusinessServiceImpl.java

@@ -189,7 +189,7 @@ public class DeviceDecommissioningBusinessServiceImpl implements DeviceDecommiss
 //            deviceDecommissioningDetail.setDeviceLibraryEntities(findInvoleDevice(deviceDecommissioningDetail.getDeviceIds()));
             deviceDecommissioningDetailService.saveDeviceDecommissioningDetail(deviceDecommissioningDetail);
         deviceLibraryService.upDateSeqNumbersLeftStatus(DeviceLifeStatus.RETIRED.id,seqNumbers);
-            devLogAdd(seqNumbers,"发了退役任务,状态转化为退役中",userId,taskBto.getId());
+            devLogAdd(seqNumbers,"发起退役任务,状态转化为退役中",userId,taskBto.getId());
         if (decommissioningOrderOutData.getApplyId()!=null) {
             Optional<Task> billIdAndBusinessTypeNotBillStatus = taskService.findBillIdAndBusinessTypeNotBillStatus(decommissioningOrderOutData.getApplyId(), BusinessEnum.APPLY.id);
             taskService.moveToEnd(billIdAndBusinessTypeNotBillStatus.get().parse2Bto());

dev-destroy/src/main/java/com/tykj/dev/device/destroy/service/Impl/DeviceDestroyBusinessServiceImpl.java

@@ -149,7 +149,7 @@ public class DeviceDestroyBusinessServiceImpl implements DeviceDestroyBusinessSe
         deviceDestroyBill.setScriptJson(JacksonUtil.toJSon(deviceDestroyBillVo.getScripts()));
         deviceLibraryService.upDateSeqNumbersLeftStatus(DeviceLifeStatus.IN_THE_DESTROYED.id,seqNumbers);
         deviceDestroyBillService.saveDeviceDestroyBill(deviceDestroyBill);
-        devLogAdd(seqNumbers,"发了销毁任务,状态转化为销毁中",securityUser.getCurrentUserInfo().getUserId(),taskBto.getId());
+        devLogAdd(seqNumbers,"发起销毁任务,状态转化为销毁中",securityUser.getCurrentUserInfo().getUserId(),taskBto.getId());
         if (deviceDestroyBillVo.getApplyId()!=null) {
             Optional<Task> billIdAndBusinessTypeNotBillStatus = taskService.findBillIdAndBusinessTypeNotBillStatus(deviceDestroyBillVo.getApplyId(), BusinessEnum.APPLY.id);
             taskService.moveToEnd(billIdAndBusinessTypeNotBillStatus.get().parse2Bto());

dev-scrap/src/main/java/com/tykj/dev/device/scrap/service/impl/ScrapBusinessServiceImpl.java

@@ -177,7 +177,7 @@ public class ScrapBusinessServiceImpl implements ScrapBusinessService {
         scrap.setScriptJson(JacksonUtil.toJSon(scrapOrderOutData.getScriptSaveVos()));
         scrapService.saveScrap(scrap);
         deviceLibraryService.upDateSeqNumbersLeftStatus(DeviceLifeStatus.IN_THE_SCRAPPED.id,seqNumbers);
-        devLogAdd(seqNumbers,"发了报废任务,状态转化为报废中",userId,taskBto.getId());
+        devLogAdd(seqNumbers,"发起报废任务,状态转化为报废中",userId,taskBto.getId());
         if (scrapOrderOutData.getApplyId()!=null) {
             Optional<Task> billIdAndBusinessTypeNotBillStatus = taskService.findBillIdAndBusinessTypeNotBillStatus(scrapOrderOutData.getApplyId(), BusinessEnum.APPLY.id);
             taskService.moveToEnd(billIdAndBusinessTypeNotBillStatus.get().parse2Bto());

dev-sendback/src/main/java/com/tykj/dev/device/sendback/service/impl/SuspensionBillBusinessServiceimpl.java

@@ -126,7 +126,7 @@ public class SuspensionBillBusinessServiceimpl implements SuspensionBillBusiness
 
         if (securityUser.getCurrentUserInfo().getUnits().getLevel()==3){
             Units parentUnit = unitsService.findUnitAreaId(areaService.findByIdTosuperiorArea(securityUser.getCurrentUserInfo().getUnits().getAreaId()).getId());
-           initiateSuspensionBill(libraryList,parentUnit,securityUser.getCurrentUserInfo());
+            initiateSuspensionBill(libraryList,parentUnit,securityUser.getCurrentUserInfo());
         }else {
             initiateSuspensionBill(libraryList,securityUser.getCurrentUserInfo().getUnits(),securityUser.getCurrentUserInfo());
         }