From 8d5c70aef9cbacbcc412d73c4b730e21f94e6514 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 30 六月 2025 09:04:10 +0800
Subject: [PATCH] 1
---
src/main/webapp/static/wms/js/wrkMast/wrkMast.js | 47 +++++++++++++++++++++++++++--------------------
1 files changed, 27 insertions(+), 20 deletions(-)
diff --git a/src/main/webapp/static/wms/js/wrkMast/wrkMast.js b/src/main/webapp/static/wms/js/wrkMast/wrkMast.js
index 7e4e1e6..7ebc08a 100644
--- a/src/main/webapp/static/wms/js/wrkMast/wrkMast.js
+++ b/src/main/webapp/static/wms/js/wrkMast/wrkMast.js
@@ -1,5 +1,7 @@
var pageCurr;
var wrkNo;
+var wmsWrkNo;
+var ioTime;
layui.config({
base: baseUrl + "/static/wms/layui/lay/modules/"
}).extend({
@@ -12,12 +14,13 @@
var form = layui.form;
$('#wrkNo').val(parent.wrkNo);
+ $('#wmsWrkNo').val(parent.wmsWrkNo);
// 鏁版嵁娓叉煋
tableIns = table.render({
elem: '#wrkMast',
headers: {token: localStorage.getItem('token')},
url: baseUrl + '/wrkMast/list/auth',
- where: {wrk_no: parent.wrkNo},
+ where: {wrk_no: parent.wrkNo, wms_wrk_no: parent.wmsWrkNo},
page: true,
limit: 16,
limits: [16, 30, 50, 100, 200, 500],
@@ -26,16 +29,18 @@
cellMinWidth: 50,
cols: [[
{type: 'checkbox'}
- , {field: 'wrkNo', align: 'center', title: '宸ヤ綔鍙�', sort: true, width: 85}
- , {field: 'ioTime$', align: 'center', title: '宸ヤ綔鏃堕棿', sort: true, width: 160}
- , {field: 'wrkSts$', align: 'center', title: '宸ヤ綔鐘舵��'}
- , {field: 'ioType$', align: 'center', title: '鍏ュ嚭搴撶被鍨�'}
+ , {field: 'wmsWrkNo', align: 'center', title: 'WMS浠诲姟鍙�', sort: true, width: 120}
+ , {field: 'wrkNo', align: 'center', title: '浠诲姟鍙�', sort: true, width: 120}
+ , {field: 'ioTime$', align: 'center', title: '浠诲姟鏃堕棿', sort: true, width: 160}
+ , {field: 'durationTime', align: 'center', title: '鎸佺画鏃堕暱', width: 160}
+ , {field: 'wrkSts$', align: 'center', title: '浠诲姟鐘舵��'}
+ , {field: 'ioType$', align: 'center', title: '浠诲姟绫诲瀷'}
, {field: 'ioPri', align: 'center', title: '浼樺厛绾�'}
, {field: 'crnNo$', align: 'center', title: '鍫嗗灈鏈�'}
, {field: 'sourceStaNo$', align: 'center', title: '婧愮珯'}
, {field: 'staNo$', align: 'center', title: '鐩爣绔�'}
- , {field: 'sourceLocNo$', align: 'center', title: '婧愬簱浣�'}
- , {field: 'locNo$', align: 'center', title: '鐩爣搴撲綅'}
+ , {field: 'sourceLocNo$', align: 'center', title: '璧峰鐐�'}
+ , {field: 'locNo$', align: 'center', title: '鐩爣鐐�'}
, {field: 'barcode', align: 'center', title: '鏉＄爜'}
, {field: 'preHave', align: 'center', title: '鍏堝叆鍝�', hide: true}
, {field: 'takeNone', align: 'center', title: '绌烘搷浣�', hide: true}
@@ -72,7 +77,7 @@
// return html;
// }}
- , {fixed: 'right', title: '鎿嶄綔', align: 'left', toolbar: '#operate', width: 120}
+ , {fixed: 'right', title: '鎿嶄綔', align: 'center', toolbar: '#operate', width: 110}
]],
request: {
pageName: 'curr',
@@ -93,7 +98,7 @@
if (res.code === 403) {
top.location.href = baseUrl + "/";
}
- $(".layui-table-body, .layui-table-box, .layui-table-cell").css('overflow','visible');//瑙ｅ喅layui鏁版嵁琛ㄦ牸涓祵濂椾笅鎷夋鏄剧ず闂
+ $(".layui-table-body, .layui-table-box, .layui-table-cell").css('overflow', 'visible');//瑙ｅ喅layui鏁版嵁琛ㄦ牸涓祵濂椾笅鎷夋鏄剧ず闂
pageCurr = curr;
limit();
form.on('checkbox(tableCheckbox)', function (data) {
@@ -285,12 +290,13 @@
// 鏄庣粏灞曠ず
case 'detlShow':
wrkNo = data.wrkNo;
+ ioTime = data.ioTime;
// 琛ㄦ牸涓嬫柟鏄剧ず
// locDetl(data.wrkNo);
// 寮瑰眰鏄剧ず
layer.open({
type: 2,
- title: '宸ヤ綔妗ｆ槑缁�',
+ title: '浠诲姟妗ｆ槑缁�',
maxmin: true,
area: [top.detailWidth, top.detailHeight],
shadeClose: true,
@@ -301,7 +307,7 @@
break;
// 瀹屾垚
case 'complete':
- layer.confirm('纭瀹屾垚璇ョ瑪宸ヤ綔妗ｏ紵', {title: '宸ヤ綔鍙凤細' + data.wrkNo, shadeClose: true}, function () {
+ layer.confirm('纭瀹屾垚璇ョ瑪浠诲姟妗ｏ紵', {title: '浠诲姟鍙凤細' + data.wrkNo, shadeClose: true}, function () {
http.post(baseUrl + "/hand/control/wrkMast", {workNo: data.wrkNo, type: 1}, function (res) {
$(".layui-laypage-btn")[0].click();
layer.msg(data.wrkNo + res.msg);
@@ -314,7 +320,7 @@
case 'cancel':
if (data.pdcType === "Y") {
layer.confirm('褰撳墠浠诲姟鍏宠仈ERP閿�鍞崟锛屽彇娑堝皢閲嶆柊鐢熸垚鍑哄簱浣滀笟锛屾槸鍚︾户缁紵', {
- title: '宸ヤ綔鍙凤細' + data.wrkNo,
+ title: '浠诲姟鍙凤細' + data.wrkNo,
shadeClose: true
}, function () {
http.post(baseUrl + "/hand/control/wrkMast", {workNo: data.wrkNo, type: 2}, function (res) {
@@ -324,8 +330,8 @@
layer.closeAll();
});
} else {
- layer.confirm('纭鍙栨秷璇ョ瑪宸ヤ綔妗ｏ紵', {
- title: '宸ヤ綔鍙凤細' + data.wrkNo,
+ layer.confirm('纭鍙栨秷璇ョ瑪浠诲姟妗ｏ紵', {
+ title: '浠诲姟鍙凤細' + data.wrkNo,
shadeClose: true
}, function () {
http.post(baseUrl + "/hand/control/wrkMast", {workNo: data.wrkNo, type: 2}, function (res) {
@@ -338,7 +344,7 @@
break;
// 鎷ｆ枡鍏ュ簱
case 'pick':
- layer.confirm('鎷ｆ枡鍏ュ簱璇ョ瑪宸ヤ綔妗ｏ紵', {title: '宸ヤ綔鍙凤細' + data.wrkNo, shadeClose: true}, function () {
+ layer.confirm('鎷ｆ枡鍏ュ簱璇ョ瑪浠诲姟妗ｏ紵', {title: '浠诲姟鍙凤細' + data.wrkNo, shadeClose: true}, function () {
http.post(baseUrl + "/hand/control/wrkMast", {workNo: data.wrkNo, type: 3}, function (res) {
$(".layui-laypage-btn")[0].click();
layer.msg(data.wrkNo + res.msg);
@@ -349,7 +355,7 @@
// 鍏堝叆鍝�
case 'preHave':
layer.confirm('浠诲姟鍙戠敓鍏堝叆鍝佸紓甯搞�傚闇�閲嶆柊鍏ュ簱锛岃纭繚璐х墿宸叉斁鑷冲爢鍨涙満鍑哄簱绔欙紒', {
- title: '宸ヤ綔鍙凤細' + data.wrkNo,
+ title: '浠诲姟鍙凤細' + data.wrkNo,
shadeClose: true
}, function () {
http.post(baseUrl + "/deal/preHave/start", {wrkNo: data.wrkNo}, function (res) {
@@ -362,7 +368,7 @@
// 绌烘搷浣�
case 'takeNone':
layer.confirm('浠诲姟鍙戦�佺┖鎿嶄綔寮傚父锛佹槸鍚︺�傘�傘�傘�傘�傘�傘�傘�傦紵', {
- title: '宸ヤ綔鍙凤細' + data.wrkNo,
+ title: '浠诲姟鍙凤細' + data.wrkNo,
shadeClose: true
}, function () {
});
@@ -399,6 +405,7 @@
break;
case 'commandShow'://鏌ョ湅鎸囦护
wrkNo = data.wrkNo;
+ wmsWrkNo = data.wmsWrkNo;
layer.open({
type: 2,
title: 'WMS浠诲姟鎸囦护',
@@ -406,7 +413,7 @@
area: [top.detailWidth, top.detailHeight],
shadeClose: true,
content: '../commandManage/commandManage.html',
- success: function(layero, index){
+ success: function (layero, index) {
}
});
break;
@@ -611,8 +618,8 @@
cellMinWidth: 50,
cols: [[
{type: 'checkbox'}
- , {field: 'wrkNo', align: 'center', title: '宸ヤ綔鍙�'}
- , {field: 'ioTime$', align: 'center', title: '宸ヤ綔鏃堕棿'}
+ , {field: 'wrkNo', align: 'center', title: '浠诲姟鍙�'}
+ , {field: 'ioTime$', align: 'center', title: '浠诲姟鏃堕棿'}
, {field: 'matnr', align: 'center', title: '鐗╂枡'}
, {field: 'lgnum', align: 'center', title: '浠撳簱鍙�'}
, {field: 'tbnum', align: 'center', title: '杞偍璇锋眰缂栧彿'}
--
Gitblit v1.9.1