From ea4ae824ebfc32a5c8754cbcd5161eaaa7e3bd16 Mon Sep 17 00:00:00 2001
From: qiankanghui <kanghui.qian@xujiesoft.com>
Date: Mon, 13 Jul 2026 16:24:38 +0800
Subject: [PATCH] =?UTF-8?q?style(template):=20=E4=BC=98=E5=8C=96=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF=E6=96=87=E4=BB=B6=E4=B8=AD=E7=9A=84=E7=A9=BA=E7=99=BD?=
 =?UTF-8?q?=E5=AD=97=E7=AC=A6=E5=92=8C=E9=93=BE=E6=8E=A5=E6=96=87=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 移除多余的空行以改善代码整洁性
- 将导航菜单中的"Finished good rolls"统一修改为"FG roll number"
- 将"Scrap defective/QC"修改为"Scrap"
- 将"Query SO"修改为"Query by order Number"
- 将"Query serial number"修改为"Query by Seril Number"
- 将"Automatically count by SO quantity"修改为"S/O quantity statistics"
- 将"IFS Received Qty Verify"修改为"IFS Received Qty Confirm"
- 将"Freeze and Unfreeze"修改为"Block and relase"
- 将"Material Info"修改为"Part Info"
- 将"Defective Processing"修改为"Disposal of Defective parts"
- 将"Slitting Roll Comfirm"修改为"FG Roll Comfirm"
---
 src/main/resources/templates/master.ftl | 60 ++++++++++++-------------
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/src/main/resources/templates/master.ftl b/src/main/resources/templates/master.ftl
index 515e9b5..14c6b8a 100644
--- a/src/main/resources/templates/master.ftl
+++ b/src/main/resources/templates/master.ftl
@@ -17,7 +17,7 @@
 
     <link rel="stylesheet" type="text/css" href="/jeasyui/themes/default/easyui.css">
     <link rel="stylesheet" type="text/css" href="/jeasyui/themes/icon.css">
-    
+
    <link rel="stylesheet" type="text/css" href="/js/layer/skin/layer.css">
    <!-- <link href="/css/layui/layui.css" rel="stylesheet"> -->
 
@@ -30,7 +30,7 @@
     <script src="/js/layui/layui.js"></script>
 
     <script>
-    
+
     //Format string time
     function formatStringTime(value, row){
     	if(null == value || '' == value){
@@ -58,7 +58,7 @@
             return "";
         }
 
-        
+
      // Unified Ajax error handling
         function handleAjaxError(data) {
             var responseText = data.responseText;
@@ -78,7 +78,7 @@
                 layer.alert('Operation failed: Network error');
             }
         }
