bonus
/
Bonus-Cloud-Material
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

维修管理--数量多维修逻辑调整

This commit is contained in:
syruan 2024-11-18 18:20:25 +08:00
parent 7e4725c231
commit 1aa586b07d
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairController.java
View File

@ -123,7 +123,7 @@ public class RepairController extends BaseController {
*/ */
@ApiOperation(value = "批量维修--批量--按照传参维修方式进行维修") @ApiOperation(value = "批量维修--批量--按照传参维修方式进行维修")
@PostMapping("/batchRepairApply") @PostMapping("/batchRepairApply")
public AjaxResult batchRepairApply(@RequestBody List<RepairDeviceVO> list) { public AjaxResult batchRepairApply(@RequestBody @NotNull List<RepairDeviceVO> list) {
return service.batchRepairApply(list); return service.batchRepairApply(list);
} }

10
bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java
View File

@ -43,7 +43,6 @@ public class RepairServiceImpl implements RepairService {
// 维修管理方式--0：编码管理 1：数量管理 // 维修管理方式--0：编码管理 1：数量管理
private final int manageTypeByCode = 0, manageTypeByNumber = 1; private final int manageTypeByCode = 0, manageTypeByNumber = 1;
@Override @Override
public List<RepairTask> getRepairTaskList(RepairTask bean) { public List<RepairTask> getRepairTaskList(RepairTask bean) {
return repairMapper.getRepairTaskList(bean); return repairMapper.getRepairTaskList(bean);
@ -90,7 +89,6 @@ public class RepairServiceImpl implements RepairService {
return new ArrayList<>(resultMap.values()); return new ArrayList<>(resultMap.values());
} }
/** /**
* 提交维修记录 * 提交维修记录
* @param bean repairApplyRecord * @param bean repairApplyRecord
@ -325,7 +323,7 @@ public class RepairServiceImpl implements RepairService {
// ---------------校验维修数量----------------- // ---------------校验维修数量-----------------
// 统计已维修数量 + 本次维修数量 // 统计已维修数量 + 本次维修数量
int repairNum = details.getRepairedNum() + bean.getRepairNum(); int repairNum = details.getRepairedNum() + bean.getNumberScrapRepairPartList().get(0).getRepairNum();
// 统计报废数量 + 维修合计数量 // 统计报废数量 + 维修合计数量
int num = repairNum + details.getScrapNum(); int num = repairNum + details.getScrapNum();
if (num > details.getRepairNum()) { if (num > details.getRepairNum()) {
@ -340,12 +338,13 @@ public class RepairServiceImpl implements RepairService {
// 处理配件集合数据 -- 数量管理--外部返厂维修 // 处理配件集合数据 -- 数量管理--外部返厂维修
if (CollectionUtil.isNotEmpty(bean.getNumberOutRepairPartList())) { if (CollectionUtil.isNotEmpty(bean.getNumberOutRepairPartList())) {
BigDecimal sfCosts = new BigDecimal("0"); BigDecimal sfCosts = new BigDecimal("0");
partList = bean.getNumberOutRepairPartList(); partList = bean.getNumberOutRepairPartList();
// ---------------校验维修数量----------------- // ---------------校验维修数量-----------------
// 统计已维修数量 + 本次维修数量 // 统计已维修数量 + 本次维修数量
int repairNum = details.getRepairedNum() + bean.getRepairNum(); int repairNum = details.getRepairedNum() + bean.getNumberScrapRepairPartList().get(0).getRepairNum();
// 统计报废数量 + 维修合计数量 // 统计报废数量 + 维修合计数量
int num = repairNum + details.getScrapNum(); int num = repairNum + details.getScrapNum();
if (num > details.getRepairNum()) { if (num > details.getRepairNum()) {
@ -388,7 +387,8 @@ public class RepairServiceImpl implements RepairService {
if (CollectionUtil.isNotEmpty(bean.getNumberScrapRepairPartList())) { if (CollectionUtil.isNotEmpty(bean.getNumberScrapRepairPartList())) {
// -------------校验维修数量开始---------------- // -------------校验维修数量开始----------------
// 统计历史已报废数量 + 本次报废数量 = 报废总数 // 统计历史已报废数量 + 本次报废数量 = 报废总数
int scrapNum = details.getScrapNum() + bean.getScrapNum(); // TODO : get数组的维修数量不对，后续修改对象
int scrapNum = details.getScrapNum() + bean.getNumberScrapRepairPartList().get(0).getRepairNum();
// 统计 报废总数 + 历史已维修数量, // 统计 报废总数 + 历史已维修数量,
int num = scrapNum + details.getRepairedNum(); int num = scrapNum + details.getRepairedNum();
// 不能大与总的待维修数量 // 不能大与总的待维修数量