[退役、报废] 保存草稿不填写单位在次发起 不保存单位的bug 修改

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

@@ -113,6 +113,8 @@ public class DeviceDecommissioningBusinessServiceImpl implements DeviceDecommiss
             deviceDecommissioningDetail.setDecommissioningStatus(taskBto.getBillStatus());
             deviceDecommissioningDetail.setSendUserbId(decommissioningOrderOutData.getSendUserbId());
             deviceDecommissioningDetail.setSenderUserB(decommissioningOrderOutData.getSenderUserB());
+            deviceDecommissioningDetail.setReceiveUnit(decommissioningOrderOutData.getReceiveUnit());
+            deviceDecommissioningDetail.setReceiveUnitId(decommissioningOrderOutData.getReceiveUnitId());
         }
         deviceDecommissioningDetail.setOutboundFile(FilesUtil.stringFileToList(decommissioningOrderOutData.getOutboundFileList()));
         deviceDecommissioningDetail.setApplyNumber(decommissioningOrderOutData.getApplyNumber());
@@ -171,7 +173,8 @@ public class DeviceDecommissioningBusinessServiceImpl implements DeviceDecommiss
                 deviceDecommissioningDetail.setDecommissioningStatus(taskBto.getBillStatus());
                 deviceDecommissioningDetail.setSendUserbId(decommissioningOrderOutData.getSendUserbId());
                 deviceDecommissioningDetail.setSenderUserB(decommissioningOrderOutData.getSenderUserB());
-
+                deviceDecommissioningDetail.setReceiveUnit(decommissioningOrderOutData.getReceiveUnit());
+                deviceDecommissioningDetail.setReceiveUnitId(decommissioningOrderOutData.getReceiveUnitId());
             }
             deviceDecommissioningDetail.setLeftSignatureId(decommissioningOrderOutData.getLeftSignatureId());
             deviceDecommissioningDetail.setApplyNumber(decommissioningOrderOutData.getApplyNumber());
@@ -275,7 +278,6 @@ public class DeviceDecommissioningBusinessServiceImpl implements DeviceDecommiss
             deviceDecommissioningDetail = deviceDecommissioningDetailService.findDeviceDecommissioningDetail(taskBto.getBillId());
             taskBto = taskService.moveToSpecial(taskBto, StatusEnum.DECOMMISSIONING_1251, orderOutData.getSendUserbId());
             deviceDecommissioningDetail.setDecommissioningStatus(taskBto.getBillStatus());
-
         }
         deviceDecommissioningDetail.setReceiveTime(new Date());
         deviceDecommissioningDetail.setApplyNumber(orderOutData.getApplyNumber());

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

@@ -107,7 +107,8 @@ public class ScrapBusinessServiceImpl implements ScrapBusinessService {
             scrap.setScrapStatus(taskBto.getBillStatus());
             scrap.setSenderUserB(scrapOrderOutData.getSenderUserB());
             scrap.setSendUserbId(scrapOrderOutData.getSendUserbId());
-
+            scrap.setReceiveUnit(scrapOrderOutData.getReceiveUnit());
+            scrap.setReceiveUnitId(scrapOrderOutData.getReceiveUnitId());
         }
 
         scrap.setDeviceIds(StringUtils.ListToString(scrapOrderOutData.getDevIds()));
@@ -152,6 +153,8 @@ public class ScrapBusinessServiceImpl implements ScrapBusinessService {
             taskService.moveToSpecial(taskBto,StatusEnum.SCRAP_2222,"country");
             addMessage(new MessageBto(taskBto.getId(),taskBto.getBusinessType(),"发起报废任务,待上传回执单据",gainThisUser(user.getUserId(),user.getUnitsId())));
             scrap.setScrapStatus(taskBto.getBillStatus());
+            scrap.setReceiveUnit(scrapOrderOutData.getReceiveUnit());
+            scrap.setReceiveUnitId(scrapOrderOutData.getReceiveUnitId());
         }else {
             scrap = scrapOrderOutData.toScrap();
             scrapService.saveScrap(scrap);