From b5d0bbde2cd8d77e781690a7b3e762a5ce7645ca Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期三, 02 六月 2021 14:43:23 +0800
Subject: [PATCH] pda新增小车组托入库功能
---
src/main/webapp/static/js/pakStore/pakStore.js | 188 ++++++++++++++++++++++++++++++++++++++++------
1 files changed, 161 insertions(+), 27 deletions(-)
diff --git a/src/main/webapp/static/js/pakStore/pakStore.js b/src/main/webapp/static/js/pakStore/pakStore.js
index d40dd18..8ba81be 100644
--- a/src/main/webapp/static/js/pakStore/pakStore.js
+++ b/src/main/webapp/static/js/pakStore/pakStore.js
@@ -1,16 +1,43 @@
-
var initCountVal = 0;
var matCodeData = [];
+
function getCol() {
var cols = [
- {fixed: 'left', field: 'count', title: '鏁伴噺(蹇呭～)', align: 'center', edit:'text', width: 120, style:'color: blue;font-weight: bold'}
+ {type: 'checkbox', fixed: 'left'},
+ {
+ fixed: 'left',
+ field: 'count',
+ title: '鏁伴噺(蹇呭～)',
+ align: 'center',
+ edit: 'text',
+ width: 120,
+ style: 'color: blue;font-weight: bold'
+ }
];
- cols.push.apply(cols, matCols);
- cols.push({fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:80})
+ var matColsSelf = [
+ {field: 'str5', align: 'center',title: '鐢熶骇鍗曞彿', edit: 'text'}
+ ,{field: 'matNo', align: 'center',title: '鐗╂枡缂栫爜'}
+ ,{field: 'barcode', align: 'center',title: '鏉″舰鐮�', hide: true}
+ ,{field: 'matName', align: 'center',title: '鐗╂枡鍚嶇О', width: 500}
+ ,{field: 'str2', align: 'center',title: '鐗╂枡绫诲埆'}
+ ,{field: 'str3', align: 'center',title: '瑙勬牸鍨嬪彿'}
+ ,{field: 'str1', align: 'center',title: '鍩烘湰鍗曚綅', hide: true}
+ ,{field: 'str4', align: 'center',title: '鐘舵��', hide: true}
+ ,{field: 'str6', align: 'center',title: '閫氱煡鍗曞彿', edit: 'text'}
+ ,{field: 'str7', align: 'center',title: '榛樿浠撳簱', hide: true}
+ ,{field: 'str17', align: 'center',title: '鍙噰璐�', hide: true}
+ ,{field: 'str18', align: 'center',title: '鍙负瀛愪欢', hide: true}
+ ,{field: 'str21', align: 'center',title: '鎴愭湰璁＄畻鏂规硶', hide: true}
+ ,{field: 'str22', align: 'center',title: '閲囪喘鍗曚綅', hide: true}
+ ,{field: 'str23', align: 'center',title: '閿�鍞崟浣�', hide: true}
+ ];
+ cols.push.apply(cols, matColsSelf);
+ cols.push({field: 'matStatus', title: '鐗╂枡鐘舵��', align: 'center', width: 120, templet: '#matStatus'});
+ cols.push({fixed: 'right', title: '鎿嶄綔', align: 'center', toolbar: '#operate', width: 80});
return cols;
}
-layui.use(['table','laydate', 'form'], function() {
+layui.use(['table', 'laydate', 'form'], function () {
var table = layui.table;
var $ = layui.jquery;
var layer = layui.layer;
@@ -35,14 +62,19 @@
// 椤甸潰淇敼
table.on('edit(chooseData)', function (obj) {
- updateMatCodeData(obj.data.matNo, Number(obj.value));
+ if (obj.field === 'count') {
+ updateMatCodeData(obj.data.matNo, Number(obj.value));
+ }
+ if (obj.field === 'str5' || obj.field === 'str6') {
+ updateMatCodeData2(obj.data.matnr, obj.value, obj.data.index, obj.field);
+ }
});
// 鐩戝惉澶村伐鍏锋爮浜嬩欢
table.on('toolbar(chooseData)', function (obj) {
var checkStatus = table.checkStatus(obj.config.id);
var data = checkStatus.data;
- switch(obj.event) {
+ switch (obj.event) {
case 'comb':
// 鍒ゆ柇鏄惁瀛樺湪鐗╂枡
if (matCodeData.length === 0) {
@@ -50,34 +82,43 @@
return;
}
// 鍒ゆ柇鐗╂枡鏁伴噺鏄惁瀛樺湪寮傚父
- for (var i=0;i<matCodeData.length;i++){
+ for (var i = 0; i < matCodeData.length; i++) {
if (isNaN(matCodeData[i].count)) {
layer.msg("璇疯緭鍏ユ暟瀛�");
return;
}
- if (matCodeData[i].count === 0){
+ if (matCodeData[i].count === 0) {
layer.msg("鏁伴噺涓嶈兘涓洪浂");
+ return;
+ }
+ if (matCodeData[i].str5 == null || matCodeData[i].str5 == '' || matCodeData[i].str5 == undefined) {
+ layer.msg("璇疯緭鍏ョ敓浜у崟鍙�");
return;
}
}
$.ajax({
- url: baseUrl+"/full/store/put/start",
+ url: baseUrl + "/full/store/put/start",
headers: {'token': localStorage.getItem('token')},
data: JSON.stringify({
devpNo: Number($('#putSiteSelect').val()),
list: matCodeData
}),
- contentType:'application/json;charset=UTF-8',
+ contentType: 'application/json;charset=UTF-8',
method: 'POST',
async: false,
success: function (res) {
- if (res.code === 200){
+ if (res.code === 200) {
layer.msg("鍏ュ簱鍚姩鎴愬姛锛岀洰鏍囧簱浣嶏細" + res.data);
matCodeData = [];
- tableIns.reload({data: matCodeData,done:function (res) { limit(); getInBound();}});
- } else if (res.code === 403){
- top.location.href = baseUrl+"/";
- }else {
+ tableIns.reload({
+ data: matCodeData, done: function (res) {
+ limit();
+ getInBound();
+ }
+ });
+ } else if (res.code === 403) {
+ top.location.href = baseUrl + "/";
+ } else {
layer.msg(res.msg)
}
}
@@ -87,7 +128,7 @@
});
// 鐩戝惉琛屽伐鍏蜂簨浠�
- table.on('tool(chooseData)', function(obj){
+ table.on('tool(chooseData)', function (obj) {
var data = obj.data;
switch (obj.event) {
case 'remove':
@@ -96,18 +137,20 @@
matCodeData.splice(i, 1);
}
}
- tableIns.reload({data: matCodeData,done:function (res) {
+ tableIns.reload({
+ data: matCodeData, done: function (res) {
limit();
getInBound();
// 瑕嗙洊render鏂规硶鐨刣one
- }});
+ }
+ });
break;
}
});
function setMatCodeData(data) {
matCodeData = data;
- for (var i=0;i<matCodeData.length;i++){
+ for (var i = 0; i < matCodeData.length; i++) {
matCodeData[i]["count"] = initCountVal;
}
}
@@ -117,8 +160,8 @@
layer.msg("璇疯緭鍏ユ暟瀛�");
} else {
if (count > 0) {
- for (var i=0;i<matCodeData.length;i++){
- if (matCodeData[i]["matNo"] === matNo){
+ for (var i = 0; i < matCodeData.length; i++) {
+ if (matCodeData[i]["matNo"] === matNo) {
matCodeData[i]["count"] = count;
}
}
@@ -127,11 +170,25 @@
}
}
- tableIns.reload({data: matCodeData,done:function (res) {
+ tableIns.reload({
+ data: matCodeData, done: function (res) {
limit();
getInBound();
// 瑕嗙洊render鏂规硶鐨刣one
- }});
+ }
+ });
+ }
+
+ function updateMatCodeData2(matnr, value, index, field) {
+ for (var i = 0; i < matCodeData.length; i++) {
+ if (matCodeData[i]["matnr"] === matnr && matCodeData[i]["index"] === index) {
+ matCodeData[i][field] = value;
+ }
+ }
+
+ tableIns.reload({
+ data: matCodeData,
+ });
}
// 鑾峰彇鍙敤鍏ュ簱绔欑偣
@@ -169,16 +226,16 @@
area: [top.detailWidth, top.detailHeight],
shadeClose: true,
content: 'matQuery.html',
- success: function(layero, index){
+ success: function (layero, index) {
}
});
}
// 娣诲姞琛ㄦ牸鏁版嵁
function addTableData(data) {
- for (var i=0;i<data.length;i++){
+ for (var i = 0; i < data.length; i++) {
let pass = false;
- for (var j=0;j<matCodeData.length;j++){
+ for (var j = 0; j < matCodeData.length; j++) {
if (data[i].matNo === matCodeData[j].matNo) {
pass = true;
break;
@@ -193,4 +250,81 @@
matCodeData.push.apply(matCodeData, data);
tableIns.reload({data: matCodeData});
layer.close(matCodeLayerIdx);
+}
+
+// 鎵撳紑鎵归噺淇敼鐗╂枡鐘舵�佸脊绐�
+var matStatusConfirm;
+function showMatStatus() {
+ var layer = layui.layer;
+ var table = layui.table;
+ // 鑾峰彇閫変腑琛�
+ var checkStatus = table.checkStatus('chooseData');
+ // 閫夋嫨琛屾暟鎹�
+ var checkData = checkStatus.data;
+ if (checkData.length == 0) {
+ layer.msg("璇烽�夋嫨鏁版嵁");
+ return;
+ }
+
+ matStatusConfirm = layer.open({
+ type: 2,
+ title: '閫夋嫨鐗╂枡鐘舵��',
+ area: ['300px', '175px'],
+ content: 'matStatus.html',
+ btn: ['纭畾'],
+ success: function (layero, index) {
+ // 鎴愬姛鎵撳紑寮圭獥
+ },
+ yes: function (index, layero) {
+ //do something
+ // 瀛愰〉闈�
+ var matStatus = layero.find('iframe')[0].contentDocument;
+ // 椤甸潰閫夋嫨鏁版嵁鐩戞帶
+ var forms = matStatus.forms;
+ var cho = forms[0][0].value;
+ // 鏇存柊琛ㄥ崟鏁版嵁
+ matCodeData.map(function (item) {
+ checkData.map(function (e) {
+ if (item.matNo === e.matNo) {
+ item.matStatus = cho;
+ }
+ });
+ });
+ // 琛ㄦ牸鏁版嵁閲嶈浇
+ tableIns.reload({data: matCodeData});
+ // 鍏抽棴寮圭獥
+ layer.close(index);
+ }
+ });
+}
+
+// 鍏抽棴鎵归噺淇敼鐗╂枡鐘舵�佸脊绐�
+function closeMatStatus() {
+ var layer = layui.layer;
+ layer.close(matStatusConfirm);
+}
+
+// 鎵归噺绉婚櫎
+function batchRemove() {
+ debugger
+ var layer = layui.layer;
+ var table = layui.table;
+ // 鑾峰彇閫変腑琛�
+ var checkStatus = table.checkStatus('chooseData');
+ // 閫夋嫨琛屾暟鎹�
+ var checkData = checkStatus.data;
+ if (checkData.length == 0) {
+ layer.msg("璇烽�夋嫨鏁版嵁");
+ return;
+ }
+ // 鏇存柊琛ㄥ崟鏁版嵁
+ for (var k = checkData.length-1; k >= 0; k--) {
+ for(var i = matCodeData.length-1; i >= 0; i--) {
+ if (matCodeData[i].matNo === checkData[k].matNo) {
+ matCodeData.splice(i, 1);
+ }
+ }
+ }
+ // 琛ㄦ牸鏁版嵁閲嶈浇
+ tableIns.reload({data: matCodeData});
}
\ No newline at end of file
--
Gitblit v1.9.1