From 13f94745c5f526b3140909cf433f5722cb2953a1 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期五, 07 十一月 2025 13:32:30 +0800
Subject: [PATCH] 修改生成物料标签重复问题

---
 Pda/View/SoSetting/productOut.html |   61 ++++++++++++++++++++----------
 1 files changed, 41 insertions(+), 20 deletions(-)

diff --git a/Pda/View/SoSetting/productOut.html b/Pda/View/SoSetting/productOut.html
index 0ffac4f..8833d2a 100644
--- a/Pda/View/SoSetting/productOut.html
+++ b/Pda/View/SoSetting/productOut.html
@@ -288,7 +288,7 @@
 										</div>
 									</td>
 								</tr> -->
-								<tr>
+								<!-- <tr>
 									<td>
 										<div class="layui-form-item layout-input" style="margin-top: 6px;">
 											<label class="layui-form-label lableWidth">杩芥函鏉$爜锛�</label>
@@ -298,15 +298,14 @@
 											</div>
 										</div>
 									</td>
-								</tr>
+								</tr> -->
 								<tr class="divPickQty1">
 									<td>
 										<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,'')">
+													autocomplete="off" class="layui-input">
 											</div>
 										</div>
 									</td>
@@ -971,20 +970,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("鎷h揣鏁伴噺涓嶈兘澶т簬寰呮嫞鏁伴噺锛�", {
-							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() > parseInt($('#pickQty').val())) {
+					// 	layer.msg("鎷h揣鏁伴噺涓嶈兘澶т簬寰呮嫞鏁伴噺锛�", {
+					// 		icon: 2,
+					// 		time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+					// 	});
+					// 	return;
+					// }
 				}
 				// let boxQty = parseInt($('#boxQty').val())
 				// let qty = parseInt($('#qty').val()) 
@@ -1017,7 +1016,7 @@
 					"SoDetailId": $("#skuLotNo").val(),
 					"PalletNo": $('#palletNo').val(),
 					"BoxNo": $('#boxNo').val(),
-					"BoxNo3": $('#boxNo3').val(),
+					//"BoxNo3": $('#boxNo3').val(),
 					"PickQty": $('#pickQty1').val()
 				}
 				sendData(IP + "/PdaSo/SoSetPick", param, 'post', function (res) {
@@ -1321,6 +1320,28 @@
 				});
 			}
 
+			//涓嬫媺鐗╂枡鎵规閫変腑鍚庝簨浠�
+			form.on('select(getSkuLotNo2)', function (data) {
+				if ($('#palletNo2').val() == "") {
+					layer.msg("璇疯緭鍏ユ墭鐩樻潯鐮�", {
+						icon: 2,
+						time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+					}, function () {
+						clear21();
+						clear23();
+					});
+					return
+				}
+				if ($('#skuLotNo2').val() == "") {
+					clear21();
+					clear23();
+					return
+				}
+				updateQtyList2();
+				getBar2();
+				//GetBoxInfo();
+			});
+
 			//鍒濆鍖栨覆鍗曟嵁鐨勮鍒掓暟閲忓拰瀹屾垚鏁伴噺
 			function updateQtyList2() {
 				clear23();
@@ -1356,7 +1377,7 @@
 						$('#outModel2').val(res.data.OutModel);
 						$('#standard2').val(res.data.Standard);
 
-						$('#pickQty2').val(res.data.PickQty - res.data.PickedQty);
+						$('#pickQty2').val(res.data.PickQty);
 						$('#pickedQty2').val(res.data.PickedQty);
 					} else { //涓嶆垚鍔�
 						if ($("#planQty").val() == $("#finishQty").val() || $('#pickQty').val() == $('#pickedQty').val()) {

--
Gitblit v1.8.0