diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/BackApplyController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/BackApplyController.java index 86660fd..74118d0 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/BackApplyController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/BackApplyController.java @@ -169,6 +169,10 @@ public class BackApplyController extends BaseController { return AjaxResult.error("参数错误"); } try { + //查看本次退料申请是否合法 + if (!backApplyService.isBackApplyNumberCorrect(bean)) { + return AjaxResult.error("已申请退料数量加上本次退料申请数量,超过领料出库数量,请重试!"); + } //生成退料编码 String code = backApplyService.genderBackCode(); if (StringUtils.isEmpty(code)) { diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/BackApplyMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/BackApplyMapper.java index 1526f05..ef9b4ec 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/BackApplyMapper.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/BackApplyMapper.java @@ -40,6 +40,8 @@ public interface BackApplyMapper { */ String selectTaskNumByMonth(@Param("date") Date date, @Param("taskType") Integer taskType); + List getBackApplyDetailsTypeCount(); + /** * 增加 * @param bean diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/BackApplyService.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/BackApplyService.java index e1a2192..c588e19 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/BackApplyService.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/BackApplyService.java @@ -30,6 +30,8 @@ public interface BackApplyService { */ List getMaterialList(BackApplyInfo bean); + public boolean isBackApplyNumberCorrect(BackApplyInfo bean); + /** * 生成后台退料编号 * @return diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/BackApplyServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/BackApplyServiceImpl.java index 02ebde8..a59aed2 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/BackApplyServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/BackApplyServiceImpl.java @@ -85,6 +85,22 @@ public class BackApplyServiceImpl implements BackApplyService { return backApplyMapper.getMaterialList(bean); } + @Override + public boolean isBackApplyNumberCorrect(BackApplyInfo bean) { + boolean isCorrect = true; //默认合法 + // 查看出库数据 + List backTypeList = backApplyMapper.getBackApplyDetailsTypeCount(); + + // 查看退料已审核数据 + + + // 比较本次退料数据,是否大于前两者的差额,大于就报错 + List backApplyDetails = bean.getBackApplyDetails(); + + + return isCorrect; + } + @Override public String genderBackCode() { SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd"); diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml index 3d78dc1..4cc4b50 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml @@ -529,6 +529,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ORDER BY create_time DESC LIMIT 1 + + - \ No newline at end of file