Merge branch 'master' of http://118.89.139.230:10101/r/~whyclxw/CadDrawManager

lxw

2022-09-03 370e9a253370a74cfffbe6ba25719a3798bdb09d

Merge branch 'master' of http://118.89.139.230:10101/r/~whyclxw/CadDrawManager

 src/main/java/com/whyc/mapper/ProductBomMapper.java

@@ -25,4 +25,6 @@

    List<ProductBom> getListByCodeAndModelList2(List<ProductBom> bomList);

    ProductBom getEnabledStandardBomListByParentCode(String parentCode);

}

 src/main/java/com/whyc/mapper/ProductMapper.java

@@ -2,8 +2,6 @@

import com.whyc.pojo.Product;

import java.util.List;

public interface ProductMapper extends CustomMapper<Product>{

}

 src/main/java/com/whyc/pojo/ProductBomHistory.java

@@ -24,7 +24,9 @@
    private Integer subSVersion;
    @ApiModelProperty("bom终止版本")
    private Integer subEVersion;

    @ApiModelProperty("物料实体类")
    @TableField(exist = false)
    private Material materialObj;

    @ApiModelProperty("结构件类型")

 src/main/java/com/whyc/service/ProductBomHistoryService.java

@@ -449,6 +449,7 @@
    public Map<String, List> parseCompare(Product baseProduct, Product product) {
        List<ProductBom> bomList = product.getBomList();
        List<ProductBom> baseBomList = new LinkedList<>();
        ProductBom baseProductBom = null;

        Map<String,List> compareMap = new HashMap<>();
        List<ProductBomHistory> diffList = new LinkedList<>();
@@ -457,7 +458,7 @@

        //根据baseProduct的code和custom_code,查找到基准产品
        if(baseProduct == null){
            //productService.getBomL
            baseProductBom = bomService.getEnabledStandardBomListByParentCode(product.getParentCode());
        }else{

        }

 src/main/java/com/whyc/service/ProductBomService.java

@@ -537,4 +537,8 @@
    public List<ProductBom> getListByCodeAndModelList2(List<ProductBom> bomList) {
        return mapper.getListByCodeAndModelList2(bomList);
    }

    public ProductBom getEnabledStandardBomListByParentCode(String parentCode) {
        return mapper.getEnabledStandardBomListByParentCode(parentCode);
    }
}

 src/main/resources/mapper/ProductBomMapper.xml

@@ -169,4 +169,12 @@
            select id,#{item.quantity} as quantity from db_doc.tb_material where sub_code = #{item.subCode} and sub_model = #{item.subModel}
        </foreach>
    </select>
    <select id="getEnabledStandardBomListByParentCode" resultType="com.whyc.pojo.ProductBom">
        SELECT
        b.quantity,m.*
        FROM db_doc.tb_product p,db_doc.tb_product_bom b,db_doc.tb_material m
        where p.id = b.product_id
        and b.material_id = m.id
        and p.parent_code = #{parentCode} and p.custom_code = "0"
    </select>
</mapper>