From af73aff35be4607dd22232d5695e30ca3059c436 Mon Sep 17 00:00:00 2001
From: zhaowc <526854230@qq.com>
Date: 星期二, 01 四月 2025 15:58:21 +0800
Subject: [PATCH] PDA的2个拣货页面修改

---
 Pda/View/SoSetting/productOut.html |   94 ++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 92 insertions(+), 2 deletions(-)

diff --git a/Pda/View/SoSetting/productOut.html b/Pda/View/SoSetting/productOut.html
index 0928734..b18023e 100644
--- a/Pda/View/SoSetting/productOut.html
+++ b/Pda/View/SoSetting/productOut.html
@@ -262,6 +262,11 @@
 								<input type="checkbox" name="IsZhengTuo" id="IsZhengTuo" lay-skin="switch" lay-text="鏄瘄鍚�"
 									lay-filter="IsZhengTuo">
 							</div>
+							<label class="layui-form-label" lang>鏄惁杩炵画鎷h揣锛�</label>
+							<div class="layui-input-block">
+								<input type="checkbox" name="IsCheckCon" id="IsCheckCon" lay-skin="switch" lay-text="鏄瘄鍚�"
+									lay-filter="IsCheckCon">
+							</div>
 						</div>
 						<div id="BoxDIv" class="layout-tab-page">
 							<table class="layout-tab-content" border="" cellspacing="" cellpadding="">
@@ -345,6 +350,17 @@
 													</div>
 												</td> -->
 											</tr>
+											<tr>
+												<td>
+												   <div class="layui-form-item ">
+													   <label class="layui-form-label lableWidth">鎵樼洏涓婃暟閲忥細</label>
+													   <div class="layui-input-block">
+														   <input id="palletNoqty" class="layui-input" style="border: 0;"
+															   type="text" lay-verify="" disabled placeholder="">
+													   </div>
+												   </div>
+											   </td> 
+										   </tr>
 										</table>
 									</td>
 								</tr>
@@ -612,11 +628,25 @@
 			var curPageIndex = 1
 			//鏄惁鏁存墭鎷h揣
 			var isContinue = "0";
+			var isConCheck = "0";
 			var tableData = null
 			var tableData2 = null
 			var canPickBox = true
 			$("#palletNo").focus();//鍏夋爣榛樿閫変腑		
 
+
+			function clear5()
+			{
+				$('#outModel').val("");//鍑哄簱鍙�
+				$('#standard').val("");//瑙勬牸
+
+				$('#pickQty').val("");//寰呮嫞鏁伴噺
+				$('#pickedQty').val("");//宸叉嫞鏁伴噺
+				$('#palletNoqty').val("");//宸叉嫞鏁伴噺
+				
+				$('#boxNo').val("");//绠辩爜
+				$('#boxQty').val("");//鎵樼洏涓婃暟閲�
+			}
 			function clear1() {
 				$('#outModel').val("");//鍑哄簱鍙�
 				$('#standard').val("");//瑙勬牸
@@ -657,6 +687,16 @@
 				} else {					
 					$('#BoxDIv').attr("style", "display:block")
 					isContinue="0";
+				}
+				$('#boxNo').val("");
+				$('#boxNo3').val("");
+			});
+			
+			form.on('switch(IsCheckCon)', function (obj) {
+				if (obj.elem.checked) {
+					isConCheck="1";
+				} else {					
+					isConCheck="0";
 				}
 				$('#boxNo').val("");
 				$('#boxNo3').val("");
@@ -774,9 +814,22 @@
 							icon: 2,
 							time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
 						});
+						clear5;
+						
+						$("#palletNo").val("");//鎵樼洏鍙�
+						$("#pickQty1").val("");//鎵樼洏鍙�
+						
+						$("#planQty").val("");  //璁″垝鏁伴噺
+						$("#finishQty").val("");//瀹屾垚鏁伴噺
+						//鐗╂枡鎵规
+						$("#skuLotNo").empty();
+						$("#skuLotNo").append('<option value =>' + '</option>');
+						form.render('select');
 					}
 				});
 			}
+
+			
 
 			//鍒濆鍖栨覆鏌� 鐗╂枡-鎵规
 			function updateSkuLotNoList() {
@@ -870,6 +923,7 @@
 
 				console.log(list != null);
 				console.log(list);
+				let pallnono = 0;
 				if (list != null && list.length > 0) { //鎴愬姛
 
 					var arrTrs = new Array()
@@ -886,6 +940,7 @@
 						tr.find("td[name='boxNo']").html(list[i].BoxNo); 
 						tr.find("td[name='qty']").html(list[i].Qty);
 						tr.find("td[name='pickedQty']").html(list[i].PickedQty);
+						pallnono = pallnono + list[i].Qty;
 
 						tr.show();
 						arrTrs[i] = tr
@@ -901,6 +956,7 @@
 					// $("#boxNum").val(0)
 					setPages(1, 0)
 				}
+				$("#palletNoqty").val(pallnono)
 			}
 
 			//鑾峰彇鎵樼洏鐗╂枡鍚嶇粏
@@ -982,7 +1038,36 @@
 						});
 						return;
 					}
-				}				
+				}	
+				if(isConCheck=="0"){
+					if ($('#boxNo').val() == "") {
+						layer.msg("璇疯緭鍏ョ鐮�", {
+							icon: 2,
+							time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+						}); return;
+					}
+					if ($('#boxQty').val() == "") {
+						layer.msg("绠卞唴鏁伴噺涓虹┖锛屼笉鑳芥嫞璐�", {
+							icon: 2,
+							time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+						});
+						return;
+					}
+					if(($('#boxNo3').val() != "" && ($('#pickQty1').val() != "" || $('#pickQty1').val() != 0))){
+						layer.msg("杩芥函鏉$爜鍜屾嫞璐ф暟閲忎笉鑳藉悓鏃惰緭鍏ワ紒", {
+							icon: 2,
+							time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+						});
+						return;
+					}
+					if($('#pickQty1').val() != "" && $('#pickQty1').val()>parseFloat($('#pickQty').val())){
+						layer.msg("鎷h揣鏁伴噺涓嶈兘澶т簬寰呮嫞鏁伴噺锛�", {
+							icon: 2,
+							time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+						});
+						return;
+					}
+				}			
 				// let boxQty = parseInt($('#boxQty').val())
 				// let qty = parseInt($('#qty').val()) 
 				// if (qty <= 0 || qty > boxQty) {
@@ -1279,6 +1364,7 @@
 				var param = {
 					PalletNo: $("#palletNo2").val(),
 				};
+				
 				synData(IP + "/PdaSo/GetRunSoNoticeList", param, 'post', function (res) {
 					if (res.code == 0) { //鎴愬姛
 						console.log(res.data);
@@ -1291,11 +1377,15 @@
 						}
 						form.render('select');
 
-					} else { //涓嶆垚鍔�
+					}
+					else
+					 { //涓嶆垚鍔�
+						
 						layer.msg(res.msg, {
 							icon: 2,
 							time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
 						});
+						
 					}
 				});
 			}

--
Gitblit v1.8.0