From cf0353e26f5e5c698d6eff9a31d0424bfe5838d9 Mon Sep 17 00:00:00 2001 From: Junjie <fallin.jie@qq.com> Date: 星期三, 24 五月 2023 15:26:52 +0800 Subject: [PATCH] man_mat增加物料类型 --- src/main/resources/mapper/MatMapper.xml | 2 +- src/main/java/com/zy/asrs/entity/Mat.java | 10 +++++----- src/main/webapp/static/js/common.js | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/zy/asrs/entity/Mat.java b/src/main/java/com/zy/asrs/entity/Mat.java index 04b9923..fb27489 100644 --- a/src/main/java/com/zy/asrs/entity/Mat.java +++ b/src/main/java/com/zy/asrs/entity/Mat.java @@ -341,8 +341,8 @@ * 鐗╂枡绫诲瀷{1:鍗曞搧,2:楂橀,3:娣锋斁} */ @ApiModelProperty(value= "鐗╂枡绫诲瀷") - @TableField("man_type") - private Integer manType; + @TableField("mat_type") + private Integer matType; public Mat() {} @@ -565,11 +565,11 @@ } } - public String getManType$() { - if (this.manType == null) { + public String getMatType$() { + if (this.matType == null) { return ""; } - switch (this.manType) { + switch (this.matType) { case 1: return "鍗曞搧"; case 2: diff --git a/src/main/resources/mapper/MatMapper.xml b/src/main/resources/mapper/MatMapper.xml index 15a54c2..f710d44 100644 --- a/src/main/resources/mapper/MatMapper.xml +++ b/src/main/resources/mapper/MatMapper.xml @@ -48,7 +48,7 @@ <result column="store_min" property="storeMin" /> <result column="store_max_date" property="storeMaxDate" /> <result column="inout_everyday" property="inoutEveryday" /> - <result column="man_type" property="manType" /> + <result column="mat_type" property="matType" /> </resultMap> <select id="listByPage" resultMap="BaseResultMap"> diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js index bd063c5..1aa73c7 100644 --- a/src/main/webapp/static/js/common.js +++ b/src/main/webapp/static/js/common.js @@ -223,7 +223,7 @@ ,{field: 'storeMin$', align: 'center',title: '搴撳瓨涓嬮檺'} ,{field: 'storeMaxDate$', align: 'center',title: '搴撻緞涓婇檺(澶�)'} ,{field: 'inoutEveryday$', align: 'center',title: '楂橀', width: 60} - ,{field: 'manType$', align: 'center',title: '鐗╂枡绫诲瀷', width: 100} + ,{field: 'matType$', align: 'center',title: '鐗╂枡绫诲瀷', width: 100} ] -- Gitblit v1.9.1