-     
+
         function formatDate(value,row){
             if (value && value > 0){
                 var d = new Date(value);
@@ -122,7 +122,7 @@
     	<div style="display: none;">
     		<input type="hidden" id="current_username" value="${currentUser.username}">
     		<input type="hidden" id="current_orderNo" value="${currentUser.workingOrder}">
-    	
+
     	</div>
         <div id="navbar" class="collapse navbar-collapse">
             <ul class="nav navbar-nav">
@@ -145,7 +145,7 @@
                             <li><a href="/indigo/create_roll">Create Roll</a></li>
                             <li><a href="/indigo/roll_op">Indigo</a></li>
                             <li><a href="/rollop/indigo/createQcRoll">Defective/QC</a></li>
-                            <li><a href="/scanning/finalrolls/10/">Finished good rolls</a></li>
+                            <li><a href="/scanning/finalrolls/10/">FG roll number</a></li>
                             <li><a href="javascript:void(0)" onclick="printSfOrderModal()">Semi-finished WO Print</a></li>
                             <li><a href="javascript:void(0)" onclick="changeWorkingOrder('indigo');">Switch Order</a></li>
                         </ul>
@@ -154,12 +154,12 @@
                 <!-- Head Lamination -->
 				<#if currentUser.isAdmin || currentUser.authorities?contains("thermal")>
                     <li class="dropdown">
-                        <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" 
+                        <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true"
                         aria-expanded="false">Head Lamination<span class="caret"></span></a>
                         <ul class="dropdown-menu">
                             <li><a href="/rollop/thermal/">Head Lamination</a></li>
                             <li><a href="/rollop/thermal/createQcRoll">Defective/QC</a></li>
-                            <li><a href="/scanning/finalrolls/15/">Finished good rolls</a></li>
+                            <li><a href="/scanning/finalrolls/15/">FG roll number</a></li>
                             <li><a href="javascript:void(0)" onclick="changeWorkingOrder('thermal');">Switch Order</a></li>
                         </ul>
                     </li>
@@ -167,12 +167,12 @@
                  <!-- Cutting -->
 				<#if currentUser.isAdmin || currentUser.authorities?contains("cut")>
                     <li class="dropdown">
-                        <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" 
+                        <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true"
                         aria-expanded="false">Cutting<span class="caret"></span></a>
                         <ul class="dropdown-menu">
                             <li><a href="/cut/rollop/">Cutting</a></li>
                             <li><a href="/cut/createQcRoll">Defective/QC</a></li>
-                            <li><a href="/scanning/finalrolls/15/">Finished good rolls</a></li>
+                            <li><a href="/scanning/finalrolls/15/">FG roll number</a></li>
                             <li><a href="javascript:void(0)" onclick="changeWorkingOrder('cut');">Switch Order</a></li>
                         </ul>
                     </li>
@@ -184,7 +184,7 @@
                            <!--  <li><a href="/rollop/abg/">ABG</a></li> -->
                            <li><a href="/abg/rollop/">ABG</a></li>
                             <li><a href="/abg/createQcRoll">Defective/QC</a></li>
-                            <li><a href="/scanning/finalrolls/20/">Finished good rolls</a></li>
+                            <li><a href="/scanning/finalrolls/20/">FG roll number</a></li>
                             <li><a href="javascript:void(0)" onclick="changeWorkingOrder('abg');">Switch Order</a></li>
                         </ul>
                     </li>
@@ -197,7 +197,7 @@
 <#--                            <li><a href="/rollop/aoi/">AOI</a></li>-->
                             <li><a href="/aoi/rollop/">AOI</a></li>
                             <li><a href="/aoi/createQcRoll">Defective/QC</a></li>
-                            <li><a href="/scanning/finalrolls/30/">Finished good rolls</a></li>
+                            <li><a href="/scanning/finalrolls/30/">FG roll number</a></li>
                             <li><a href="javascript:void(0)" onclick="changeWorkingOrder('aoi');">Switch Order</a></li>
                         </ul>
                     </li>
@@ -221,10 +221,10 @@
                             <li><a href="/scanning/jobdtlByUser">Scan Task</a></li>
                             <li><a href="/scanning/jobReworkDtls">Rework Scanning</a></li>
                             <li><a href="/scanning/rollCheck">Master roll confirm</a></li>
-                            <li><a href="/scanning/slittingCheck">Slitting Roll Comfirm</a></li>
+                            <li><a href="/scanning/slittingCheck">FG Roll Comfirm</a></li>
                             <li><a href="/scanning/reworkRollCheck">Rework Roll Check</a></li>
-                            <li><a href="/scanning/finalrolls/40/">Finished good rolls</a></li>
-                            <li><a href="/scanning/createQcRoll">Defective Processing</a></li>
+                            <li><a href="/scanning/finalrolls/40/">FG roll number</a></li>
+                            <li><a href="/scanning/createQcRoll">Disposal of Defective parts</a></li>
                             <li><a href="javascript:void(0)" onclick="changeWorkingOrder('scanning');">Switch Order</a></li>
                         </ul>
                     </li>
@@ -253,7 +253,7 @@
                         <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Dispatch<span class="caret"></span></a>
                         <ul class="dropdown-menu">
                             <li><a href="/shipment">Dispatch</a></li>
-                            <li><a href="/discard">Scrap defective/QC</a></li>
+                            <li><a href="/discard">Scrap</a></li>
                         </ul>
                     </li>
                 </#if>
@@ -261,10 +261,10 @@
                 <li class="dropdown">
                         <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Query<span class="caret"></span></a>
                         <ul class="dropdown-menu">
-                            <li><a href="/prepress/query">Query SO</a></li>
-                            <li><a href="/prepress/serialInfo">Query serial number</a></li>
-                            <li><a href="/prepress/soOrderInfo">Automatically count by SO quantity</a></li>
-                            <li><a href="/prepress/receiveQty">IFS Received Qty Verify</a></li>
+                            <li><a href="/prepress/query">Query by order Number</a></li>
+                            <li><a href="/prepress/serialInfo">Query by Seril Number</a></li>
+                            <li><a href="/prepress/soOrderInfo">S/O quantity statistics</a></li>
+                            <li><a href="/prepress/receiveQty">IFS Received Qty Confirm</a></li>
                             <#if currentUser.isAdmin>
                             <li><a href="javascript:void(0)" onclick="missingReport();">Missing Report</a></li>
                             <li><a href="javascript:void(0)" onclick="complement();">Missing No. Supplement</a></li>
@@ -281,7 +281,7 @@
                                 <li><a href="javascript:void(0)" onclick="scanZeroRoll();">Reprint Remainder Roll</a></li>
                             </#if>
                             <#if currentUser.isAdmin || currentUser.authorities?contains("freezeAndThaw")>
-                            	<li><a href="/menu21/freeze_and_thaw">Freeze and Unfreeze</a></li>
+                            	<li><a href="/menu21/freeze_and_thaw">Block and relase</a></li>
                             </#if>
                             <li><a href="/delivery/order/query">WO Shipment Query</a></li>
                             <li><a href="/material/order/batch/query">WO Batch Query</a></li>
@@ -296,7 +296,7 @@
                     <li class="dropdown">
                         <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Basic Data<span class="caret"></span></a>
                         <ul class="dropdown-menu">
-                            <li><a href="/partManage">Material Info</a></li>
+                            <li><a href="/partManage">Part Info</a></li>
                             <li><a href="/system/system_info">System Parameters</a></li>
                         </ul>
                     </li>
@@ -586,7 +586,7 @@ var clodopLicense = '${clodoplisence}';
                     $.messager.alert('error',result.errorMsg, 'error');
                 } else {
                 	$('#complementSnDlgFm').form('clear');
-                } 
+                }
             }
         });
     }
