[报废 销毁 退役] bug 修复

dev-decommissioning/src/main/java/com/tykj/dev/device/decommissioning/entity/DeviceDecommissioningDetail.java

@@ -231,6 +231,9 @@ public class DeviceDecommissioningDetail extends BaseEntity {
     @ApiModelProperty(value = "清退单对象")
     private List<FileRet> outboundFiles ;
 
+    @Transient
+    @ApiModelProperty(value = "任务id")
+    private Integer taskId ;
 
     public Documents toDoc(){
         return new Documents(num,"装备清退单据",receiveUnit,replayNumber,sendUnit,null,null,senderUserA,senderUserB,receiveUserA,receiveUserB,null);

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

@@ -129,6 +129,7 @@ public class DeviceDecommissioningBusinessServiceImpl implements DeviceDecommiss
         deviceDecommissioningDetail.setScripts(decommissioningOrderOutData.getScriptSaveVos());
         deviceDecommissioningDetail.setScriptJson(JacksonUtil.toJSon(decommissioningOrderOutData.getScriptSaveVos()));
         deviceDecommissioningDetailService.saveDeviceDecommissioningDetail(deviceDecommissioningDetail);
+        taskBto.setRecordId(deviceDecommissioningDetail.getNum());
         return taskBto;
     }
 

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

@@ -149,18 +149,18 @@ public class DeviceDestroyBusinessServiceImpl implements DeviceDestroyBusinessSe
         List<String> seqNumbers= scriptListToStringList(deviceDestroyBillVo);
         deviceLibraryService.judgeSeqNumbersInNotEqualLifeStatus(seqNumbers,DeviceLifeStatus.IN_THE_DESTROYED.id);
         if (deviceDestroyBillVo.getSupervisor()!=null) {
-            deviceDestroyBill.setSupervisor(deviceDestroyBill.getSupervisor());
+            deviceDestroyBill.setSupervisor(deviceDestroyBillVo.getSupervisor());
         }
         if (deviceDestroyBillVo.getLeader()!=null) {
-            deviceDestroyBill.setLeader(deviceDestroyBill.getLeader());
+            deviceDestroyBill.setLeader(deviceDestroyBillVo.getLeader());
         }
         if (deviceDestroyBillVo.getUndertaker()!=null) {
-            deviceDestroyBill.setUndertaker(deviceDestroyBill.getUndertaker());
+            deviceDestroyBill.setUndertaker(deviceDestroyBillVo.getUndertaker());
         }
         deviceDestroyBill.setDestructionFiles(FilesUtil.stringFileToList(deviceDestroyBillVo.getDestructionFileList()));
-        deviceDestroyBillService.saveDeviceDestroyBill(deviceDestroyBill);
         taskBto= taskService.moveToEnd(taskBto);
         deviceDestroyBill.setDestroyStatus(taskBto.getBillStatus());
+        deviceDestroyBillService.saveDeviceDestroyBill(deviceDestroyBill);
         deviceLibraryDao.upDateSeqNumbersLeftStatus(DeviceLifeStatus.DESTROYED.id,seqNumbers);
         addMessage(new MessageBto(taskBto.getId(),taskBto.getBusinessType(),"销毁任务补充手续完成",gainThisUser(securityUser.getCurrentUserInfo().getUserId(),securityUser.getCurrentUserInfo().getUnitsId())));
         devLogAdd(seqNumbers,"补充单据信息，状态转化已销毁",deviceDestroyBillVo.getOperationId());

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

@@ -123,6 +123,7 @@ public class ScrapBusinessServiceImpl implements ScrapBusinessService {
         scrap.setScriptJson(JacksonUtil.toJSon(scrapOrderOutData.getScriptSaveVos()));
 //        scrap.setDeviceLibraryEntities(findInvoleDevice(scrap.getDeviceIds()));
         scrapService.saveScrap(scrap);
+        taskBto.setRecordId(scrap.getNum());
         return taskBto;
     }