From bbd55a7466e770e7acb86ccc9d83ab20bde17980 Mon Sep 17 00:00:00 2001
From: IPC-610 <IPC-610@DESKTOP-6LEOOS3>
Date: 星期四, 26 九月 2024 19:30:45 +0800
Subject: [PATCH] 增加申请空托跺出库接口
---
Pda/View/SoSetting/SampleOut.html | 185 ++++++++++++++++++++++++++++++++--------------
1 files changed, 129 insertions(+), 56 deletions(-)
diff --git a/Pda/View/SoSetting/SampleOut.html b/Pda/View/SoSetting/SampleOut.html
index b223c7e..8ed7e48 100644
--- a/Pda/View/SoSetting/SampleOut.html
+++ b/Pda/View/SoSetting/SampleOut.html
@@ -666,7 +666,7 @@
getBar();
GetBoxInfo();
}
- sampleType = 0;
+ sampleType = "0";
}
if (res.data == "1") {//搴撳墠鍙栨牱
$('#kuqianlabel').show();
@@ -675,7 +675,7 @@
updateAsnBillList();
GetBoxInfo();
- sampleType = 1;
+ sampleType = "1";
}
}else { //涓嶆垚鍔�
@@ -998,7 +998,25 @@
}
else if (sampleType == "1") {
-
+ if ($('#AsnBar').val() == "") {
+ layer.msg("璇烽�夋嫨鍏ュ簱鍗�", {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }); return;
+ }
+ if ($('#boxNo').val() == "") {
+ layer.msg("璇疯緭鍏ョ鐮�", {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }); return;
+ }
+ if(($('#boxNo3').val() != "" && ($('#pickQty1').val() != "" || $('#pickQty1').val() != 0))){
+ layer.msg("杩芥函鏉＄爜鍜屾嫞璐ф暟閲忎笉鑳藉悓鏃惰緭鍏ワ紒", {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ });
+ return;
+ }
}
else {
layer.msg("绫诲瀷閿欒锛岃鍒锋柊椤甸潰閲嶈瘯", {
@@ -1024,28 +1042,41 @@
//纭鎷ｈ揣
function reqPickScatter() {
+ canPickBox = false//鍥炶皟
var param = {
"SoNo": $("#bar").val(),
"SoDetailId": $("#skuLotNo").val(),
"PalletNo": $('#palletNo').val(),
"BoxNo": $('#boxNo').val(),
"BoxNo3": $('#boxNo3').val(),
- "PickQty":$('#pickQty1').val()
+ "PickQty":$('#pickQty1').val(),
+ "AsnNo":$('#AsnBar').val(),
+ "Type":sampleType
}
- sendData(IP + "/PdaSo/SoSetPick", param, 'post', function (res) {
- //console.log(res);
+
+ sendData(IP + "/PdaSo/SampleSoSetPick", param, 'post', function (res) {
if (res.code == 0) { //鎴愬姛
layer.msg(res.msg, {
icon: 1,
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
}, function () {
- canPickBox = true//鍥炶皟
- $("#boxNo").val('');
- $("#boxNo3").val('');
- updateQtyList();
- getBar();
- GetBoxInfo();
+ if (sampleType == "0") {
+ canPickBox = true//鍥炶皟
+ $("#boxNo").val('');
+ $("#boxNo3").val('');
+ updateQtyList();
+ getBar();
+ GetBoxInfo();
+ }
+ if (sampleType == "1") {
+ canPickBox = true//鍥炶皟
+ $("#boxNo").val('');
+ $("#boxNo3").val('');
+ $("#pickQty1").val('');
+ GetBoxInfo();
+ }
+
});
} else { //涓嶆垚鍔�
layer.msg(res.msg, {
@@ -1283,25 +1314,29 @@
if (res.data == "0") {//搴撳唴鍙栨牱
$('#kuneilabel2').show();
$('#kuqianlabel2').hide();
+ updateBillList2();
+ console.log($('#bar2').val())
+ if ($('#bar2').val() == "") {
+ console.log(1)
+ clear21();
+ return;
+ } else {
+ console.log(2)
+ updateSkuLotNoList2();
+ updateQtyList2();
+ getBar2();
+ GetDataInfo();
+ }
+ sampleType = "0";
}
if (res.data == "1") {//搴撳墠鍙栨牱
$('#kuqianlabel2').show();
$('#kuneilabel2').hide();
updateAsnBillList2();
+ GetDataInfo();
+ sampleType = "1";
}
- // updateBillList2();
- // console.log($('#bar2').val())
- // if ($('#bar2').val() == "") {
- // console.log(1)
- // clear21();
- // return;
- // } else {
- // console.log(2)
- // updateSkuLotNoList2();
- // updateQtyList2();
- // getBar2();
- // GetDataInfo();
- // }
+
}else { //涓嶆垚鍔�
layer.msg(res.msg, {
icon: 2,
@@ -1501,33 +1536,60 @@
//鍗曟嫞璐э紙纭鎸夐挳锛�
form.on('submit(formPickScatter2)', function (data) {
- if ($('#bar2').val() == "") {
- layer.msg("璇烽�夋嫨鍑哄簱鍗�", {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }); return;
+ if (sampleType == "0") {
+ if ($('#bar2').val() == "") {
+ layer.msg("璇烽�夋嫨鍑哄簱鍗�", {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }); return;
+ }
+ if ($('#skuLotNo2').val() == "") {
+ layer.msg("璇烽�夋嫨鐗╂枡-鎵规", {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }); return;
+ }
+ if ($('#palletNo2').val() == "") {
+ layer.msg("璇疯緭鍏ユ墭鐩樼爜", {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }); return;
+ }
+ let pickedQty = parseInt($('#pickedQty2').val()) //宸叉嫞鏁伴噺
+ let pickQty = parseInt($('#pickQty2').val()) //鎷ｈ揣鏁伴噺
+ if (pickQty <= 0) {
+ layer.msg("鎷ｈ揣鏁伴噺闇�澶т簬0", {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ });
+ return;
+ }
}
- if ($('#skuLotNo2').val() == "") {
- layer.msg("璇烽�夋嫨鐗╂枡-鎵规", {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }); return;
- }
- if ($('#palletNo2').val() == "") {
- layer.msg("璇疯緭鍏ユ墭鐩樼爜", {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }); return;
- }
- let pickedQty = parseInt($('#pickedQty2').val()) //宸叉嫞鏁伴噺
- let pickQty = parseInt($('#pickQty2').val()) //鎷ｈ揣鏁伴噺
- if (pickQty <= 0) {
- layer.msg("鎷ｈ揣鏁伴噺闇�澶т簬0", {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- });
- return;
- }
+ else if (sampleType == "1") {
+ if ($('#AsnBar').val() == "") {
+ layer.msg("璇烽�夋嫨鍏ュ簱鍗�", {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }); return;
+ }
+ let pickedQty = parseInt($('#pickedQty2').val()) //宸叉嫞鏁伴噺
+ let pickQty = parseInt($('#pickQty2').val()) //鎷ｈ揣鏁伴噺
+ if (pickQty <= 0) {
+ layer.msg("鎷ｈ揣鏁伴噺闇�澶т簬0", {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ });
+ return;
+ }
+ }
+ else {
+ layer.msg("绫诲瀷閿欒锛岃鍒锋柊椤甸潰閲嶈瘯", {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ });
+ return;
+ }
+
if (canPickBox == false) {
@@ -1545,24 +1607,35 @@
//纭鎷ｈ揣
function reqPickScatter2() {
+ canPickBox = false//鍥炶皟
var param = {
"SoNo": $("#bar2").val(),
"SoDetailId": $("#skuLotNo2").val(),
"PalletNo": $('#palletNo2').val(),
"PickQty": $('#pickQty2').val(),
+ "AsnNo":$('#AsnBar').val(),
+ "Type":sampleType
}
- sendData(IP + "/PdaSo/SoSetQtyPick", param, 'post', function (res) {
+ sendData(IP + "/PdaSo/SampleSoSetQtyPick", param, 'post', function (res) {
//console.log(res);
if (res.code == 0) { //鎴愬姛
+
layer.msg(res.msg, {
icon: 1,
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
}, function () {
- canPickBox = true//鍥炶皟
- updateQtyList2();
- getBar2();
- GetDataInfo();
+
+ if (sampleType == "0") {
+ canPickBox = true//鍥炶皟
+ updateQtyList2();
+ getBar2();
+ GetDataInfo();
+ }
+ if (sampleType == "1") {
+ canPickBox = true//鍥炶皟
+ GetDataInfo();
+ }
});
} else { //涓嶆垚鍔�
layer.msg(res.msg, {
--
Gitblit v1.8.0