From 7dee324420d2559f2cb40fef1a8299a03625d46a Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 24 五月 2023 15:12:45 +0800
Subject: [PATCH] man_mat增加物料类型
---
src/main/resources/mapper/MatMapper.xml | 1 +
src/main/java/com/zy/asrs/entity/Mat.java | 22 ++++++++++++++++++++++
src/main/webapp/static/js/common.js | 1 +
3 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/Mat.java b/src/main/java/com/zy/asrs/entity/Mat.java
index 0e6d939..04b9923 100644
--- a/src/main/java/com/zy/asrs/entity/Mat.java
+++ b/src/main/java/com/zy/asrs/entity/Mat.java
@@ -337,6 +337,12 @@
@TableField("inout_everyday")
private Boolean inoutEveryday;
+ /**
+ * 鐗╂枡绫诲瀷{1:鍗曞搧,2:楂橀,3:娣锋斁}
+ */
+ @ApiModelProperty(value= "鐗╂枡绫诲瀷")
+ @TableField("man_type")
+ private Integer manType;
public Mat() {}
@@ -559,4 +565,20 @@
}
}
+ public String getManType$() {
+ if (this.manType == null) {
+ return "";
+ }
+ switch (this.manType) {
+ case 1:
+ return "鍗曞搧";
+ case 2:
+ return "楂橀";
+ case 3:
+ return "娣锋斁";
+ default:
+ return "";
+ }
+ }
+
}
diff --git a/src/main/resources/mapper/MatMapper.xml b/src/main/resources/mapper/MatMapper.xml
index 8f6125d..15a54c2 100644
--- a/src/main/resources/mapper/MatMapper.xml
+++ b/src/main/resources/mapper/MatMapper.xml
@@ -48,6 +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" />
</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 ff4c525..bd063c5 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -223,6 +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}
]
--
Gitblit v1.9.1