From b9eee33b8d3f3adf57fd40a9ff225c6717d20158 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期五, 15 十二月 2023 14:27:17 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/LocInPrintMat.java | 4 ++--
src/main/java/com/zy/asrs/controller/MatController.java | 4 ++++
src/main/webapp/static/js/locInPrintMat/locInPrintMat.js | 8 ++++----
src/main/java/com/zy/asrs/controller/LocInPrintMatController.java | 2 ++
src/main/webapp/views/locInPrintMat/locInPrintMat.html | 16 +++++++++++++---
5 files changed, 25 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocInPrintMatController.java b/src/main/java/com/zy/asrs/controller/LocInPrintMatController.java
index 317fb38..ec0ecca 100644
--- a/src/main/java/com/zy/asrs/controller/LocInPrintMatController.java
+++ b/src/main/java/com/zy/asrs/controller/LocInPrintMatController.java
@@ -44,6 +44,8 @@
excludeTrash(param);
convert(param, wrapper);
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ wrapper.orderBy("status",true);
+ wrapper.orderBy("create_time",false);
return R.ok(locInPrintMatService.selectPage(new Page<>(curr, limit), wrapper));
}
diff --git a/src/main/java/com/zy/asrs/controller/MatController.java b/src/main/java/com/zy/asrs/controller/MatController.java
index 847dd64..b5d0607 100644
--- a/src/main/java/com/zy/asrs/controller/MatController.java
+++ b/src/main/java/com/zy/asrs/controller/MatController.java
@@ -290,6 +290,10 @@
print.setAnfme(locInPrintMat.getAnfme().toString());
print.setMemo(locInPrintMat.getMemo());
res.add(print);
+ locInPrintMat.setUpdateTime(new Date());
+ locInPrintMat.setUpdateBy(getUserId());
+ locInPrintMat.setStatus(2);
+ locInPrintMatService.updateById(locInPrintMat);
}
return R.ok().add(res);
}
diff --git a/src/main/java/com/zy/asrs/entity/LocInPrintMat.java b/src/main/java/com/zy/asrs/entity/LocInPrintMat.java
index d4815d1..07be576 100644
--- a/src/main/java/com/zy/asrs/entity/LocInPrintMat.java
+++ b/src/main/java/com/zy/asrs/entity/LocInPrintMat.java
@@ -133,8 +133,8 @@
this.uuid = now.toString();
this.createTime = now;
this.createBy = userId;
- this.updateTime = now;
- this.updateBy = userId;
+// this.updateTime = now;
+// this.updateBy = userId;
this.matnr = matnr;
this.batch = batch;
this.anfme = anfme;
diff --git a/src/main/webapp/static/js/locInPrintMat/locInPrintMat.js b/src/main/webapp/static/js/locInPrintMat/locInPrintMat.js
index e07f8a8..64a1890 100644
--- a/src/main/webapp/static/js/locInPrintMat/locInPrintMat.js
+++ b/src/main/webapp/static/js/locInPrintMat/locInPrintMat.js
@@ -30,10 +30,10 @@
,{field: 'anfme', align: 'center',title: '閲嶉噺(kg)', width:100,hide: false}
,{field: 'locNo', align: 'center',title: '搴撲綅鍙�', width:120,hide: false}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О',hide: false}
- ,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿',hide: true}
- ,{field: 'createBy$', align: 'center',title: '娣诲姞浜哄憳', width:100,hide: true}
- ,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿', width:120,hide: false}
- ,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳',hide: false}
+ ,{field: 'createTime$', align: 'center',title: '鍏ュ簱鏃堕棿', width:120,hide: false}
+ ,{field: 'createBy$', align: 'center',title: '鍏ュ簱浜哄憳', width:100,hide: false}
+ ,{field: 'updateTime$', align: 'center',title: '鎵撳嵃鏃堕棿', width:120,hide: false}
+ ,{field: 'updateBy$', align: 'center',title: '鎵撳嵃浜哄憳',hide: false}
,{field: 'memo', align: 'center',title: '澶囨敞',hide: false}
,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
diff --git a/src/main/webapp/views/locInPrintMat/locInPrintMat.html b/src/main/webapp/views/locInPrintMat/locInPrintMat.html
index 521b438..fbf9ac6 100644
--- a/src/main/webapp/views/locInPrintMat/locInPrintMat.html
+++ b/src/main/webapp/views/locInPrintMat/locInPrintMat.html
@@ -62,10 +62,20 @@
<div class="layui-card-body">
<div class="layui-form toolbar" id="search-box">
<div class="layui-form-item">
+<!-- <div class="layui-inline">-->
+<!-- <label class="layui-form-label">缂栧彿:</label>-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input class="layui-input" type="text" name="id" placeholder="缂栧彿" autocomplete="off">-->
+<!-- </div>-->
+<!-- </div>-->
<div class="layui-inline">
- <label class="layui-form-label">缂栧彿:</label>
- <div class="layui-input-inline">
- <input class="layui-input" type="text" name="id" placeholder="缂栧彿" autocomplete="off">
+ <label class="layui-form-label">鎵撳嵃鎯呭喌: </label>
+ <div class="layui-input-block">
+ <select name="status">
+ <option value="">璇烽�夋嫨鎵撳嵃鎯呭喌</option>
+ <option value="1">鏈墦鍗�</option>
+ <option value="2">宸叉墦鍗�</option>
+ </select>
</div>
</div>
<div class="layui-inline"> 
--
Gitblit v1.9.1