From d8dc84a3d56df839895f1c417a4d9cbee763d262 Mon Sep 17 00:00:00 2001
From: 高章伟 <gaozhangwei@prec-tech.com>
Date: 星期五, 03 三月 2023 14:50:59 +0800
Subject: [PATCH] gzw 测试环境代码更新
---
force-app/main/default/classes/StatuAchievementsPCLController.cls | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/force-app/main/default/classes/StatuAchievementsPCLController.cls b/force-app/main/default/classes/StatuAchievementsPCLController.cls
index 88bf17f..11b6364 100644
--- a/force-app/main/default/classes/StatuAchievementsPCLController.cls
+++ b/force-app/main/default/classes/StatuAchievementsPCLController.cls
@@ -54,7 +54,7 @@
public Boolean sortOrderAsc { get; set; }
public String[] sortOrder { get; set; }
public String[] columus = new String[]{'ContractNO__c', 'Opp_Hospital__c', 'Opportunity_Name__c', 'Agency1_Name_F__c', 'Opportunity_Salesdepartment_SAP__c'
- ,'SaleProvince_SAP__c', 'Team__c', 'Owner__c', 'Order_no_without_0__c', 'Status_1__c'
+ ,'SaleProvince_SAP__c', 'Team__c', 'Owner_Category__c', 'Owner__c', 'Order_no_without_0__c', 'Status_1__c'
/* 10 */ ,'Status_2_Formula__c', 'Book_stock__c', 'Opp_OCM__c', 'Opp_Department_Name__c', 'Opportunity_Category__c'
,'QuotationCode__c', 'ContractAmount_F__c', 'PaymentAmount_F__c', 'NOT_PaymentAmount_F__c', 'PaymentRate_F__c'
/* 20 */ ,'UnshippedAmount_F__c', 'UnshippedAmount_without_tax_Thousand_DN__c', 'X5weeks_ago__c', 'X4weeks_ago__c', 'X3Weeks_ago__c'
@@ -158,6 +158,7 @@
textOpts.add(new SelectOption('','--鏃�--'));
textOpts.add(new SelectOption('S:ContractNO__c', Schema.SObjectType.Statu_Achievements__c.fields.ContractNO__c.label));
textOpts.add(new SelectOption('S:Opp_Hospital__c', Schema.SObjectType.Statu_Achievements__c.fields.Opp_Hospital__c.label));
+ textOpts.add(new SelectOption('S:Owner_Category__c', Schema.SObjectType.Statu_Achievements__c.fields.Owner_Category__c.label));// 20220907 XLIU-CHY4JL you
textOpts.add(new SelectOption('S:Opportunity_Name__c', Schema.SObjectType.Opportunity.fields.Name.label));
textOpts.add(new SelectOption('S:Opportunity__r.Opportunity_sub_owner__r.name', Schema.SObjectType.Opportunity.fields.Opportunity_sub_owner__c.label));
textOpts.add(new SelectOption('S:Agency1_Name_F__c', Schema.SObjectType.Statu_Achievements__c.fields.Agency1_Name_F__c.label));
@@ -457,7 +458,7 @@
+ ' Last_update_Reason_not_ship__c, Last_update_followup_situation__c, Last_update_shipping_status__c, Last_update_OverviewStatus__c, Last_update_manager_feedback__c,'
+ ' Last_update_Payment_All_Scheduled_Date__c, Last_update_Payment_Scheduled_Date__c, Last_update_forecast_shipping_date__c, Last_update_EndUser_contract_submit_day__c,'
+ ' ContractNO_link__c, Hospital_link__c, Opportunity_Name__c, Agency1_Name_F__c, Opportunity_Salesdepartment_SAP__c,'
- + ' SaleProvince_SAP__c, Team__c, Owner__c, Order_no_without_0__c, Status_1__c,Opportunity__r.Opportunity_sub_owner__c,'
+ + ' SaleProvince_SAP__c, Team__c, Owner_Category__c, Owner__c, Order_no_without_0__c, Status_1__c,Opportunity__r.Opportunity_sub_owner__c,'
+ ' Status_2_Formula__c, Book_stock__c, Opp_OCM__c, Opp_Department_Name__c, Opportunity_Category__c,'
+ ' Open_Quotation__c, ContractAmount_F__c, PaymentAmount_F__c, NOT_PaymentAmount_F__c, PaymentRate_F__c,'
+ ' UnshippedAmount_F__c, UnshippedAmount_without_tax_Thousand_DN__c, X5weeks_ago__c, X4weeks_ago__c, X3Weeks_ago__c,'
@@ -474,7 +475,7 @@
+ ' Last_update_Reason_not_ship__c, Last_update_followup_situation__c, Last_update_shipping_status__c, Last_update_OverviewStatus__c, Last_update_manager_feedback__c,'
+ ' Last_update_Payment_All_Scheduled_Date__c, Last_update_Payment_Scheduled_Date__c, Last_update_forecast_shipping_date__c, Last_update_EndUser_contract_submit_day__c,'
+ ' ContractNO_link__c, Hospital_link__c, Opportunity_Name__c, Agency1_Name_F__c, Opportunity_Salesdepartment_SAP__c,'
- + ' SaleProvince_SAP__c, Team__c, Owner__c, Order_no_without_0__c, Status_1__c,Opportunity__r.Opportunity_sub_owner__c,'
+ + ' SaleProvince_SAP__c, Team__c, Owner_Category__c, Owner__c, Order_no_without_0__c, Status_1__c,Opportunity__r.Opportunity_sub_owner__c,'
+ ' Status_2_Formula__c, Book_stock__c, Opp_OCM__c, Opp_Department_Name__c, Opportunity_Category__c,'
+ ' Open_Quotation__c, convertCurrency(ContractAmount_F__c), convertCurrency(PaymentAmount_F__c), convertCurrency(NOT_PaymentAmount_F__c), PaymentRate_F__c,'
+ ' convertCurrency(UnshippedAmount_F__c), UnshippedAmount_without_tax_Thousand_DN__c, X5weeks_ago__c, X4weeks_ago__c, X3Weeks_ago__c,'
--
Gitblit v1.9.1