Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印

liyong

2 天以前 a92b12d5adaa8827c1474d42b73c98e17953ecb5

Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印

 src/main/java/com/ruoyi/production/controller/ProductStructureController.java

@@ -37,4 +37,10 @@
    public R listBybomId( @PathVariable("bomId") Integer bomId){
        return R.ok(productStructureService.listBybomId(bomId));
    }


    @GetMapping("/listBybomIdIsParent/{bomId}")
    public R listBybomIdIsParent(@PathVariable Integer bomId){
        return R.ok(productStructureService.listBybomIdIsParent(bomId));
    }
}

 src/main/java/com/ruoyi/production/mapper/ProductStructureMapper.java

@@ -13,7 +13,7 @@
@Mapper
public interface ProductStructureMapper  extends BaseMapper<ProductStructure> {

    List<ProductStructureDto> listBybomId(@Param("bomId") Integer bomId);
    List<ProductStructureDto> listBybomId(@Param("bomId") Integer bomId,@Param("isParent") Boolean isParent);

    List<ProductStructureDto> listBybomAndProcess(@Param("bomId") Integer bomId, @Param("processId") Long processId);
}

 src/main/java/com/ruoyi/production/service/ProductStructureService.java

@@ -14,4 +14,5 @@

    List<ProductStructureDto> listBybomId(Integer bomId);

    List<ProductStructureDto> listBybomIdIsParent(Integer bomId);
}

 src/main/java/com/ruoyi/production/service/impl/ProductStructureServiceImpl.java

@@ -131,7 +131,7 @@

    @Override
    public List<ProductStructureDto> listBybomId(Integer bomId) {
        List<ProductStructureDto> list = productStructureMapper.listBybomId(bomId);
        List<ProductStructureDto> list = productStructureMapper.listBybomId(bomId, false);

        Map<Long, ProductStructureDto> map = new HashMap<>();
        for (ProductStructureDto node : list) {
@@ -154,4 +154,9 @@
        return tree;
    }

    @Override
    public List<ProductStructureDto> listBybomIdIsParent(Integer bomId) {
        return productStructureMapper.listBybomId(bomId, true);
    }

}

 src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProductServiceImpl.java

@@ -495,7 +495,7 @@
        if (processRoute == null) {
            return R.fail("请先设置工艺路线");
        }
        List<ProductStructureDto> productStructureDtos = productStructureMapper.listBybomId(processRoute.getBomId());
        List<ProductStructureDto> productStructureDtos = productStructureMapper.listBybomId(processRoute.getBomId(),false);
        if (productStructureDtos.isEmpty()) {
            return R.fail("请先设置产品结构");
        }

 src/main/resources/mapper/production/ProductStructureMapper.xml

@@ -23,6 +23,9 @@
                left join product p on pm.product_id = p.id
                left join product_process pp on ps.process_id = pp.id
        where ps.bom_id = #{bomId}
        <if test="isParent">
            and ps.parent_id is not null
        </if>
        order by ps.id
    </select>
    <select id="listBybomAndProcess" resultType="com.ruoyi.production.dto.ProductStructureDto">