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/pakStore.js | 101 +++++++++++++++++++++-----------------------------
1 files changed, 43 insertions(+), 58 deletions(-)
diff --git a/src/main/webapp/static/js/pakStore/pakStore.js b/src/main/webapp/static/js/pakStore/pakStore.js
index 3b3e666..166c63e 100644
--- a/src/main/webapp/static/js/pakStore/pakStore.js
+++ b/src/main/webapp/static/js/pakStore/pakStore.js
@@ -1,10 +1,10 @@
-var admin;
+var matCodeLayerIdx;
var initCountVal = 0;
var matCodeData = [];
function getCol() {
var cols = [
{fixed: 'left', field: 'anfme', title: '鏁伴噺锛堝繀濉級', align: 'center', edit:'text', width: 120, style:'color: blue;font-weight: bold'},
- {field: 'batch', title: '鎵瑰彿锛堥�夊～锛�', align: 'center', edit:'text', width: 200, style:'color: blue;font-weight: bold'}
+ {field: 'batch', title: '绠卞彿锛堥�夊～锛�', align: 'center', edit:'text', width: 200, style:'color: block;font-weight: bold'}
];
cols.push.apply(cols, matCols);
cols.push({fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width: 80})
@@ -18,7 +18,7 @@
var $ = layui.jquery;
var layer = layui.layer;
var form = layui.form;
- admin = layui.admin;
+ var admin = layui.admin;
tableIns = table.render({
elem: '#chooseData',
@@ -29,8 +29,6 @@
toolbar: '#toolbar',
cols: [getCol()],
done: function (res, curr, count) {
- $('td[data-field=anfme] div').html(initCountVal);
- setMatCodeData(res.data);
limit();
getInBound();
}
@@ -67,25 +65,31 @@
case 'comb':
// 鍒ゆ柇鏄惁瀛樺湪鐗╂枡
if (matCodeData.length === 0) {
- layer.msg("璇峰厛娣诲姞鐗╂枡");
+ layer.msg("璇峰厛鎻愬彇鍟嗗搧", {icon: 2});
return;
}
// 鍒ゆ柇鐗╂枡鏁伴噺鏄惁瀛樺湪寮傚父
for (var i=0;i<matCodeData.length;i++){
if (isNaN(matCodeData[i].anfme)) {
- layer.msg("璇疯緭鍏ユ暟瀛�");
+ layer.msg("璇疯緭鍏ユ暟瀛�", {icon: 2});
return;
}
- if (matCodeData[i].anfme === 0){
- layer.msg("鏁伴噺涓嶈兘涓洪浂");
+ if (matCodeData[i].anfme <= 0){
+ layer.msg("鏁伴噺蹇呴』澶т簬闆�", {icon: 2});
return;
}
}
+ let devpNo = $('#putSiteSelect').val();
+ if (isEmpty(devpNo)) {
+ layer.msg("璇烽�夋嫨鍏ュ簱绔�", {icon: 2});
+ return;
+ }
+ console.log(matCodeData)
$.ajax({
url: baseUrl+"/full/store/put/start",
headers: {'token': localStorage.getItem('token')},
data: JSON.stringify({
- devpNo: Number($('#putSiteSelect').val()),
+ devpNo: Number(devpNo),
list: matCodeData
}),
contentType:'application/json;charset=UTF-8',
@@ -93,43 +97,33 @@
async: false,
success: function (res) {
if (res.code === 200){
- layer.msg("鍏ュ簱鍚姩鎴愬姛锛岀洰鏍囧簱浣嶏細" + res.data);
+ layer.msg("鍏ュ簱鍚姩鎴愬姛锛岀洰鏍囧簱浣嶏細" + res.data, {icon: 1});
matCodeData = [];
$('#focusMatByMat').val("");
tableIns.reload({data: matCodeData,done:function (res) { limit(); getInBound();}});
- document.getElementById("focusMatByMat").focus();
} else if (res.code === 403){
top.location.href = baseUrl+"/";
}else {
- layer.msg(res.msg)
+ layer.msg(res.msg, {icon: 2})
}
}
})
+ break;
+ default:
break;
}
});
// 鐩戝惉琛屽伐鍏蜂簨浠�
table.on('tool(chooseData)', function(obj){
- var data = obj.data;
switch (obj.event) {
case 'remove':
- for (let i = matCodeData.length - 1; i >= 0; i--) {
- if (matCodeData[i].matNo === data.matNo && matCodeData[i].batch === data.batch) {
- matCodeData.splice(i, 1);
- }
- }
+ let index = obj.tr.attr("data-index");
+ matCodeData.splice(index, 1);
tableIns.reload({data: matCodeData});
break;
}
});
-
- function setMatCodeData(data) {
- matCodeData = data;
- for (var i=0;i<matCodeData.length;i++){
- matCodeData[i]["anfme"] = initCountVal;
- }
- }
// 鑾峰彇鍙敤鍏ュ簱绔欑偣
function getInBound() {
@@ -153,24 +147,26 @@
})
}
+ // 鎻愬彇鐗╂枡
+ $(document).on('click','#mat-query', function () {
+ let loadIndex = layer.msg('璇锋眰涓�...', {icon: 16, shade: 0.01, time: false});
+ matCodeLayerIdx = admin.open({
+ type: 2,
+ title: false,
+ closeBtn: false,
+ maxmin: false,
+ area: ['90%', '85%'],
+ shadeClose: true,
+ content: 'matQuery.html',
+ success: function(layero, index){
+ layer.close(loadIndex);
+ }
+ });
+ })
});
-// 鎻愬彇鐗╂枡
-var matCodeLayerIdx;
-function getMat() {
- matCodeLayerIdx = admin.open({
- type: 2,
- title: false,
- closeBtn: false,
- maxmin: false,
- area: ['90%', '85%'],
- shadeClose: true,
- content: 'matQuery.html',
- success: function(layero, index){
- }
- });
-}
+
// 鎵爜
function focusMat(el) {
@@ -178,7 +174,7 @@
return
}
$.ajax({
- url: baseUrl + "/matCode/" + el.value + "/auth",
+ url: baseUrl + "/mat/" + el.value + "/auth",
headers: {'token': localStorage.getItem('token')},
method: 'GET',
success: function (res) {
@@ -197,22 +193,11 @@
}
// 娣诲姞琛ㄦ牸鏁版嵁
-function addTableData(data) {
- 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) {
- pass = true;
- break;
- }
- }
- if (pass) {
- data.splice(i--, 1);
- } else {
- data[i]["count"] = initCountVal;
- }
- }
- matCodeData.push.apply(matCodeData, data);
+function addTableData(list) {
+ list.map(function (d) {
+ d['anfme'] = initCountVal;
+ })
+ matCodeData.push.apply(matCodeData, list);
tableIns.reload({data: matCodeData});
layer.close(matCodeLayerIdx);
}
--
Gitblit v1.9.1