diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairController.java index 5862a027..e5181e3d 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairController.java @@ -123,7 +123,7 @@ public class RepairController extends BaseController { */ @ApiOperation(value = "批量维修--批量--按照传参维修方式进行维修") @PostMapping("/batchRepairApply") - public AjaxResult batchRepairApply(@RequestBody List list) { + public AjaxResult batchRepairApply(@RequestBody @NotNull List list) { return service.batchRepairApply(list); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java index b36eca9b..81993905 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java @@ -43,7 +43,6 @@ public class RepairServiceImpl implements RepairService { // 维修管理方式--0:编码管理 1:数量管理 private final int manageTypeByCode = 0, manageTypeByNumber = 1; - @Override public List getRepairTaskList(RepairTask bean) { return repairMapper.getRepairTaskList(bean); @@ -90,7 +89,6 @@ public class RepairServiceImpl implements RepairService { return new ArrayList<>(resultMap.values()); } - /** * 提交维修记录 * @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(); if (num > details.getRepairNum()) { @@ -340,12 +338,13 @@ public class RepairServiceImpl implements RepairService { // 处理配件集合数据 -- 数量管理--外部返厂维修 if (CollectionUtil.isNotEmpty(bean.getNumberOutRepairPartList())) { + BigDecimal sfCosts = new BigDecimal("0"); partList = bean.getNumberOutRepairPartList(); // ---------------校验维修数量----------------- // 统计已维修数量 + 本次维修数量 - int repairNum = details.getRepairedNum() + bean.getRepairNum(); + int repairNum = details.getRepairedNum() + bean.getNumberScrapRepairPartList().get(0).getRepairNum(); // 统计报废数量 + 维修合计数量 int num = repairNum + details.getScrapNum(); if (num > details.getRepairNum()) { @@ -388,7 +387,8 @@ public class RepairServiceImpl implements RepairService { 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(); // 不能大与总的待维修数量