@@ -606,7 +606,7 @@ var clodopLicense = '${clodoplisence}';
             }
         });
     }
-    
+
     //Export missing serial numbers
     function missingReport() {
     	$('#missingSnDlg').dialog('center').dialog('setTitle', 'Missing Report').dialog('open');
@@ -633,7 +633,7 @@ var clodopLicense = '${clodoplisence}';
     	$('#scanBoxDlg').dialog('center').dialog('setTitle', 'Scan Box No').dialog('open');
         $('#scanBoxDlgFm').form('clear');
     }
-    
+
     function scanBoxComplement(){
     	var boxNo = $("#boxNo").val();
         $.post("/shipment/scanBoxNo", {boxNo: boxNo}, function(ret){
@@ -800,7 +800,7 @@ function getInnerBoxPrintCacheData(boxNo, onLoaded){
         },10000);
 
     }
-    
+
 	// Open and initialize "Print Semi-finished Work Order" dialog
 	function printSfOrderModal(){
 		$('#print_sf_order').dialog('center').dialog('setTitle', 'Print Semi-finished WO').dialog('open');
@@ -826,10 +826,10 @@ function getInnerBoxPrintCacheData(boxNo, onLoaded){
 			}
 		});
 	}
-	
-	
-	
-	
+
+
+
+
 </script>
 
 </div> <!-- /container -->