From ad51be373212c515f0add60aaf4b9f7c21a8de55 Mon Sep 17 00:00:00 2001
From: zhaowc <526854230@qq.com>
Date: 星期五, 07 二月 2025 11:02:41 +0800
Subject: [PATCH] 修改在公司本地数据库配置

---
 Pda/View/SoSetting/productOut.html |   50 +++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 45 insertions(+), 5 deletions(-)

diff --git a/Pda/View/SoSetting/productOut.html b/Pda/View/SoSetting/productOut.html
index e1326d7..b538ac9 100644
--- a/Pda/View/SoSetting/productOut.html
+++ b/Pda/View/SoSetting/productOut.html
@@ -303,8 +303,8 @@
 										<div class="layui-form-item layout-input" style="margin-top: 6px;">
 											<label class="layui-form-label lableWidth">鎷h揣鏁伴噺锛�</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>
@@ -509,9 +509,9 @@
 											<label class="layui-form-label lableWidth" >鎷h揣鏁伴噺锛�</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">
@@ -677,7 +677,7 @@
 
 			//妫�鏌ユ墭鐩樼姸鎬�
 			function checkPalletState() {
-
+				
 				var param = {
 					"PalletNo": $("#palletNo").val()
 				}
@@ -845,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绉掞級
@@ -901,6 +905,10 @@
 
 			//鑾峰彇鎵樼洏鐗╂枡鍚嶇粏
 			function GetBoxInfo() { 
+				if ($('#pickQty').val() == $('#pickedQty').val())
+				{
+					return;
+				}
 				let param2 = {
 					"SoDetailId": $("#skuLotNo").val(),
 					"PalletNo": $("#palletNo").val(),
@@ -913,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绉掞級
@@ -997,6 +1009,16 @@
 
 			//纭鎷h揣 
 			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(),
@@ -1347,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绉掞級
@@ -1358,6 +1384,10 @@
 
 			//鑾峰彇鎵樼洏鐗╂枡鍚嶇粏
 			function GetDataInfo() { 
+				if ($("#planQty").val() == $("#finishQty").val())
+				{
+					return;
+				}
 				let param2 = {
 					"SoDetailId": $("#skuLotNo2").val(),
 					"PalletNo": $("#palletNo2").val(),
@@ -1469,6 +1499,16 @@
 
 			//纭鎷h揣 
 			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