From 2e964f53ebea6f309f6556a8b13f93d526b2d72f Mon Sep 17 00:00:00 2001
From: hdy <1105738590@qq.com>
Date: 星期二, 09 一月 2024 15:16:15 +0800
Subject: [PATCH] 基础数据-物料信息 增加特需代码字段
---
jcdm-main/src/main/resources/mapper/bs/material/BsMaterialInfoMapper.xml | 7 ++++++-
jcdm-ui/src/views/main/bs/material/index.vue | 2 ++
jcdm-main/src/main/java/com/jcdm/main/bs/material/domain/BsMaterialInfo.java | 13 +++++++++++++
3 files changed, 21 insertions(+), 1 deletions(-)
diff --git a/jcdm-main/src/main/java/com/jcdm/main/bs/material/domain/BsMaterialInfo.java b/jcdm-main/src/main/java/com/jcdm/main/bs/material/domain/BsMaterialInfo.java
index 0885f59..015bb39 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/bs/material/domain/BsMaterialInfo.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/bs/material/domain/BsMaterialInfo.java
@@ -78,6 +78,8 @@
@Excel(name = "鍘傚晢")
private String supplier;
+ @Excel(name = "鐗归渶浠ｇ爜")
+ private String mark;
public void setId(Long id)
{
this.id = id;
@@ -223,6 +225,16 @@
return supplier;
}
+ public void setMark(String mark)
+ {
+ this.mark = mark;
+ }
+
+ public String getMark()
+ {
+ return mark;
+ }
+
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -244,6 +256,7 @@
.append("version", getVersion())
.append("status", getStatus())
.append("supplier", getSupplier())
+ .append("mark", getMark())
.toString();
}
}
diff --git a/jcdm-main/src/main/resources/mapper/bs/material/BsMaterialInfoMapper.xml b/jcdm-main/src/main/resources/mapper/bs/material/BsMaterialInfoMapper.xml
index cae981e..d76ded0 100644
--- a/jcdm-main/src/main/resources/mapper/bs/material/BsMaterialInfoMapper.xml
+++ b/jcdm-main/src/main/resources/mapper/bs/material/BsMaterialInfoMapper.xml
@@ -22,10 +22,11 @@
<result property="version" column="version" />
<result property="status" column="status" />
<result property="supplier" column="supplier" />
+ <result property="mark" column="mark" />
</resultMap>
<sql id="selectBsMaterialInfoVo">
- select id, material_code, material_name, material_view, type_z, type_l, unit, matter_version, remarks, create_user, create_time, update_user, update_time, erp_spec, data_source, version, status, supplier from bs_material_info
+ select id, material_code, mark, material_name, material_view, type_z, type_l, unit, matter_version, remarks, create_user, create_time, update_user, update_time, erp_spec, data_source, version, status, supplier from bs_material_info
</sql>
<select id="selectBsMaterialInfoList" parameterType="BsMaterialInfo" resultMap="BsMaterialInfoResult">
@@ -33,6 +34,7 @@
<where>
<if test="materialCode != null and materialCode != ''"> and material_code like concat('%', #{materialCode}, '%')</if>
<if test="materialName != null and materialName != ''"> and material_name like concat('%', #{materialName}, '%')</if>
+ <if test="mark != null and mark != ''"> and mark like concat('%', #{mark}, '%')</if>
<if test="materialView != null and materialView != ''"> and material_view = #{materialView}</if>
<if test="typeZ != null and typeZ != ''"> and type_z = #{typeZ}</if>
<if test="typeL != null and typeL != ''"> and type_l = #{typeL}</if>
@@ -61,6 +63,7 @@
<if test="id != null">id,</if>
<if test="materialCode != null">material_code,</if>
<if test="materialName != null">material_name,</if>
+ <if test="mark != null">mark,</if>
<if test="materialView != null">material_view,</if>
<if test="typeZ != null">type_z,</if>
<if test="typeL != null">type_l,</if>
@@ -81,6 +84,7 @@
<if test="id != null">#{id},</if>
<if test="materialCode != null">#{materialCode},</if>
<if test="materialName != null">#{materialName},</if>
+ <if test="mark != null">#{mark},</if>
<if test="materialView != null">#{materialView},</if>
<if test="typeZ != null">#{typeZ},</if>
<if test="typeL != null">#{typeL},</if>
@@ -104,6 +108,7 @@
<trim prefix="SET" suffixOverrides=",">
<if test="materialCode != null">material_code = #{materialCode},</if>
<if test="materialName != null">material_name = #{materialName},</if>
+ <if test="mark != null">mark = #{mark},</if>
<if test="materialView != null">material_view = #{materialView},</if>
<if test="typeZ != null">type_z = #{typeZ},</if>
<if test="typeL != null">type_l = #{typeL},</if>
diff --git a/jcdm-ui/src/views/main/bs/material/index.vue b/jcdm-ui/src/views/main/bs/material/index.vue
index f32dc96..97a7e15 100644
--- a/jcdm-ui/src/views/main/bs/material/index.vue
+++ b/jcdm-ui/src/views/main/bs/material/index.vue
@@ -276,6 +276,7 @@
dataSource: null,
version: null,
status: null,
+ mark: null,
supplier: null
},
// 琛ㄥ崟鍙傛暟
@@ -335,6 +336,7 @@
dataSource: null,
version: null,
status: '0',
+ mark: null,
supplier: null
};
this.resetForm("form");
--
Gitblit v1.9.3