Skip to content

D
device-back
提交 ffa29589 authored 作者: 133's avatar 133
浏览文件
操作

[清退、销毁、报废] bug修改

上级 9f99ff9f
隐藏空白字符变更
内嵌 并排
正在显示 包含 27 行增加 和 24 行删除
dev-decommissioning/src/main/java/com/tykj/dev/device/decommissioning/service/impl/DeviceDecommissioningBusinessServiceImpl.java
浏览文件 @ ffa29589
......@@ -137,7 +137,7 @@ public class DeviceDecommissioningBusinessServiceImpl implements DeviceDecommiss
public DeviceDecommissioningDetail provinceSendDecommissioning(Integer userId, DecommissioningOrderOutData decommissioningOrderOutData) {
User user = userService.findByUser(userId);
Units units = unitsService.findById(user.getUnitsId());
DeviceDecommissioningDetail deviceDecommissioningDetail = decommissioningOrderOutData.toDeviceDecommissioningDetail();
DeviceDecommissioningDetail deviceDecommissioningDetail ;
List<ScriptSaveVo> scriptSaveVos = decommissioningOrderOutData.getScriptSaveVos();
List<String> seqNumbers = new ArrayList<>();
scriptSaveVos.forEach(
......@@ -155,20 +155,20 @@ public class DeviceDecommissioningBusinessServiceImpl implements DeviceDecommiss
statusEnums.add(StatusEnum.DECOMMISSIONING_1250);
statusEnums.add(StatusEnum.DECOMMISSIONING_1252);
TaskDisposeUtil.isNotSubmit(taskBto.getBillStatus(), statusEnums);
DeviceDecommissioningDetail deviceDecommissioningDetail1=deviceDecommissioningDetailService.findDeviceDecommissioningDetail(taskBto.getBillId());
deviceDecommissioningDetail.setId(deviceDecommissioningDetail1.getId());
deviceDecommissioningDetail.setNum(deviceDecommissioningDetail1.getNum());
deviceDecommissioningDetail=deviceDecommissioningDetailService.findDeviceDecommissioningDetail(taskBto.getBillId());
taskBto= taskService.moveToSpecial(taskBto,StatusEnum.SEND_BACK_1210,"country");
deviceDecommissioningDetail.setDecommissioningStatus(taskBto.getBillStatus());
addMessage(new MessageBto(taskBto.getId(),taskBto.getBusinessType(),user.getName()+"保存退役任务草稿",gainThisUser(userId,units.getUnitId())));
}else {
deviceDecommissioningDetail = decommissioningOrderOutData.toDeviceDecommissioningDetail();
deviceDecommissioningDetailService.saveDeviceDecommissioningDetail(deviceDecommissioningDetail);
TaskBto taskBto= sendOutSuperior(units.getUnitId(), deviceDecommissioningDetail.getId(),userId);
addMessage(new MessageBto(taskBto.getId(), taskBto.getBusinessType(), "发起退役任务,待上传回执单据", gainThisUser(user.getUserId(), user.getUnitsId())));
deviceDecommissioningDetail.setNum("NO:第" + LocalDateTime.now().getYear() + "QT" + deviceDecommissioningDetail.getId());
deviceDecommissioningDetail.setDecommissioningStatus(taskBto.getBillStatus());
}
deviceDecommissioningDetail.setApplyNumber(decommissioningOrderOutData.getApplyNumber());
deviceDecommissioningDetail.setReplayNumber(decommissioningOrderOutData.getReplayNumber());
deviceDecommissioningDetail.setReplyFiles(FilesUtil.stringFileToList(decommissioningOrderOutData.getReplyFileList()));
deviceDecommissioningDetail.setApplyFiles(FilesUtil.stringFileToList(decommissioningOrderOutData.getApplyFileList()));
deviceDecommissioningDetail.setDeviceIds(StringUtils.ListToString(decommissioningOrderOutData.getDevIds()));
......@@ -195,7 +195,8 @@ public class DeviceDecommissioningBusinessServiceImpl implements DeviceDecommiss
TaskBto taskBto= taskService.get(taskId);
List<StatusEnum> statusEnums = new ArrayList<>();
statusEnums.add(StatusEnum.SEND_BACK_1210);
TaskDisposeUtil.isNotSubmit(taskBto.getBillStatus(), statusEnums); DeviceDecommissioningDetail deviceDecommissioningDetail=deviceDecommissioningDetailService.findDeviceDecommissioningDetail(taskBto.getBillId());
TaskDisposeUtil.isNotSubmit(taskBto.getBillStatus(), statusEnums);
DeviceDecommissioningDetail deviceDecommissioningDetail=deviceDecommissioningDetailService.findDeviceDecommissioningDetail(taskBto.getBillId());
deviceDecommissioningDetail.setBillFile(FilesUtil.stringFileToList(storageDeviceDevommissiong.getFileRets()));
List<String> seqNumbers=new ArrayList<>();
JacksonUtil.readValue(deviceDecommissioningDetail.getScriptJson(), new TypeReference<List<ScriptSaveVo>>() {}).forEach(
......
dev-destroy/src/main/java/com/tykj/dev/device/destroy/service/Impl/DeviceDestroyBusinessServiceImpl.java
浏览文件 @ ffa29589
......@@ -105,15 +105,12 @@ public class DeviceDestroyBusinessServiceImpl implements DeviceDestroyBusinessSe
@Override
public DeviceDestroyBill provinceDeviceDestroyBill(SecurityUser securityUser, DeviceDestroyBillVo deviceDestroyBillVo) {
DeviceDestroyBill deviceDestroyBill= deviceDestroyBillVo.toDeviceDestroyBill();
deviceDestroyBill.setApplyNumber(deviceDestroyBillVo.getApplyNumber());
deviceDestroyBill.setReplayNumber(deviceDestroyBillVo.getReplayNumber());
deviceDestroyBill.setApplyFiles(FilesUtil.stringFileToList(deviceDestroyBill.getApplyFileList()));
deviceDestroyBill.setReplayFiles(FilesUtil.stringFileToList(deviceDestroyBill.getReplayFileList()));
deviceDestroyBill.setScriptJson(JacksonUtil.toJSon(deviceDestroyBill.getScripts()));
DeviceDestroyBill deviceDestroyBill;
List<String> seqNumbers= scriptListToStringList(deviceDestroyBillVo);
deviceLibraryService.judgeSeqNumbersInNotEqualLifeStatus(seqNumbers,DeviceLifeStatus.TO_BE_DESTROYED.id);
if (deviceDestroyBillVo.getTaskId()==null){
deviceDestroyBill=deviceDestroyBillVo.toDeviceDestroyBill();
deviceDestroyBillService.saveDeviceDestroyBill(deviceDestroyBill);
deviceDestroyBill.setNum("NO:第" + LocalDateTime.now().getYear() + "XF" + deviceDestroyBill.getId());
TaskBto taskBto= awaitUploadDestructionTask(securityUser.getCurrentUserInfo().getUnitsId(),deviceDestroyBill.getId(),securityUser.getCurrentUserInfo().getUserId());
......@@ -121,14 +118,20 @@ public class DeviceDestroyBusinessServiceImpl implements DeviceDestroyBusinessSe
addMessage(new MessageBto(taskBto.getId(),taskBto.getBusinessType(),"销毁任务等待补充手续",gainThisUser(securityUser.getCurrentUserInfo().getUserId(),securityUser.getCurrentUserInfo().getUnitsId())));
}else {
TaskBto taskBto = taskService.get(deviceDestroyBillVo.getTaskId());
DeviceDestroyBill deviceDestroyBill1=deviceDestroyBillService.findDeviceDestroyBill(taskBto.getBillId());
deviceDestroyBill.setId(deviceDestroyBill1.getId());
deviceDestroyBill.setNum(deviceDestroyBill1.getNum());
deviceDestroyBill=deviceDestroyBillService.findDeviceDestroyBill(taskBto.getBillId());
taskBto= taskService.moveToSpecial(taskBto,StatusEnum.DESTROY_2,0,"country");
deviceDestroyBill.setDestroyStatus(taskBto.getBillStatus());
addMessage(new MessageBto(taskBto.getId(),taskBto.getBusinessType(),"销毁任务等待补充手续",gainThisUser(securityUser.getCurrentUserInfo().getUserId(),securityUser.getCurrentUserInfo().getUnitsId())));
}
deviceDestroyBill.setSupervisor(deviceDestroyBillVo.getSupervisor());
deviceDestroyBill.setLeader(deviceDestroyBillVo.getLeader());
deviceDestroyBill.setUndertaker(deviceDestroyBillVo.getUndertaker());
deviceDestroyBill.setApplyNumber(deviceDestroyBillVo.getApplyNumber());
deviceDestroyBill.setReplayNumber(deviceDestroyBillVo.getReplayNumber());
deviceDestroyBill.setApplyFiles(FilesUtil.stringFileToList(deviceDestroyBill.getApplyFileList()));
deviceDestroyBill.setReplayFiles(FilesUtil.stringFileToList(deviceDestroyBill.getReplayFileList()));
deviceDestroyBill.setScriptJson(JacksonUtil.toJSon(deviceDestroyBill.getScripts()));
deviceLibraryDao.upDateSeqNumbersLeftStatus(DeviceLifeStatus.IN_THE_DESTROYED.id,seqNumbers);
deviceDestroyBillService.saveDeviceDestroyBill(deviceDestroyBill);
devLogAdd(seqNumbers,"发了销毁任务,状态转化为销毁中",securityUser.getCurrentUserInfo().getUserId());
......
dev-misc/src/main/java/com/tykj/dev/misc/base/StatusEnum.java
浏览文件 @ ffa29589
......@@ -269,7 +269,7 @@ public enum StatusEnum {
/**
* 报废状态
*/
SCRAP_2222(2222, "等待上报废签收单"),
SCRAP_2222(2222, "等待上传废签收单"),
SCRAP_2223(2223, "报废草稿"),
SCRAP_2224(2224, "报废出库签章审核"),
SCRAP_2225(2225, "报废出库等待盖电子签章");
......
dev-scrap/src/main/java/com/tykj/dev/device/scrap/service/impl/ScrapBusinessServiceImpl.java
浏览文件 @ ffa29589
......@@ -131,7 +131,7 @@ public class ScrapBusinessServiceImpl implements ScrapBusinessService {
public Scrap provinceScrap(Integer userId, ScrapOrderOutData scrapOrderOutData) {
User user = userService.findByUser(userId);
Units units = unitsService.findById(user.getUnitsId());
Scrap scrap = scrapOrderOutData.toScrap();
Scrap scrap;
List<ScriptSaveVo> scriptSaveVos = scrapOrderOutData.getScriptSaveVos();
List<String> seqNumbers = new ArrayList<>();
scriptSaveVos.forEach(
......@@ -149,13 +149,12 @@ public class ScrapBusinessServiceImpl implements ScrapBusinessService {
statusEnums.add(StatusEnum.SCRAP_2223);
statusEnums.add(StatusEnum.SCRAP_2225);
TaskDisposeUtil.isNotSubmit(taskBto.getBillStatus(), statusEnums);
Scrap scrap1=scrapService.findScrap(taskBto.getBillId());
scrap.setId(scrap1.getId());
scrap.setNum(scrap1.getNum());
scrap=scrapService.findScrap(taskBto.getBillId());
taskService.moveToSpecial(taskBto,StatusEnum.SCRAP_2222,"country");
addMessage(new MessageBto(taskBto.getId(),taskBto.getBusinessType(),"发起报废任务,待上传回执单据",gainThisUser(user.getUserId(),user.getUnitsId())));
scrap.setScrapStatus(taskBto.getBillStatus());
}else {
scrap = scrapOrderOutData.toScrap();
scrapService.saveScrap(scrap);
scrap.setNum("NO:第" + LocalDateTime.now().getYear() + "QT" + scrap.getId());
TaskBto taskBto= sendOutSuperior(units.getUnitId(), scrap.getId(),userId);
......@@ -189,7 +188,7 @@ public class ScrapBusinessServiceImpl implements ScrapBusinessService {
TaskBto taskBto = taskService.get(taskId);
TaskDisposeUtil.isNotSubmit(taskBto.getBillStatus(),StatusEnum.SCRAP_2222);
Scrap scrap=scrapService.findScrap(taskBto.getBillId());
scrap.setOutboundFile(FilesUtil.stringFileToList(storageScrap.getOutFiles()));
scrap.setBillFile(FilesUtil.stringFileToList(storageScrap.getFileRets()));
List<String> seqNumbers=new ArrayList<>();
JacksonUtil.readValue(scrap.getScriptJson(), new TypeReference<List<ScriptSaveVo>>() {}).forEach(
scriptSaveVo -> {
......
dev-sendback/src/main/java/com/tykj/dev/device/sendback/service/impl/RepelBusinessServiceImpl.java
浏览文件 @ ffa29589
......@@ -193,7 +193,7 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
deviceRepelDetail.setRepelStatus(1);
TaskBto taskBto = statsXTask(units.getUnitId(),deviceRepel1.getId(),deviceRepel.getTitle(),userId);
//给本单位其他专管员阅知
addMessage(new MessageBto(taskBto.getId(),taskBto.getBusinessType(),user.getName()+"发起清退任务["+deviceRepel1.getTitle()+"]",gainThisUser(userId,units.getUnitId())));
// addMessage(new MessageBto(taskBto.getId(),taskBto.getBusinessType(),user.getName()+"发起清退任务["+deviceRepel1.getTitle()+"]",gainThisUser(userId,units.getUnitId())));
List<RepelTaskStatistical> list=new ArrayList<>();
deviceRepel.getTaskScopes().forEach(
......@@ -294,7 +294,7 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
deviceRepelDetail.setRepelId(deviceRepel1.getId());
deviceRepelDetail.setRepelStatus(1);
TaskBto taskBto= cityTotalTask(units.getUnitId(),deviceRepel1.getId(),deviceRepel.getTitle(),taskId,userId);
addMessage(new MessageBto(taskBto.getId(),taskBto.getBusinessType(),user.getName()+"转发清退任务["+deviceRepel1.getTitle()+"]",gainThisUser(userId,units.getUnitId())));
// addMessage(new MessageBto(taskBto.getId(),taskBto.getBusinessType(),user.getName()+"转发清退任务["+deviceRepel1.getTitle()+"]",gainThisUser(userId,units.getUnitId())));
List<RepelTaskStatistical> list=new ArrayList<>();
deviceRepel.getTaskScopes().forEach(
......@@ -542,7 +542,7 @@ public class RepelBusinessServiceImpl implements RepelBusinessService {
DeviceRepel deviceRepel= deviceRepelService.findDeviceRepel(deviceRepelDetail.getRepelId());
waitingReceiptsTask(orderOutData.getSendUnitId(),deviceRepelDetail.getId(),taskBto.getId(),"清退装备出库等待上传回执单",userId);
addMessage(new MessageBto(taskBto.getId(),taskBto.getBusinessType(),"根据["+deviceRepel.getTitle()+"]任务，已完成退回出库",gainThisUser(userId,user.getUnitsId())));
devLogAdd(findInvoleDevice(deviceRepelDetail.getDeviceIds()),deviceRepelDetail.getSendUnit()+"装备清退出库"+"，等待"+deviceRepelDetail.getReceiveUnit()+"接收",userId);
devLogAdd(findInvoleDevice(deviceRepelDetail.getDeviceIds()),deviceRepelDetail.getSendUnit()+"装备清退出库"+"，等待接收",userId);
orderOutDataRepelDetail.setDeviceLibraryEntities(findInvoleDevice(deviceRepelDetail.getDeviceIds()));
//把一些字段填写到对象中，保存入库
//把任务状态修改为 清退提交装备待接收
......
dev-union/src/main/resources/bill.html
浏览文件 @ ffa29589
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论