From 716b29fea5945ca7dc4419d9f1f980c379312b32 Mon Sep 17 00:00:00 2001
From: chengsc <Demo@DESKTOP-CPA90BF>
Date: 星期四, 24 十月 2024 18:46:48 +0800
Subject: [PATCH] 修改问题
---
Pda/View/AsnSetting/productEnterQuantity.html | 134 ++++++++++++++++++++++++++++++++++++--------
1 files changed, 108 insertions(+), 26 deletions(-)
diff --git a/Pda/View/AsnSetting/productEnterQuantity.html b/Pda/View/AsnSetting/productEnterQuantity.html
index 9365895..ee6ef29 100644
--- a/Pda/View/AsnSetting/productEnterQuantity.html
+++ b/Pda/View/AsnSetting/productEnterQuantity.html
@@ -138,8 +138,15 @@
<div id="BOX" class="layui-form-item layout-input">
<label class="layui-form-label" lang>澶栫鏉＄爜锛�</label>
<div class="layui-input-block">
- <input id="BOXCODE" type="text" lay-verify="required" lang langholder
+ <input id="BOXCODE" type="text" lang langholder
placeholder="璇锋壂鎻忓绠辨潯鐮�" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ <div id="BOX" class="layui-form-item layout-input">
+ <label class="layui-form-label" lang>杩芥函鏉＄爜锛�</label>
+ <div class="layui-input-block">
+ <input id="BOXCODE3" type="text" lang langholder
+ placeholder="璇锋壂鎻忚拷婧潯鐮�" autocomplete="off" class="layui-input">
</div>
</div>
<div id="" class="layui-form-item layout-input">
@@ -540,7 +547,29 @@
checkBoxInfo()
}
});
+ //绠辩爜鍥炶溅浜嬩欢
+ $("#BOXCODE3").keydown(function (e) {
+ if (e.keyCode === 13) {
+ if ($("#BOXCODE3").val() == "") {
+ layer.msg('璇峰厛鎵弿杩芥函鐮�', {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ });
+ return
+ }
+ // if ($("#STOCKCODE").val() == "") {
+ // layer.msg('璇峰厛鎵弿鎵樼洏鐮�', {
+ // icon: 2,
+ // time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ // });
+ // $("#BOXCODE").val("");
+ // $("#STOCKCODE").focus();
+ // return;
+ // }
+ checkBoxInfo3()
+ }
+ });
/* 鍏ュ簱鍗曟嵁涓嬫媺妗� */
//鐐瑰嚮鍏ュ簱鍗曟嵁涓嬫媺妗嗕簨浠�
// $("#selectDiv").click(function () {
@@ -713,19 +742,20 @@
});
return;
}
- if ($("#BOXCODE").val() == "") {
- layer.msg('璇锋壂鎻忓绠辨潯鐮�', {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- });
- return;
- }
+ // if ($("#BOXCODE").val() == "") {
+ // layer.msg('璇锋壂鎻忓绠辨潯鐮�', {
+ // icon: 2,
+ // time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ // });
+ // return;
+ // }
var param = {
AsnNo: $("#goodSelect").val(),
PalletNo: $("#STOCKCODE").val(),
//AsnDetailId: parseInt($("#goodSelect").val()),
LotNo: $("#goodSelect").find("option:selected").text(),
BoxNo: $("#BOXCODE").val(),
+ BoxNo01: $("#BOXCODE3").val(),
IsContinue: isContinue,
TailBoxNo: $("#BOXCODE2").val(),
Origin: "PDA",
@@ -763,6 +793,7 @@
// });
// return;
// }
+ var reg = /(^[1-9]([0-9]+)?(\.[0-9]{1,4})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/;
if ($("#goodSelect1").val() == "") {
layer.msg('璇烽�夋嫨鐗╂枡鍙婃槑缁�', {
icon: 2,
@@ -777,12 +808,19 @@
});
return;
}
+ if (!reg.test($("#SkuQty").val())) {
+ layer.msg("鍏ュ簱鏁伴噺蹇呴』澶т簬0(鍙繚鐣�4浣嶅皬鏁�)", {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ });
+ return -1;
+ }
var param = {
AsnNo: $("#goodSelect1").val(), //鍑哄簱鍗曟嵁
PalletNo: $("#STOCKCODE1").val(), //鎵樼洏鏉＄爜
//AsnDetailId: parseInt($("#goodSelect1").val()), //鍏ュ簱鍗曟槑缁咺D
LotNo: $("#goodSelect1").find("option:selected").text(), //鐗╂枡鎵规
- SkuQty: parseInt($("#SkuQty").val()), //鐗╂枡鏁伴噺
+ SkuQty: parseFloat($("#SkuQty").val()), //鐗╂枡鏁伴噺
Demo: $("#NoticeDemo").val(), //鐗╂枡鏁伴噺
Origin: "PDA",
TableType: xianshiyemian,
@@ -880,6 +918,7 @@
$("#Standard1").val(res.data.Standard);
$("#ImportFactQuantity1").val(res.data.FactQty + "");
if (res.data.SkuNo == "100088") {
+ $("textarea[name='NoticeDemo']").val(res.data.UDF5); //澶囨敞
$('#demodiv').show();
$('#demodiv1').show();
}else{
@@ -1373,7 +1412,7 @@
function checkBoxInfo() {
var param = {
"BoxNo": $("#BOXCODE").val(),
- "AsnNo":$("#bar").val(),
+ "AsnNo":$("#goodSelect").val(),
}
sendData(IP + "/PdaAsn/GetBindBoxInfos", param, 'post', function (res) {
if (res.code == 0) { //鎴愬姛
@@ -1385,24 +1424,24 @@
});
return;
}
- if (res.data[0].ASNNo != '' && res.data[0].ASNNo != null) {
- $("#bar").empty()
- $("#bar").append('<option value =>' + '</option>');
- form.render('select');
+ // if (res.data[0].ASNNo != '' && res.data[0].ASNNo != null) {
+ // $("#bar").empty()
+ // $("#bar").append('<option value =>' + '</option>');
+ // form.render('select');
- $("#bar").append('<option value =' + res.data[0].ASNNo + ' selected>' + res.data[0].ASNNo + '</option>');
+ // $("#bar").append('<option value =' + res.data[0].ASNNo + ' selected>' + res.data[0].ASNNo + '</option>');
- // updateGoodList(res.data[0].SkuNo)
- setOrderGoods();
- } else {
- if (asnDetails == '') {
- layer.msg("璇峰厛閫夋嫨鍏ュ簱鍗曟嵁!", {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- });
- return;
- }
- }
+ // // updateGoodList(res.data[0].SkuNo)
+ // setOrderGoods();
+ // } else {
+ // if (asnDetails == '') {
+ // layer.msg("璇峰厛閫夋嫨鍏ュ簱鍗曟嵁!", {
+ // icon: 2,
+ // time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ // });
+ // return;
+ // }
+ // }
asnDetails.forEach(element => {
console.log(element);
@@ -1431,6 +1470,49 @@
}
+ function checkBoxInfo3() {
+ var param = {
+ "BoxNo3": $("#BOXCODE3").val(),
+ "AsnNo":$("#goodSelect").val(),
+ }
+ sendData(IP + "/PdaAsn/GetBindBoxInfo2s", param, 'post', function (res) {
+ if (res.code == 0) { //鎴愬姛
+ var bl = false;
+ if (res.data.length == 0) {
+ layer.msg("鏈煡璇㈠埌姝ょ鐗╂枡淇℃伅锛岃鏍稿疄!", {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ });
+ return;
+ }
+
+ asnDetails.forEach(element => {
+ console.log(element);
+
+ if (element.SkuNo == res.data[0].SkuNo && element.LotNo == res.data[0].LotNo) {
+ var sel = 'dd[lay-value=' + element.id + ']';
+ $('#goodSelect').siblings("div.layui-form-select").find('dl').find(sel).addClass('layui-this');
+ bl = true;
+ }
+ });
+ if (!bl) {
+ layer.msg("姝ょ鐗╂枡涓嶇鍚堣鍏ュ簱鍗曪紝璇锋牳瀹�!", {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ });
+ } else {
+ $("#BoxQty").val(res.data[0].Qty);
+ }
+
+ } else { //涓嶆垚鍔�
+ layer.msg(res.msg, {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ });
+ }
+ });
+
+ }
/* 鍒嗛〉 */
//璁剧疆鍒嗛〉
--
Gitblit v1.8.0