From 174407545043c2f79feeea4bc5adb85e033706ae Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@DESKTOP-JIE70N9>
Date: 星期三, 10 九月 2025 18:33:05 +0800
Subject: [PATCH] 修改问题
---
Pda/View/AsnSetting/productEnterQuantity.html | 624 ++++++++++++++++++++++++--------------------------------
1 files changed, 270 insertions(+), 354 deletions(-)
diff --git a/Pda/View/AsnSetting/productEnterQuantity.html b/Pda/View/AsnSetting/productEnterQuantity.html
index b470796..df0fe21 100644
--- a/Pda/View/AsnSetting/productEnterQuantity.html
+++ b/Pda/View/AsnSetting/productEnterQuantity.html
@@ -265,7 +265,7 @@
</div>
<!-- 鏃犵爜 -->
<div id="content2">
- <div id="zongDiv" class="layout-bill-info" style="height: 255px;">
+ <div id="zongDiv2" class="layout-bill-info" style="height: 255px;">
<form class="layui-form" id="form2" action="">
<div id="" class="layui-form-item layout-dropdownlist">
<label class="layui-form-label" lang>鍏ュ簱鍗曪細</label>
@@ -295,11 +295,25 @@
</div>
<div id="" class="layui-form-item layout-input">
- <label class="layui-form-label" lang>鐗╂枡鏁伴噺锛�</label>
+ <!-- <label class="layui-form-label" lang>鐗╂枡鏁伴噺锛�</label>
<div class="layui-input-block">
<input id="SkuQty" type="number" lay-verify="stock" lang langholder
placeholder="璇疯緭鍏ョ墿鏂欐暟閲�" autocomplete="off" class="layui-input"
oninput="value=value.replace(/^(0+)|[^\d]+/g,'')">
+ </div> -->
+
+ <!-- <div class="layui-input-block">
+ <input id="SkuQty" type="number" lay-verify="stock" lay-affix="number" lang langholder
+ placeholder="璇疯緭鍏ョ墿鏂欐暟閲�" step="0.0001"
+ autocomplete="off" class="layui-input"
+ oninput="value=value.replace(/^(0+)|[^\d]+/g,'')">
+ </div> -->
+ <label class="layui-form-label" lang>鐗╂枡鏁伴噺锛�</label>
+ <div class="layui-input-block">
+ <!-- 鍏佽鏁板瓧銆佸皬鏁扮偣鍙婃渶澶�4浣嶅皬鏁� -->
+ <input id="SkuQty" type="number" lay-verify="stock" placeholder="璇疯緭鍏ョ墿鏂欐暟閲�"
+ autocomplete="off" class="layui-input"
+ oninput="value=value.replace(/^(0+)(?=\d)|[^\d.]/g,'').replace(/(\.\d{4})\d+/g, '$1')">
</div>
</div>
@@ -482,7 +496,7 @@
initLanguage()
setLanguage()
-
+
//鏄惁杩炵画缁勬墭
isContinue = "0";
@@ -568,8 +582,20 @@
checkBoxInfo()
}
});
+ //绠辩爜澶卞幓鐒︾偣浜嬩欢
+ $("#BOXCODE").blur(function(){
+ if ($("#BOXCODE").val() == "") {
+ layer.msg('璇峰厛鎵弿绠辩爜', {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ });
+ return
+ }
-
+ checkBoxInfo()
+ })
+
+
//鐐瑰嚮鍏ュ簱鍗曟嵁涓嬫媺妗嗕簨浠�
$("#selectDiv").click(function () {
if (xianshiyemian == 0) {
@@ -610,7 +636,7 @@
sendData(IP + "/PdaAsn/GetPasteAsnNoStrList", param, 'post', function (res) {
if (res.code == 0) { //鎴愬姛
for (var i = 0; i < res.data.length; i++) {
- $("#bar").append('<option value =' + res.data[i] + '>' + res.data[i] +'</option>');
+ $("#bar").append('<option value =' + res.data[i] + '>' + res.data[i] + '</option>');
}
form.render('select');
@@ -684,7 +710,7 @@
}, function () { });
}
})
-
+
//閫変腑鍏ュ簱鍗曚簨浠�
form.on('select(getbar)', function (data) {
updateGoodList()
@@ -737,7 +763,7 @@
'</option>');
} else {
$("#goodSelect").append('<option value =' + res.data[i].Id + '-' + i + ' selected>' + res.data[i]
- .SkuName + "-" + res.data[i].LotNo +
+ .SkuName + "=>" + res.data[i].LotNo +
'</option>');
}
} else {
@@ -748,7 +774,7 @@
'</option>');
} else {
$("#goodSelect").append('<option value =' + res.data[i].Id + '-' + i + ' selected>' + res.data[i]
- .SkuName + "-" + res.data[i].LotNo +
+ .SkuName + "=>" + res.data[i].LotNo +
'</option>');
}
@@ -759,7 +785,7 @@
'</option>');
} else {
$("#goodSelect").append('<option value =' + res.data[i].Id + '-' + i + '>' + res.data[i]
- .SkuName + "-" + res.data[i].LotNo +
+ .SkuName + "=>" + res.data[i].LotNo +
'</option>');
}
}
@@ -771,7 +797,7 @@
$('#goodSelect').siblings("div.layui-form-select").find('dl').find('.layui-select-tips').addClass('layui-this')
} else {
var sel = 'dd[lay-value=' + val + ']';
- $('#goodSelect').siblings("div.layui-form-select").find('dl').find(sel).addClass('layui-this')
+ //$('#goodSelect').siblings("div.layui-form-select").find('dl').find(sel).addClass('layui-this')
}
} else {
}
@@ -811,7 +837,7 @@
.SkuName);
}
if (res.data[i].LotNo != null) {
- $("#goodSelect1").append("-" + res.data[i].LotNo +
+ $("#goodSelect1").append("=>" + res.data[i].LotNo +
'</option>');
}
} else {
@@ -821,7 +847,7 @@
'</option>');
} else {
$("#goodSelect1").append('<option value =' + res.data[i].Id + ' selected>' + res.data[i]
- .SkuName + "-" + res.data[i].LotNo +
+ .SkuName + "=>" + res.data[i].LotNo +
'</option>');
}
}
@@ -891,130 +917,153 @@
}
-
+ var isChongFu = true;
//缁戝畾鍒版墭鐩樹簨浠�
form.on('submit(formBind)', function (data) {
- if (xianshiyemian == 0) {
- console.log($("#goodSelect").val());
- if ($("#bar").val() == "") {
- layer.msg('璇烽�夋嫨鍏ュ簱鍗�', {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- });
- return;
- }
- if ($("#goodSelect").val() == "") {
- layer.msg('璇烽�夋嫨鐗╂枡鍙婃槑缁�', {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- });
- return;
- }
- if ($("#STOCKCODE").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: $("#bar").val(),
- PalletNo: $("#STOCKCODE").val(),
- AsnDetailId: parseInt($("#goodSelect").val()),
- LotNo: $("#goodSelect").find("option:selected").text(),
- BoxNo: $("#BOXCODE").val(),
- IsContinue: isContinue,
- TailBoxNo: $("#BOXCODE2").val(),
- Origin: "PDA",
- TableType: xianshiyemian,
- }
- console.log(param)
- //缁勭洏
- sendData(IP + "/PdaAsn/BindPallet", param, 'post', function (res) {
- if (res.code == 0) { //鎴愬姛
- layer.msg(res.msg, {
- icon: 1,
- time: 1000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function () {
- setOrderGoods();
- refreshTable();
- $("#BOXCODE").val("");
- $("#BOXCODE2").val("");
- $("#QTY").val("");
- });
- } else { //涓嶆垚鍔�
- layer.msg(res.msg, {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function () {
- //鍥炶皟
- });
- }
- });
- }
- else if (xianshiyemian == 1) {
- if ($("#bar1").val() == "") {
- layer.msg('璇烽�夋嫨鍏ュ簱鍗�', {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- });
- return;
- }
- if ($("#goodSelect1").val() == "") {
- layer.msg('璇烽�夋嫨鐗╂枡鍙婃槑缁�', {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- });
- return;
- }
- if ($("#STOCKCODE1").val() == "") {
- layer.msg('璇锋壂鎻忔墭鐩樻潯鐮�', {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- });
- return;
- }
- var param = {
- AsnNo: $("#bar1").val(), //鍑哄簱鍗曟嵁
- PalletNo: $("#STOCKCODE1").val(), //鎵樼洏鏉＄爜
- AsnDetailId: parseInt($("#goodSelect1").val()), //鍏ュ簱鍗曟槑缁咺D
- LotNo: $("#goodSelect1").find("option:selected").text(), //鐗╂枡鎵规
- SkuQty: parseInt($("#SkuQty").val()), //鐗╂枡鏁伴噺
- Demo: $("#NoticeDemo").val(), //鐗╂枡鏁伴噺
- Origin: "PDA",
- TableType: xianshiyemian,
- }
+ if (isChongFu == true) {
+ isChongFu = false;
- console.log(param)
- //缁勭洏
- sendData(IP + "/PdaAsn/BindPallet", param, 'post', function (res) {
- if (res.code == 0) { //鎴愬姛
- layer.msg(res.msg, {
- icon: 1,
- time: 1000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function () {
- setOrderGoods();
- refreshTable();
- $("#STOCKCODE").val("");
- $("#SkuQty").val("");
- });
- } else { //涓嶆垚鍔�
- layer.msg(res.msg, {
+ if (xianshiyemian == 0) {
+ if ($("#bar").val() == "") {
+ layer.msg('璇烽�夋嫨鍏ュ簱鍗�', {
icon: 2,
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function () {
- //鍥炶皟
});
+ return;
}
+ if ($("#goodSelect").val() == "") {
+ layer.msg('璇烽�夋嫨鐗╂枡鍙婃槑缁�', {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ });
+ return;
+ }
+ if ($("#STOCKCODE").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: $("#bar").val(),
+ PalletNo: $("#STOCKCODE").val(),
+ AsnDetailId: parseInt($("#goodSelect").val()),
+ LotNo: $("#goodSelect").find("option:selected").text(),
+ BoxNo: $("#BOXCODE").val(),
+ IsContinue: isContinue,
+ TailBoxNo: $("#BOXCODE2").val(),
+ Origin: "PDA",
+ TableType: xianshiyemian,
+ }
+ layer.msg('鏁版嵁鎻愪氦涓紝姝ｅ湪缁勬墭...');
+ setTimeout(function() {
+ //缁勭洏
+ sendData(IP + "/PdaAsn/BindPallet", param, 'post', function (res) {
+ if (res.code == 0) { //鎴愬姛
+ layer.msg(res.msg, {
+ icon: 1,
+ time: 1000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () {
+ setOrderGoods();
+ //refreshTable();
+ $("#BOXCODE").val("");
+ $("#BOXCODE2").val("");
+ $("#QTY").val("");
+
+ isChongFu = true;
+ });
+ } else { //涓嶆垚鍔�
+ layer.msg(res.msg, {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () {
+ //鍥炶皟
+ isChongFu = true;
+ });
+ }
+ });
+ }, 2000); // 寤惰繜 1.5 绉�
+
+ }
+ else if (xianshiyemian == 1) {
+ if ($("#bar1").val() == "") {
+ layer.msg('璇烽�夋嫨鍏ュ簱鍗�', {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ });
+ return;
+ }
+ if ($("#goodSelect1").val() == "") {
+ layer.msg('璇烽�夋嫨鐗╂枡鍙婃槑缁�', {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ });
+ return;
+ }
+ if ($("#STOCKCODE1").val() == "") {
+ layer.msg('璇锋壂鎻忔墭鐩樻潯鐮�', {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ });
+ return;
+ }
+ // 鑾峰彇杈撳叆鐨勫�煎苟澶勭悊
+ var skuQty = parseFloat($("#SkuQty").val()) || 0;
+ // 纭繚鏄剧ず鏃朵繚鐣�4浣嶅皬鏁�
+ var formattedQty = skuQty.toFixed(4);
+
+ var param = {
+ AsnNo: $("#bar1").val(), //鍑哄簱鍗曟嵁
+ PalletNo: $("#STOCKCODE1").val(), //鎵樼洏鏉＄爜
+ AsnDetailId: parseInt($("#goodSelect1").val()), //鍏ュ簱鍗曟槑缁咺D
+ LotNo: $("#goodSelect1").find("option:selected").text(), //鐗╂枡鎵规
+ SkuQty: Number(skuQty), //鐗╂枡鏁伴噺
+ Demo: $("#NoticeDemo").val(), //鐗╂枡鏁伴噺
+ Origin: "PDA",
+ TableType: xianshiyemian,
+ }
+
+ console.log(param)
+ //缁勭洏
+ sendData(IP + "/PdaAsn/BindPallet", param, 'post', function (res) {
+ if (res.code == 0) { //鎴愬姛
+ layer.msg(res.msg, {
+ icon: 1,
+ time: 1000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () {
+ setOrderGoods();
+ //refreshTable();
+ $("#STOCKCODE").val("");
+ $("#SkuQty").val("");
+
+ isChongFu = true;
+ });
+ } else { //涓嶆垚鍔�
+ layer.msg(res.msg, {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () {
+ //鍥炶皟
+ isChongFu = true;
+ });
+ }
+ });
+ }
+ }else{
+ layer.msg("璇峰嬁閲嶅鐐瑰嚮", {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
});
}
+
return false; //闃绘琛ㄥ崟璺宠浆銆傚鏋滈渶瑕佽〃鍗曡烦杞紝鍘绘帀杩欐鍗冲彲銆�
});
@@ -1047,254 +1096,86 @@
});
}
-
-
-
-
- // 娓叉煋绠辩爜淇℃伅
- // function refreshTable() {
- // if (xianshiyemian == 0) {
- // //鍏堟竻绌轰竴涓嬬瀛愬垪琛�
- // let trs = $("#tableBoxList tr")
- // let len = trs.length
-
- // for (i = len - 1; i >= 2; i--) {
- // trs[i].remove();
- // }
-
- // //璁剧疆鎵樼洏鍙�
- // $("#palletCode").val($.cookie('stockCode'))
-
- // var param = {
- // PalletNo: $.cookie('stockCode')
- // };
- // // 鏍规嵁鎵樼洏鍙疯幏鍙栫鐮佷俊鎭�
- // sendData(IP + "/PdaAsn/GetBoxInfos", param, 'post', function (res) {
- // if (res.code == 0) { //鎴愬姛
- // var list = res
- // var arrTrs = new Array()
- // let idx = 0
- // for (var i in res.data) {
- // var tr = $("#boxCell").eq(0).clone();
- // tr.appendTo("#tableBoxList");
- // tr.attr('id', res.data[i].Id)
- // tr.attr('boxno', res.data[i].BoxNo)
- // tr.attr('BindNo', res.data[i].BindNo)
- // idx++;
- // tr.attr('index', idx)
- // tr.find("td[name='code']").html(res.data[i].BoxNo);
- // tr.find("td[name='name']").html(res.data[i].SkuName);
- // tr.find("td[name='lotNo']").html(res.data[i].LotNo);
- // tr.find("td[name='num']").html(res.data[i].Qty);
- // tr.find("td[name='del']").click(function () {
- // var elem = $(this).parent()
- // var boxno = elem.attr('boxno')
- // var BindNo = elem.attr('BindNo')
- // var Id = elem.attr('id')
- // layer.alert("纭畾瑕佷粠鎵樼洏涓婂垹闄よ繖涓鐗╂枡鍚楋紵<br>" + boxno, {
- // icon: 2,
- // time: 0, //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- // btn: ['鍒犻櫎', '鍙栨秷'],
- // yes: function () {
-
- // var param = {
- // boxNo: boxno,
- // };
- // sendData(IP + "/BllAsn/DelBindBoxInfo", param, 'get', function (res) {
- // if (res.code == 0) { //鎴愬姛
- // layer.msg(res.msg, {
- // icon: 1,
- // time: 1000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- // });
- // elem.remove()
- // setOrderGoods();
- // refreshTable();
- // } else { //涓嶆垚鍔�
- // layer.msg(res.msg, {
- // icon: 2,
- // time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- // }, function () { });
- // }
- // });
- // }
- // })
- // })
- // tr.show();
- // arrTrs[i] = tr
- // }
- // //璁剧疆鍒嗛〉
- // setPages(1, res.data.length)
-
- // } else { //涓嶆垚鍔�
- // layer.msg("鏃犳暟鎹�", {
- // icon: 2,
- // time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- // }, function () { });
- // $("#boxNum").val(0)
- // setPages(1, 0)
- // }
- // });
- // }
- // else if (xianshiyemian == 1) {
- // //鍏堟竻绌轰竴涓嬬瀛愬垪琛�
- // let trs = $("#tableBoxList1 tr")
- // let len = trs.length
-
- // for (i = len - 1; i >= 2; i--) {
- // trs[i].remove();
- // }
-
- // //璁剧疆鎵樼洏鍙�
- // $("#palletCode").val($.cookie('stockCode1'))
-
- // var param = {
- // PalletNo: $.cookie('stockCode1')
- // };
- // // 鏍规嵁鎵樼洏鍙疯幏鍙栫鐮佷俊鎭�
- // sendData(IP + "/PdaAsn/GetPalletBindInfo", param, 'post', function (res) {
- // if (res.code == 0) { //鎴愬姛
- // var list = res
- // var arrTrs = new Array()
- // let idx = 0
- // for (var i in res.data) {
- // var tr = $("#boxCell").eq(0).clone();
- // tr.appendTo("#tableBoxList1");
- // tr.attr('id', res.data[i].Id)
- // tr.attr('boxno', res.data[i].BoxNo)
- // tr.attr('BindNo', res.data[i].BindNo)
- // idx++;
- // tr.attr('index', idx)
- // tr.find("td[name='code']").html(res.data[i].SkuNo);
- // tr.find("td[name='name']").html(res.data[i].SkuName);
- // tr.find("td[name='lotNo']").html(res.data[i].LotNo);
- // tr.find("td[name='num']").html(res.data[i].Qty);
- // tr.find("td[name='del']").click(function () {
- // var elem = $(this).parent()
- // // var boxno = elem.attr('boxno')
- // var BindNo = elem.attr('BindNo')
- // console.log(res)
- // var Id = elem.attr('id')
- // layer.alert("纭畾瑕佷粠鎵樼洏涓婂垹闄よ繖鎵樼墿鏂欏悧锛�<br>" + res.data[0].PalletNo, {
- // icon: 2,
- // time: 0, //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- // btn: ['鍒犻櫎', '鍙栨秷'],
- // yes: function () {
-
- // var param = {
- // Id: parseInt(Id),
- // PalletNo: res.data[0].PalletNo,
- // };
- // console.log(Id)
- // console.log(param)
- // sendData(IP + "/PdaAsn/DelPalletBind", param, 'post', function (res) {
- // if (res.code == 0) { //鎴愬姛
- // layer.msg(res.msg, {
- // icon: 1,
- // time: 1000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- // });
- // elem.remove()
- // setOrderGoods();
- // refreshTable();
- // } else { //涓嶆垚鍔�
- // layer.msg(res.msg, {
- // icon: 2,
- // time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- // }, function () { });
- // }
- // });
- // }
- // })
- // })
- // tr.show();
- // arrTrs[i] = tr
- // }
-
- // //璁剧疆鍒嗛〉
- // setPages(1, res.data.length)
-
- // } else { //涓嶆垚鍔�
- // layer.msg("鏃犳暟鎹�", {
- // icon: 2,
- // time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- // }, function () { });
- // $("#boxNum").val(0)
- // setPages(1, 0)
- // }
- // });
- // }
-
- // }
-
-
//绠卞洖杞︿簨浠�
function checkBoxInfo() {
var param = {
"BoxNo": $("#BOXCODE").val(),
+ "ASNNo": $("#bar").val()
}
sendData(IP + "/PdaAsn/GetBindBoxInfos", param, 'post', function (res) {
- BoxLevelVal = "0";
+
+
if (res.code == 0) { //鎴愬姛
- //鍒ゆ柇鏄惁涓洪浂绠盉itBoxMark
- if (res.data[0].BitBoxMark == '1') {
- getFMBoxinfo();
+
+ var bl = false;
+ if (res.data.length == 0) {
+ layer.msg("鏈煡璇㈠埌姝ょ鐗╂枡淇℃伅锛岃鏍稿疄!", {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ });
+ return;
+ }
+
+ 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>');
+
+ updateGoodList(res.data[0].SkuNo)
+ setOrderGoods();
} else {
- var bl = false;
- if (res.data.length == 0) {
- layer.msg("鏈煡璇㈠埌姝ょ鐗╂枡淇℃伅锛岃鏍稿疄!", {
+ if (asnDetails == '') {
+ layer.msg("璇峰厛閫夋嫨鍏ュ簱鍗曟嵁!", {
icon: 2,
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
});
return;
}
-
- 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>');
-
- updateGoodList(res.data[0].SkuNo)
- setOrderGoods();
- } else {
- if (asnDetails == '') {
- 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);
- }
}
+ asnDetails.forEach(element => {
+ console.log(element.SkuNo);
+ console.log(res.data[0].SkuNo);
+ console.log(element.SkuNo == res.data[0].SkuNo);
+ console.log(element.LotNo == res.data[0].LotNo);
+
+ if (element.SkuNo == res.data[0].SkuNo && element.LotNo == res.data[0].LotNo) {
+ console.log("asdfasdfsadf");
+
+ var sel = 'dd[lay-value=' + element.id + ']';
+ $('#goodSelect').siblings("div.layui-form-select").find('dl').find(sel).addClass('layui-this');
+ bl = true;
+ }
+ });
+ console.log(bl);
+
+ 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绉掞級
+ });
//绠辩爜涓嶅瓨鍦紝璋冪敤璧嬬爜鎺ュ彛鑾峰彇绠变俊鎭�
- getFMBoxinfo();
+ //getFMBoxinfo();
}
});
}
- function getFMBoxinfo(){
+ function getFMBoxinfo() {
var param = {
"BoxNo": $("#BOXCODE").val(),
}
sendData(IP + "/UpApi/GetFMBindBoxInfos", param, 'post', function (res) {
+ console.log(res);
if (res.code == 0) { //鎴愬姛//鏍规嵁瀵规帴鎺ュ彛瀹氫箟鍚勫瓧娈靛垽鏂潯浠�
var bl = false;
if (res.data.length == 0) {
@@ -1354,9 +1235,44 @@
form.on('switch(IsLianXu)', function (obj) {
if (obj.elem.checked) {
- $('#BOX2').attr("style", "display:block")
- $('#zongDiv').attr("style", "height: 315px;")
- isContinue = "1";
+ if ($("#bar").val() == "") {
+ $('#IsLianXu').prop('checked',false);
+ layui.form.render();
+ layer.msg('璇烽�夋嫨鍏ュ簱鍗�', {
+ icon: 2,
+ time: 1000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ });
+ return;
+ }
+ var param = {
+ ASNNo: $("#bar").val()
+ };
+ sendData(IP + "/PdaAsn/GetArrivalNotice", param, 'post', function (res) {
+ if (res.code == 0) { //鎴愬姛
+ if(res.data[0].Type=="0"){
+ $('#IsLianXu').prop('checked',false);
+ layui.form.render();
+ layer.msg('鎴愬搧鍏ュ簱鍗曚笉鑳藉紑鍚繛缁勶紒', {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ });
+ return;
+ }else{
+ $('#BOX2').attr("style", "display:block")
+ $('#zongDiv').attr("style", "height: 315px;")
+ isContinue = "1";
+ }
+ } else { //涓嶆垚鍔�
+ layer.msg('鍏ュ簱鍗曚俊鎭笉瀛樺湪', {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function() {
+ $('#IsLianXu').prop('checked',false);
+ layui.form.render();
+ });
+ }
+ });
+
} else {
$('#BOX2').attr("style", "display:none")
$('#zongDiv').attr("style", "height: 285px;")
--
Gitblit v1.8.0