From 9ebb2b2124c6ea776c61da36c3cc49940895687a Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@DESKTOP-5BIMHQ3>
Date: 星期三, 27 三月 2024 08:09:39 +0800
Subject: [PATCH] Merge branch 'master' into wxw
---
Pda/View/SoSetting/productOut.html | 68 +++++++++++++++++++++++++++++-----
1 files changed, 58 insertions(+), 10 deletions(-)
diff --git a/Pda/View/SoSetting/productOut.html b/Pda/View/SoSetting/productOut.html
index 78e1a8b..cda229e 100644
--- a/Pda/View/SoSetting/productOut.html
+++ b/Pda/View/SoSetting/productOut.html
@@ -169,12 +169,14 @@
</ul>
</div>
- <ul>
+ <!-- <ul>
<li id="option1">鏍囩</li>
<li id="option2">鏁伴噺</li>
- </ul>
+ </ul> -->
- <br />
+ <button id="option1" class="layout-btn" type="button">鏍囩</button>
+ <button id="option2" class="layout-btn" type="button">鏁伴噺</button>
+ <br /><br />
<!-- 鏈夌爜 -->
<div id="content1">
@@ -292,6 +294,17 @@
<div class="layui-input-block">
<input id="boxNo3" type="text" lang langholder placeholder="璇锋壂鎻忚拷婧潯鐮�"
autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ </td>
+ </tr>
+ <tr class="divPickQty1">
+ <td>
+ <div class="layui-form-item layout-input" style="margin-top: 6px;">
+ <label class="layui-form-label lableWidth">鎷ｈ揣鏁伴噺锛�</label>
+ <div class="layui-input-block">
+ <input id="pickQty1" type="number" placeholder="璇疯緭鍏ユ嫞璐ф暟閲�"autocomplete="off"
+ class="layui-input" oninput="value=value.replace(/^(0+)|[^\d]+/g,'')">
</div>
</div>
</td>
@@ -567,18 +580,18 @@
var xianshiyemian = 0;
- $('#option1').attr("style", "background-color: aqua;width: 45.77%;float: left;text-align: center;"); //閫変腑鍚庨鑹�
- $('#option2').attr("style", "background-color: #999;width: 45.77%;float: right;text-align: center;"); //榛樿棰滆壊
+ $('#option1').attr("style", "background-color: red;width: 50%;float: left;text-align: center;"); //閫変腑鍚庨鑹�
+ $('#option2').attr("style", "background-color: #999;width: 50%;float: right;text-align: center;"); //榛樿棰滆壊
$('#content2').hide();
$(document).ready(function () {
$('#option1').click(function () {
// qingkong();
xianshiyemian = 0;
$('#content1').show();
- $('#option1').attr("style", "background-color: aqua;width: 45.77%;float: left;text-align: center;"); //閫変腑鍚庨鑹�
+ $('#option1').attr("style", "background-color: red;width: 50%;float: left;text-align: center;"); //閫変腑鍚庨鑹�
$('#content2').hide();
- $('#option2').attr("style", "background-color: #999;width: 45.77%;float: right;text-align: center;"); //榛樿棰滆壊
+ $('#option2').attr("style", "background-color: #999;width: 50%;float: right;text-align: center;"); //榛樿棰滆壊
$("#palletNo").focus();//鍏夋爣榛樿閫変腑
});
@@ -586,10 +599,10 @@
// qingkong();
xianshiyemian = 1;
$('#content1').hide();
- $('#option1').attr("style", "background-color: #999;width: 45.77%;float: left;text-align: center;"); //榛樿棰滆壊
+ $('#option1').attr("style", "background-color: #999;width: 50%;float: left;text-align: center;"); //榛樿棰滆壊
$('#content2').show();
- $('#option2').attr("style", "background-color: aqua;width: 45.77%;float: right;text-align: center;"); //閫変腑鍚庨鑹�
+ $('#option2').attr("style", "background-color: red;width: 50%;float: right;text-align: center;"); //閫変腑鍚庨鑹�
$("#palletNo2").focus();//鍏夋爣榛樿閫変腑
});
});
@@ -664,7 +677,7 @@
//妫�鏌ユ墭鐩樼姸鎬�
function checkPalletState() {
-
+
var param = {
"PalletNo": $("#palletNo").val()
}
@@ -832,6 +845,10 @@
$('#pickQty').val(res.data.PickQty);
$('#pickedQty').val(res.data.PickedQty);
} else { //涓嶆垚鍔�
+ if($("#planQty").val() == $("#finishQty").val() || $('#pickQty').val() == $('#pickedQty').val())
+ {
+ return;
+ }
layer.msg(res.msg, {
icon: 2,
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
@@ -888,6 +905,10 @@
//鑾峰彇鎵樼洏鐗╂枡鍚嶇粏
function GetBoxInfo() {
+ if ($('#pickQty').val() == $('#pickedQty').val())
+ {
+ return;
+ }
let param2 = {
"SoDetailId": $("#skuLotNo").val(),
"PalletNo": $("#palletNo").val(),
@@ -900,6 +921,10 @@
refreshTable(tableData)
} else {
+ // $("#planQty").val(); //璁″垝鏁伴噺
+ // $("#finishQty").val();//瀹屾垚鏁伴噺
+ // console.info($("#planQty").val(),$("#finishQty").val())
+
layer.msg(res.msg, {
icon: 2,
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
@@ -943,6 +968,20 @@
});
return;
}
+ if(($('#boxNo3').val() != "" && ($('#pickQty1').val() != "" || $('#pickQty1').val() != 0))){
+ 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())
@@ -976,6 +1015,7 @@
"PalletNo": $('#palletNo').val(),
"BoxNo": $('#boxNo').val(),
"BoxNo3": $('#boxNo3').val(),
+ "PickQty":$('#pickQty1').val()
}
sendData(IP + "/PdaSo/SoSetPick", param, 'post', function (res) {
//console.log(res);
@@ -1319,6 +1359,10 @@
$('#pickQty2').val(res.data.PickQty - res.data.PickedQty);
$('#pickedQty2').val(res.data.PickedQty);
} else { //涓嶆垚鍔�
+ if($("#planQty").val() == $("#finishQty").val() || $('#pickQty').val() == $('#pickedQty').val())
+ {
+ return;
+ }
layer.msg(res.msg, {
icon: 2,
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
@@ -1330,6 +1374,10 @@
//鑾峰彇鎵樼洏鐗╂枡鍚嶇粏
function GetDataInfo() {
+ if ($("#planQty").val() == $("#finishQty").val())
+ {
+ return;
+ }
let param2 = {
"SoDetailId": $("#skuLotNo2").val(),
"PalletNo": $("#palletNo2").val(),
--
Gitblit v1.8.0