From e9fa2cd033cc5399a4a23601f8155a8cd2079aab Mon Sep 17 00:00:00 2001
From: test <15284381150@163.com>
Date: 星期日, 21 九月 2025 11:06:29 +0800
Subject: [PATCH] Merge branch 'master' of http://47.95.120.53:8083/r/JC34WMS
---
Pda/View/SoSetting/productOutCode.html | 63 ++++++++++++++++++++++---------
1 files changed, 45 insertions(+), 18 deletions(-)
diff --git a/Pda/View/SoSetting/productOutCode.html b/Pda/View/SoSetting/productOutCode.html
index 6f6bbee..8f41278 100644
--- a/Pda/View/SoSetting/productOutCode.html
+++ b/Pda/View/SoSetting/productOutCode.html
@@ -197,7 +197,7 @@
<tr>
<td colspan="3">
<div class="layui-form-item">
- <label class="layui-form-label" style="width: 17%;">SAP鍗曞彿锛�</label>
+ <label class="layui-form-label" style="width: 17%;">涓嬪彂鍗曞彿锛�</label>
<div class="layui-input-block" style="width: 83%;margin-left:17%;">
<input id="OrderCode" type="text" lay-verify="" disabled placeholder=""
class="layui-input">
@@ -374,6 +374,7 @@
$("#palletNo").focus();//鍏夋爣榛樿閫変腑
function clear1() {
+ $("#OrderCode").val("");//涓嬪彂鍗曞彿
$('#outModel').val("");//鍑哄簱鍙�
$('#standard').val("");//瑙勬牸
@@ -407,11 +408,31 @@
form.on('switch(IsZhengTuo)', function (obj) {
if (obj.elem.checked) {
+ var boxNum=0;
+ var param = {
+ "PalletNo": $("#palletNo").val()
+ }
+ synData(IP + "/PdaSo/CheckBoxForPick", param, 'get', function (res) {
+ if (res.code == 0) { //鎴愬姛
+ boxNum=res.data
+ $('#scanQty').val(boxNum);
+
+ } else { //涓嶆垚鍔�
+ layer.msg(res.msg, {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () { });
+ return;
+ }
+ });
$('#BoxDIv').attr("style", "display:none")
isContinue = "1";
+ refreshTable();
+ boxes = [];
} else {
$('#BoxDIv').attr("style", "display:block")
isContinue = "0";
+ $('#scanQty').val(0);
}
$('#boxNo').val("");
});
@@ -619,6 +640,7 @@
console.log(res.data);
$("#planQty").val(res.data.PlanQty)
$("#finishQty").val(res.data.FinishQty)
+ $("#OrderCode").val(res.data.OrderCode)
} else { //涓嶆垚鍔�
layer.msg(res.msg, {
icon: 2,
@@ -686,10 +708,10 @@
canPickBox = true
} else { //涓嶆垚鍔�
- layer.msg("鏃犳暟鎹�", {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function () { });
+ // layer.msg("鏃犳暟鎹�", {
+ // icon: 2,
+ // time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ // }, function () { });
// $("#boxNum").val(0)
}
}
@@ -714,20 +736,19 @@
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
}); return;
}
- if (isContinue == "0") {
- if ($('#boxNo').val() == "") {
- layer.msg("璇疯緭鍏ョ鐮�", {
+ if($("#planQty").val()!=$("#scanQty").val()){
+ layer.msg("宸叉壂鏁伴噺鍜岃鍒掓暟閲忎笉涓�鑷达紒", {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }); return;
+ }
+ if (isContinue == "0") {
+ if (boxes == null || boxes.length<=0) {
+ layer.msg("璇锋壂鎻忔爣绛剧爜", {
icon: 2,
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
}); return;
- }
- if ($('#boxQty').val() == "") {
- layer.msg("绠卞唴鏁伴噺涓虹┖锛屼笉鑳芥嫞璐�", {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- });
- return;
- }
+ }
}
if (canPickBox == false) {
@@ -745,13 +766,17 @@
//纭鎷ｈ揣
function reqPickScatter() {
+ var boxList=[];
+ for(var i=0;i<boxes.length;i++){
+ boxList.push(boxes[i].BoxNo)
+ }
var param = {
"SoNo": $("#bar").val(),
"SoDetailId": $("#skuLotNo").val(),
"PalletNo": $('#palletNo').val(),
- "BoxNo": $('#boxNo').val()
+ "BoxNoList": boxList
}
- sendData(IP + "/PdaSo/SoSetPick", param, 'post', function (res) {
+ sendData(IP + "/PdaSo/SoSetPickCode", param, 'post', function (res) {
//console.log(res);
if (res.code == 0) { //鎴愬姛
@@ -763,6 +788,8 @@
$("#boxNo").val('');
updateQtyList();
getBar();
+ refreshTable();
+ boxes = [];
});
} else { //涓嶆垚鍔�
layer.msg(res.msg, {
--
Gitblit v1.8.0