diff --git a/ruoyi-admin/src/main/java/com/ruoyi/erp/service/impl/ErpMaterialServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/erp/service/impl/ErpMaterialServiceImpl.java index 958f655c..5ed37052 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/erp/service/impl/ErpMaterialServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/erp/service/impl/ErpMaterialServiceImpl.java @@ -120,6 +120,12 @@ public class ErpMaterialServiceImpl implements IErpMaterialService @Autowired private SalesEstimateDetailMapper estimateDetailMapper; + @Autowired + private BaseRequisitioningOrderChildMapper requisitioningOrderChildMapper; + + @Autowired + private BaseEmpRequisiteOrderChildMapper requisiteOrderChildMapper; + private final static String RMB = "1"; //RMB @@ -519,6 +525,19 @@ public class ErpMaterialServiceImpl implements IErpMaterialService throw new BusinessException("该物料信息被开发修改单引用,无法作废!"); } + //是否被员工请购单引用 + int countRequisitioningOrderChild = requisitioningOrderChildMapper.checkMaterialIsReferencedByRequisitioningOrderChild(erpMaterialVo.getMaterialNo()); + if(countRequisitioningOrderChild>0){ + throw new BusinessException("该物料信息被请购单引用,无法作废!"); + } + + //是否被员工领料单引用 + int countRequisiteOrderChild = requisiteOrderChildMapper.checkMaterialIsReferencedByRequisiteOrderChild(erpMaterialVo.getMaterialNo()); + if(countRequisiteOrderChild>0){ + throw new BusinessException("该物料信息被员工领料单引用,无法作废!"); + } + + SysUser sysUser = ShiroUtils.getSysUser(); List sysPostsList = sysPostService.selectPostsByUserId(sysUser.getUserId()); String operPeople = sysUser.getDept().getDeptName() + "/" + sysPostsList.get(0).getPostName()+"/" + sysUser.getUserName(); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/BaseEmpRequisiteOrderChildMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/BaseEmpRequisiteOrderChildMapper.java index 487f532a..cf6240af 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/BaseEmpRequisiteOrderChildMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/BaseEmpRequisiteOrderChildMapper.java @@ -85,4 +85,9 @@ public interface BaseEmpRequisiteOrderChildMapper * @return 结果 */ public int restoreBaseEmpRequisiteOrderChildById(Long requisitioningChildId); + + /** + * 检查领料单子表是否引用了物料 + * */ + int checkMaterialIsReferencedByRequisiteOrderChild(String materialNo); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/BaseRequisitioningOrderChildMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/BaseRequisitioningOrderChildMapper.java index 4fdd91ac..3c9e6d66 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/BaseRequisitioningOrderChildMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/BaseRequisitioningOrderChildMapper.java @@ -114,4 +114,9 @@ public interface BaseRequisitioningOrderChildMapper */ public int updateBaseRequisitioningOrderChildByRequisitioningCode(String delFlag,String requisitioningCode); + + /** + * 检查请购单子表是否引用了物料 + * */ + int checkMaterialIsReferencedByRequisitioningOrderChild(String materialNo); } diff --git a/ruoyi-admin/src/main/resources/mapper/system/BaseEmpRequisiteOrderChildMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/BaseEmpRequisiteOrderChildMapper.xml index 3e5c7fd7..d954f3f8 100644 --- a/ruoyi-admin/src/main/resources/mapper/system/BaseEmpRequisiteOrderChildMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/system/BaseEmpRequisiteOrderChildMapper.xml @@ -71,6 +71,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where quote_id = #{quoteId} + + insert into base_emp_requisite_order_child diff --git a/ruoyi-admin/src/main/resources/mapper/system/BaseRequisitioningOrderChildMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/BaseRequisitioningOrderChildMapper.xml index 11b5b24e..5e8b2f0e 100644 --- a/ruoyi-admin/src/main/resources/mapper/system/BaseRequisitioningOrderChildMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/system/BaseRequisitioningOrderChildMapper.xml @@ -76,6 +76,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where requisitioning_code = #{requisitioningCode} + + + + insert into base_requisitioning_order_child