From bdd84cc48ba7b2527584c44d174da8e7d20c5375 Mon Sep 17 00:00:00 2001
From: zhaowc <526854230@qq.com>
Date: 星期三, 18 九月 2024 16:37:13 +0800
Subject: [PATCH] 增加对申请入库时对平库库位的校验

---
 HTML/views/ASNSetting/PalletBind.html |   31 ++++++++++---------------------
 1 files changed, 10 insertions(+), 21 deletions(-)

diff --git a/HTML/views/ASNSetting/PalletBind.html b/HTML/views/ASNSetting/PalletBind.html
index c769367..83dcf1e 100644
--- a/HTML/views/ASNSetting/PalletBind.html
+++ b/HTML/views/ASNSetting/PalletBind.html
@@ -3,7 +3,7 @@
 
 <head>
 	<meta charset="utf-8">
-	<title>鎵樼洏缁戝畾</title>
+	<title>缁勬墭鏀惰揣</title>
 	<meta name="renderer" content="webkit">
 	<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
 	<meta name="viewport"
@@ -331,17 +331,6 @@
 					{{ GetBtn11(d) }}
 				</script>
 
-				<script type="text/html" id="WareHouseButton">
-					{{# 
-						switch (d.WareHouseNo) {
-							case "W01": return '鍔涜绔嬩綋搴�';
-							case "W02": return '鍔涜骞冲簱';
-							default: return "";
-						}
-						
-					}}
-				</script>
-
 				<script type="text/html" id="RoadwayButton">
 					{{# 
 						switch (d.RoadwayNo) {
@@ -466,13 +455,13 @@
 				{ field: 'PalletNo3', title: '鎵樼洏鍙稬V3', align: 'center' },
 				{ field: 'LocatNo', title: '鍌ㄤ綅鍦板潃', align: 'center', width: 90 },
 				{ field: 'RoadwayNo', title: '鎵�灞炲贩閬�', align: 'center', width: 90, templet: '#RoadwayButton' },
-				{ field: 'WareHouseNo', title: '鎵�灞炰粨搴�', align: 'center', width: 90, templet: '#WareHouseButton' },
+				{ field: 'WareHouseName', title: '鎵�灞炰粨搴�', align: 'center', width: 90 },
 				{ field: 'SkuNo', title: '鐗╂枡缂栫爜', align: 'center', width: 110 },
 				{ field: 'SkuName', title: '鐗╂枡鍚嶇О', align: 'center' },
-				{ field: 'LotNo', title: '鎵规鍙�', align: 'center',width: 120 },
+				{ field: 'LotNo', title: '鎵规鍙�', align: 'center', width: 120 },
 				{ field: 'Qty', title: '鏁伴噺', align: 'center', width: 90 },
 				{ field: 'FullQty', title: '鏁存墭鏁伴噺', align: 'center', width: 90 },
-				{ field: 'SamplingQty', title: '鍙栨牱鏁伴噺', align: 'center', width: 90 },
+				//{ field: 'SamplingQty', title: '鍙栨牱鏁伴噺', align: 'center', width: 90 },                // 鍙栨牱鏁伴噺鏀惧埌璇烽獙澶勬樉绀�
 				{ field: 'InspectMark', title: '鎶芥鏍囪', align: 'center', width: 90, templet: '#templetInspectMark' },
 				//{ field: 'Status', title: '鎵ц鐘舵��', align: 'center', width: 90, templet: '#templetStatus' },   // 閮芥槸鍏ュ簱瀹屾垚
 				{ field: 'BitPalletMark', title: '闆舵墭鏍囪', align: 'center', width: 90, templet: '#templetBitPalletMark' },
@@ -545,17 +534,17 @@
 			var DetailColsArr = [[
 				{ field: '', title: '搴忓彿', type: 'numbers', width: 60, align: 'center', fixed: 'left', "disabled": true },
 				{ field: 'PalletNo', title: '鎵樼洏鍙�', align: 'center', width: 95 },
-				{ field: 'PalletNo2', title: '鎵樼洏缂栧彿LV2', align: 'center', width: 120 },
-				{ field: 'PalletNo3', title: '鎵樼洏缂栧彿LV3', align: 'center', width: 120 },
+				// { field: 'PalletNo2', title: '鎵樼洏缂栧彿LV2', align: 'center', width: 120 },
+				// { field: 'PalletNo3', title: '鎵樼洏缂栧彿LV3', align: 'center', width: 120 },
 				{ field: 'BoxNo', title: '绠卞彿', align: 'center', width: 220 },
-				{ field: 'BoxNo2', title: '鐩掑彿', align: 'center', width: 220 },
-				{ field: 'BoxNo3', title: '鏀彿', align: 'center', width: 220 },
+				// { field: 'BoxNo2', title: '鐩掑彿', align: 'center', width: 220 },
+				// { field: 'BoxNo3', title: '鏀彿', align: 'center', width: 220 },
 				{ field: 'SkuNo', title: '鐗╂枡缂栫爜', align: 'center', width: 150 },
 				{ field: 'SkuName', title: '鐗╂枡鍚嶇О', align: 'center', align: 'center', width: 226 },
 				{ field: 'LotNo', title: '鎵规鍙�', align: 'center', width: 150, },
 				{ field: 'Qty', title: '鏁伴噺', align: 'center', width: 105, },
 				{ field: 'FullQty', title: '鏁寸鏁伴噺', align: 'center', width: 105, },
-				{ field: 'SamplingQty', title: '鍙栨牱鏁伴噺', align: 'center', width: 105, },
+				//{ field: 'SamplingQty', title: '鍙栨牱鏁伴噺', align: 'center', width: 105, },           // 鍙栨牱鏁伴噺鏀惧埌璇烽獙椤甸潰鏄剧ず銆�
 				{ field: 'ProductionTime', title: '鐢熶骇鏃ユ湡', align: 'center', width: 160, templet: '#templetProductionTime' },
 				{ field: 'ExpirationTime', title: '杩囨湡鏃ユ湡', align: 'center', width: 180, templet: '#templetExpirationTime' },
 				{ field: 'LotText', title: '鎵规鎻忚堪', align: 'center', width: 150, },
@@ -816,7 +805,7 @@
 						layer.open({
 							type: 2,
 							title: '绠辨敮璇︽儏淇℃伅',
-							content: 'BindBoxInfo.html?BoxNo=' + BoxNo+'&BindNo='+data.BindNo,
+							content: 'BindBoxInfo.html?BoxNo=' + BoxNo + '&BindNo=' + data.BindNo,
 							maxmin: true,
 							area: ['80%', '85%'],
 							btn: ['鍏抽棴'],

--
Gitblit v1.8.0