From 6599114495a190322f93b65e4124c31d50953a12 Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期三, 26 十月 2022 10:57:53 +0800
Subject: [PATCH] #
---
src/main/resources/mapper/MatMapper.xml | 4 +
src/main/webapp/views/mat/mat.html | 27 ++++++++++++-
src/main/java/com/zy/asrs/entity/Mat.java | 34 +++++++++++++++++
src/main/webapp/static/js/common.js | 3 +
4 files changed, 64 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/Mat.java b/src/main/java/com/zy/asrs/entity/Mat.java
index bb98001..95beb7b 100644
--- a/src/main/java/com/zy/asrs/entity/Mat.java
+++ b/src/main/java/com/zy/asrs/entity/Mat.java
@@ -306,6 +306,16 @@
@ExcelProperty(value = "澶囨敞")
private String memo;
+ @TableField("store_max")
+ private Double storeMax;
+
+ @TableField("store_min")
+ private Double storeMin;
+
+ @TableField("store_max_date")
+ private Integer storeMaxDate;
+
+
public Mat() {}
public Mat(String uuid,Long tagId,String matnr,String maktx,String name,String specs,String model,String color,String brand,String unit,Double price,String sku,Double units,String barcode,String origin,String manu,String manuDate,String itemNum,Double safeQty,Double weight,Double length,Double volume,String threeCode,String supp,String suppCode,Integer beBatch,String deadTime,Integer deadWarn,Integer source,Integer inspect,Integer danger,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
@@ -492,4 +502,28 @@
}
+ public String getStoreMax$(){
+ if (Cools.isEmpty(this.storeMax)) {
+ return "鏈缃�";
+ }else {
+ return this.storeMax + "";
+ }
+ }
+
+ public String getStoreMin$(){
+ if (Cools.isEmpty(this.storeMin)) {
+ return "鏈缃�";
+ }else {
+ return this.storeMin + "";
+ }
+ }
+
+ public String getStoreMaxDate$(){
+ if (Cools.isEmpty(this.storeMaxDate)) {
+ return "鏈缃�";
+ }else {
+ return this.storeMaxDate + "澶�";
+ }
+ }
+
}
diff --git a/src/main/resources/mapper/MatMapper.xml b/src/main/resources/mapper/MatMapper.xml
index 0a13399..04a0a12 100644
--- a/src/main/resources/mapper/MatMapper.xml
+++ b/src/main/resources/mapper/MatMapper.xml
@@ -42,8 +42,10 @@
<result column="update_by" property="updateBy" />
<result column="update_time" property="updateTime" />
<result column="memo" property="memo" />
-
<result column="stock" property="stock" />
+ <result column="store_max" property="storeMax" />
+ <result column="store_min" property="storeMin" />
+ <result column="store_max_date" property="storeMaxDate" />
</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 fd981ae..ea4a044 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -219,6 +219,9 @@
,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳', hide: true}
,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿', hide: true}
,{field: 'memo', align: 'center',title: '澶囨敞', hide: true}
+ ,{field: 'storeMax$', align: 'center',title: '搴撳瓨涓婇檺'}
+ ,{field: 'storeMin$', align: 'center',title: '搴撳瓨涓嬮檺'}
+ ,{field: 'storeMaxDate$', align: 'center',title: '鏈�澶ф粸鐣欐椂闂�'}
]
var detlCols = [
diff --git a/src/main/webapp/views/mat/mat.html b/src/main/webapp/views/mat/mat.html
index 5c45008..88b9e2e 100644
--- a/src/main/webapp/views/mat/mat.html
+++ b/src/main/webapp/views/mat/mat.html
@@ -197,13 +197,19 @@
<input name="maktx" placeholder="璇疯緭鍏ュ晢鍝佸悕绉�" class="layui-input" lay-vertype="tips" lay-verify="required" required="">
</div>
</div>
-
<div class="layui-form-item">
- <label class="layui-form-label">澶囨敞</label>
+ <label class="layui-form-label">搴撳瓨涓婇檺</label>
<div class="layui-input-block">
- <input name="memo" placeholder="璇疯緭鍏ュ娉�" class="layui-input">
+ <input name="storeMax" placeholder="搴撳瓨涓婇檺" type="number" class="layui-input">
</div>
</div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">婊炵暀鏃堕棿</label>
+ <div class="layui-input-block">
+ <input name="storeMaxDate" placeholder="鏈�澶ф粸鐣欐椂闂�(澶�)" type="number" class="layui-input">
+ </div>
+ </div>
+
</div>
@@ -222,6 +228,21 @@
</div>
</div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">搴撳瓨涓嬮檺</label>
+ <div class="layui-input-block">
+ <input name="storeMin" placeholder="搴撳瓨涓嬬嚎" type="number" class="layui-input">
+ </div>
+ </div>
+
+
+ <div class="layui-form-item">
+ <label class="layui-form-label">澶囨敞</label>
+ <div class="layui-input-block">
+ <input name="memo" placeholder="璇疯緭鍏ュ娉�" class="layui-input">
+ </div>
+ </div>
+
</div>
</div>
<hr class="layui-bg-gray">
--
Gitblit v1.9.1