From af73aff35be4607dd22232d5695e30ca3059c436 Mon Sep 17 00:00:00 2001
From: zhaowc <526854230@qq.com>
Date: 星期二, 01 四月 2025 15:58:21 +0800
Subject: [PATCH] PDA的2个拣货页面修改
---
Pda/View/SoSetting/pinTuoOut.html | 123 +++++++++++++++++++++++++++++++++-------
1 files changed, 100 insertions(+), 23 deletions(-)
diff --git a/Pda/View/SoSetting/pinTuoOut.html b/Pda/View/SoSetting/pinTuoOut.html
index 9dd59d2..750b654 100644
--- a/Pda/View/SoSetting/pinTuoOut.html
+++ b/Pda/View/SoSetting/pinTuoOut.html
@@ -343,15 +343,17 @@
</div>
</div>
</td>
- <!-- <td>
+ </tr>
+ <tr>
+ <td>
<div class="layui-form-item ">
- <label class="layui-form-label lableWidth">绠卞唴鏁伴噺锛�</label>
+ <label class="layui-form-label lableWidth">鎵樼洏涓婃暟閲忥細</label>
<div class="layui-input-block">
- <input id="boxQty" class="layui-input" style="border: 0;"
+ <input id="palletNoqty" class="layui-input" style="border: 0;"
type="text" lay-verify="" disabled placeholder="">
</div>
</div>
- </td> -->
+ </td>
</tr>
</table>
</td>
@@ -631,7 +633,20 @@
var tableData = null
var tableData2 = null
var canPickBox = true
- $("#palletNo").focus();//鍏夋爣榛樿閫変腑
+ $("#palletNo").focus();//鍏夋爣榛樿閫変腑
+
+ function clear5()
+ {
+ $('#outModel').val("");//鍑哄簱鍙�
+ $('#standard').val("");//瑙勬牸
+
+ $('#pickQty').val("");//寰呮嫞鏁伴噺
+ $('#pickedQty').val("");//宸叉嫞鏁伴噺
+ $('#palletNoqty').val("");//宸叉嫞鏁伴噺
+
+ $('#boxNo').val("");//绠辩爜
+ $('#boxQty').val("");//鎵樼洏涓婃暟閲�
+ }
function clear1() {
$('#outModel').val("");//鍑哄簱鍙�
@@ -639,6 +654,8 @@
$('#pickQty').val("");//寰呮嫞鏁伴噺
$('#pickedQty').val("");//宸叉嫞鏁伴噺
+ $('#palletNoqty').val("");//宸叉嫞鏁伴噺
+
}
function clear2() {
//鐗╂枡鎵规
@@ -652,7 +669,7 @@
}
function clear4() {
$('#boxNo').val("");//绠辩爜
- $('#boxQty').val("");//绠卞唴鏁伴噺
+ $('#boxQty').val("");//鎵樼洏涓婃暟閲�
}
//褰撴墭鐩樻潯鐮佽緭鍏ユ鏂囨湰鏀瑰彉鏃�,妫�鏌ヤ竴涓嬫墭鐩樼姸鎬�
$("#palletNo").on('input', function () {
@@ -790,6 +807,17 @@
icon: 2,
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
});
+ clear5;
+
+ $("#palletNo").val("");//鎵樼洏鍙�
+ $("#pickQty1").val("");//鎵樼洏鍙�
+
+ $("#planQty").val(""); //璁″垝鏁伴噺
+ $("#finishQty").val("");//瀹屾垚鏁伴噺
+ //鐗╂枡鎵规
+ $("#skuLotNo").empty();
+ $("#skuLotNo").append('<option value =>' + '</option>');
+ form.render('select');
}
});
}
@@ -879,7 +907,12 @@
for (i = len - 1; i >= 2; i--) {
trs[i].remove();
}
-
+ console.log("LIST.LENGTH:"+list.length);
+
+ if(list.length == 1){
+ $("#pickQty1").val(list[0].Qty)
+ }
+ let pallnono = 0;
console.log(list != null);
console.log(list);
if (list != null && list.length > 0) { //鎴愬姛
@@ -899,6 +932,8 @@
tr.find("td[name='qty']").html(list[i].Qty);
tr.find("td[name='pickedQty']").html(list[i].PickedQty);
+ pallnono = pallnono + list[i].Qty;
+
tr.show();
arrTrs[i] = tr
}
@@ -913,6 +948,7 @@
// $("#boxNum").val(0)
setPages(1, 0)
}
+ $("#palletNoqty").val(pallnono)
}
//鑾峰彇鎵樼洏鐗╂枡鍚嶇粏
@@ -925,9 +961,34 @@
}
synData(IP + "/PdaSo/GetDataComBoxInfo", param2, 'post', function (res) {
if (res.code == 0) {
- tableData = deepCopy(res.data)
-
- refreshTable(tableData)
+ console.log("111111111111111:"+res.data.Qty);
+ //tableData = deepCopy(res.data)
+ console.log("111111111111111:"+res.data.Qty);
+
+ $("#pickQty1").val(res.data.Qty)
+
+ refreshTable(res.data)
+ } else {
+ layer.msg(res.msg, {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () { });
+ }
+ });
+ }
+ //鑾峰彇鎵樼洏鐗╂枡鍚嶇粏
+ function getpallnono() {
+ let param2 = {
+ "PalletNo": $("#palletNo").val(),
+ }
+ synData(IP + "/PdaSo/GetDataPallnoInfo", param2, 'post', function (res) {
+ if (res.code == 0) {
+ console.log("111111111111111:"+res.data.Qty);
+ //tableData = deepCopy(res.data)
+ console.log("111111111111111:"+res.data.Qty);
+
+ $("#palletNoqty").val(res.data.Qty)
+
} else {
layer.msg(res.msg, {
icon: 2,
@@ -985,13 +1046,14 @@
});
return;
}
- if($('#pickQty1').val() != "" && $('#pickQty1').val()>parseInt($('#pickQty').val())){
- layer.msg("鎷ｈ揣鏁伴噺涓嶈兘澶т簬寰呮嫞鏁伴噺锛�", {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- });
- return;
- }
+ //鎷ｈ揣鏁伴噺鍙互瓒呰繃寰呮嫞鏁伴噺
+ // if($('#pickQty1').val() != "" && $('#pickQty1').val()>parseInt($('#pickQty').val())){
+ // layer.msg("鎷ｈ揣鏁伴噺涓嶈兘澶т簬寰呮嫞鏁伴噺锛�", {
+ // icon: 2,
+ // time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ // });
+ // return;
+ // }
}
// let boxQty = parseInt($('#boxQty').val())
// let qty = parseInt($('#qty').val())
@@ -1020,8 +1082,15 @@
//纭鎷ｈ揣
function reqPickScatter() {
if($('#pickQty1').val()!= "" && $('#pickQty1').val()!= undefined){
- var reg = /(^[1-9]([0-9]+)?(\.[0-9]{1,4})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/;
- if (!reg.test($("#pickQty1").val())) {
+ // var reg = /^[1-9]\d*(\.\d{1,4})?$|^0\.\d{1,4}[1-9]\d*$/;
+ // if (!reg.test($("#pickQty1").val())) {
+ // layer.msg("鏁伴噺蹇呴』澶т簬0(鍙繚鐣�4浣嶅皬鏁�)", {
+ // icon: 2,
+ // time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ // });
+ // return -1;
+ // }
+ if (!($('#pickQty1').val()>0)) {
layer.msg("鏁伴噺蹇呴』澶т簬0(鍙繚鐣�4浣嶅皬鏁�)", {
icon: 2,
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
@@ -1398,6 +1467,7 @@
console.log(param2);
synData(IP + "/PdaSo/GetAllotPlnInfo", param2, 'post', function (res) {
if (res.code == 0) {
+ console.log("22222222222222222:");
tableData2 = deepCopy(res.data)
refreshTable2(tableData2)
@@ -1482,8 +1552,8 @@
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
}); return;
}
- let pickedQty = parseInt($('#pickedQty2').val()) //宸叉嫞鏁伴噺
- let pickQty = parseInt($('#pickQty2').val()) //鎷ｈ揣鏁伴噺
+ let pickedQty = parseFloat($('#pickedQty2').val()) //宸叉嫞鏁伴噺
+ let pickQty = parseFloat($('#pickQty2').val()) //鎷ｈ揣鏁伴噺
if (pickQty <= 0) {
layer.msg("鎷ｈ揣鏁伴噺闇�澶т簬0", {
icon: 2,
@@ -1509,8 +1579,15 @@
//纭鎷ｈ揣
function reqPickScatter2() {
if($('#pickQty2').val()!= "" && $('#pickQty2').val()!= undefined){
- var reg = /(^[1-9]([0-9]+)?(\.[0-9]{1,4})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/;
- if (!reg.test($("#pickQty2").val())) {
+ // var reg = /^[1-9]\d*(\.\d{1,4})?$|^0\.\d{1,4}[1-9]\d*$/;
+ // if (!reg.test($("#pickQty2").val())) {
+ // layer.msg("鏁伴噺蹇呴』澶т簬0(鍙繚鐣�4浣嶅皬鏁�)", {
+ // icon: 2,
+ // time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ // });
+ // return -1;
+ // }
+ if (!($('#pickQty2').val()>0)) {
layer.msg("鏁伴噺蹇呴』澶т簬0(鍙繚鐣�4浣嶅皬鏁�)", {
icon: 2,
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
--
Gitblit v1.8.0