From e34a92fc8833d3434511225939302cac0b75f3f3 Mon Sep 17 00:00:00 2001
From: Demo <Demo@DESKTOP-CPA90BF>
Date: 星期四, 14 三月 2024 16:47:16 +0800
Subject: [PATCH] 修改PDA取样出库
---
Pda/View/SoSetting/SampleOut.html | 55 +++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 43 insertions(+), 12 deletions(-)
diff --git a/Pda/View/SoSetting/SampleOut.html b/Pda/View/SoSetting/SampleOut.html
index b223c7e..fd4cac1 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, {
--
Gitblit v1.8.0