From 4586c8cc13cb147caa01b1cd8c3fa6afea8d5cc0 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 11 八月 2021 10:10:28 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/manager/controller/PakinController.java | 4 +++-
src/main/webapp/static/js/pakin/pakin.js | 6 +++---
src/main/java/zy/cloud/wms/manager/controller/OpenController.java | 2 +-
src/main/java/zy/cloud/wms/common/model/param/ReplenishDto.java | 2 ++
src/main/webapp/views/pakin/pakin.html | 12 +++++++++++-
5 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/common/model/param/ReplenishDto.java b/src/main/java/zy/cloud/wms/common/model/param/ReplenishDto.java
index 8d6b436..9857b3a 100644
--- a/src/main/java/zy/cloud/wms/common/model/param/ReplenishDto.java
+++ b/src/main/java/zy/cloud/wms/common/model/param/ReplenishDto.java
@@ -12,4 +12,6 @@
private Double count;
+ private Integer workNo;
+
}
diff --git a/src/main/java/zy/cloud/wms/manager/controller/OpenController.java b/src/main/java/zy/cloud/wms/manager/controller/OpenController.java
index 2aebcd8..9162971 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/OpenController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/OpenController.java
@@ -145,7 +145,7 @@
now, // 娣诲姞鏃堕棿
9527L, // 淇敼浜哄憳
now, // 淇敼鏃堕棿
- "琛ヤ粨鍏ュ簱" // 澶囨敞
+ "琛ヤ粨鍏ュ簱[绔嬪簱璧勬枡锛�" + param.getWorkNo() + "]" // 澶囨敞
);
VersionUtils.setPakin(pakin, mat);
if (!pakinService.insert(pakin)) {
diff --git a/src/main/java/zy/cloud/wms/manager/controller/PakinController.java b/src/main/java/zy/cloud/wms/manager/controller/PakinController.java
index 9a7dd21..832003a 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/PakinController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/PakinController.java
@@ -43,7 +43,9 @@
EntityWrapper<Pakin> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} else {
+ wrapper.orderBy("update_time", false);
+ }
return R.ok(pakinService.selectPage(new Page<>(curr, limit), wrapper));
}
diff --git a/src/main/webapp/static/js/pakin/pakin.js b/src/main/webapp/static/js/pakin/pakin.js
index 4c571c4..e6adeb6 100644
--- a/src/main/webapp/static/js/pakin/pakin.js
+++ b/src/main/webapp/static/js/pakin/pakin.js
@@ -24,7 +24,7 @@
,{field: 'wrkNo', align: 'center',title: '浠诲姟鍙�'}
// ,{field: 'wrkSts$', align: 'center',title: '宸ヤ綔鐘舵��',event: 'wrkSts', style: 'cursor:pointer'}
// ,{field: 'zpallet', align: 'center',title: '鎵樼洏鍙�'}
- ,{field: 'anfme', align: 'center',title: '鍑哄簱鏁伴噺'}
+ ,{field: 'anfme', align: 'center',title: '鍏ュ簱鏁伴噺'}
,{field: 'nodeId', align: 'center',title: '鍏宠仈璐т綅', hide: true}
,{field: 'locNo', align: 'center',title: '璐т綅'}
,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栫爜'}
@@ -45,10 +45,10 @@
// ,{field: 'createBy$', align: 'center',title: '娣诲姞浜哄憳',event: 'createBy', style: 'cursor:pointer'}
// ,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿'}
// ,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳'}
- ,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿'}
+ ,{field: 'updateTime$', align: 'center',title: '鍏ュ簱鏃堕棿'}
,{field: 'memo', align: 'center',title: '澶囨敞', hide: false}
- ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:150}
+ // ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:150}
]],
request: {
pageName: 'curr',
diff --git a/src/main/webapp/views/pakin/pakin.html b/src/main/webapp/views/pakin/pakin.html
index 6987499..5f0227a 100644
--- a/src/main/webapp/views/pakin/pakin.html
+++ b/src/main/webapp/views/pakin/pakin.html
@@ -18,7 +18,7 @@
<div class="layui-inline">
<div class="layui-input-inline cool-auto-complete">
<input id="nodeId" class="layui-input" name="node_id" type="text" placeholder="璇疯緭鍏�" autocomplete="off" style="display: none">
- <input id="nodeId$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="鐩樼偣璐т綅" onfocus=this.blur()>
+ <input id="nodeId$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璐т綅" onfocus=this.blur()>
<div class="cool-auto-complete-window">
<input class="cool-auto-complete-window-input" data-key="nodeQueryBynodeId" onkeyup="autoLoad(this.getAttribute('data-key'))">
<select class="cool-auto-complete-window-select" data-key="nodeQueryBynodeIdSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
@@ -31,6 +31,16 @@
<input class="layui-input" type="text" name="matnr" placeholder="鍟嗗搧缂栫爜" autocomplete="off">
</div>
</div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="memo" placeholder="澶囨敞" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline" style="width: 300px">
+ <div class="layui-input-inline">
+ <input class="layui-input layui-laydate-range" name="update_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
+ </div>
+ </div>
<!-- 寰呮坊鍔� -->
<div id="data-search-btn" class="layui-btn-container layui-form-item">
<button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">鎼滅储</button>
--
Gitblit v1.9.1