From 86729230fe82c9387898264cf21df9af4b2f0a2d Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 05 十月 2023 16:17:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzskasrs' into tzskasrs
---
src/main/webapp/static/js/agvPakStore/locCheckOut.js | 2 ++
src/main/webapp/views/agvWaitPakin/waitPakin.html | 2 +-
src/main/webapp/views/agvWaitPakinLog/waitPakinLog.html | 7 ++++++-
src/main/webapp/static/js/agvPakStore/locMove.js | 2 ++
src/main/webapp/views/agvLocDetl/locDetl.html | 2 +-
src/main/webapp/views/agvWrkMast/wrkMast.html | 5 +++++
src/main/webapp/views/agvPakStore/locDetlCheckQuery.html | 2 ++
7 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/src/main/webapp/static/js/agvPakStore/locCheckOut.js b/src/main/webapp/static/js/agvPakStore/locCheckOut.js
index 0f5d610..ecdc2cc 100644
--- a/src/main/webapp/static/js/agvPakStore/locCheckOut.js
+++ b/src/main/webapp/static/js/agvPakStore/locCheckOut.js
@@ -5,7 +5,9 @@
function getCol() {
var cols = [
{field: 'locNo', align: 'center',title: '搴撲綅鍙�', merge: true, style: 'font-weight: bold'}
+ ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
];
+ arrRemove(detlCols, 'field', 'zpallet');
cols.push.apply(cols, detlCols);
return cols;
}
diff --git a/src/main/webapp/static/js/agvPakStore/locMove.js b/src/main/webapp/static/js/agvPakStore/locMove.js
index 0f2a120..4934797 100644
--- a/src/main/webapp/static/js/agvPakStore/locMove.js
+++ b/src/main/webapp/static/js/agvPakStore/locMove.js
@@ -3,7 +3,9 @@
function getCol() {
var cols = [
{field: 'locNo', align: 'center',title: '搴撲綅鍙�', merge: true, style: 'font-weight: bold'}
+ ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
];
+ arrRemove(detlCols, 'field', 'zpallet');
cols.push.apply(cols, detlCols);
return cols;
}
diff --git a/src/main/webapp/views/agvLocDetl/locDetl.html b/src/main/webapp/views/agvLocDetl/locDetl.html
index b07c1a0..cd1e631 100644
--- a/src/main/webapp/views/agvLocDetl/locDetl.html
+++ b/src/main/webapp/views/agvLocDetl/locDetl.html
@@ -21,7 +21,7 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="zpallet" placeholder="鎵樼洏鐮�" autocomplete="off">
+ <input class="layui-input" type="text" name="supp_code" placeholder="鏂欑鐮�" autocomplete="off">
</div>
</div>
<div class="layui-inline">
diff --git a/src/main/webapp/views/agvPakStore/locDetlCheckQuery.html b/src/main/webapp/views/agvPakStore/locDetlCheckQuery.html
index faf54f8..b4a0680 100644
--- a/src/main/webapp/views/agvPakStore/locDetlCheckQuery.html
+++ b/src/main/webapp/views/agvPakStore/locDetlCheckQuery.html
@@ -98,7 +98,9 @@
let cols = [
{type: 'checkbox', merge: ['locNo']}
,{field: 'locNo', align: 'center',title: '搴撲綅鍙�', merge: true, width:150, style: 'font-weight: bold'}
+ ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
];
+ arrRemove(detlCols, 'field', 'zpallet');
cols.push.apply(cols, detlCols);
cols.push({field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide: true}
,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿'})
diff --git a/src/main/webapp/views/agvWaitPakin/waitPakin.html b/src/main/webapp/views/agvWaitPakin/waitPakin.html
index 124835e..aa22117 100644
--- a/src/main/webapp/views/agvWaitPakin/waitPakin.html
+++ b/src/main/webapp/views/agvWaitPakin/waitPakin.html
@@ -16,7 +16,7 @@
<div id="search-box" class="layui-form layui-card-header">
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="zpallet" placeholder="鎵樼洏鏉＄爜" autocomplete="off">
+ <input class="layui-input" type="text" name="supp_code" placeholder="鏂欑鐮�" autocomplete="off">
</div>
</div>
<div class="layui-inline">
diff --git a/src/main/webapp/views/agvWaitPakinLog/waitPakinLog.html b/src/main/webapp/views/agvWaitPakinLog/waitPakinLog.html
index 21ceea9..178bb52 100644
--- a/src/main/webapp/views/agvWaitPakinLog/waitPakinLog.html
+++ b/src/main/webapp/views/agvWaitPakinLog/waitPakinLog.html
@@ -16,7 +16,12 @@
<div id="search-box" class="layui-form layui-card-header">
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="pakin_id" placeholder="鍏ュ簱閫氱煡鍙�" autocomplete="off">
+ <input class="layui-input" type="text" name="supp_code" placeholder="鏂欑鐮�" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="matnr" placeholder="鐗╂枡鐮�" autocomplete="off">
</div>
</div>
<!-- 鏃ユ湡鑼冨洿 -->
diff --git a/src/main/webapp/views/agvWrkMast/wrkMast.html b/src/main/webapp/views/agvWrkMast/wrkMast.html
index fb8f6ca..2af8353 100644
--- a/src/main/webapp/views/agvWrkMast/wrkMast.html
+++ b/src/main/webapp/views/agvWrkMast/wrkMast.html
@@ -58,6 +58,11 @@
</div>
</div>
<div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="supp_code" placeholder="鏂欑鐮�" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
<div class="layui-input-inline cool-auto-complete">
<input id="wrkSts" class="layui-input" name="wrk_sts" type="text" placeholder="璇疯緭鍏�" autocomplete="off" style="display: none">
<input id="wrkSts$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="宸ヤ綔鐘舵��" onfocus=this.blur()>
--
Gitblit v1.9.1