kelvin/wms-dj-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

完善大号物料字段

Browse Source
This commit is contained in:
刘名喜 2024-12-16 16:15:53 +08:00
parent 38bf3825c7
commit 2ea01a7fff
2 changed files with 42 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ktg-mes/src/main/java/com/ktg/mes/md/domain/MdItem.java
View File

@ -40,8 +40,8 @@ public class MdItem extends BaseEntity {
private Integer attr1;
private Integer attr2;
/* 预留字段3 - 为空或者0表示普通物料-1表示大物料 */
private String attr3;
private String attr4;
private Integer attr3;
private Integer attr4;
private Long count;
@ -204,19 +204,19 @@ public class MdItem extends BaseEntity {
this.attr2 = attr2;
}
public String getAttr3() {
public Integer getAttr3() {
return attr3;
}
public void setAttr3(String attr3) {
public void setAttr3(Integer attr3) {
this.attr3 = attr3;
}
public String getAttr4() {
public Integer getAttr4() {
return attr4;
}
public void setAttr4(String attr4) {
public void setAttr4(Integer attr4) {
this.attr4 = attr4;
}
@ -249,9 +249,9 @@ public class MdItem extends BaseEntity {
", maxStock=" + maxStock +
", highValue='" + highValue + '\'' +
", attr1=" + attr1 +
", attr2='" + attr2 + '\'' +
", attr3='" + attr3 + '\'' +
", attr4='" + attr4 + '\'' +
", attr2=" + attr2 +
", attr3=" + attr3 +
", attr4=" + attr4 +
", count=" + count +
'}';
}

64
ktg-mes/src/main/resources/mapper/md/MdItemMapper.xml
View File

@ -52,6 +52,8 @@
high_value,
attr1,
attr2,
attr3,
attr4,
create_by,
create_time,
remark
@ -66,8 +68,8 @@
</if>
<if test="itemTypeId != null and itemTypeId != 0">
AND (item_type_id = #{itemTypeId} OR item_type_id in (select item_type_id
from md_item_type
where find_in_set(#{itemTypeId}, ancestors)))
from md_item_type
where find_in_set(#{itemTypeId}, ancestors)))
</if>
<if test="itemName != null and itemName != ''">
AND item_name like concat('%', #{itemName}, '%')
@ -84,38 +86,38 @@
<select id="getExeportList" parameterType="MdItem" resultMap="MdItemResult">
select i.item_id,
i.item_code,
i.item_name,
i.specification,
i.model_number,
i.unit_of_measure,
i.unit_name,
i.item_or_product,
i.item_type_id,
i.item_type_code,
i.enable_flag,
i.safe_stock_flag,
i.min_stock,
i.max_stock,
i.high_value,
i.create_by,
i.create_time,
i.remark,
CONCAT((select group_concat(item_type_name separator '/')
from md_item_type b
where FIND_IN_SET(CAST(item_type_id as CHAR), a.ancestors) > 0), '/',
a.item_type_name) as item_type_name
i.item_code,
i.item_name,
i.specification,
i.model_number,
i.unit_of_measure,
i.unit_name,
i.item_or_product,
i.item_type_id,
i.item_type_code,
i.enable_flag,
i.safe_stock_flag,
i.min_stock,
i.max_stock,
i.high_value,
i.create_by,
i.create_time,
i.remark,
CONCAT((select group_concat(item_type_name separator '/')
from md_item_type b
where FIND_IN_SET(CAST(item_type_id as CHAR), a.ancestors) > 0), '/',
a.item_type_name) as item_type_name
from md_item i
left join md_item_type a
on i.item_type_id = a.item_type_id
left join md_item_type a
on i.item_type_id = a.item_type_id
<where>
<if test="itemCode != null and itemCode != ''">
AND i.item_code like concat('%', #{itemCode}, '%')
</if>
<if test="itemTypeId != null and itemTypeId != 0">
AND (i.item_type_id = #{itemTypeId} OR i.item_type_id in (select item_type_id
from md_item_type
where find_in_set(#{itemTypeId}, ancestors)))
from md_item_type
where find_in_set(#{itemTypeId}, ancestors)))
</if>
<if test="itemName != null and itemName != ''">
AND i.item_name like concat('%', #{itemName}, '%')
@ -161,7 +163,7 @@
<insert id="insertMdItem" parameterType="MdItem" useGeneratedKeys="true" keyProperty="itemId">
insert into md_item(item_code,
item_name,
item_name,
<if test="specification != null and specification != ''">
specification,
</if>
@ -213,7 +215,7 @@
</if>
create_time)
values (#{itemCode},
#{itemName},
#{itemName},
<if test="specification != null and specification != ''">
#{specification},
</if>
@ -323,10 +325,10 @@
<if test="attr2 != null">
attr2=#{attr2},
</if>
<if test="attr3 != null and attr3 != 0">
<if test="attr3 != null">
attr3=#{attr3},
</if>
<if test="attr4 != null and attr4 != 0">
<if test="attr4 != null">
attr4=#{attr4},
</if>
<if test="updateBy != null and updateBy != ''">