From b263341dc1baa04b0e062a7ef72179757729a388 Mon Sep 17 00:00:00 2001
From: hdy <1105738590@qq.com>
Date: 星期一, 15 一月 2024 15:52:41 +0800
Subject: [PATCH] 物料信息代码更新
---
jcdm-main/src/main/resources/mapper/bs/material/BsMaterialInfoMapper.xml | 8 +++++++-
jcdm-ui/src/views/main/bs/material/index.vue | 7 +++++++
jcdm-main/src/main/java/com/jcdm/main/bs/material/domain/BsMaterialInfo.java | 9 +++++++++
3 files changed, 23 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 015bb39..a7b9a52 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
@@ -22,6 +22,8 @@
@Excel(name = "鐗╂枡缂栧彿")
private String materialCode;
+ @Excel(name = "杞﹀瀷")
+ private String carType;
/** 鐗╂枡鍚嶇О */
@Excel(name = "鐗╂枡鍚嶇О")
private String materialName;
@@ -97,6 +99,12 @@
public String getMaterialCode()
{
return materialCode;
+ }
+ public void setCarType(String carType) {this.carType = carType;}
+
+ public String getCarType()
+ {
+ return carType;
}
public void setMaterialName(String materialName)
{
@@ -241,6 +249,7 @@
.append("id", getId())
.append("materialCode", getMaterialCode())
.append("materialName", getMaterialName())
+ .append("carType", getCarType())
.append("materialView", getMaterialView())
.append("typeZ", getTypeZ())
.append("typeL", getTypeL())
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 d76ded0..5dbc104 100644
--- a/jcdm-main/src/main/resources/mapper/bs/material/BsMaterialInfoMapper.xml
+++ b/jcdm-main/src/main/resources/mapper/bs/material/BsMaterialInfoMapper.xml
@@ -23,10 +23,12 @@
<result property="status" column="status" />
<result property="supplier" column="supplier" />
<result property="mark" column="mark" />
+ <result property="carType" column="car_type" />
+
</resultMap>
<sql id="selectBsMaterialInfoVo">
- 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
+ select id, material_code, mark, material_name,car_type, 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">
@@ -41,6 +43,7 @@
<if test="unit != null and unit != ''"> and unit = #{unit}</if>
<if test="matterVersion != null and matterVersion != ''"> and matter_version = #{matterVersion}</if>
<if test="remarks != null and remarks != ''"> and remarks = #{remarks}</if>
+ <if test="carType != null and carType != ''"> and car_type = #{carType}</if>
<if test="createUser != null and createUser != ''"> and create_user = #{createUser}</if>
<if test="createTime != null "> and create_time = #{createTime}</if>
<if test="updateUser != null and updateUser != ''"> and update_user = #{updateUser}</if>
@@ -63,6 +66,7 @@
<if test="id != null">id,</if>
<if test="materialCode != null">material_code,</if>
<if test="materialName != null">material_name,</if>
+ <if test="carType != null">car_type,</if>
<if test="mark != null">mark,</if>
<if test="materialView != null">material_view,</if>
<if test="typeZ != null">type_z,</if>
@@ -84,6 +88,7 @@
<if test="id != null">#{id},</if>
<if test="materialCode != null">#{materialCode},</if>
<if test="materialName != null">#{materialName},</if>
+ <if test="carType != null">#{carType},</if>
<if test="mark != null">#{mark},</if>
<if test="materialView != null">#{materialView},</if>
<if test="typeZ != null">#{typeZ},</if>
@@ -108,6 +113,7 @@
<trim prefix="SET" suffixOverrides=",">
<if test="materialCode != null">material_code = #{materialCode},</if>
<if test="materialName != null">material_name = #{materialName},</if>
+ <if test="carType != null">car_type = #{carType},</if>
<if test="mark != null">mark = #{mark},</if>
<if test="materialView != null">material_view = #{materialView},</if>
<if test="typeZ != null">type_z = #{typeZ},</if>
diff --git a/jcdm-ui/src/views/main/bs/material/index.vue b/jcdm-ui/src/views/main/bs/material/index.vue
index 9a5bf4d..ad04c8e 100644
--- a/jcdm-ui/src/views/main/bs/material/index.vue
+++ b/jcdm-ui/src/views/main/bs/material/index.vue
@@ -91,6 +91,8 @@
</el-table-column>
<el-table-column label="鐗规畩浠ｇ爜" align="center" prop="mark" width="180">
</el-table-column>
+ <el-table-column label="杞﹀瀷" align="center" prop="carType" width="180">
+ </el-table-column>
<el-table-column label="绫诲瀷" align="center" prop="typeL">
<template slot-scope="scope">
<dict-tag :options="dict.type.material_type" :value="scope.row.typeL"/>
@@ -175,6 +177,9 @@
</el-form-item>
<el-form-item label="鐗规畩浠ｇ爜" prop="mark">
<el-input v-model="form.mark" placeholder="璇疯緭鍏ョ壒娈婁唬鐮�" />
+ </el-form-item>
+ <el-form-item label="杞﹀瀷" prop="carType">
+ <el-input v-model="form.carType" placeholder="璇疯緭鍏ョ壒娈婁唬鐮�" />
</el-form-item>
<el-form-item label="鐗╂枡鍚嶇О" prop="materialName">
<el-input v-model="form.materialName" placeholder="璇疯緭鍏ョ墿鏂欏悕绉�" />
@@ -267,6 +272,7 @@
pageNum: 1,
pageSize: 10,
materialCode: null,
+ carType:null,
materialName: null,
materialView: null,
typeZ: null,
@@ -329,6 +335,7 @@
materialName: null,
materialView: null,
typeZ: null,
+ carType:null,
typeL: null,
unit: null,
matterVersion: null,
--
Gitblit v1.9.3