From 1a7367c38242644640b0abcb4f9773ed32d4b450 Mon Sep 17 00:00:00 2001
From: sunxia <sunxia@prec-tech.com>
Date: 星期二, 29 三月 2022 15:23:48 +0800
Subject: [PATCH] 【委托】 【phase5上线课题56】-增加回收后NG废弃理由上线文件更新
---
force-app/main/default/pages/EquipmentSetShippmentReceived2.page | 27 ++++++++-----
force-app/main/default/classes/TransferShippmentReceived2Controller.cls | 4 +-
force-app/main/default/pages/TransferShippmentReceived2.page | 31 ++++++++++++++-
3 files changed, 47 insertions(+), 15 deletions(-)
diff --git a/force-app/main/default/classes/TransferShippmentReceived2Controller.cls b/force-app/main/default/classes/TransferShippmentReceived2Controller.cls
index d74a3e8..0a9d533 100644
--- a/force-app/main/default/classes/TransferShippmentReceived2Controller.cls
+++ b/force-app/main/default/classes/TransferShippmentReceived2Controller.cls
@@ -67,7 +67,7 @@
// 澶囧搧set鏄庣粏
List<TransferApplyDetail__c> eList = [
- select Repair__c, SerialNumber_F__c, Pre_After_Inspection_elapsed_days__c, Pre_Inspection_Comment__c,Fixture_Name_F__c, Shipment_request_time2__c, DeliverySlip__c, TransferApplySummary__r.Fixture_Set__r.Name, Fixture_QRCode_F__c, TransferApplySummary__r.Name, Pre_inspection_time__c, StockDown__c, StockDown_time__c, Id, Name, Asset__c, Asset__r.Name, Asset__r.SerialNumber, Asset__r.Product_Serial_No__c,
+ select Repair__c, SerialNumber_F__c, Pre_After_Inspection_elapsed_days__c, Pre_Inspection_Comment__c,Pre_NG_abord_reason__c,Fixture_Name_F__c, Shipment_request_time2__c, DeliverySlip__c, TransferApplySummary__r.Fixture_Set__r.Name, Fixture_QRCode_F__c, TransferApplySummary__r.Name, Pre_inspection_time__c, StockDown__c, StockDown_time__c, Id, Name, Asset__c, Asset__r.Name, Asset__r.SerialNumber, Asset__r.Product_Serial_No__c,
Asset__r.Remark__c, Asset__r.ImageAsset__c, Asset__r.ImageSerial__c, Asset__r.ImageAssetUploadedTime__c, Asset__r.ImageSerialUploadedTime__c,
Loaner_CDS_Info__c, Inspection_result__c, Check_lost_Item__c, Pre_disinfection__c, Water_leacage_check__c, Inspection_result_after__c, Arrival_in_wh__c,
Asset__r.Pre_Reserve_TAES_Detail__c, Asset__r.Pre_Reserve_TAES_Detail__r.After_Inspection_time__c,
@@ -174,7 +174,7 @@
done_flg = true;
} catch (Exception ex) {
system.debug('=====' + ex.getMessage());
- ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, ex.getMessage()+'( '+Step_status+' )'));
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, ex.getDmlMessage(0)));
Database.rollback(sp);
done_flg = false;
}
diff --git a/force-app/main/default/pages/EquipmentSetShippmentReceived2.page b/force-app/main/default/pages/EquipmentSetShippmentReceived2.page
index 8644d9e..d9a02bd 100644
--- a/force-app/main/default/pages/EquipmentSetShippmentReceived2.page
+++ b/force-app/main/default/pages/EquipmentSetShippmentReceived2.page
@@ -295,7 +295,7 @@
<span>鍙戣揣鍓�-妫�娴嬬粨鏋滐細 </span>
<!-- 20210721 ljh 1719 end -->
<apex:outputPanel layout="none" rendered="{!esdInfo.editable}">
- <apex:inputField id="inspectionResult" value="{!esdInfo.rec.Inspection_result__c}" style="margin:3px;width:75px;" />
+ <apex:inputField id="inspectionResult" value="{!esdInfo.rec.Inspection_result__c}" style="margin:3px;width:75px;"/>
</apex:outputPanel>
<apex:outputPanel layout="none" rendered="{!NOT(esdInfo.editable)}">
<span><apex:outputField id="inspectionResult2" value="{!esdInfo.rec.Inspection_result__c}" style="margin:3px;width:75px;" /></span>
@@ -307,18 +307,19 @@
<span><apex:inputField id="inspectionResultNg" value="{!esdInfo.rec.Inspection_result_NG__c}" style="margin:3px;width:75px;"/></span>
</apex:outputPanel>
<apex:outputPanel layout="none" rendered="{!NOT(esdInfo.editable)}">
- <span><apex:outputField id="inspectionResultNg1" value="{!esdInfo.rec.Inspection_result_NG__c}" style="margin:3px;width:75px;"/></span>
+ <span><apex:outputField id="inspectionResultNg1" value="{!esdInfo.rec.Inspection_result_NG__c}" style="margin:3px;width:75px;" /></span>
</apex:outputPanel>
</li>
- <li style="{!IF(esdInfo.rec.Inspection_result_NG__c='缁翠慨','','display: none;')}">
+ <li style="{!IF(esdInfo.quickCheck, 'background:#BBFF66;', '')}">
<span>{!$ObjectType.Rental_Apply_Equipment_Set_Detail__c.fields.Pre_NG_abord_reason__c.label}锛�</span>
- <apex:outputPanel layout="none" rendered="{!AND(esdInfo.editable,esdInfo.rec.Inspection_result_NG__c='缁翠慨')}">
+ <apex:outputPanel layout="none" rendered="{!(esdInfo.editable)}">
<span>
<apex:inputField id="inspectionResultNG2" value="{!esdInfo.rec.Pre_NG_abord_reason__c}" style="margin:3px;width:90%;float:left;"/>
</span>
<script>
- disabledShowNG() {
+ disabledShowNG();
+ function disabledShowNG() {
var inspection_result_NG = '{!esdInfo.rec.Inspection_result_NG__c}';
if(inspection_result_NG != '搴熷純'){
j$(escapeVfId('allPage:allForm:esdList:' + ('{!indexloop}' - 1) + ':inspectionResultNG2')).prop("disabled", true);
@@ -326,22 +327,27 @@
}
</script>
</apex:outputPanel>
- <apex:outputPanel layout="none" rendered="{!AND(NOT(esdInfo.editable),esdInfo.rec.Inspection_result_NG__c='缁翠慨')}">
+ <apex:outputPanel layout="none" rendered="{!NOT(esdInfo.editable)}">
<span>
- <apex:outputField value="{!esdInfo.rec.Inspection_NG_abord_reason__c}" style="margin:3px;width:90%;float:left;"></apex:outputField>
+ <apex:outputField id="inspectionResultNG3" value="{!esdInfo.rec.Pre_NG_abord_reason__c}" style="margin:3px;width:90%;float:left;"></apex:outputField>
</span>
</apex:outputPanel>
</li>
<li style="{!IF(esdInfo.quickCheck, 'background:#BBFF66;', '')}">
<span>{!$ObjectType.Rental_Apply_Equipment_Set_Detail__c.fields.Pre_Inspection_Comment__c.label}锛� </span>
- <apex:outputPanel layout="none" rendered="{!(esdInfo.editable)}">
- <apex:inputField value="{!esdInfo.rec.Pre_Inspection_Comment__c}" style="margin:3px;width:75px;"/>
+ <apex:outputPanel layout="none" rendered="{!(esdInfo.editable)}" >
+ <span>
+ <apex:inputField value="{!esdInfo.rec.Pre_Inspection_Comment__c}" style="margin:3px;width:90%;float:left;"/>
+ </span>
</apex:outputPanel>
<apex:outputPanel layout="none" rendered="{!NOT(esdInfo.editable)}">
- <span><apex:outputField value="{!esdInfo.rec.Pre_Inspection_Comment__c}" style="margin:3px;width:75px;"/></span>
+ <span>
+ <apex:outputField value="{!esdInfo.rec.Pre_Inspection_Comment__c}" style="margin:3px;width:90%;float:left;"></apex:outputField>
+ </span>
</apex:outputPanel>
</li>
+
<li style="{!IF(esdInfo.quickCheck, 'background:#BBFF66;', '')}">
<span>涓婃鍥炴敹鍚庢娴嬫椂闂达細 </span>
<span><apex:outputField rendered="{!IF(esdInfo.rec.Asset__r.Pre_Reserve_RAES_Detail__c==null, false, true)}" value="{!esdInfo.rec.Asset__r.Pre_Reserve_RAES_Detail__r.After_Inspection_time__c}" style="margin:3px;width:75px;"/></span>
@@ -357,6 +363,7 @@
<!-- </div> -->
</apex:outputPanel>
</ul>
+
</div>
<div class="rbottom">
<div class="r4"></div>
diff --git a/force-app/main/default/pages/TransferShippmentReceived2.page b/force-app/main/default/pages/TransferShippmentReceived2.page
index 61450d8..a8de9d3 100644
--- a/force-app/main/default/pages/TransferShippmentReceived2.page
+++ b/force-app/main/default/pages/TransferShippmentReceived2.page
@@ -273,12 +273,37 @@
</apex:outputPanel>
</li>
<li style="{!IF(esdInfo.quickCheck, 'background:#BBFF66;', '')}">
- <span>{!$ObjectType.TransferApplyDetail__c.fields.Pre_Inspection_Comment__c.label}锛� </span>
+ <span>{!$ObjectType.TransferApplyDetail__c.fields.Pre_NG_abord_reason__c.label}锛� </span>
<apex:outputPanel layout="none" rendered="{!(esdInfo.editable)}">
- <apex:inputField value="{!esdInfo.rec.Pre_Inspection_Comment__c}" style="margin:3px;width:75px;"/>
+ <span>
+ <apex:inputField id="inspectionResultNg2" value="{!esdInfo.rec.Pre_NG_abord_reason__c}" style="margin:3px;width:75px;"/>
+ <script>
+ disabledShowNG();
+ function disabledShowNG() {
+ var inspection_result_NG = '{!esdInfo.rec.Inspection_result_ng__c}';
+ console.log("====",inspection_result_NG)
+ if(inspection_result_NG != '搴熷純'){
+ j$(escapeVfId('allPage:allForm:esdList:' + ('{!indexloop}' - 1) + ':inspectionResultNG2')).prop("disabled", true);
+ }
+ }
+ </script>
+ </span>
</apex:outputPanel>
<apex:outputPanel layout="none" rendered="{!NOT(esdInfo.editable)}">
- <span><apex:outputField value="{!esdInfo.rec.Pre_Inspection_Comment__c}" style="margin:3px;width:75px;"/></span>
+ <span><apex:outputField id="inspectionResultNg3" value="{!esdInfo.rec.Pre_NG_abord_reason__c}" style="margin:3px;width:75px;"/></span>
+ </apex:outputPanel>
+ </li>
+ <li style="{!IF(esdInfo.quickCheck, 'background:#BBFF66;', '')}">
+ <span>{!$ObjectType.TransferApplyDetail__c.fields.Pre_Inspection_Comment__c.label}锛� </span>
+ <apex:outputPanel layout="none" rendered="{!(esdInfo.editable)}">
+ <span>
+ <apex:inputField value="{!esdInfo.rec.Pre_Inspection_Comment__c}" style="margin:3px;width:90%;float:left;"/>
+ </span>
+ </apex:outputPanel>
+ <apex:outputPanel layout="none" rendered="{!NOT(esdInfo.editable)}">
+ <span>
+ <apex:outputField value="{!esdInfo.rec.Pre_Inspection_Comment__c}" style="margin:3px;width:90%;float:left;"/>
+ </span>
</apex:outputPanel>
</li>
<li style="{!IF(esdInfo.quickCheck, 'background:#BBFF66;', '')}">
--
Gitblit v1.9.1