From 6f7a815b2d6e4f30e7ccf901b24d5103aaa72078 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期一, 25 十二月 2023 10:23:08 +0800
Subject: [PATCH] Merge branch 'tzskasrs-1' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs-1
---
src/main/webapp/static/js/order/out.js | 48 +++++++++++++++++++++++++++++++++++++-----------
1 files changed, 37 insertions(+), 11 deletions(-)
diff --git a/src/main/webapp/static/js/order/out.js b/src/main/webapp/static/js/order/out.js
index a96fd48..677f08d 100644
--- a/src/main/webapp/static/js/order/out.js
+++ b/src/main/webapp/static/js/order/out.js
@@ -32,15 +32,17 @@
{type: 'checkbox'}
,{type: 'numbers', title: '#'}
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', templet: '#orderNoTpl', width: 160}
- ,{field: 'matnr', align: 'center',title: '鍗曟嵁鍙�', width: 160}
- ,{field: 'maktx', align: 'center',title: '鐗╂枡鍙�', width: 200}
+ ,{field: 'matnr', align: 'center',title: '鐗╂枡鍙�', width: 160}
+ ,{field: 'maktx', align: 'center',title: '鐗╂枡鍚嶇О', width: 200}
,{field: 'batch', align: 'center',title: '搴忓垪鐮�'}
,{field: 'specs', align: 'center',title: '瑙勬牸'}
// ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
// ,{field: 'qty', align: 'center',title: '浣滀笟鏁伴噺', style: 'font-weight: bold'}
,{field: 'enableQty', align: 'center',title: '寰呭嚭鏁伴噺', style: 'font-weight: bold'}
+ ,{field: 'threeCode', align: 'center',title: '閿�鍞鍗曞彿'}
+ ,{field: 'deadTime', align: 'center',title: '閿�鍞鍗曡鍙�'}
// ,{field: 'name', align: 'center',title: '鍚嶇О'}
- // ,{field: 'model', align: 'center',title: '鎵规'}
+ // ,{field: 'model', align: 'center',title: '閫氱敤鍨嬪彿'}
,{field: 'unit', align: 'center',title: '鍗曚綅', hide: true}
,{field: 'barcode', align: 'center',title: '鍟嗗搧鏉＄爜', hide: true}
// ,{field: 'supplier', align: 'center',title: '渚涘簲鍟�'}
@@ -143,6 +145,12 @@
}
function pakoutPreviewDialog(data) {
+ for(var i=0; i<data.length; i++){
+ if(!data[i].staNos){
+ data[i].staNos = data[i].agvStaNos;
+ data[i].staNo = data[i].agvStaNo;
+ }
+ }
var tableCache;
layer.open({
type: 1
@@ -170,10 +178,11 @@
{field: 'title', title: '鍟嗗搧', merge: true, align: 'center', width: 350},
{field: 'batch', title: '搴忓垪鐮�', align: 'center'},
{field: 'anfme', title: '鏁伴噺', align: 'center', width: 90, style: 'font-weight: bold'},
- {field: 'locNo', title: '璐т綅', align: 'center', width: 100, templet: '#locNoTpl'},
+ {field: 'locNo', title: '璐т綅', align: 'center', templet: '#locNoTpl'},
{field: 'staNos', align: 'center', title: '鍑哄簱绔�', merge: ['locNo'], templet: '#tbBasicTbStaNos'},
// {type: 'checkbox', merge: ['locNo']},
]],
+ //cols: getCol(data),
done: function (res) {
tableMerge.render(this);
$('.layui-table-body.layui-table-main').css("overflow", "auto");
@@ -186,7 +195,8 @@
let data = tableCache[index];
for (let i = 0; i<tableCache.length; i++) {
if (tableCache[i].locNo === data.locNo) {
- tableCache[i]['staNo'] = Number(obj.elem.value);
+ //tableCache[i]['staNo'] = Number(obj.elem.value);
+ tableCache[i]['staNo'] = obj.elem.value;
}
}
obj.othis.children().find("input").css("color", "blue");
@@ -231,7 +241,8 @@
// 纭
form.on('submit(staBatchSelectConfirm)', function (obj) {
let loadIdx = layer.load(2);
- let batchSta = Number(obj.field.batchSta);
+ //let batchSta = Number(obj.field.batchSta);
+ let batchSta = obj.field.batchSta;
let arr = [];
for (let i = 0; i<tableCache.length; i++) {
tableCache[i]['staNo'] = batchSta;
@@ -270,6 +281,13 @@
function pakout(tableCache, layerIndex) {
// let loadIndex = layer.load(2);
+ for(var i=0; i<tableCache.length; i++){
+ if(tableCache[i].agvStaNos){
+ tableCache[i].agvStaNo = tableCache[i].staNo;
+ tableCache[i].staNos = null;
+ tableCache[i].staNo = null;
+ }
+ }
notice.msg('姝ｅ湪鐢熸垚鍑哄簱浠诲姟......', {icon: 4});
$.ajax({
url: baseUrl + "/out/pakout/auth",
@@ -385,8 +403,8 @@
cellMinWidth: 100,
cols: [[
{type: 'checkbox'},
- {field: 'matnr', title: '鍗曟嵁鍙�', align: 'center', width: 350},
- {field: 'maktx', title: '鐗╂枡鍙�', align: 'center'},
+ {field: 'matnr', title: '鐗╂枡鍙�', align: 'center', width: 350},
+ {field: 'maktx', title: '鐗╂枡鍚嶇О', align: 'center'},
{field: 'specs', title: '瑙勬牸', align: 'center'},
{field: 'batch', title: '鎵瑰彿', align: 'center'},
{field: 'anfme', title: '鏁伴噺', align: 'center', width: 90, style: 'font-weight: bold'},
@@ -439,6 +457,12 @@
}
function pakoutPreviewMergeDialog(data) {
+ for(var i=0; i<data.length; i++){
+ if(!data[i].staNos){
+ data[i].staNos = data[i].agvStaNos;
+ data[i].staNo = data[i].agvStaNo;
+ }
+ }
var mergeTabCache;
layer.open({
type: 1
@@ -466,7 +490,7 @@
{field: 'specs', title: '瑙勬牸', align: 'center'},
{field: 'batch', title: '搴忓垪鐮�', align: 'center'},
{field: 'anfme', title: '鏁伴噺', align: 'center', width: 90, style: 'font-weight: bold'},
- {field: 'locNo', title: '璐т綅', align: 'center', width: 100, templet: '#locNoTpl'},
+ {field: 'locNo', title: '璐т綅', align: 'center', templet: '#locNoTpl'},
{field: 'staNos', align: 'center', title: '鍑哄簱绔�', merge: ['locNo'], templet: '#tbBasicTbStaNos'},
// {type: 'checkbox', merge: ['locNo']},
]],
@@ -482,7 +506,8 @@
let data = mergeTabCache[index];
for (let i = 0; i<mergeTabCache.length; i++) {
if (mergeTabCache[i].locNo === data.locNo) {
- mergeTabCache[i]['staNo'] = Number(obj.elem.value);
+ //mergeTabCache[i]['staNo'] = Number(obj.elem.value);
+ mergeTabCache[i]['staNo'] = obj.elem.value;
}
}
obj.othis.children().find("input").css("color", "blue");
@@ -527,7 +552,8 @@
// 纭
form.on('submit(staBatchSelectConfirm)', function (obj) {
let loadIdx = layer.load(2);
- let batchSta = Number(obj.field.batchSta);
+ //let batchSta = Number(obj.field.batchSta);
+ let batchSta = obj.field.batchSta;
let arr = [];
for (let i = 0; i<mergeTabCache.length; i++) {
mergeTabCache[i]['staNo'] = batchSta;
--
Gitblit v1.9.1