From f42e607f9309c06394c6c46bfdc354ddd5195d51 Mon Sep 17 00:00:00 2001
From: liudl <673013083@qq.com>
Date: 星期四, 16 一月 2025 08:31:25 +0800
Subject: [PATCH] Merge branch 'Liudl'
---
Pda/View/SoSetting/productOut.html | 70 ++++++++++++++++++++++++++++-------
1 files changed, 56 insertions(+), 14 deletions(-)
diff --git a/Pda/View/SoSetting/productOut.html b/Pda/View/SoSetting/productOut.html
index 0e49687..b538ac9 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">
@@ -301,8 +303,8 @@
<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,'')">
+ <input id="pickQty1" type="text" placeholder="璇疯緭鍏ユ嫞璐ф暟閲�"autocomplete="off"
+ class="layui-input" >
</div>
</div>
</td>
@@ -507,9 +509,9 @@
<label class="layui-form-label lableWidth" >鎷ｈ揣鏁伴噺锛�</label>
<div id="" class="local-input">
<div class="layui-input-block">
- <input id="pickQty2" type="number" placeholder="璇疯緭鍏ユ嫞璐ф暟閲�"
+ <input id="pickQty2" type="text" placeholder="璇疯緭鍏ユ嫞璐ф暟閲�"
autocomplete="off" class="layui-input" style="padding-left:0.1rem;"
- oninput="value=value.replace(/^(0+)|[^\d]+/g,'')">
+ >
</div>
</div>
<div id="" class="local-ok">
@@ -578,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();//鍏夋爣榛樿閫変腑
});
@@ -597,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();//鍏夋爣榛樿閫変腑
});
});
@@ -675,7 +677,7 @@
//妫�鏌ユ墭鐩樼姸鎬�
function checkPalletState() {
-
+
var param = {
"PalletNo": $("#palletNo").val()
}
@@ -843,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绉掞級
@@ -899,6 +905,10 @@
//鑾峰彇鎵樼洏鐗╂枡鍚嶇粏
function GetBoxInfo() {
+ if ($('#pickQty').val() == $('#pickedQty').val())
+ {
+ return;
+ }
let param2 = {
"SoDetailId": $("#skuLotNo").val(),
"PalletNo": $("#palletNo").val(),
@@ -911,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绉掞級
@@ -995,6 +1009,16 @@
//纭鎷ｈ揣
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())) {
+ layer.msg("鏁伴噺蹇呴』澶т簬0(鍙繚鐣�4浣嶅皬鏁�)", {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ });
+ return -1;
+ }
+ }
var param = {
"SoNo": $("#bar").val(),
"SoDetailId": $("#skuLotNo").val(),
@@ -1345,6 +1369,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绉掞級
@@ -1356,6 +1384,10 @@
//鑾峰彇鎵樼洏鐗╂枡鍚嶇粏
function GetDataInfo() {
+ if ($("#planQty").val() == $("#finishQty").val())
+ {
+ return;
+ }
let param2 = {
"SoDetailId": $("#skuLotNo2").val(),
"PalletNo": $("#palletNo2").val(),
@@ -1467,6 +1499,16 @@
//纭鎷ｈ揣
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())) {
+ layer.msg("鏁伴噺蹇呴』澶т簬0(鍙繚鐣�4浣嶅皬鏁�)", {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ });
+ return -1;
+ }
+ }
var param = {
"SoNo": $("#bar2").val(),
"SoDetailId": $("#skuLotNo2").val(),
--
Gitblit v1.8.0