From b7e08df5a07b3fa832a46ecc31983e16f2bccc8c Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期一, 24 七月 2023 14:56:01 +0800
Subject: [PATCH] # 出库作业，和库存明细管理 排序
---
src/main/webapp/static/js/pakStore/stockAdjust.js | 108 +++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 95 insertions(+), 13 deletions(-)
diff --git a/src/main/webapp/static/js/pakStore/stockAdjust.js b/src/main/webapp/static/js/pakStore/stockAdjust.js
index 970f9d8..e81a6e6 100644
--- a/src/main/webapp/static/js/pakStore/stockAdjust.js
+++ b/src/main/webapp/static/js/pakStore/stockAdjust.js
@@ -3,13 +3,25 @@
var matCodeData = [];
var currLocNo;
function getCol() {
+ arrRemove(detlCols, "field", "str3");
+ arrRemove(detlCols, "field", "str4")
+ arrRemove(detlCols, "field", "str5$")
+ arrRemove(detlCols, "field", "str6")
var cols = [
- {fixed: 'left', field: 'count', title: '瀹為檯鏁伴噺', align: 'center', edit:'text', width: 120, style:'color: blue;font-weight: bold'}
- ,{field: 'qty', align: 'center',title: '鏁伴噺'}
+ {fixed: 'left', field: 'count', title: '瀹為檯鏁伴噺', align: 'center', edit:'text', width: 120, style:'color: blue;font-weight: bold'},
+ {field: 'supplier', title: '鎵瑰彿', align: 'center', width: 120},
+ {field: 'source', title: '鏉ユ簮', align: 'center', edit:'text', width: 120},
+ {field: 'vendor', title: '渚涘簲鍟�', align: 'center', edit:'text', width: 120}
+ ,{field: 'str3', align: 'center',title: '瀹㈡埛鍚嶇О'}
+ ,{field: 'str4', align: 'center',title: '椤圭洰淇℃伅'}
+ ,{field: 'str5$', align: 'center',title: '绫诲埆'}
+ // {field: 'allqty', title: '鎬绘暟閲�', align: 'center'},
+ // {field: 'allweight', title: '鎬婚噸閲�', align: 'center'}
+ // ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
];
- arrRemove(detlCols, "field", "qty")
+ arrRemove(detlCols, "field", "anfme")
cols.push.apply(cols, detlCols);
- cols.push({fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:80})
+ cols.push({fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120})
return cols;
}
@@ -35,7 +47,34 @@
// 椤甸潰淇敼
table.on('edit(chooseData)', function (obj) {
- updateMatCodeData(obj.data.matNo, Number(obj.value));
+ if(obj.field === 'count'){
+ updateMatCodeData(obj.data.matNo,obj.data.supplier, Number(obj.value));
+ }
+
+ if (obj.field === 'supplier'){
+ for (var i=0;i<matCodeData.length;i++){
+ if (matCodeData[i]["matNo"] === obj.data.matNo && matCodeData[i]["count"] === obj.data.count && matCodeData[i]["qty"] === obj.data.qty){
+ matCodeData[i]["supplier"] = obj.data.supplier;
+ }
+ }
+ }
+ if (obj.field === 'source'){
+ for (var i=0;i<matCodeData.length;i++){
+ if (matCodeData[i]["matNo"] === obj.data.matNo && matCodeData[i]["supplier"] === obj.data.supplier){
+ matCodeData[i]["source"] = obj.data.source;
+ }
+ }
+ }
+ if (obj.field === 'vendor'){
+ for (var i=0;i<matCodeData.length;i++){
+ if (matCodeData[i]["matNo"] === obj.data.matNo && matCodeData[i]["supplier"] === obj.data.supplier){
+ matCodeData[i]["vendor"] = obj.data.vendor;
+ }
+ }
+ }
+ tableIns.reload({data: matCodeData,done:function (res) {
+ limit();
+ }});
});
// 鐩戝惉澶村伐鍏锋爮浜嬩欢
@@ -51,7 +90,9 @@
layer.msg("璇峰厛娣诲姞浜у搧");
return;
}
+ // debugger
for (var i=0;i<matCodeData.length;i++){
+
if (isNaN(matCodeData[i].count)) {
layer.msg("璇疯緭鍏ユ暟瀛�");
return;
@@ -67,7 +108,8 @@
headers: {'token': localStorage.getItem('token')},
data: JSON.stringify({
locNo: currLocNo,
- list: matCodeData
+ list: matCodeData,
+ zpallet:zpa
}),
contentType:'application/json;charset=UTF-8',
method: 'POST',
@@ -90,15 +132,45 @@
// 鐩戝惉琛屽伐鍏蜂簨浠�
table.on('tool(chooseData)', function(obj){
+
var data = obj.data;
switch (obj.event) {
case 'remove':
for (var i = matCodeData.length - 1; i >= 0; i--) {
- if (matCodeData[i].matNo === data.matNo) {
+ if (matCodeData[i].matNo === data.matNo && matCodeData[i].supplier === data.supplier) {
matCodeData.splice(i, 1);
}
}
tableIns.reload({data: matCodeData,done:function (res) {limit();}});
+ break;
+ case 'supplier':
+ var supplierLayer = layer.open({
+ type: 2,
+ title: '鎵瑰彿',
+ maxmin: true,
+ area: ['400px', '215px'],
+ shadeClose: false,
+ content: 'matSupplier.html',
+ btn: ['淇濆瓨', '鍙栨秷'],
+ style: 'text-algin: center',
+ yes: function(index, layero){
+ var supplier = layer.getChildFrame('body', index).find("#supplier")[0].value;
+ matCodeData.map(function (item) {
+ if (item.matNo === data.matNo && item.supplier === data.supplier) {
+ item.supplier = supplier;
+ }
+ });
+ layer.close(index);
+ // // 閲嶇疆琛ㄦ牸鏁版嵁
+ tableIns.reload({data: matCodeData,done:function (res) {
+ limit();
+ }});
+ },
+ success: function(layero, index){
+ var iframeWin = window[layero.find('iframe')[0]['name']];//寰楀埌iframe椤电殑绐楀彛瀵硅薄
+ iframeWin.setMatSupplier(data.supplier);
+ }
+ });
break;
}
});
@@ -120,11 +192,11 @@
});
function init(locNo) {
- http.post(baseUrl + "/locDetl/list/auth", {locNo: locNo,limit: 1000}, function (res) {
+ http.post(baseUrl + "/locDetl/list/sts", {locNo: locNo,limit: 1000}, function (res) {
matCodeData = [];
let data = res.data.records;
for (var i = 0; i<data.length; i++) {
- data[i]["count"] = data[i].qty;
+ data[i]["count"] = data[i].anfme;
data[i]["removeBtn"] = false;
matCodeData.push(data[i]);
}
@@ -174,13 +246,13 @@
}
}
- function updateMatCodeData(matNo, count) {
+ function updateMatCodeData(matNo, supplier, count) {
if (isNaN(count)) {
layer.msg("璇疯緭鍏ユ暟瀛�");
} else {
if (count >= 0) {
for (var i=0;i<matCodeData.length;i++){
- if (matCodeData[i]["matNo"] === matNo){
+ if (matCodeData[i]["matNo"] === matNo && matCodeData[i]["supplier"] === supplier){
matCodeData[i]["count"] = count;
}
}
@@ -221,6 +293,8 @@
el.css("border-color", "#b8b8b8");
}, 1000);
}
+var zpa=0
+
// 娣诲姞琛ㄦ牸鏁版嵁
function addTableData(data) {
@@ -228,11 +302,14 @@
for (var i=0;i<data.length;i++){
let pass = false;
for (var j=0;j<matCodeData.length;j++){
- if (data[i].matNo === matCodeData[j].matNo) {
+ zpa=matCodeData[0].zpallet
+ if (data[i].matNo === matCodeData[j].matNo && data[i].supplier === matCodeData[j].supplier) {
+ // console.log(data[i].supplier + '@@' +matCodeData[j].supplier)
pass = true;
break;
}
}
+
if (!pass) {
applyData.push({
count: initCountVal,
@@ -241,9 +318,14 @@
matNo: data[i].matNo,
matName: data[i].matName,
specs: data[i].specs,
+ color: data[i].color,
size: data[i].size,
unit: data[i].unit,
- color: data[i].color,
+ zpallet:zpa,
+ supplier:'',
+ qtyBox:data[i].str6,
+ weight:data[i].weight,
+ qty:0
})
}
}
--
Gitblit v1.9.1