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

问题修复

This commit is contained in:
luoliming 2023-12-27 23:02:22 +08:00
parent 77a04f6911
commit a88ab0abcb
4 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BaseMaterialVO.java
View File

@ -58,6 +58,7 @@ public class BaseMaterialVO {
@ApiModelProperty("物料分类编码名称") @ApiModelProperty("物料分类编码名称")
private String categoryName; private String categoryName;
@ApiModelProperty("单位")
private String materialUnit;
} }

6
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewEbomChildVO.java
View File

@ -47,11 +47,7 @@ public class BomNewEbomChildVO extends BaseMaterialVO implements Serializable {
/**
* 单位
*/
@ApiModelProperty(value = "单位")
private String materialUnit;
/** /**

5
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewEbomParentVO.java
View File

@ -55,11 +55,6 @@ public class BomNewEbomParentVO extends BaseMaterialVO implements Serializable {
/**
* 单位
*/
@ApiModelProperty(value = "单位")
private String materialUnit;
/** /**
* 单重 * 单重

2
nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/MaterialMainMapper.xml
View File

@ -71,7 +71,7 @@
<select id="getMaterialBaseInfo" resultType="com.nflg.product.bomnew.pojo.vo.BaseMaterialVO"> <select id="getMaterialBaseInfo" resultType="com.nflg.product.bomnew.pojo.vo.BaseMaterialVO">
select a.row_id as materialRowId, material_no, material_name, material_desc, procure_type, project_type, material_state,drawing_no,a.material_category_code ,material_get_type,drawing_no select a.row_id as materialRowId, material_no, material_name, material_desc, procure_type, project_type, material_state,drawing_no,a.material_category_code ,material_get_type,drawing_no
,material_texture as material ,material_texture , b.rel_category_code,b.category_name ,material_texture as material ,material_texture , b.rel_category_code,b.category_name,material_unit
from t_material_main a join t_material_category b on a.material_category_code=b.category_code from t_material_main a join t_material_category b on a.material_category_code=b.category_code
where material_no in where material_no in
<foreach collection="materialNos" item="item" open="(" close=")" separator=","> <foreach collection="materialNos" item="item" open="(" close=")" separator=",">