From bbd55a7466e770e7acb86ccc9d83ab20bde17980 Mon Sep 17 00:00:00 2001
From: IPC-610 <IPC-610@DESKTOP-6LEOOS3>
Date: 星期四, 26 九月 2024 19:30:45 +0800
Subject: [PATCH] 增加申请空托跺出库接口

---
 Pda/View/SoSetting/productOut.html |   42 ++++++++++++++++++++++++++++++++----------
 1 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/Pda/View/SoSetting/productOut.html b/Pda/View/SoSetting/productOut.html
index 0e49687..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">
@@ -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绉掞級
@@ -1345,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绉掞級
@@ -1356,6 +1374,10 @@
 
 			//鑾峰彇鎵樼洏鐗╂枡鍚嶇粏
 			function GetDataInfo() { 
+				if ($("#planQty").val() == $("#finishQty").val())
+				{
+					return;
+				}
 				let param2 = {
 					"SoDetailId": $("#skuLotNo2").val(),
 					"PalletNo": $("#palletNo2").val(),

--
Gitblit v1.8.0