Skip to content

D
device-back
提交 06d4ee51 authored 作者: zjm's avatar zjm
浏览文件
操作

fix(退役、报废、销毁、清退): 任务完成时涉及的设备的库房置为空

任务完成时涉及的设备的库房置为空
上级 083e794e
隐藏空白字符变更
内嵌 并排
正在显示 包含 101 行增加 和 8 行删除
dev-decommissioning/src/main/java/com/tykj/dev/device/decommissioning/service/impl/DeviceDecommissioningBusinessServiceImpl.java
浏览文件 @ 06d4ee51
...@@ -10,6 +10,7 @@ import com.tykj.dev.device.decommissioning.service.DeviceDecommissioningBusiness ...@@ -10,6 +10,7 @@ import com.tykj.dev.device.decommissioning.service.DeviceDecommissioningBusiness
import com.tykj.dev.device.decommissioning.service.DeviceDecommissioningDetailService; import com.tykj.dev.device.decommissioning.service.DeviceDecommissioningDetailService;
import com.tykj.dev.device.file.service.FilesUtil; import com.tykj.dev.device.file.service.FilesUtil;
import com.tykj.dev.device.library.repository.DeviceLibraryDao; import com.tykj.dev.device.library.repository.DeviceLibraryDao;
import com.tykj.dev.device.library.service.DeviceLibraryPositionService;
import com.tykj.dev.device.library.service.DeviceLibraryService; import com.tykj.dev.device.library.service.DeviceLibraryService;
import com.tykj.dev.device.library.service.DeviceLogService; import com.tykj.dev.device.library.service.DeviceLogService;
import com.tykj.dev.device.library.subject.Dto.DeviceLogDto; import com.tykj.dev.device.library.subject.Dto.DeviceLogDto;
...@@ -76,6 +77,9 @@ public class DeviceDecommissioningBusinessServiceImpl implements DeviceDecommiss ...@@ -76,6 +77,9 @@ public class DeviceDecommissioningBusinessServiceImpl implements DeviceDecommiss
@Autowired @Autowired
DeviceApplyBillService deviceApplyBillService; DeviceApplyBillService deviceApplyBillService;
@Autowired
DeviceLibraryPositionService deviceLibraryPositionService;
@Override @Override
public TaskBto saveDeviceDecommissioningDraft(Integer userId, DecommissioningOrderOutData decommissioningOrderOutData) { public TaskBto saveDeviceDecommissioningDraft(Integer userId, DecommissioningOrderOutData decommissioningOrderOutData) {
User user = userService.findByUser(userId); User user = userService.findByUser(userId);
...@@ -188,7 +192,7 @@ public class DeviceDecommissioningBusinessServiceImpl implements DeviceDecommiss ...@@ -188,7 +192,7 @@ public class DeviceDecommissioningBusinessServiceImpl implements DeviceDecommiss
deviceDecommissioningDetail.setScriptJson(JacksonUtil.toJSon(decommissioningOrderOutData.getScriptSaveVos())); deviceDecommissioningDetail.setScriptJson(JacksonUtil.toJSon(decommissioningOrderOutData.getScriptSaveVos()));
// deviceDecommissioningDetail.setDeviceLibraryEntities(findInvoleDevice(deviceDecommissioningDetail.getDeviceIds())); // deviceDecommissioningDetail.setDeviceLibraryEntities(findInvoleDevice(deviceDecommissioningDetail.getDeviceIds()));
deviceDecommissioningDetailService.saveDeviceDecommissioningDetail(deviceDecommissioningDetail); deviceDecommissioningDetailService.saveDeviceDecommissioningDetail(deviceDecommissioningDetail);
deviceLibraryService.upDateSeqNumbersLeftStatus(DeviceLifeStatus.RETIRED.id,seqNumbers); deviceLibraryService.upDateSeqNumbersLeftStatus(DeviceLifeStatus.RETIRED.id,seqNumbers);
devLogAdd(seqNumbers,"发起退役任务,状态转化为退役中",userId,taskBto.getId()); devLogAdd(seqNumbers,"发起退役任务,状态转化为退役中",userId,taskBto.getId());
if (decommissioningOrderOutData.getApplyId()!=null) { if (decommissioningOrderOutData.getApplyId()!=null) {
Optional<Task> billIdAndBusinessTypeNotBillStatus = taskService.findBillIdAndBusinessTypeNotBillStatus(decommissioningOrderOutData.getApplyId(), BusinessEnum.APPLY.id); Optional<Task> billIdAndBusinessTypeNotBillStatus = taskService.findBillIdAndBusinessTypeNotBillStatus(decommissioningOrderOutData.getApplyId(), BusinessEnum.APPLY.id);
...@@ -244,6 +248,9 @@ public class DeviceDecommissioningBusinessServiceImpl implements DeviceDecommiss ...@@ -244,6 +248,9 @@ public class DeviceDecommissioningBusinessServiceImpl implements DeviceDecommiss
deviceDecommissioningDetail.setReceiveTime(new Date()); deviceDecommissioningDetail.setReceiveTime(new Date());
deviceDecommissioningDetail.setDecommissioningStatus(taskBto.getBillStatus()); deviceDecommissioningDetail.setDecommissioningStatus(taskBto.getBillStatus());
deviceLibraryService.upDateSeqNumbersLeftStatusAndUnitNameAndLockStatus(DeviceLifeStatus.RETIRE.id,deviceDecommissioningDetail.getReceiveUnit(),0,seqNumbers); deviceLibraryService.upDateSeqNumbersLeftStatusAndUnitNameAndLockStatus(DeviceLifeStatus.RETIRE.id,deviceDecommissioningDetail.getReceiveUnit(),0,seqNumbers);
//根据序列号获取id集合 在更新3d的信息 装备修改库房位置为空 todo
//修改3d库房位置
deviceLibraryPositionService.batchUpdateStorageLocationAndSeqNumList(null,null,seqNumbers);
deviceDecommissioningDetailService.saveDeviceDecommissioningDetail(deviceDecommissioningDetail); deviceDecommissioningDetailService.saveDeviceDecommissioningDetail(deviceDecommissioningDetail);
addMessage(new MessageBto(taskBto.getId(),taskBto.getBusinessType(),"退役任务回执单据上传成功任务结束",gainThisUser(user.getUserId(),user.getUnitsId()))); addMessage(new MessageBto(taskBto.getId(),taskBto.getBusinessType(),"退役任务回执单据上传成功任务结束",gainThisUser(user.getUserId(),user.getUnitsId())));
devLogAdd(seqNumbers,"办结退役任务:"+MessageFormatUtil.spellTwoWicket(deviceDecommissioningDetail.getSendUnit(),deviceDecommissioningDetail.getReceiveUnit()),storageDeviceDevommissiong.getUserId(),taskBto.getId()); devLogAdd(seqNumbers,"办结退役任务:"+MessageFormatUtil.spellTwoWicket(deviceDecommissioningDetail.getSendUnit(),deviceDecommissioningDetail.getReceiveUnit()),storageDeviceDevommissiong.getUserId(),taskBto.getId());
......
dev-destroy/src/main/java/com/tykj/dev/device/destroy/service/Impl/DeviceDestroyBusinessServiceImpl.java
浏览文件 @ 06d4ee51
...@@ -8,6 +8,7 @@ import com.tykj.dev.device.destroy.service.DeviceDestroyBillService; ...@@ -8,6 +8,7 @@ import com.tykj.dev.device.destroy.service.DeviceDestroyBillService;
import com.tykj.dev.device.destroy.service.DeviceDestroyBusinessService; import com.tykj.dev.device.destroy.service.DeviceDestroyBusinessService;
import com.tykj.dev.device.file.service.FilesUtil; import com.tykj.dev.device.file.service.FilesUtil;
import com.tykj.dev.device.library.repository.DeviceLibraryDao; import com.tykj.dev.device.library.repository.DeviceLibraryDao;
import com.tykj.dev.device.library.service.DeviceLibraryPositionService;
import com.tykj.dev.device.library.service.DeviceLibraryService; import com.tykj.dev.device.library.service.DeviceLibraryService;
import com.tykj.dev.device.library.service.DeviceLogService; import com.tykj.dev.device.library.service.DeviceLogService;
import com.tykj.dev.device.library.subject.Dto.DeviceLogDto; import com.tykj.dev.device.library.subject.Dto.DeviceLogDto;
...@@ -72,6 +73,9 @@ public class DeviceDestroyBusinessServiceImpl implements DeviceDestroyBusinessSe ...@@ -72,6 +73,9 @@ public class DeviceDestroyBusinessServiceImpl implements DeviceDestroyBusinessSe
@Autowired @Autowired
DeviceApplyBillService deviceApplyBillService; DeviceApplyBillService deviceApplyBillService;
@Autowired
DeviceLibraryPositionService deviceLibraryPositionService;
@Override @Override
public TaskBto saveDeviceDestroyBill(SecurityUser securityUser, DeviceDestroyBillVo deviceDestroyBillVo) { public TaskBto saveDeviceDestroyBill(SecurityUser securityUser, DeviceDestroyBillVo deviceDestroyBillVo) {
...@@ -182,7 +186,9 @@ public class DeviceDestroyBusinessServiceImpl implements DeviceDestroyBusinessSe ...@@ -182,7 +186,9 @@ public class DeviceDestroyBusinessServiceImpl implements DeviceDestroyBusinessSe
// deviceDestroyBill.setDestroyTime(new Date()); // deviceDestroyBill.setDestroyTime(new Date());
deviceDestroyBill.setDestroyStatus(taskBto.getBillStatus()); deviceDestroyBill.setDestroyStatus(taskBto.getBillStatus());
deviceDestroyBillService.saveDeviceDestroyBill(deviceDestroyBill); deviceDestroyBillService.saveDeviceDestroyBill(deviceDestroyBill);
deviceLibraryService.upDateSeqNumbersLeftStatus(DeviceLifeStatus.DESTROYED.id,seqNumbers); deviceLibraryService.upDateSeqNumbersLeftStatusAndStorageLocationNull(DeviceLifeStatus.DESTROYED.id,seqNumbers);
//修改3d数据的库房位置 置为null
deviceLibraryPositionService.batchUpdateStorageLocationAndSeqNumList(null,null,seqNumbers);
addMessage(new MessageBto(taskBto.getId(),taskBto.getBusinessType(),"销毁任务补充手续完成",gainThisUser(securityUser.getCurrentUserInfo().getUserId(),securityUser.getCurrentUserInfo().getUnitsId()))); addMessage(new MessageBto(taskBto.getId(),taskBto.getBusinessType(),"销毁任务补充手续完成",gainThisUser(securityUser.getCurrentUserInfo().getUserId(),securityUser.getCurrentUserInfo().getUnitsId())));
devLogAdd(seqNumbers,"补充单据信息，状态转化已销毁",deviceDestroyBillVo.getOperationId(),taskBto.getId()); devLogAdd(seqNumbers,"补充单据信息，状态转化已销毁",deviceDestroyBillVo.getOperationId(),taskBto.getId());
......
dev-library/src/main/java/com/tykj/dev/device/library/repository/DeviceLibraryDao.java
浏览文件 @ 06d4ee51
...@@ -107,6 +107,13 @@ public interface DeviceLibraryDao extends JpaRepository<DeviceLibrary, Integer>, ...@@ -107,6 +107,13 @@ public interface DeviceLibraryDao extends JpaRepository<DeviceLibrary, Integer>,
@Query("update DeviceLibrary o set o.lifeStatus = :lifeStatus ,o.updateTime=current_timestamp where o.seqNumber in :seqNumbers") @Query("update DeviceLibrary o set o.lifeStatus = :lifeStatus ,o.updateTime=current_timestamp where o.seqNumber in :seqNumbers")
int upDateSeqNumbersLeftStatus(Integer lifeStatus,@Param("seqNumbers") List<String> seqNumbers); int upDateSeqNumbersLeftStatus(Integer lifeStatus,@Param("seqNumbers") List<String> seqNumbers);
@Transactional
@Modifying
@Query("update DeviceLibrary o set o.lifeStatus = :lifeStatus ,o.updateTime=current_timestamp,o.storageLocation=null ,o.storageLocationId=null where o.seqNumber in :seqNumbers")
int upDateSeqNumbersLeftStatusStorageLocationNull(Integer lifeStatus,@Param("seqNumbers") List<String> seqNumbers);
@Transactional @Transactional
@Modifying @Modifying
@Query("update DeviceLibrary o set o.applyTaskId = :applyTaskId ,o.updateTime=current_timestamp where o.seqNumber in :seqNumbers") @Query("update DeviceLibrary o set o.applyTaskId = :applyTaskId ,o.updateTime=current_timestamp where o.seqNumber in :seqNumbers")
...@@ -130,7 +137,13 @@ public interface DeviceLibraryDao extends JpaRepository<DeviceLibrary, Integer>, ...@@ -130,7 +137,13 @@ public interface DeviceLibraryDao extends JpaRepository<DeviceLibrary, Integer>,
@Transactional @Transactional
@Modifying @Modifying
@Query("update DeviceLibrary o set o.lifeStatus = :lifeStatus ,o.locationUnit = :unitName,o.ownUnit = :unitName,o.lockStatus=:lock ,o.updateTime=current_timestamp where o.seqNumber in :seqNumbers") @Query("update DeviceLibrary o set o.lifeStatus = :lifeStatus ,o.locationUnit = :unitName,o.ownUnit = :unitName ,o.lockStatus=:lock ,o.updateTime=current_timestamp ,o.storageLocation =null ,o.storageLocationId=null where o.id in :idList")
int upDateLeftStatusAndUnitNameAndLockStatusStorageLocationNull(Integer lifeStatus,String unitName,Integer lock,@Param("idList") List<Integer> idList);
@Transactional
@Modifying
@Query("update DeviceLibrary o set o.lifeStatus = :lifeStatus ,o.locationUnit = :unitName,o.ownUnit = :unitName,o.lockStatus=:lock ,o.updateTime=current_timestamp,o.storageLocationId = null,o.storageLocation=null where o.seqNumber in :seqNumbers")
int upDateSeqNumbersLeftStatusAndUnitNameAndLockStatus(Integer lifeStatus,String unitName,Integer lock,@Param("seqNumbers") List<String> seqNumbers); int upDateSeqNumbersLeftStatusAndUnitNameAndLockStatus(Integer lifeStatus,String unitName,Integer lock,@Param("seqNumbers") List<String> seqNumbers);
@Transactional @Transactional
......
dev-library/src/main/java/com/tykj/dev/device/library/repository/DeviceLibraryPositionDao.java
浏览文件 @ 06d4ee51
...@@ -55,5 +55,11 @@ public interface DeviceLibraryPositionDao extends JpaRepository<DeviceLibraryPos ...@@ -55,5 +55,11 @@ public interface DeviceLibraryPositionDao extends JpaRepository<DeviceLibraryPos
@Query("update DeviceLibraryPosition d set d.seqNumber = :seqNumber where d.deviceId = :deviceId") @Query("update DeviceLibraryPosition d set d.seqNumber = :seqNumber where d.deviceId = :deviceId")
int updateSeqNumber(@Param("seqNumber") String seqNumber,@Param("deviceId") Integer deviceId); int updateSeqNumber(@Param("seqNumber") String seqNumber,@Param("deviceId") Integer deviceId);
@Transactional
@Modifying
@Query("update DeviceLibraryPosition d set d.storageLocationId = :StorageLocationId ,d.storageLocation = :StorageLocation where d.seqNumber in :deviceIds")
int batchUpdateStorageLocationSeqNumList(@Param("StorageLocationId") Integer StorageLocationId,
@Param("StorageLocation")String StorageLocation,@Param("deviceIds")List<String> deviceIds);
} }
dev-library/src/main/java/com/tykj/dev/device/library/service/DeviceLibraryPositionService.java
浏览文件 @ 06d4ee51
...@@ -38,6 +38,15 @@ public interface DeviceLibraryPositionService { ...@@ -38,6 +38,15 @@ public interface DeviceLibraryPositionService {
*/ */
void onlyUpdateStorageLocation(Integer StorageLocationId,String StorageLocation,Integer deviceId); void onlyUpdateStorageLocation(Integer StorageLocationId,String StorageLocation,Integer deviceId);
/**
* 批量修改库房位置
* @param StorageLocationId 库房id
* @param StorageLocation 库房名称
* @param seqNumList 装备序列号的集合
*/
void batchUpdateStorageLocationAndSeqNumList(Integer StorageLocationId,String StorageLocation,List<String> seqNumList);
/** /**
* 批量修改库房位置 * 批量修改库房位置
* @param StorageLocationId 库房id * @param StorageLocationId 库房id
...@@ -45,7 +54,6 @@ public interface DeviceLibraryPositionService { ...@@ -45,7 +54,6 @@ public interface DeviceLibraryPositionService {
* @param deviceIds 装备id的集合 * @param deviceIds 装备id的集合
*/ */
void batchUpdateStorageLocation(Integer StorageLocationId,String StorageLocation,List<Integer> deviceIds); void batchUpdateStorageLocation(Integer StorageLocationId,String StorageLocation,List<Integer> deviceIds);
/** /**
* 条件查询 * 条件查询
* @param queryTheWarehouseVo 条件查询类 * @param queryTheWarehouseVo 条件查询类
......
dev-library/src/main/java/com/tykj/dev/device/library/service/DeviceLibraryService.java
浏览文件 @ 06d4ee51
...@@ -325,6 +325,15 @@ public interface DeviceLibraryService { ...@@ -325,6 +325,15 @@ public interface DeviceLibraryService {
*/ */
int upDateSeqNumbersLeftStatus(Integer lifeStatus,@Param("seqNumbers") List<String> seqNumbers); int upDateSeqNumbersLeftStatus(Integer lifeStatus,@Param("seqNumbers") List<String> seqNumbers);
/**
* 根据装备id的集合更新装备的生命状态
* @param lifeStatus 生命状态
* @param seqNumbers 装备序列号的集合
* @return 影响行数
*/
int upDateSeqNumbersLeftStatusAndStorageLocationNull(Integer lifeStatus,@Param("seqNumbers") List<String> seqNumbers);
/** /**
* 根据装备id的集合更新装备的生命状态和lock * 根据装备id的集合更新装备的生命状态和lock
* @param lifeStatus 生命状态 * @param lifeStatus 生命状态
...@@ -352,6 +361,17 @@ public interface DeviceLibraryService { ...@@ -352,6 +361,17 @@ public interface DeviceLibraryService {
*/ */
int upDateLeftStatusAndUnitNameAndLockStatus(Integer lifeStatus,String unitName,Integer lock,@Param("idList") List<Integer> idList); int upDateLeftStatusAndUnitNameAndLockStatus(Integer lifeStatus,String unitName,Integer lock,@Param("idList") List<Integer> idList);
/**
* 根据装备id的集合更新生命状态和单位名称
* @param lifeStatus
* @param unitName
* @param lock
* @param idList
* @return 影响行数
*/
int upDateLeftStatusAndUnitNameAndLockStatusStorageLocationNull(Integer lifeStatus,String unitName,Integer lock,@Param("idList") List<Integer> idList);
/** /**
* 根据装备的序列号的集合更新生命状态和单位名称和锁 * 根据装备的序列号的集合更新生命状态和单位名称和锁
* @param lifeStatus 生命状态 * @param lifeStatus 生命状态
......
dev-library/src/main/java/com/tykj/dev/device/library/service/impl/DeviceLibraryPositionServiceImpl.java
浏览文件 @ 06d4ee51
...@@ -92,6 +92,11 @@ public class DeviceLibraryPositionServiceImpl implements DeviceLibraryPositionSe ...@@ -92,6 +92,11 @@ public class DeviceLibraryPositionServiceImpl implements DeviceLibraryPositionSe
} }
} }
@Override
public void batchUpdateStorageLocationAndSeqNumList(Integer StorageLocationId, String StorageLocation, List<String> seqNumList) {
deviceLibraryPositionDao.batchUpdateStorageLocationSeqNumList(StorageLocationId, StorageLocation, seqNumList);
}
@Override @Override
public void batchUpdateStorageLocation(Integer StorageLocationId, String StorageLocation, List<Integer> deviceIds) { public void batchUpdateStorageLocation(Integer StorageLocationId, String StorageLocation, List<Integer> deviceIds) {
deviceLibraryPositionDao.batchUpdateStorageLocation(StorageLocationId,StorageLocation,deviceIds); deviceLibraryPositionDao.batchUpdateStorageLocation(StorageLocationId,StorageLocation,deviceIds);
......
dev-library/src/main/java/com/tykj/dev/device/library/service/impl/DeviceLibraryServiceImpl.java
浏览文件 @ 06d4ee51
...@@ -932,6 +932,12 @@ public class DeviceLibraryServiceImpl implements DeviceLibraryService { ...@@ -932,6 +932,12 @@ public class DeviceLibraryServiceImpl implements DeviceLibraryService {
return deviceLibraryDao.upDateSeqNumbersLeftStatus(lifeStatus,seqNumbers); return deviceLibraryDao.upDateSeqNumbersLeftStatus(lifeStatus,seqNumbers);
} }
@Override
@UpdateCache
public int upDateSeqNumbersLeftStatusAndStorageLocationNull(Integer lifeStatus, List<String> seqNumbers) {
return deviceLibraryDao.upDateSeqNumbersLeftStatusStorageLocationNull(lifeStatus, seqNumbers);
}
@Override @Override
@UpdateCache @UpdateCache
public int upDateLeftStatusAndLockStatus(Integer lifeStatus, Integer lock, List<Integer> idList) { public int upDateLeftStatusAndLockStatus(Integer lifeStatus, Integer lock, List<Integer> idList) {
...@@ -950,9 +956,15 @@ public class DeviceLibraryServiceImpl implements DeviceLibraryService { ...@@ -950,9 +956,15 @@ public class DeviceLibraryServiceImpl implements DeviceLibraryService {
return deviceLibraryDao.upDateLeftStatusAndUnitNameAndLockStatus(lifeStatus,unitName,lock,idList); return deviceLibraryDao.upDateLeftStatusAndUnitNameAndLockStatus(lifeStatus,unitName,lock,idList);
} }
@Override
public int upDateLeftStatusAndUnitNameAndLockStatusStorageLocationNull(Integer lifeStatus, String unitName, Integer lock, List<Integer> idList) {
return deviceLibraryDao.upDateLeftStatusAndUnitNameAndLockStatusStorageLocationNull(lifeStatus, unitName, lock, idList);
}
@Override @Override
@UpdateCache @UpdateCache
public int upDateSeqNumbersLeftStatusAndUnitNameAndLockStatus(Integer lifeStatus, String unitName, Integer lock, List<String> seqNumbers) { public int upDateSeqNumbersLeftStatusAndUnitNameAndLockStatus(Integer lifeStatus, String unitName, Integer lock, List<String> seqNumbers) {
return deviceLibraryDao.upDateSeqNumbersLeftStatusAndUnitNameAndLockStatus(lifeStatus,unitName,lock,seqNumbers); return deviceLibraryDao.upDateSeqNumbersLeftStatusAndUnitNameAndLockStatus(lifeStatus,unitName,lock,seqNumbers);
} }
......
dev-scrap/src/main/java/com/tykj/dev/device/scrap/service/impl/ScrapBusinessServiceImpl.java
浏览文件 @ 06d4ee51
...@@ -5,6 +5,7 @@ import com.tykj.dev.config.base.DeviceLifeStatus; ...@@ -5,6 +5,7 @@ import com.tykj.dev.config.base.DeviceLifeStatus;
import com.tykj.dev.device.apply.service.DeviceApplyBillService; import com.tykj.dev.device.apply.service.DeviceApplyBillService;
import com.tykj.dev.device.file.service.FilesUtil; import com.tykj.dev.device.file.service.FilesUtil;
import com.tykj.dev.device.library.repository.DeviceLibraryDao; import com.tykj.dev.device.library.repository.DeviceLibraryDao;
import com.tykj.dev.device.library.service.DeviceLibraryPositionService;
import com.tykj.dev.device.library.service.DeviceLibraryService; import com.tykj.dev.device.library.service.DeviceLibraryService;
import com.tykj.dev.device.library.service.DeviceLogService; import com.tykj.dev.device.library.service.DeviceLogService;
import com.tykj.dev.device.library.subject.Dto.DeviceLogDto; import com.tykj.dev.device.library.subject.Dto.DeviceLogDto;
...@@ -72,6 +73,9 @@ public class ScrapBusinessServiceImpl implements ScrapBusinessService { ...@@ -72,6 +73,9 @@ public class ScrapBusinessServiceImpl implements ScrapBusinessService {
@Autowired @Autowired
MessageService messageService; MessageService messageService;
@Autowired
DeviceLibraryPositionService deviceLibraryPositionService;
@Override @Override
public TaskBto saveDeviceScrapDraft(Integer userId, ScrapOrderOutData scrapOrderOutData) { public TaskBto saveDeviceScrapDraft(Integer userId, ScrapOrderOutData scrapOrderOutData) {
User user = userService.findByUser(userId); User user = userService.findByUser(userId);
...@@ -228,6 +232,8 @@ public class ScrapBusinessServiceImpl implements ScrapBusinessService { ...@@ -228,6 +232,8 @@ public class ScrapBusinessServiceImpl implements ScrapBusinessService {
scrap.setScrapStatus(taskBto.getBillStatus()); scrap.setScrapStatus(taskBto.getBillStatus());
scrap.setReceiveTime(new Date()); scrap.setReceiveTime(new Date());
deviceLibraryService.upDateSeqNumbersLeftStatusAndUnitNameAndLockStatus(DeviceLifeStatus.SCRAP_I.id,scrap.getReceiveUnit(),0,seqNumbers); deviceLibraryService.upDateSeqNumbersLeftStatusAndUnitNameAndLockStatus(DeviceLifeStatus.SCRAP_I.id,scrap.getReceiveUnit(),0,seqNumbers);
//修改3D数据的库房字段置为空
deviceLibraryPositionService.batchUpdateStorageLocationAndSeqNumList(null,null,seqNumbers);
scrapService.saveScrap(scrap); scrapService.saveScrap(scrap);
devLogAdd(seqNumbers,"报废任务完成,状态转化为已报废",user.getUserId(),taskBto.getId()); devLogAdd(seqNumbers,"报废任务完成,状态转化为已报废",user.getUserId(),taskBto.getId());
addMessage(new MessageBto(taskBto.getId(),taskBto.getBusinessType(),"办结报废业务:"+MessageFormatUtil.spellTwoWicket(scrap.getSendUnit(),scrap.getReceiveUnit()),gainThisUser(user.getUserId(),user.getUnitsId()))); addMessage(new MessageBto(taskBto.getId(),taskBto.getBusinessType(),"办结报废业务:"+MessageFormatUtil.spellTwoWicket(scrap.getSendUnit(),scrap.getReceiveUnit()),gainThisUser(user.getUserId(),user.getUnitsId())));
......
dev-sendback/src/main/java/com/tykj/dev/device/sendback/service/impl/RepelBusinessServiceImpl.java
浏览文件 @ 06d4ee51
...@@ -9,6 +9,7 @@ import com.tykj.dev.device.file.service.FilesUtil; ...@@ -9,6 +9,7 @@ import com.tykj.dev.device.file.service.FilesUtil;
import com.tykj.dev.device.file.service.PdfService; import com.tykj.dev.device.file.service.PdfService;
import com.tykj.dev.device.library.repository.DeviceLibraryDao; import com.tykj.dev.device.library.repository.DeviceLibraryDao;
import com.tykj.dev.device.library.service.DeviceLibraryCacheService; import com.tykj.dev.device.library.service.DeviceLibraryCacheService;
import com.tykj.dev.device.library.service.DeviceLibraryPositionService;
import com.tykj.dev.device.library.service.DeviceLibraryService; import com.tykj.dev.device.library.service.DeviceLibraryService;
import com.tykj.dev.device.library.service.DeviceLogService; import com.tykj.dev.device.library.service.DeviceLogService;
import com.tykj.dev.device.library.subject.Dto.DeviceLogDto; import com.tykj.dev.device.library.subject.Dto.DeviceLogDto;
...@@ -113,6 +114,9 @@ public class RepelBusinessServiceImpl implements RepelBusinessService { ...@@ -113,6 +114,9 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
@Autowired @Autowired
RepelEscrowService repelEscrowService; RepelEscrowService repelEscrowService;
@Autowired
DeviceLibraryPositionService deviceLibraryPositionService;
/** /**
* 发起申请后清退任务 * 发起申请后清退任务
* *
...@@ -994,10 +998,13 @@ public class RepelBusinessServiceImpl implements RepelBusinessService { ...@@ -994,10 +998,13 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
repelTaskStatistical.setTaskStatus(1); repelTaskStatistical.setTaskStatus(1);
if (units.getLevel() == 1 && units.getType()==1) { if (units.getLevel() == 1 && units.getType()==1) {
deviceLibraryService.upDateLeftStatusAndUnitNameAndLockStatus(filterTypeReturnLeftStatus(deviceRepel.getType()), deviceRepelDetail.getReceiveUnit(), 0, StringUtils.stringToList(deviceRepelDetail.getDeviceIds())); deviceLibraryService.upDateLeftStatusAndUnitNameAndLockStatusStorageLocationNull(filterTypeReturnLeftStatus(deviceRepel.getType()), deviceRepelDetail.getReceiveUnit(), 0, StringUtils.stringToList(deviceRepelDetail.getDeviceIds()));
} else { } else {
deviceLibraryService.upDateLeftStatusAndUnitNameAndLockStatus(DeviceLifeStatus.IN_LIBRARY.id, deviceRepelDetail.getReceiveUnit(), 0, StringUtils.stringToList(deviceRepelDetail.getDeviceIds())); deviceLibraryService.upDateLeftStatusAndUnitNameAndLockStatusStorageLocationNull(DeviceLifeStatus.IN_LIBRARY.id, deviceRepelDetail.getReceiveUnit(), 0, StringUtils.stringToList(deviceRepelDetail.getDeviceIds()));
} }
//修改3d的库房位置 置为null
// TODO: 12/30/21
deviceLibraryPositionService.batchUpdateStorageLocation(null,null,StringUtils.stringToList(deviceRepelDetail.getDeviceIds()));
List<DeviceLibrary> libraries = findInvoleDevice(deviceRepelDetail.getDeviceIds()); List<DeviceLibrary> libraries = findInvoleDevice(deviceRepelDetail.getDeviceIds());
libraries.forEach( libraries.forEach(
deviceLibrary -> { deviceLibrary -> {
...@@ -1023,10 +1030,13 @@ public class RepelBusinessServiceImpl implements RepelBusinessService { ...@@ -1023,10 +1030,13 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
repelTaskStatistical.setTaskStatus(1); repelTaskStatistical.setTaskStatus(1);
if (units.getLevel() == 1 && units.getType() == 1) { if (units.getLevel() == 1 && units.getType() == 1) {
deviceLibraryService.upDateLeftStatusAndUnitNameAndLockStatus(filterTypeReturnLeftStatus(deviceRepel.getType()), deviceRepelDetail.getReceiveUnit(), 0, StringUtils.stringToList(deviceRepelDetail.getDeviceIds())); deviceLibraryService.upDateLeftStatusAndUnitNameAndLockStatusStorageLocationNull(filterTypeReturnLeftStatus(deviceRepel.getType()), deviceRepelDetail.getReceiveUnit(), 0, StringUtils.stringToList(deviceRepelDetail.getDeviceIds()));
} else { } else {
deviceLibraryService.upDateLeftStatusAndUnitNameAndLockStatus(DeviceLifeStatus.SEND_BACK.id, deviceRepelDetail.getReceiveUnit(), 0, StringUtils.stringToList(deviceRepelDetail.getDeviceIds())); deviceLibraryService.upDateLeftStatusAndUnitNameAndLockStatusStorageLocationNull(DeviceLifeStatus.SEND_BACK.id, deviceRepelDetail.getReceiveUnit(), 0, StringUtils.stringToList(deviceRepelDetail.getDeviceIds()));
} }
//修改3d的库房位置 置为null
// TODO: 12/30/21
deviceLibraryPositionService.batchUpdateStorageLocation(null,null,StringUtils.stringToList(deviceRepelDetail.getDeviceIds()));
taskService.moveToEnd(taskBto); taskService.moveToEnd(taskBto);
taskService.moveToEnd(taskService.findBillTypeAndFatherId(BusinessEnum.SEND_BACK.id, taskId)); taskService.moveToEnd(taskService.findBillTypeAndFatherId(BusinessEnum.SEND_BACK.id, taskId));
taskService.moveToArchive(taskService.findBillTypeAndFatherId(BusinessEnum.SEND_BACK.id, taskId)); taskService.moveToArchive(taskService.findBillTypeAndFatherId(BusinessEnum.SEND_BACK.id, taskId));
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论