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/matStore/matStore.js | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/src/main/webapp/static/js/matStore/matStore.js b/src/main/webapp/static/js/matStore/matStore.js
index 7f83832..0f5d761 100644
--- a/src/main/webapp/static/js/matStore/matStore.js
+++ b/src/main/webapp/static/js/matStore/matStore.js
@@ -5,7 +5,7 @@
var cols = [
{fixed: 'left', field: 'count', title: '鏁伴噺(蹇呭～)', align: 'center', edit:'text', width: 120, style:'color: blue;font-weight: bold'}
,{field: 'billNo', title:'鍗曟嵁缂栧彿', align: 'center'}
- ,{field: 'seqNo', title:'搴忓彿', align: 'center'}
+ ,{field: 'seqNo', title:'搴忓彿', align: 'center', width:80}
,{field: 'qty', title:'閫氱煡鍏ュ簱閲�', align: 'center'}
,{field: 'inQty', title:'宸插叆搴撻噺', align: 'center'}
];
@@ -42,7 +42,7 @@
// 椤甸潰淇敼
table.on('edit(chooseData)', function (obj) {
- updateMatCodeData(obj.data.matNo, Number(obj.value));
+ updateMatCodeData(obj.data.billNo,obj.data.seqNo,obj.data.matNo, Number(obj.value),Number(obj.data.qty),Number(obj.data.inQty));
});
// 鐩戝惉澶村伐鍏锋爮浜嬩欢
@@ -66,9 +66,13 @@
layer.msg("鏁伴噺涓嶈兘涓洪浂");
return;
}
+ if (matCodeData[i].count > (matCodeData[i].qty - matCodeData[i].inQty)){
+ layer.msg("鍏ュ簱鏁伴噺涓嶈兘瓒呰繃鍙叆搴撻噺");
+ return;
+ }
}
$.ajax({
- url: baseUrl+"/full/store/put/start",
+ url: baseUrl+"/mat/store/start",
headers: {'token': localStorage.getItem('token')},
data: JSON.stringify({
devpNo: Number($('#putSiteSelect').val()),
@@ -100,7 +104,7 @@
switch (obj.event) {
case 'remove':
for (var i = matCodeData.length - 1; i >= 0; i--) {
- if (matCodeData[i].matNo === data.matNo) {
+ if (matCodeData[i].billNo === data.billNo && matCodeData[i].seqNo === data.seqNo) {
matCodeData.splice(i, 1);
}
}
@@ -150,13 +154,17 @@
}
}
- function updateMatCodeData(matNo, count) {
+ function updateMatCodeData(billNo, seqNo, matNo, count, qty, inQty) {
if (isNaN(count)) {
layer.msg("璇疯緭鍏ユ暟瀛�");
} else {
+ if(count > (qty-inQty) ){
+ layer.msg("鍏ュ簱鏁伴噺涓嶈兘瓒呰繃鍙叆搴撻噺");
+ }
if (count > 0) {
for (var i=0;i<matCodeData.length;i++){
- if (matCodeData[i]["matNo"] === matNo){
+ // if (matCodeData[i]["matNo"] === matNo){
+ if (matCodeData[i]["billNo"] === billNo && matCodeData[i]["seqNo"] === seqNo){
matCodeData[i]["count"] = count;
}
}
@@ -217,7 +225,8 @@
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) {
+ // if (data[i].matNo === matCodeData[j].matNo) {
+ if (data[i].billNo === matCodeData[j].billNo && data[i].seqNo === matCodeData[j].seqNo) {
pass = true;
break;
}
--
Gitblit v1.9.1