From 9885a8a2f98104f5ee63dd5ab8023095a1d8b9f6 Mon Sep 17 00:00:00 2001
From: bklLiudl <673013083@qq.com>
Date: 星期一, 02 九月 2024 08:23:44 +0800
Subject: [PATCH] 功能测试

---
 HTML/views/ASNSetting/PalletBind.html |   25 +++++++------------------
 1 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/HTML/views/ASNSetting/PalletBind.html b/HTML/views/ASNSetting/PalletBind.html
index 51f9d81..83dcf1e 100644
--- a/HTML/views/ASNSetting/PalletBind.html
+++ b/HTML/views/ASNSetting/PalletBind.html
@@ -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: '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, },

--
Gitblit v1.8.0