From dcae969ee04f67b6dc46f3ca061116f44558307a Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期二, 24 六月 2025 08:27:36 +0800
Subject: [PATCH] #订单导入去重
---
src/main/webapp/static/js/pakStore/locCheckOut.js | 138 ++++++++++++++++-----------------------------
1 files changed, 50 insertions(+), 88 deletions(-)
diff --git a/src/main/webapp/static/js/pakStore/locCheckOut.js b/src/main/webapp/static/js/pakStore/locCheckOut.js
index bce5470..638a859 100644
--- a/src/main/webapp/static/js/pakStore/locCheckOut.js
+++ b/src/main/webapp/static/js/pakStore/locCheckOut.js
@@ -1,8 +1,10 @@
-var pageCurr;
+var locDetlLayerIdx;
var tableIns;
+var locDetlData = [];
function getCol() {
var cols = [
- {field: 'locNo$', align: 'center',title: '搴撲綅鍙�'}
+ {field: 'locNo', align: 'center',title: '搴撲綅鍙�', merge: true, style: 'font-weight: bold'},
+ {field: 'anfme', align: 'center',title: '鏁伴噺'}
];
cols.push.apply(cols, detlCols);
return cols;
@@ -10,13 +12,14 @@
layui.config({
base: baseUrl + "/static/layui/lay/modules/"
-}).use(['table','laydate', 'form', 'admin'], function() {
+}).use(['table','laydate', 'form', 'admin', 'tableMerge'], function() {
var table = layui.table;
var $ = layui.jquery;
var layer = layui.layer;
var layDate = layui.laydate;
var form = layui.form;
var admin = layui.admin;
+ var tableMerge = layui.tableMerge;
tableIns = table.render({
elem: '#chooseData',
@@ -25,39 +28,31 @@
even: true,
toolbar: '#toolbar',
cellMinWidth: 50,
+ limit: 500,
+ page:false,
cols: [getCol()],
done: function(res, curr, count) {
+ tableMerge.render(this);
limit();
getOutBound();
}
});
- // 椤甸潰淇敼
- table.on('edit(chooseData)', function (obj) {
- updateLocDetlData(obj.data.locNo, obj.data.matnr, Number(obj.value));
- });
-
// 鐩戝惉澶村伐鍏锋爮浜嬩欢
table.on('toolbar(chooseData)', function (obj) {
- var data = locDetlData;
switch (obj.event) {
case 'outbound':
- if (data.length === 0){
- layer.msg('璇峰厛娣诲姞搴撲綅鐗╂枡');
+ if (locDetlData.length === 0){
+ layer.msg('璇峰厛娣诲姞鐩樼偣搴撳瓨', {icon: 2});
} else {
var staNo = $("#staNoSelect").val();
if (staNo === "" || staNo === null){
- layer.msg("璇烽�夋嫨鍑哄簱鍙�");
+ layer.msg("璇烽�夋嫨鐩樼偣绔�", {icon: 2});
return;
}
- var locDetls = [];
- data.forEach(function(elem) {
- // locDetls.push({locNo: elem.locNo, matnr: elem.matnr, count: elem.count}); // todo
- locDetls.push({locNo: elem.locNo, matnr: elem.matnr});
- });
let param = {
outSite: staNo,
- locDetls: locDetls
+ locDetls: locDetlData
}
$.ajax({
url: baseUrl+"/locCheck/out/start",
@@ -68,12 +63,12 @@
success: function (res) {
if (res.code === 200){
locDetlData = [];
- tableIns.reload({data: locDetlData,done:function (res) {limit();getOutBound();}});
- layer.msg(res.msg);
+ tableIns.reload({data: locDetlData});
+ layer.msg(res.msg, {icon: 1});
} else if (res.code === 403){
top.location.href = baseUrl+"/";
} else {
- layer.msg(res.msg)
+ layer.msg(res.msg, {icon: 2})
}
}
});
@@ -81,43 +76,6 @@
break;
}
});
-
- // 鐩戝惉琛屽伐鍏蜂簨浠�
- table.on('tool(chooseData)', function(obj){
- var data = obj.data;
- switch (obj.event) {
- case 'remove':
- for (var i = locDetlData.length - 1; i >= 0; i--) {
- if (locDetlData[i].locNo === data.locNo && locDetlData[i].matnr === data.matnr) {
- locDetlData.splice(i, 1);
- }
- }
- tableIns.reload({data: locDetlData,done:function (res) {limit();getOutBound();}});
- break;
- }
- });
-
- function updateLocDetlData(locNo, matnr, count) {
- if (isNaN(count)) {
- layer.msg("璇疯緭鍏ユ暟瀛�");
- } else {
- if (count > 0) {
- for (var i=0;i<locDetlData.length;i++){
- if (locDetlData[i]["locNo"] === locNo && locDetlData[i]["matnr"] === matnr){
- if (count > locDetlData[i]["anfme"]) {
- layer.msg("涓嶈兘瓒呰繃鍘熸暟閲�");
- } else {
- locDetlData[i]["count"] = count;
- }
- break;
- }
- }
- } else {
- layer.msg("鏁伴噺蹇呴』澶т簬闆�");
- }
- }
- tableIns.reload({data: locDetlData,done:function (res) {limit(); getOutBound();}});
- }
// 鑾峰彇鍑哄簱鍙�
function getOutBound(){
@@ -141,41 +99,45 @@
}
})
}
+
+ $(document).on('click','#mat-query', function () {
+ let loadIndex = layer.msg('璇锋眰涓�...', {icon: 16, shade: 0.01, time: false});
+ locDetlLayerIdx = layer.open({
+ type: 2,
+ title: false,
+ closeBtn: false,
+ maxmin: false,
+ area: ['90%', '85%'],
+ shadeClose: true,
+ content: 'locDetlCheckQuery.html',
+ success: function(layero, index){
+ layer.close(loadIndex);
+ }
+ });
+ })
+
})
-// 鎻愬彇鐗╂枡
-var locDetlLayerIdx;
-function getLocDetl() {
- locDetlLayerIdx = layer.open({
- type: 2,
- title: '鎻愬彇鍑鸿揣鍐呭',
- maxmin: true,
- area: [top.detailWidth, top.detailHeight],
- shadeClose: true,
- content: 'locDetlCheckQuery.html',
- success: function(layero, index){
- }
- });
-}
-
-// 娣诲姞琛ㄦ牸鏁版嵁
function addTableData(data) {
- for (var i=0;i<data.length;i++){
- let pass = false;
- for (var j=0;j<locDetlData.length;j++){
- if (data[i].matnr === locDetlData[j].matnr && data[i].locNo$ === locDetlData[j].locNo$) {
- pass = true;
- break;
- }
- }
- if (pass) {
- data.splice(i--, 1);
- } else {
- data[i]["count"] = data[i]["anfme"];
- }
+ let newData = [];
+ for (let i = 0; i < data.length; i++) {
+ let item = data[i];
+ let exist = locDetlData.some(old =>
+ old.matnr === item.matnr &&
+ old.batch === item.batch &&
+ (old.locNo$ === item.locNo$ || old.locNo === item.locNo)
+ );
+
+ if (!exist) {
+ item.count = item.anfme;
+ newData.push(item);
+ }
}
- locDetlData.push.apply(locDetlData, data);
+
+ locDetlData = locDetlData.concat(newData);
+ console.log("浼犲叆琛ㄦ牸鏁版嵁闀垮害锛�", locDetlData.length, locDetlData);
tableIns.reload({data: locDetlData});
layer.close(locDetlLayerIdx);
}
+
--
Gitblit v1.9.1