From b453fa6c987210616dfab066cc097cf9f742999e Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 25 十月 2024 09:24:29 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/pakStore/stockAdjust.js | 199 ++++++++++++++++++++++++++++---------------------
1 files changed, 113 insertions(+), 86 deletions(-)
diff --git a/src/main/webapp/static/js/pakStore/stockAdjust.js b/src/main/webapp/static/js/pakStore/stockAdjust.js
index 2e4721f..62dc502 100644
--- a/src/main/webapp/static/js/pakStore/stockAdjust.js
+++ b/src/main/webapp/static/js/pakStore/stockAdjust.js
@@ -2,12 +2,33 @@
var initAnfmeVal = "-";
var matCodeData = [];
var currLocNo;
-layui.use(['table','laydate', 'form'], function() {
+var matCodeLayerIdx;
+function getCol() {
+ var cols = [
+ {fixed: 'left', field: 'count', title: '瀹為檯鏁伴噺', align: 'center', edit:'text', width: 120, style:'color: blue;font-weight: bold'}
+ ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
+ ,{field: 'batch', align: 'center',title: '搴忓垪鐮侊紙缂栬緫锛�', edit: true, style: 'font-weight:bold'}
+ ];
+ arrRemove(detlCols, "field", "anfme");
+ arrRemove(detlCols, "field", "batch");
+ arrRemove(detlCols, "field", "manu");
+ arrRemove(detlCols, "field", "memo");
+ detlCols.push({field: 'manu', align: 'center', title: '瀹㈡埛淇℃伅', edit: 'text', hide: false});
+ detlCols.push({field: 'memo', align: 'center',title: '澶囨敞', edit: 'text' ,hide: false})
+ cols.push.apply(cols, detlCols);
+ cols.push({fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:80})
+ return cols;
+}
+
+layui.config({
+ base: baseUrl + "/static/layui/lay/modules/"
+}).use(['table','laydate', 'form', 'admin'], function() {
var table = layui.table;
var $ = layui.jquery;
var layer = layui.layer;
var layDate = layui.laydate;
var form = layui.form;
+ var admin = layui.admin;
tableIns = table.render({
elem: '#chooseData',
@@ -16,16 +37,7 @@
limit: 500,
cellMinWidth: 50,
toolbar: '#toolbar',
- cols: [[
- {fixed: 'left', field: 'count', title: '瀹為檯鏁伴噺', align: 'center', edit:'text', width: 120, style:'color: blue;font-weight: bold'},
- {field: 'anfme', align: 'center',title: '鏁伴噺'},
- {field: 'matNo', align: 'center', title: '鐗╂枡缂栫爜'},
- {field: 'barcode', align: 'center', title: '鏉$爜'},
- {field: 'matName', align: 'center', title: '鐗╂枡鍚嶇О'},
- {field: 'str1', align: 'center', title: '鐗╂枡鍗曚綅'},
- {field: 'str2', align: 'center', title: '鐗╂枡瑙勬牸'},
- {fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:80}
- ]],
+ cols: [getCol()],
done: function (res, curr, count) {
limit();
}
@@ -33,7 +45,25 @@
// 椤甸潰淇敼
table.on('edit(chooseData)', function (obj) {
- updateMatCodeData(obj.data.matNo, Number(obj.value));
+ let index = obj.tr.attr("data-index");
+ let data = matCodeData[index];
+ let modify = true;
+ if (obj.field === 'count'){
+ let vle = Number(obj.value);
+ if (isNaN(vle)) {
+ layer.msg("璇疯緭鍏ユ暟瀛�", {icon: 2});
+ modify = false;
+ } else {
+ if (vle <= 0) {
+ layer.msg("鏁伴噺蹇呴』澶т簬闆�", {icon: 2});
+ modify = false;
+ }
+ }
+ }
+ if (modify) {
+ data[obj.field] = obj.value;
+ }
+ tableIns.reload({data: matCodeData});
});
// 鐩戝惉澶村伐鍏锋爮浜嬩欢
@@ -41,30 +71,30 @@
switch(obj.event) {
case 'adjust':
if (isEmpty(currLocNo)) {
- layer.msg("璇峰厛妫�绱㈠簱浣�")
+ layer.msg("璇峰厛妫�绱㈠簱浣�", {icon: 2})
inputTip($("#searchLocNo"));
return;
}
if (matCodeData.length === 0) {
- layer.msg("璇峰厛娣诲姞鐗╂枡");
+ layer.msg("璇峰厛娣诲姞鏄庣粏", {icon: 2});
return;
}
for (var i=0;i<matCodeData.length;i++){
if (isNaN(matCodeData[i].count)) {
- layer.msg("璇疯緭鍏ユ暟瀛�");
+ layer.msg("璇疯緭鍏ユ暟瀛�", {icon: 2});
return;
}
if (matCodeData[i].count < 0){
- layer.msg("鏁伴噺涓嶈兘灏忎簬闆�");
+ layer.msg("鏁伴噺涓嶈兘灏忎簬闆�", {icon: 2});
return;
}
}
layer.confirm('纭畾璋冩暣'+currLocNo+'搴撲綅鐨勬槑缁嗗悧锛�', {shadeClose: true}, function(){
$.ajax({
- url: baseUrl+"/full/store/put/start",
+ url: baseUrl+"/locDdetl/adjust/start",
headers: {'token': localStorage.getItem('token')},
data: JSON.stringify({
- devpNo: $('#putSiteSelect').val(),
+ locNo: currLocNo,
list: matCodeData
}),
contentType:'application/json;charset=UTF-8',
@@ -72,13 +102,12 @@
async: false,
success: function (res) {
if (res.code === 200){
- layer.msg("鍏ュ簱鍚姩鎴愬姛锛岀洰鏍囧簱浣嶏細" + res.data);
- matCodeData = [];
- tableIns.reload({data: matCodeData,done:function (res) { limit(); getInBound();}});
+ layer.msg(currLocNo + res.msg, {icon: 1});
+ init(currLocNo)
} else if (res.code === 403){
top.location.href = baseUrl+"/";
}else {
- layer.msg(res.msg)
+ layer.msg(res.msg, {icon: 2})
}
}
})
@@ -92,12 +121,9 @@
var data = obj.data;
switch (obj.event) {
case 'remove':
- for (var i = matCodeData.length - 1; i >= 0; i--) {
- if (matCodeData[i].matNo === data.matNo) {
- matCodeData.splice(i, 1);
- }
- }
- tableIns.reload({data: matCodeData,done:function (res) {limit();}});
+ let index = obj.tr.attr("data-index");
+ matCodeData.splice(index, 1);
+ tableIns.reload({data: matCodeData});
break;
}
});
@@ -110,36 +136,36 @@
layer.msg("璇疯緭鍏ュ簱浣嶅彿");
return;
}
- http.post(baseUrl + "/locDetl/list/auth", {locNo: locNo,limit: 1000}, function (res) {
- matCodeData = [];
- let data = res.data.records;
- for (var i = 0; i<data.length; i++) {
- matCodeData.push({
- count: data[i].anfme,
- anfme: data[i].anfme,
- matNo: data[i].matnr,
- matName: data[i].maktx,
-
- })
- }
- locTips(true, locNo);
- tableReload();
- })
+ init(locNo);
});
// 閲嶇疆浜嬩欢
form.on('submit(reset)', function (data) {
+ reset();
+ });
+
+ function init(locNo) {
+ http.post(baseUrl + "/locDetl/list/auth", {locNo: locNo,limit: 1000}, function (res) {
+ matCodeData = [];
+ matCodeData = res.data.records;
+ for (var i = 0; i<matCodeData.length; i++) {
+ matCodeData[i]["count"] = matCodeData[i]["anfme"];
+ }
+ locTips(true, locNo);
+ tableReload();
+ })
+ }
+
+ function reset() {
clearFormVal($('#search-box'));
matCodeData = [];
tableReload();
locTips(false);
- });
+ }
// 閲嶈浇琛ㄦ牸
function tableReload() {
- tableIns.reload({data: matCodeData,done:function (res) {
- limit();
- }});
+ tableIns.reload({data: matCodeData});
}
// 搴撲綅鎻愮ず妗�
@@ -149,11 +175,11 @@
let data = res.data;
if (data != null) {
$(".retrieve").show();
- $("#locMsg").html(locNo + " ,搴撲綅鐘舵�侊細" + data.locType$);
+ $("#locMsg").html(locNo + " ,搴撲綅鐘舵�侊細" + data.locSts$);
$('.not-retrieve').hide();
currLocNo = locNo;
} else {
- layer.msg("璇疯緭鍏ユ湁鏁堝簱浣嶅彿");
+ layer.msg("璇疯緭鍏ユ湁鏁堝簱浣嶅彿", {icon: 2});
$('.not-retrieve').show();
$("#locMsg").html("");
$(".retrieve").hide();
@@ -169,45 +195,28 @@
}
}
- function updateMatCodeData(matNo, count) {
- if (isNaN(count)) {
- layer.msg("璇疯緭鍏ユ暟瀛�");
- } else {
- if (count > 0) {
- for (var i=0;i<matCodeData.length;i++){
- if (matCodeData[i]["matNo"] === matNo){
- matCodeData[i]["count"] = count;
- }
- }
- } else {
- layer.msg("鏁伴噺蹇呴』澶т簬闆�");
+ $(document).on('click','#mat-query', function () {
+ if (isEmpty(currLocNo)) {
+ layer.msg("璇峰厛妫�绱㈠簱浣�")
+ inputTip($("#searchLocNo"));
+ return;
+ }
+ 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);
}
- }
- tableIns.reload({data: matCodeData,done:function (res) {
- limit();
- }});
- }
-})
+ });
+ })
-// 鎻愬彇鐗╂枡
-var matCodeLayerIdx;
-function getMat() {
- if (isEmpty(currLocNo)) {
- layer.msg("璇峰厛妫�绱㈠簱浣�")
- inputTip($("#searchLocNo"));
- return;
- }
- matCodeLayerIdx = layer.open({
- type: 2,
- title: '鎻愬彇鐗╂枡',
- maxmin: true,
- area: [top.detailWidth, top.detailHeight],
- shadeClose: true,
- content: 'matQuery.html',
- success: function(layero, index){
- }
- });
-}
+})
// 鎼滅储妗嗙┖鍊兼彁绀�
function inputTip(el) {
@@ -216,3 +225,21 @@
el.css("border-color", "#b8b8b8");
}, 1000);
}
+
+// 娣诲姞琛ㄦ牸鏁版嵁
+function addTableData(data) {
+ for (let i=0;i<data.length;i++){
+ for (let j=0;j<matCodeData.length;j++){
+ if (data[i].matnr === matCodeData[j].matnr && data[i].batch === matCodeData[j].batch) {
+ data.splice(i, 1);
+ break;
+ } else {
+ data[i]['anfme'] = initAnfmeVal;
+ data[i]['count'] = initCountVal;
+ }
+ }
+ }
+ matCodeData.push.apply(matCodeData, data);
+ tableIns.reload({data: matCodeData});
+ layer.close(matCodeLayerIdx);
+}
--
Gitblit v1.9.1