Browse Source

[fix] 工程管理

修改物料作废后端接口:新增作废前判断,是否被员工请购单引用判断,有就进行提示;是否被员工领料单引用判断,有就进行提示;
员工领料单子表Mapper新增 检查领料单子表是否引用了物料后端接口
请购单子表Mapper新增 检查请购单子表是否引用了物料后端接口
dev
liuxiaoxu 3 days ago
parent
commit
4b33e8bd4d
  1. 19
      ruoyi-admin/src/main/java/com/ruoyi/erp/service/impl/ErpMaterialServiceImpl.java
  2. 5
      ruoyi-admin/src/main/java/com/ruoyi/system/mapper/BaseEmpRequisiteOrderChildMapper.java
  3. 5
      ruoyi-admin/src/main/java/com/ruoyi/system/mapper/BaseRequisitioningOrderChildMapper.java
  4. 4
      ruoyi-admin/src/main/resources/mapper/system/BaseEmpRequisiteOrderChildMapper.xml
  5. 6
      ruoyi-admin/src/main/resources/mapper/system/BaseRequisitioningOrderChildMapper.xml

19
ruoyi-admin/src/main/java/com/ruoyi/erp/service/impl/ErpMaterialServiceImpl.java

@ -120,6 +120,12 @@ public class ErpMaterialServiceImpl implements IErpMaterialService
@Autowired @Autowired
private SalesEstimateDetailMapper estimateDetailMapper; private SalesEstimateDetailMapper estimateDetailMapper;
@Autowired
private BaseRequisitioningOrderChildMapper requisitioningOrderChildMapper;
@Autowired
private BaseEmpRequisiteOrderChildMapper requisiteOrderChildMapper;
private final static String RMB = "1"; //RMB private final static String RMB = "1"; //RMB
@ -519,6 +525,19 @@ public class ErpMaterialServiceImpl implements IErpMaterialService
throw new BusinessException("该物料信息被开发修改单引用,无法作废!"); 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(); SysUser sysUser = ShiroUtils.getSysUser();
List<SysPost> sysPostsList = sysPostService.selectPostsByUserId(sysUser.getUserId()); List<SysPost> sysPostsList = sysPostService.selectPostsByUserId(sysUser.getUserId());
String operPeople = sysUser.getDept().getDeptName() + "/" + sysPostsList.get(0).getPostName()+"/" + sysUser.getUserName(); String operPeople = sysUser.getDept().getDeptName() + "/" + sysPostsList.get(0).getPostName()+"/" + sysUser.getUserName();

5
ruoyi-admin/src/main/java/com/ruoyi/system/mapper/BaseEmpRequisiteOrderChildMapper.java

@ -85,4 +85,9 @@ public interface BaseEmpRequisiteOrderChildMapper
* @return 结果 * @return 结果
*/ */
public int restoreBaseEmpRequisiteOrderChildById(Long requisitioningChildId); public int restoreBaseEmpRequisiteOrderChildById(Long requisitioningChildId);
/**
* 检查领料单子表是否引用了物料
* */
int checkMaterialIsReferencedByRequisiteOrderChild(String materialNo);
} }

5
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); public int updateBaseRequisitioningOrderChildByRequisitioningCode(String delFlag,String requisitioningCode);
/**
* 检查请购单子表是否引用了物料
* */
int checkMaterialIsReferencedByRequisitioningOrderChild(String materialNo);
} }

4
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} where quote_id = #{quoteId}
</select> </select>
<select id="checkMaterialIsReferencedByRequisiteOrderChild" parameterType="String" resultType="Integer">
select count(1) from base_emp_requisite_order_child where material_code = #{materialCode}
</select>
<insert id="insertBaseEmpRequisiteOrderChild" parameterType="BaseEmpRequisiteOrderChild" useGeneratedKeys="true" keyProperty="requisitioningChildId"> <insert id="insertBaseEmpRequisiteOrderChild" parameterType="BaseEmpRequisiteOrderChild" useGeneratedKeys="true" keyProperty="requisitioningChildId">
insert into base_emp_requisite_order_child insert into base_emp_requisite_order_child
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">

6
ruoyi-admin/src/main/resources/mapper/system/BaseRequisitioningOrderChildMapper.xml

@ -76,6 +76,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<include refid="selectBaseRequisitioningOrderChildVo"/> <include refid="selectBaseRequisitioningOrderChildVo"/>
where requisitioning_code = #{requisitioningCode} where requisitioning_code = #{requisitioningCode}
</select> </select>
<select id="checkMaterialIsReferencedByRequisitioningOrderChild" parameterType="String" resultType="Integer">
select count(1) from base_requisitioning_order_child where material_code = #{materialCode}
</select>
<insert id="insertBaseRequisitioningOrderChild" parameterType="BaseRequisitioningOrderChild" useGeneratedKeys="true" keyProperty="requisitioningChildId"> <insert id="insertBaseRequisitioningOrderChild" parameterType="BaseRequisitioningOrderChild" useGeneratedKeys="true" keyProperty="requisitioningChildId">
insert into base_requisitioning_order_child insert into base_requisitioning_order_child
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">

Loading…
Cancel
Save