From 50ce6a5e5ae7ac6ce3e6281acca9a0db568306e6 Mon Sep 17 00:00:00 2001
From: unknown <sunxia@prec-tech.com>
Date: 星期三, 23 八月 2023 14:54:59 +0800
Subject: [PATCH] Merge branch 'LEX_dev' of http://47.92.229.245:8089/r/lightningupdate into LEX_dev

---
 force-app/main/default/pages/TransferShippmentReceived1.page |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/force-app/main/default/pages/TransferShippmentReceived1.page b/force-app/main/default/pages/TransferShippmentReceived1.page
index 7c90307..30f73f1 100644
--- a/force-app/main/default/pages/TransferShippmentReceived1.page
+++ b/force-app/main/default/pages/TransferShippmentReceived1.page
@@ -283,6 +283,10 @@
                 </apex:outputPanel>
                 <div class="menu">
                 <h2><div class="m_title">&nbsp;<apex:outputField value="{!esdInfo.rec.Fixture_Name_F__c}" />&nbsp;&nbsp;
+                    <!-- 2023-08-02 zyh 鏈鸿韩缂栫爜鎹綅缃� -->
+                    <span>(<apex:outputField value="{!esdInfo.rec.SerialNumber_F__c}" style="margin:3px;width:75px;"/>)</span>
+                    <!-- 2023-08-02 zyh 鏈鸿韩缂栫爜鎹綅缃� -->
+
                 </div></h2>
                 <ul style="padding: 1px 0.75rem;{!IF(esdInfo.quickCheck, 'background:#BBFF66;', '')}">
                     <apex:outputPanel layout="none" rendered="{!IF(Step_status='涓嬫灦', true, false)}">
@@ -313,10 +317,12 @@
                             <span><apex:outputField value="{!esdInfo.rec.Asset__r.WH_location__c}" style="margin:3px;width:75px;"/></span>
                         </li>
                         <!-- 20230718 ljh  鎹㈠埌涓嬫灦纭涓嬮潰-->
-                        <li>
+                        <!-- 2023-08-02 zyh 鏈鸿韩缂栫爜鎹綅缃� -->
+                        <!-- <li>
                             <span>{!$ObjectType.TransferApplyDetail__c.fields.SerialNumber_F__c.label}锛� </span>
                             <span><apex:outputField value="{!esdInfo.rec.SerialNumber_F__c}" style="margin:3px;width:75px;"/></span>
-                        </li>
+                        </li> -->
+                        <!-- 2023-08-02 zyh 鏈鸿韩缂栫爜鎹綅缃� -->
                         <li>
                             <span>涓婃鍥炴敹鍚庢娴嬫椂闂达細 </span>
                             <span><apex:outputField value="{!esdInfo.rec.Asset__r.Pre_Reserve_TAES_Detail__r.After_Inspection_time__c}" style="margin:3px;width:75px;"/></span>

--
Gitblit v1.9.1