rakor
/
nflg_project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'refs/heads/feature/DM/nflg-bom-dq' into sit_bak

This commit is contained in:
曹鹏飞 2024-05-23 13:48:48 +08:00
parent 581e59e473 c99cbcf852
commit f6f9084ccf
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/DQBomChildService.java
View File

@ -1,12 +1,15 @@
package com.nflg.product.bomnew.service; package com.nflg.product.bomnew.service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.nflg.product.bomnew.mapper.master.BomNewDQbomChildMapper; import com.nflg.product.bomnew.mapper.master.BomNewDQbomChildMapper;
import com.nflg.product.bomnew.pojo.entity.BomNewDQbomChildEntity; import com.nflg.product.bomnew.pojo.entity.BomNewDQbomChildEntity;
import com.nflg.product.bomnew.pojo.entity.BomNewDQbomParentEntity;
import com.nflg.product.bomnew.pojo.vo.BomNewDQbomVO; import com.nflg.product.bomnew.pojo.vo.BomNewDQbomVO;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.List; import java.util.List;
/** /**
@ -16,8 +19,16 @@ import java.util.List;
@Service @Service
public class DQBomChildService extends ServiceImpl<BomNewDQbomChildMapper, BomNewDQbomChildEntity> { public class DQBomChildService extends ServiceImpl<BomNewDQbomChildMapper, BomNewDQbomChildEntity> {
@Resource
private DQBomParentService dQBomParentService;
public void deleteAllChildren(Long parentRowId) { public void deleteAllChildren(Long parentRowId) {
this.getBaseMapper().deleteAllChildren(parentRowId); this.getBaseMapper().delete(Wrappers.lambdaQuery(BomNewDQbomChildEntity.class)
.eq(BomNewDQbomChildEntity::getParentRowId, parentRowId));
dQBomParentService.lambdaUpdate()
.set(BomNewDQbomParentEntity::getBomExist, 0)
.eq(BomNewDQbomParentEntity::getRowId, parentRowId)
.update();
} }
public List<BomNewDQbomChildEntity> getByParentRowId(Long parentRowId) { public List<BomNewDQbomChildEntity> getByParentRowId(Long parentRowId) {

13
nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewDQbomChildMapper.xml
View File

@ -1,20 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.nflg.product.bomnew.mapper.master.BomNewDQbomChildMapper"> <mapper namespace="com.nflg.product.bomnew.mapper.master.BomNewDQbomChildMapper">
<delete id="deleteAllChildren">
DELETE
FROM t_bom_new_dqbom_child
WHERE parent_row_id = #{parentRowId};
UPDATE t_bom_new_dqbom_parent
SET bom_exist=0
WHERE row_id = #{parentRowId};
</delete>
<select id="getBomsByParentRowId" resultType="com.nflg.product.bomnew.pojo.vo.BomNewDQbomVO"> <select id="getBomsByParentRowId" resultType="com.nflg.product.bomnew.pojo.vo.BomNewDQbomVO">
SELECT c.*, p.row_id AS bomRowId, p.created_by AS bomCreateBy SELECT c.*, p.row_id AS bomRowId, p.created_by AS bomCreateBy
FROM t_bom_new_dqbom_child c FROM t_bom_new_dqbom_child c
LEFT JOIN t_bom_new_dqbom_parent p ON p.material_no = c.material_no LEFT JOIN t_bom_new_dqbom_parent p ON p.material_no = c.material_no
WHERE c.parent_row_id = #{rowId} WHERE c.parent_row_id = #{rowId};
</select> </select>
<select id="getBom" resultType="com.nflg.product.bomnew.pojo.vo.BomNewDQbomVO"> <select id="getBom" resultType="com.nflg.product.bomnew.pojo.vo.BomNewDQbomVO">
@ -22,6 +13,6 @@
FROM t_bom_new_dqbom_child c FROM t_bom_new_dqbom_child c
LEFT JOIN t_bom_new_dqbom_parent p ON p.material_no = c.material_no AND c.status = p.status LEFT JOIN t_bom_new_dqbom_parent p ON p.material_no = c.material_no AND c.status = p.status
WHERE c.parent_row_id = #{parentRowId} WHERE c.parent_row_id = #{parentRowId}
AND c.material_no = #{materialNo} AND c.material_no = #{materialNo};
</select> </select>
</mapper> </mapper>