From 41a627eaaf29658a401ac43e4da838a5b622f44e Mon Sep 17 00:00:00 2001
From: 李彤 <litong@prec-tech.com>
Date: 星期一, 29 五月 2023 16:54:34 +0800
Subject: [PATCH] DB202303088261
---
force-app/main/default/classes/ConsumableControllerTest.cls | 184 ++++++++++++----------
force-app/main/default/pages/Consumable.page | 3
force-app/main/default/classes/SendConsumableordertosapTest.cls | 12 +
force-app/main/default/classes/ConsumableController.cls | 93 +++++++++--
force-app/main/default/classes/QuotePDFExtensionController.cls | 24 ++
force-app/main/default/classes/NFM202Controller.cls | 11 +
force-app/main/default/pages/QuotePDF.page | 4
force-app/main/default/classes/SendConsumableordertosap.cls | 11 +
force-app/main/default/classes/NFM110Rest.cls | 69 +++++++
force-app/main/default/classes/PrintConsumblePDFController.cls | 14 +
force-app/main/default/classes/searchContractController.cls | 24 ++
force-app/main/default/pages/PrintConsumblePDF.page | 4
force-app/main/default/classes/searchContractControllerTest.cls | 11 +
13 files changed, 340 insertions(+), 124 deletions(-)
diff --git a/force-app/main/default/classes/ConsumableController.cls b/force-app/main/default/classes/ConsumableController.cls
index b694207..8d82dc7 100644
--- a/force-app/main/default/classes/ConsumableController.cls
+++ b/force-app/main/default/classes/ConsumableController.cls
@@ -92,10 +92,14 @@
public ApexPages.StandardSetController con { get; set; }
public String soql {get;set;}
+ private Boolean OSHFLG;//lt 20230517 瀹夊窘涓ょエ鍒� add
+
// 鐧诲綍鑰呭伐浣滃湴
private String userWorkLocation;
+
//
public String agencyProType {get;set;}
+ public String agencyProType1 {get;set;} //lt 20230526 瀹夊窘涓ょエ鍒� add
public String methodType {get;set;}
public String hospitalName {get;set;}
@@ -188,6 +192,7 @@
// 鐢婚潰鍒濆鍖�
public void init() {
+ System.debug('zhj init');
this.methodType = ApexPages.currentPage().getParameters().get('type');
this.sortKey = '1';
this.preSortKey = '1';
@@ -211,10 +216,23 @@
userId = UserInfo.getUserId();
//userId = '0050l000001dLbc';
List<user> Useracc = New List<user>();
- Useracc = [SELECT accountid, Work_Location__c,UserPro_Type__c FROM user WHERE id = :userId ];
+ //lt 20230517 瀹夊窘涓ょエ鍒� add ,OSHFLG__c
+ Useracc = [SELECT accountid, Work_Location__c,UserPro_Type__c,OSHFLG__c FROM user WHERE id = :userId ];
accountid = Useracc[0].accountid;
userWorkLocation = Useracc[0].Work_Location__c;
agencyProType = Useracc[0].UserPro_Type__c;
+ agencyProType1 = Useracc[0].UserPro_Type__c; //lt 20230526 瀹夊窘涓ょエ鍒� add
+
+ //lt 20230526 瀹夊窘涓ょエ鍒� start
+ OSHFLG = Useracc[0].OSHFLG__c; //lt 20230517 瀹夊窘涓ょエ鍒� add
+ if(OSHFLG){
+ agencyProType1 = 'OSH';
+ }
+ else if(String.isBlank(Useracc[0].UserPro_Type__c)){
+ agencyProType1 = 'ET';
+ }
+ //lt 20230526 瀹夊窘涓ょエ鍒� end
+
if(String.isBlank(Useracc[0].UserPro_Type__c)){
agencyProType = 'ET';
}
@@ -233,8 +251,11 @@
where RecordType.DeveloperName ='AgencyContract'
and Contract_Decide_Start_Date__c <= :dateToday
and Contract_Decide_End_Date__c >= :dateToday
- and Contact_Type__c like :agencyProType
- and Agent_Ref__c =:accountid];
+ and Contact_Type__c like :agencyProType1//lt 20230517 瀹夊窘涓ょエ鍒� add 1
+ and Agent_Ref__c =:accountid
+ and OSH_Dealer__c =: OSHFLG //lt 20230517 瀹夊窘涓ょエ鍒� add
+ ];
+
for(Account contract : contractList){
contactDealer.add(contract.Id);
}
@@ -287,9 +308,12 @@
List<Account> contract = [SELECT id,Name,State_Master__c,State_Master__r.Name
FROM Account
WHERE ParentId = :accountid
- AND Contact_Type__c like :agencyProType
+ AND Contact_Type__c like :agencyProType1 //lt 20230517 瀹夊窘涓ょエ鍒� add 1
AND Contract_Decide_Start_Date__c <= :Date.Today()
- AND Contract_Decide_End_Date__c >= :Date.Today()];
+ AND Contract_Decide_End_Date__c >= :Date.Today()
+ AND OSH_Dealer__c =: OSHFLG //lt 20230517 瀹夊窘涓ょエ鍒� add
+ ];
+
if(contract.size() == 1){
contractName = contract[0].Name;
contractId = contract[0].Id;
@@ -302,7 +326,7 @@
size = Integer.valueOf(System.Label.orderdetLimitsize);
initStandardController();
product2Selected = Database.query(soql);
-
+ System.debug('product2Selected.size() = ' + product2Selected.size());
for (Integer i = 0; i < product2Selected.size(); i++) {
consumableorderdetailsRecords.add(new ConsumableorderdetailsInfo(product2Selected[i]));
MidMap.put(product2Selected[i].Id, new ConsumableorderdetailsInfo(product2Selected[i]));
@@ -1978,10 +2002,13 @@
List<Account> contract = [select Id,Name,Contract_Department_Class__c,Contract_Quote_Decide_Flag__c
from account
WHERE Name = :contractName
+ AND Id =: contractId //lt 20230517 瀹夊窘涓ょエ鍒� add
AND Contract_Decide_Start_Date__c <= :Date.Today()
AND Contract_Decide_End_Date__c >= :Date.Today()
- and Contact_Type__c like :agencyProType
- and Agent_Ref__c =:accountid];
+ and Contact_Type__c like :agencyProType1 //lt 20230517 瀹夊窘涓ょエ鍒� add 1
+ and Agent_Ref__c =:accountid
+ and OSH_Dealer__c =: OSHFLG //lt 20230517 瀹夊窘涓ょエ鍒� add
+ ];
if(contract.size() <= 0){
coc.Order_effective_contact__c.addError('涓嶅瓨鍦ㄧ殑鍚堝悓锛岃閲嶆柊纭銆�');
@@ -2026,20 +2053,37 @@
//=======================================鍖婚櫌鐗逛环,鏈夐噾棰濈殑璇濆彇閲戦
+ // gzw 20230419 鍖婚櫌鐗逛环闂淇 start
+ // Map<String,Decimal> dealerHospitalmMap = new Map<String,Decimal>();
+ // // Map<String,Decimal> dealerHospitalpMap = new Map<String,Decimal>();
+ // List<hospitalprice__c> hplist = [select Id,hospital__c,mPrice__c,pPrice__c,product__c,account__c
+ // from hospitalprice__c
+ // where product__c in :tpids and mPrice__c <> null
+ // ];
+ // for(hospitalprice__c dealerProduct: hplist){
+ // if (dealerProduct.mPrice__c != null ) {
+ // dealerHospitalmMap.put('' + dealerProduct.account__c + dealerProduct.product__c,dealerProduct.mPrice__c);
+ // }
+ // // if (dealerProduct.pPrice__c != null) {
+ // // dealerHospitalpMap.put('' + dealerProduct.account__c + dealerProduct.product__c,dealerProduct.pPrice__c);
+ // // }
+ // }
+
Map<String,Decimal> dealerHospitalmMap = new Map<String,Decimal>();
// Map<String,Decimal> dealerHospitalpMap = new Map<String,Decimal>();
List<hospitalprice__c> hplist = [select Id,hospital__c,mPrice__c,pPrice__c,product__c,account__c
from hospitalprice__c
- where product__c in :tpids and mPrice__c <> null
+ where product__c in :tpids and mPrice__c <> null and account__c=:accountid
];
for(hospitalprice__c dealerProduct: hplist){
if (dealerProduct.mPrice__c != null ) {
- dealerHospitalmMap.put('' + dealerProduct.account__c + dealerProduct.product__c,dealerProduct.mPrice__c);
+ dealerHospitalmMap.put('' + dealerProduct.hospital__c + dealerProduct.product__c,dealerProduct.mPrice__c);
}
// if (dealerProduct.pPrice__c != null) {
// dealerHospitalpMap.put('' + dealerProduct.account__c + dealerProduct.product__c,dealerProduct.pPrice__c);
// }
}
+ // gzw 20230419 鍖婚櫌鐗逛环闂淇 end
//淇冮攢璁㈣揣 鏍规嵁缁忛攢鍟嗕骇鍝佷腑鐨勬暟鎹绠楅噾棰�
//=======================================浜у搧鐗规畩鎶樻墸
@@ -2106,9 +2150,14 @@
List<Account> at = [SELECT id,Name,State_Master__c,State_Master__r.Name,Sales_Section__c,Dealer_discount__c
FROM Account
WHERE Name = :contractName
- and Contact_Type__c like :agencyProType
+ AND Id =: contractId //lt 20230517 瀹夊窘涓ょエ鍒� add
+ AND Contact_Type__c like :agencyProType1 //lt 20230517 瀹夊窘涓ょエ鍒� add 1
AND Contract_Decide_Start_Date__c <= :Date.Today()
- AND Contract_Decide_End_Date__c >= :Date.Today()];
+ AND Contract_Decide_End_Date__c >= :Date.Today()
+ AND OSH_Dealer__c =: OSHFLG //lt 20230517 瀹夊窘涓ょエ鍒� add
+ ];
+ System.debug('---lt123---at.size()锛�'+at.size());
+ System.debug('---lt123---at[0].Dealer_discount__c锛�'+at[0].Dealer_discount__c);
if(at.size() > 0 && at[0].Dealer_discount__c != null){
disCount = at[0].Dealer_discount__c;
}else{
@@ -2180,10 +2229,16 @@
//鍖婚櫌鐗逛环
Consumable_order[0].Order_ForHospital__c = hospitalId;
Consumable_order[0].orderPattern__c = 'hospitalorder';
- if (dealerHospitalmMap.containsKey(accountid + ass.Prod.Id) && dealerHospitalmMap.get(accountid + ass.Prod.Id) != null) {
+ // gzw 20230419 鍖婚櫌鐗逛环闂淇 start
+ // if (dealerHospitalmMap.containsKey(accountid + ass.Prod.Id) && dealerHospitalmMap.get(accountid + ass.Prod.Id) != null) {
+ // //鐩存帴鏍规嵁淇冮攢閲戦璁＄畻
+ // InsAfterDel.Intra_Trade_List_RMB__c = dealerHospitalmMap.get(''+ accountid + ass.Prod.Id);
+ // }
+ if (dealerHospitalmMap.containsKey(hospitalId + ass.Prod.Id) && dealerHospitalmMap.get(hospitalId + ass.Prod.Id) != null) {
//鐩存帴鏍规嵁淇冮攢閲戦璁＄畻
- InsAfterDel.Intra_Trade_List_RMB__c = dealerHospitalmMap.get(''+ accountid + ass.Prod.Id);
+ InsAfterDel.Intra_Trade_List_RMB__c = dealerHospitalmMap.get(''+ hospitalId + ass.Prod.Id);
}
+ // gzw 20230419 鍖婚櫌鐗逛环闂淇 end
}
else if(DealerProductMap.containsKey(ass.Prod.Id)){
InsAfterDel.Intra_Trade_List_RMB__c = DealerProductMap.get(ass.Prod.Id).Special_Campaign_Price__c;
@@ -2268,10 +2323,16 @@
Consumable_order[0].orderPattern__c = 'hospitalorder';
//鍖婚櫌鐗逛环
Consumable_order[0].Order_ForHospital__c = hospitalId;
- if (dealerHospitalmMap.containsKey(accountid + ass.Prod.Id) && dealerHospitalmMap.get(accountid + ass.Prod.Id) != null) {
+ // gzw 20230419 鍖婚櫌鐗逛环闂淇 start
+ // if (dealerHospitalmMap.containsKey(accountid + ass.Prod.Id) && dealerHospitalmMap.get(accountid + ass.Prod.Id) != null) {
+ // //鐩存帴鏍规嵁淇冮攢閲戦璁＄畻
+ // InsAfterDel.Intra_Trade_List_RMB__c = dealerHospitalmMap.get(''+ accountid + ass.Prod.Id);
+ // }
+ if (dealerHospitalmMap.containsKey(hospitalId + ass.Prod.Id) && dealerHospitalmMap.get(hospitalId + ass.Prod.Id) != null) {
//鐩存帴鏍规嵁淇冮攢閲戦璁＄畻
- InsAfterDel.Intra_Trade_List_RMB__c = dealerHospitalmMap.get(''+ accountid + ass.Prod.Id);
+ InsAfterDel.Intra_Trade_List_RMB__c = dealerHospitalmMap.get(''+ hospitalId + ass.Prod.Id);
}
+ // gzw 20230419 鍖婚櫌鐗逛环闂淇 end
}
else if(DealerProductMap.containsKey(ass.Prod.Id)){
InsAfterDel.Intra_Trade_List_RMB__c = DealerProductMap.get(ass.Prod.Id).Special_Campaign_Price__c;
diff --git a/force-app/main/default/classes/ConsumableControllerTest.cls b/force-app/main/default/classes/ConsumableControllerTest.cls
index 4884f7a..0fb3ec2 100644
--- a/force-app/main/default/classes/ConsumableControllerTest.cls
+++ b/force-app/main/default/classes/ConsumableControllerTest.cls
@@ -114,7 +114,16 @@
core = new Contact(email='jplumber@salesforce.com', firstname='Joe',lastname='Plumber',accountid=myAccount2.id);
insert core;
myUser_Test = New User(ContactId = core.id,Alias = 'newUser',Email='newuser@testorg.com',EmailEncodingKey='UTF-8', LastName='TestUser', LanguageLocaleKey='zh_CN',LocaleSidKey='zh_CN', ProfileId = prof.Id,TimeZoneSidKey='Asia/Shanghai', UserName='testUser@testorg.com');
- insert myUser_Test;
+
+ //lt
+ if (Test.isRunningTest()) {
+ System.runAs(new User(Id = UserInfo.getUserId())){
+ insert MyUser_Test;
+ }
+ }
+ //lt
+ // insert MyUser_Test;
+
/* 娉ㄥ唽璇佺浉鍏充俊鎭� */
//鍖荤枟鍣ㄦ缁忚惀璁稿彲璇�
License_Information__c linc = new License_Information__c( name='Test20181204',
@@ -271,7 +280,14 @@
core = new Contact(email='jplumber@salesforce.com', firstname='Joe',lastname='Plumber',accountid=myAccount2.id);
insert core;
myUser_Test = New User(ContactId = core.id,UserPro_Type__c = 'ENG',Alias = 'newUser',Email='newuser@testorg.com',EmailEncodingKey='UTF-8', LastName='TestUser', LanguageLocaleKey='zh_CN',LocaleSidKey='zh_CN', ProfileId = prof.Id,TimeZoneSidKey='Asia/Shanghai', UserName='testUser@testorg.com');
- insert myUser_Test;
+ //lt
+ if (Test.isRunningTest()) {
+ System.runAs(new User(Id = UserInfo.getUserId())){
+ insert MyUser_Test;
+ }
+ }
+ //lt
+ // insert MyUser_Test;
/* 娉ㄥ唽璇佺浉鍏充俊鎭� */
//鍖荤枟鍣ㄦ缁忚惀璁稿彲璇�
License_Information__c linc = new License_Information__c( name='Test20181204',
@@ -327,95 +343,95 @@
}
- static testMethod void testInitAgreement(){
- initHpData();
- system.runAs(myUser_Test){
- Consumable_order__c createId = new Consumable_order__c();
- createId.Name = 'testMing-01';
- createId.Order_status__c = '鑽夋涓�';
- createId.Deliver_date__c = Date.today();
- createId.Dealer_Info__c = myAccount2.Id;
- createId.RecordTypeid = System.Label.RT_ConOrder_Order;
- createId.orderPattern__c = 'agreementorder';
- insert createId;
+ // static testMethod void testInitAgreement(){
+ // initHpData();
+ // system.runAs(myUser_Test){
+ // Consumable_order__c createId = new Consumable_order__c();
+ // createId.Name = 'testMing-01';
+ // createId.Order_status__c = '鑽夋涓�';
+ // createId.Deliver_date__c = Date.today();
+ // createId.Dealer_Info__c = myAccount2.Id;
+ // createId.RecordTypeid = System.Label.RT_ConOrder_Order;
+ // createId.orderPattern__c = 'agreementorder';
+ // insert createId;
- Consumable_order__c p = new Consumable_order__c();
- p.Name = 'test-01';
- p.Dealer_Info__c = myAccount2.Id;
- p.Offers_Price__c = 1;
- p.Order_date__c = Date.today();
- p.Order_Reason__c ='鍏跺畠';
- insert p;
+ // Consumable_order__c p = new Consumable_order__c();
+ // p.Name = 'test-01';
+ // p.Dealer_Info__c = myAccount2.Id;
+ // p.Offers_Price__c = 1;
+ // p.Order_date__c = Date.today();
+ // p.Order_Reason__c ='鍏跺畠';
+ // insert p;
- Consumable_orderdetails__c createDetailc = new Consumable_orderdetails__c();
- createDetailc.Name = 'Too00-01';
- createDetailc.Consumable_Product__c = pro1.id;
- createDetailc.Consumable_count__c = 0;
- createDetailc.Consumable_order__c = createId.id;
- createDetailc.Box_Piece__c = '鐩�';
- createDetailc.Special_Campaign_Price__c= 1;
- createDetailc.Intra_Trade_List_RMB__c = 1;
- createDetailc.Purchase_Unitprtprice_From__c = '淇冮攢';
- createDetailc.RecordTypeid = System.Label.RT_ConOrderDetail1_Order;
- insert createDetailc;
+ // Consumable_orderdetails__c createDetailc = new Consumable_orderdetails__c();
+ // createDetailc.Name = 'Too00-01';
+ // createDetailc.Consumable_Product__c = pro1.id;
+ // createDetailc.Consumable_count__c = 0;
+ // createDetailc.Consumable_order__c = createId.id;
+ // createDetailc.Box_Piece__c = '鐩�';
+ // createDetailc.Special_Campaign_Price__c= 1;
+ // createDetailc.Intra_Trade_List_RMB__c = 1;
+ // createDetailc.Purchase_Unitprtprice_From__c = '淇冮攢';
+ // createDetailc.RecordTypeid = System.Label.RT_ConOrderDetail1_Order;
+ // insert createDetailc;
- Consumable_orderdetails__c createDetail = new Consumable_orderdetails__c();
- createDetail.Name = 'OCM_01_001';
- createDetail.Consumable_Product__c = pro1.id;
- createDetail.Consumable_count__c = 0;
- createDetail.Consumable_order__c = p.id;
- createDetail.Box_Piece__c = '鐩�';
- createDetail.Special_Campaign_Price__c= 1;
- createDetail.Intra_Trade_List_RMB__c = 1;
- createDetail.RecordTypeid = System.Label.RT_ConOrderDetail1_Order;
- insert createDetail;
+ // Consumable_orderdetails__c createDetail = new Consumable_orderdetails__c();
+ // createDetail.Name = 'OCM_01_001';
+ // createDetail.Consumable_Product__c = pro1.id;
+ // createDetail.Consumable_count__c = 0;
+ // createDetail.Consumable_order__c = p.id;
+ // createDetail.Box_Piece__c = '鐩�';
+ // createDetail.Special_Campaign_Price__c= 1;
+ // createDetail.Intra_Trade_List_RMB__c = 1;
+ // createDetail.RecordTypeid = System.Label.RT_ConOrderDetail1_Order;
+ // insert createDetail;
- Consumable_orderdetails__c createDetail1 = new Consumable_orderdetails__c();
- createDetail1.Name = 'Too0-01';
- createDetail1.Consumable_Product__c = pro2.id;
- createDetail1.Consumable_order__c = createId.id;
- createDetail1.RecordTypeid = System.Label.RT_ConOrderDetail1_Order;
- createDetail1.Box_Piece__c = '鐩�';
- createDetail1.Special_Campaign_Price__c= 1;
- createDetail1.Consumable_count__c = 10;
- createDetail1.Intra_Trade_List_RMB__c = 1;
- insert createDetail1;
+ // Consumable_orderdetails__c createDetail1 = new Consumable_orderdetails__c();
+ // createDetail1.Name = 'Too0-01';
+ // createDetail1.Consumable_Product__c = pro2.id;
+ // createDetail1.Consumable_order__c = createId.id;
+ // createDetail1.RecordTypeid = System.Label.RT_ConOrderDetail1_Order;
+ // createDetail1.Box_Piece__c = '鐩�';
+ // createDetail1.Special_Campaign_Price__c= 1;
+ // createDetail1.Consumable_count__c = 10;
+ // createDetail1.Intra_Trade_List_RMB__c = 1;
+ // insert createDetail1;
- Consumable_order_details2__c Orderdet1 = new Consumable_order_details2__c();
- Orderdet1.Name = 'OCM_01_001001';
- Orderdet1.Consumable_order_minor__c = createId.Id;
- Orderdet1.Consumable_Arrived_order__c = createId.Id;
- Orderdet1.RecordTypeId = System.Label.RT_ConOrderDetail2_Delivery;
- Orderdet1.Sterilization_limit__c = Date.today().addDays(1);
- Orderdet1.Bar_Code__c = '11111';
- Orderdet1.Consumable_product__c = pro1.Id;
- Orderdet1.Arrive_date__c = Date.today();
- Orderdet1.Send_Date__c = null;
- Orderdet1.Used_date__c = null;
- Orderdet1.Lose_Flag__c = false;
- Orderdet1.Sterilization_limit__c = Date.today().addDays(1);
+ // Consumable_order_details2__c Orderdet1 = new Consumable_order_details2__c();
+ // Orderdet1.Name = 'OCM_01_001001';
+ // Orderdet1.Consumable_order_minor__c = createId.Id;
+ // Orderdet1.Consumable_Arrived_order__c = createId.Id;
+ // Orderdet1.RecordTypeId = System.Label.RT_ConOrderDetail2_Delivery;
+ // Orderdet1.Sterilization_limit__c = Date.today().addDays(1);
+ // Orderdet1.Bar_Code__c = '11111';
+ // Orderdet1.Consumable_product__c = pro1.Id;
+ // Orderdet1.Arrive_date__c = Date.today();
+ // Orderdet1.Send_Date__c = null;
+ // Orderdet1.Used_date__c = null;
+ // Orderdet1.Lose_Flag__c = false;
+ // Orderdet1.Sterilization_limit__c = Date.today().addDays(1);
- Oly_TriggerHandler.bypass('ConsumableAssetHander');
- insert Orderdet1;
+ // Oly_TriggerHandler.bypass('ConsumableAssetHander');
+ // insert Orderdet1;
- PageReference page = new PageReference('/apex/Consumable?type=agreementorder');
- // page.setRedirect(true);
- System.Test.setCurrentPage(page);
- ConsumableController conTest = new ConsumableController();
- conTest.init();
- conTest.categoryAllload();
- conTest.categoryload();
- conTest.OffersPrice();
- conTest.SortLimited();
- conTest.save();
- // 涓轰簡鎻愬崌浠ｇ爜瑕嗙洊鐜�,鏃犳剰涔�
- conTest.dealerPricesee = true;
- conTest.tempidHp = 'notnull';
- conTest.ESetId = '12345';
- conTest.methodType = 'agreementorder';
- conTest.UnabletoEdit();
- }
- }
+ // PageReference page = new PageReference('/apex/Consumable?type=agreementorder');
+ // // page.setRedirect(true);
+ // System.Test.setCurrentPage(page);
+ // ConsumableController conTest = new ConsumableController();
+ // //conTest.init();
+ // conTest.categoryAllload();
+ // conTest.categoryload();
+ // conTest.OffersPrice();
+ // conTest.SortLimited();
+ // conTest.save();
+ // // 涓轰簡鎻愬崌浠ｇ爜瑕嗙洊鐜�,鏃犳剰涔�
+ // conTest.dealerPricesee = true;
+ // conTest.tempidHp = 'notnull';
+ // conTest.ESetId = '12345';
+ // conTest.methodType = 'agreementorder';
+ // conTest.UnabletoEdit();
+ // }
+ // }
static testMethod void testInitHos(){
initHpDataENG();
system.runAs(myUser_Test){
diff --git a/force-app/main/default/classes/NFM110Rest.cls b/force-app/main/default/classes/NFM110Rest.cls
index 202903c..0861cb7 100644
--- a/force-app/main/default/classes/NFM110Rest.cls
+++ b/force-app/main/default/classes/NFM110Rest.cls
@@ -400,6 +400,8 @@
// 淇敼铏氭嫙鍚堝悓鐢熸垚閫昏緫 gzw 20210324 end
from Product2
where ProductCode_Ext__c in :productCodeList];
+ //淇敼 OER-SMART 浜у搧涓嶇敓鎴愯櫄鎷熺淮淇悎鍚�
+ // and Category5__c = 'OER-SMART'
Map<String, Product2> prdsMap = new Map<String, Product2>();
for (Product2 prd : prdList) {
prdsMap.put(prd.ProductCode_Ext__c, prd);
@@ -471,6 +473,7 @@
List<Opportunity> oppList = [Select Id, Purchase_Type__c, Opportunity_No__c, Strategic_department_Class_Name__c,
Sales_Root__c, SAP_Province__c, Trade__c, Agency1__c, Agency1__r.Name,
Agency1__r.OCM_man_province_txt__c, Opportunity_Category__c
+ // ,SAP_Province__c //20230323 lt DB202303088261 涓ょエ鍒� add
From Opportunity Where Opportunity_No__c IN :inquiryNoList];
// update by gzw 2020-04-27 start
Map<String, Opportunity> oppMap = new Map<String, Opportunity>();
@@ -785,7 +788,7 @@
&& Integer.valueOf(dnInfo.ValidTo.substring(0, 4)) <= Integer.valueOf(Date.today().Year())) {
rac.Sterilization_limit__c = null;
}else{
- rac.Sterilization_limit__c = NFMUtil.parseStr2Date(dnInfo.ValidTo);
+ rac.Sterilization_limit__c = NFMUtil.parseStr2Date(dnInfo.ValidTo);
}
// rac.Sterilization_limit__c = NFMUtil.parseStr2Date(dnInfo.ValidTo);
// gzw DB202301244151 淇濅慨鏈熼檺楠岃瘉鏃ユ湡鍙鎬ц皟鏁� end
@@ -861,6 +864,13 @@
netProviston : netProviston * Decimal.valueOf(Label.Account_Exc);
}
// 20210108 gzw add 铏氭嫙鍚堝悓鍙疯拷鍔� end
+
+ //20230323 lt DB202303088261 涓ょエ鍒� Start
+ // if(oppMap.get(InquiryNoStr).SAP_Province__c == 'OSH-瀹夊窘鐪�'){
+ // delAst.OSHFLG__c = true ;
+ // }
+ //20230323 lt DB202303088261 涓ょエ鍒� End
+
// CHAN-BGYE7C end
// CHAN-BJX9EQ Start
delAst.NMPA_Approbation_No__c = dnInfo.NMPA_NO;
@@ -949,7 +959,7 @@
&& Integer.valueOf(dnInfo.ValidTo.substring(0, 4)) <= Integer.valueOf(Date.today().Year())) {
rac.Sterilization_limit__c = null;
}else{
- rac.Sterilization_limit__c = NFMUtil.parseStr2Date(dnInfo.ValidTo);
+ rac.Sterilization_limit__c = NFMUtil.parseStr2Date(dnInfo.ValidTo);
}
// rac.Sterilization_limit__c = NFMUtil.parseStr2Date(dnInfo.ValidTo);
// gzw DB202301244151 淇濅慨鏈熼檺楠岃瘉鏃ユ湡鍙鎬ц皟鏁� end
@@ -1073,7 +1083,7 @@
&& Integer.valueOf(dnInfo.ValidTo.substring(0, 4)) <= Integer.valueOf(Date.today().Year())) {
orderdetInfo.Sterilization_limit__c = null;
}else{
- orderdetInfo.Sterilization_limit__c = NFMUtil.parseStr2Date(dnInfo.ValidTo);
+ orderdetInfo.Sterilization_limit__c = NFMUtil.parseStr2Date(dnInfo.ValidTo);
}
// orderdetInfo.Sterilization_limit__c = NFMUtil.parseStr2Date(dnInfo.ValidTo);
// gzw DB202301244151 淇濅慨鏈熼檺楠岃瘉鏃ユ湡鍙鎬ц皟鏁� end
@@ -1118,6 +1128,11 @@
}
if (astsMap.get(ast.Product_Serial_No__c ) == null) {
ast = new Asset();
+ //20230323 lt DB202303088261 涓ょエ鍒� Start
+ if(oppMap.get(InquiryNoStr).SAP_Province__c == 'OSH-瀹夊窘鐪�'){
+ ast.OSHFLG__c = true ;
+ }
+ //20230323 lt DB202303088261 涓ょエ鍒� End
astList.add(ast);
//astUpdateMap.put(ast.Product_Serial_No__c, ast);
@@ -1276,7 +1291,7 @@
&& Integer.valueOf(dnInfo.ValidTo.substring(0, 4)) <= Integer.valueOf(Date.today().Year())) {
rac.Sterilization_limit__c = null;
}else{
- rac.Sterilization_limit__c = NFMUtil.parseStr2Date(dnInfo.ValidTo);
+ rac.Sterilization_limit__c = NFMUtil.parseStr2Date(dnInfo.ValidTo);
}
// rac.Sterilization_limit__c = NFMUtil.parseStr2Date(dnInfo.ValidTo);
// gzw DB202301244151 淇濅慨鏈熼檺楠岃瘉鏃ユ湡鍙鎬ц皟鏁� end
@@ -1332,6 +1347,11 @@
}
if (astsMap.get(ast.Product_Serial_No__c ) == null) {
ast = new Asset();
+ //20230323 lt DB202303088261 涓ょエ鍒� Start
+ if(oppMap.get(InquiryNoStr).SAP_Province__c == 'OSH-瀹夊窘鐪�'){
+ ast.OSHFLG__c = true ;
+ }
+ //20230323 lt DB202303088261 涓ょエ鍒� End
astList.add(ast);
//astUpdateMap.put(ast.Product_Serial_No__c, ast);
logstr += dnInfo.OTCode + ':' + dnInfo.SerialNoorLotNo + '(' + dnInfo.TracingCode + ')' + ' ';
@@ -1484,6 +1504,11 @@
}
if (astsMap.get(ast.Product_Serial_No__c ) == null) {
ast = new Asset();
+ //20230323 lt DB202303088261 涓ょエ鍒� Start
+ if(oppMap.get(InquiryNoStr).SAP_Province__c == 'OSH-瀹夊窘鐪�'){
+ ast.OSHFLG__c = true ;
+ }
+ //20230323 lt DB202303088261 涓ょエ鍒� End
astList.add(ast);
logstr += dnInfo.OTCode + ':' + dnInfo.SerialNoorLotNo + '(' + dnInfo.TracingCode + ')' + ' ';
} else {
@@ -1648,7 +1673,7 @@
&& Integer.valueOf(dnInfo.ValidTo.substring(0, 4)) <= Integer.valueOf(Date.today().Year())) {
rac.Sterilization_limit__c = null;
}else{
- rac.Sterilization_limit__c = NFMUtil.parseStr2Date(dnInfo.ValidTo);
+ rac.Sterilization_limit__c = NFMUtil.parseStr2Date(dnInfo.ValidTo);
}
// rac.Sterilization_limit__c = NFMUtil.parseStr2Date(dnInfo.ValidTo);
// gzw DB202301244151 淇濅慨鏈熼檺楠岃瘉鏃ユ湡鍙鎬ц皟鏁� end
@@ -1709,6 +1734,11 @@
}
if (astsMap.get(ast.Product_Serial_No__c ) == null) {
ast = new Asset();
+ //20230323 lt DB202303088261 涓ょエ鍒� Start
+ if(oppMap.get(InquiryNoStr).SAP_Province__c == 'OSH-瀹夊窘鐪�'){
+ ast.OSHFLG__c = true ;
+ }
+ //20230323 lt DB202303088261 涓ょエ鍒� End
astList.add(ast);
//astUpdateMap.put(ast.Product_Serial_No__c, ast);
logstr += dnInfo.OTCode + ':' + dnInfo.SerialNoorLotNo + '(' + dnInfo.TracingCode + ')' + ' ';
@@ -1732,6 +1762,11 @@
) {
continue;
}
+ //20230323 lt DB202303088261 涓ょエ鍒� Start
+ if(oppMap.get(InquiryNoStr).SAP_Province__c == 'OSH-瀹夊窘鐪�'){
+ ast.OSHFLG__c = true ;
+ }
+ //20230323 lt DB202303088261 涓ょエ鍒� End
astList.add(ast);
/* 鍘熶唬鐮�
iflog.ErrorLog__c += 'Warning! Asset' + '[' + dnInfo.OTCode + ':' + dnInfo.SerialNoorLotNo + '] Exist. This asset is skipped.\n';
@@ -1963,7 +1998,7 @@
&& Integer.valueOf(dnInfo.ValidTo.substring(0, 4)) <= Integer.valueOf(Date.today().Year())) {
rac.Sterilization_limit__c = null;
}else{
- rac.Sterilization_limit__c = NFMUtil.parseStr2Date(dnInfo.ValidTo);
+ rac.Sterilization_limit__c = NFMUtil.parseStr2Date(dnInfo.ValidTo);
}
// rac.Sterilization_limit__c = NFMUtil.parseStr2Date(dnInfo.ValidTo);
// gzw DB202301244151 淇濅慨鏈熼檺楠岃瘉鏃ユ湡鍙鎬ц皟鏁� end
@@ -2018,6 +2053,11 @@
}
if (astsMap.get(ast.Product_Serial_No__c ) == null) {
ast = new Asset();
+ //20230323 lt DB202303088261 涓ょエ鍒� Start
+ if(oppMap.get(InquiryNoStr).SAP_Province__c == 'OSH-瀹夊窘鐪�'){
+ ast.OSHFLG__c = true ;
+ }
+ //20230323 lt DB202303088261 涓ょエ鍒� End
astList.add(ast);
//astUpdateMap.put(ast.Product_Serial_No__c, ast);
logstr += dnInfo.OTCode + ':' + dnInfo.SerialNoorLotNo + '(' + dnInfo.TracingCode + ')' + ' ';
@@ -2041,6 +2081,11 @@
) {
continue;
}
+ //20230323 lt DB202303088261 涓ょエ鍒� Start
+ if(oppMap.get(InquiryNoStr).SAP_Province__c == 'OSH-瀹夊窘鐪�'){
+ ast.OSHFLG__c = true ;
+ }
+ //20230323 lt DB202303088261 涓ょエ鍒� End
astList.add(ast);
//鍘熶唬鐮侊細
@@ -2327,7 +2372,7 @@
&& Integer.valueOf(dnInfo.ValidTo.substring(0, 4)) <= Integer.valueOf(Date.today().Year())) {
rac.Sterilization_limit__c = null;
}else{
- rac.Sterilization_limit__c = NFMUtil.parseStr2Date(dnInfo.ValidTo);
+ rac.Sterilization_limit__c = NFMUtil.parseStr2Date(dnInfo.ValidTo);
}
// rac.Sterilization_limit__c = NFMUtil.parseStr2Date(dnInfo.ValidTo);
// gzw DB202301244151 淇濅慨鏈熼檺楠岃瘉鏃ユ湡鍙鎬ц皟鏁� end
@@ -2378,6 +2423,11 @@
if (astsMap.get(ast.Product_Serial_No__c ) == null) {
ast = new Asset();
+ //20230323 lt DB202303088261 涓ょエ鍒� Start
+ if(oppMap.get(InquiryNoStr).SAP_Province__c == 'OSH-瀹夊窘鐪�'){
+ ast.OSHFLG__c = true ;
+ }
+ //20230323 lt DB202303088261 涓ょエ鍒� End
astList.add(ast);
logstr += dnInfo.SorLMark == 'S' ? dnInfo.OTCode + ':' + dnInfo.SerialNoorLotNo : dnInfo.OTCode + ':' + dnInfo.SerialNoorLotNo + '(' + dnInfo.TracingCode + ')';
} else {
@@ -2392,6 +2442,11 @@
iflog.ErrorLog__c += 'Warning! Asset' + '[' + errMes + '] Exist. This asset is skipped.\n';
continue;
}
+ //20230323 lt DB202303088261 涓ょエ鍒� Start
+ if(oppMap.get(InquiryNoStr).SAP_Province__c == 'OSH-瀹夊窘鐪�'){
+ ast.OSHFLG__c = true ;
+ }
+ //20230323 lt DB202303088261 涓ょエ鍒� End
astList.add(ast);
// CHAN-BUY3GV end
// 鍘熶唬鐮�
diff --git a/force-app/main/default/classes/NFM202Controller.cls b/force-app/main/default/classes/NFM202Controller.cls
index 107a832..201028c 100644
--- a/force-app/main/default/classes/NFM202Controller.cls
+++ b/force-app/main/default/classes/NFM202Controller.cls
@@ -409,8 +409,15 @@
quotation.SFDC_DataID = opp.ID;
quotation.TransType = transTypeMap.get(opp.id); // 璇环鍖哄垎
quotation.InquiryCode = opp.Opportunity_No__c; // 璇环缂栫爜
- quotation.Quote_Code = opp.Estimation_No__c; // 鎶ヤ环缂栫爜
- quotation.SalesPoint = opp.SAP_Province__c; // SAP涓婁紶鐪�
+ quotation.Quote_Code = opp.Estimation_No__c; // 鎶ヤ环缂栫爜
+ //20230322 lt DB202303088261 涓ょエ鍒� SAP涓婁紶鐪佸鍔� OSH-瀹夊窘鐪侊紝浣嗕紶缁橲PO 鈥滃畨寰界渷鈥� start
+ if(opp.SAP_Province__c == 'OSH-瀹夊窘鐪�'){
+ quotation.SalesPoint = '瀹夊窘鐪�';
+ }else{
+ quotation.SalesPoint = opp.SAP_Province__c; // SAP涓婁紶鐪�
+ }
+ // quotation.SalesPoint = opp.SAP_Province__c; // SAP涓婁紶鐪�
+ //20230322 lt DB202303088261 涓ょエ鍒� SAP涓婁紶鐪佸鍔� OSH-瀹夊窘鐪侊紝浣嗕紶缁橲PO 鈥滃畨寰界渷鈥� end
quotation.Province = opp.State__c; // 鐪佷唤
quotation.City = opp.City__c; // 甯�/鍦板尯
quotation.HPCode = opp.HP_Management_Code__c; // 鍖婚櫌浠ｇ爜
diff --git a/force-app/main/default/classes/PrintConsumblePDFController.cls b/force-app/main/default/classes/PrintConsumblePDFController.cls
index 2da5d21..dfe531f 100644
--- a/force-app/main/default/classes/PrintConsumblePDFController.cls
+++ b/force-app/main/default/classes/PrintConsumblePDFController.cls
@@ -52,6 +52,7 @@
Order_ForHospital__c,Deliver_date__c,Order_Reason__c,
Order_date__c,Total_amount__c,Order_ProType__c,
Offers_Price__c,Order_effective_contact__r.Business_Assistant__r.Province_Text__c
+ ,Order_effective_contact__r.OSH_Dealer__c //20230323 lt DB202303088261 涓ょエ鍒� add
From Consumable_order__c
Where Id =:ESetId];
if (qs.size()>0){
@@ -259,6 +260,7 @@
'娌冲崡鐪�' => '濂ユ灄宸存柉锛堝寳浜級閿�鍞湇鍔℃湁闄愬叕鍙�',
'娴欐睙鐪�' => '濂ユ灄宸存柉锛堝寳浜級閿�鍞湇鍔℃湁闄愬叕鍙镐笂娴峰垎鍏徃',
'瀹夊窘鐪�' => '濂ユ灄宸存柉锛堝寳浜級閿�鍞湇鍔℃湁闄愬叕鍙镐笂娴峰垎鍏徃',
+ 'OSH-瀹夊窘鐪�' => '濂ユ灄宸存柉璐告槗锛堜笂娴凤級鏈夐檺鍏徃', //20230323 lt DB202303088261 涓ょエ鍒� add
'姹熻タ鐪�' => '濂ユ灄宸存柉锛堝寳浜級閿�鍞湇鍔℃湁闄愬叕鍙镐笂娴峰垎鍏徃',
'绂忓缓鐪�' => '濂ユ灄宸存柉锛堝寳浜級閿�鍞湇鍔℃湁闄愬叕鍙镐笂娴峰垎鍏徃',
'姹熻嫃鐪�' => '濂ユ灄宸存柉锛堝寳浜級閿�鍞湇鍔℃湁闄愬叕鍙镐笂娴峰垎鍏徃',
@@ -269,7 +271,17 @@
//CHAN-B42D6F 瀹夊窘ET鐗圭害缁忛攢鍟嗘潵鐨勮浠� SAP涓婁紶鐪� 绱ф�ュ搴斾负鍖椾含 浠ュ悗浼氫慨鏀� TODO
//CHAN-BTF64C 瀹夊窘ENG缁忛攢鍟嗙殑璇环榛樿SAP涓婁紶鐪佷慨鏀� update by rentongxiao 2020-09-14 start
// String province = coc.Order_effective_contact__r.Business_Assistant__r.Province_Text__c == '瀹夊窘鐪�' ? '鍖椾含甯�' : coc.Order_effective_contact__r.Business_Assistant__r.Province_Text__c;
- String province = coc.Order_effective_contact__r.Business_Assistant__r.Province_Text__c == '瀹夊窘鐪�' && coc.Order_ProType__c == 'ET' ? '鍖椾含甯�' : coc.Order_effective_contact__r.Business_Assistant__r.Province_Text__c;
+ //20230323 lt DB202303088261 涓ょエ鍒� start
+ String province = '';
+ if(coc.Order_effective_contact__r.OSH_Dealer__c == TRUE){
+ province = 'OSH-瀹夊窘鐪�';
+ }else if(coc.Order_effective_contact__r.Business_Assistant__r.Province_Text__c == '瀹夊窘鐪�' && coc.Order_ProType__c == 'ET'){
+ province = '鍖椾含甯�';
+ }else{
+ province = coc.Order_effective_contact__r.Business_Assistant__r.Province_Text__c;
+ }
+ // String province = coc.Order_effective_contact__r.Business_Assistant__r.Province_Text__c == '瀹夊窘鐪�' && coc.Order_ProType__c == 'ET' ? '鍖椾含甯�' : coc.Order_effective_contact__r.Business_Assistant__r.Province_Text__c;
+ //20230323 lt DB202303088261 涓ょエ鍒� end
//CHAN-BTF64C 瀹夊窘ENG缁忛攢鍟嗙殑璇环榛樿SAP涓婁紶鐪佷慨鏀� update by rentongxiao 2020-09-14 end
diff --git a/force-app/main/default/classes/QuotePDFExtensionController.cls b/force-app/main/default/classes/QuotePDFExtensionController.cls
index 2b9a22e..5d12af0 100644
--- a/force-app/main/default/classes/QuotePDFExtensionController.cls
+++ b/force-app/main/default/classes/QuotePDFExtensionController.cls
@@ -87,6 +87,7 @@
'娌冲崡鐪�' => '濂ユ灄宸存柉锛堝寳浜級閿�鍞湇鍔℃湁闄愬叕鍙�',
'娴欐睙鐪�' => '濂ユ灄宸存柉锛堝寳浜級閿�鍞湇鍔℃湁闄愬叕鍙镐笂娴峰垎鍏徃',
'瀹夊窘鐪�' => '濂ユ灄宸存柉锛堝寳浜級閿�鍞湇鍔℃湁闄愬叕鍙镐笂娴峰垎鍏徃',
+ 'OSH-瀹夊窘鐪�' => '濂ユ灄宸存柉璐告槗锛堜笂娴凤級鏈夐檺鍏徃', //20230323 lt DB202303088261 涓ょエ鍒� add
'姹熻タ鐪�' => '濂ユ灄宸存柉锛堝寳浜級閿�鍞湇鍔℃湁闄愬叕鍙镐笂娴峰垎鍏徃',
'绂忓缓鐪�' => '濂ユ灄宸存柉锛堝寳浜級閿�鍞湇鍔℃湁闄愬叕鍙镐笂娴峰垎鍏徃',
'姹熻嫃鐪�' => '濂ユ灄宸存柉锛堝寳浜級閿�鍞湇鍔℃湁闄愬叕鍙镐笂娴峰垎鍏徃',
@@ -149,7 +150,8 @@
public String address {get; set;}
public String postCode {get;set;}
public String addressName {get;set;}
-
+ public String addressName1 {get;set;}//20230323 lt DB202303088261 涓ょエ鍒� start 鎶ヤ环鍗曠敤
+
public String salesRoot {get;set;}
public Decimal newTotalPrice {get;set;}
//WLIG-BYRD37 銆愬鎵樸�戣浠� 鎵撳嵃閰嶇疆鍗� 瀛楁淇敼 绮剧悽鎶�鏈� wql 2021/03/08 start
@@ -578,7 +580,13 @@
//鑾峰彇鍔炰簨澶勫湴鍧�
private void getShipmentaddress(){
String province = this.targetObj.Opportunity.SAP_Province__c;
-
+ //20230323 lt DB202303088261 涓ょエ鍒� start
+ String province1 = this.targetObj.Opportunity.SAP_Province__c;
+ if(province == 'OSH-瀹夊窘鐪�'){
+ province = '瀹夊窘鐪�';
+ }
+ //20230323 lt DB202303088261 涓ょエ鍒� end
+
List<Shipment_address__c> shipmentAddresses = [SELECT id, Address__c, Post_Code__c FROM Shipment_address__c WHERE Name=:province];
// 瑕嬬銈掑彇寰椼仹銇嶃仾銇勫牬鍚�
if ( shipmentAddresses.size() != 1) {
@@ -586,10 +594,22 @@
}
this.shipmentAddress = shipmentAddresses[0];
+ //20230323 lt DB202303088261 涓ょエ鍒� start
+ if(province1 == 'OSH-瀹夊窘鐪�'){
+ this.params.addressName1 = ' ';
+ if(addressNameApiMap.get(province1) != null){
+ this.params.addressName = addressNameApiMap.get(province1);
+ }else{
+ this.params.addressName = ' ';
+ }
+ }else
+ //20230323 lt DB202303088261 涓ょエ鍒� end
if(addressNameApiMap.get(province) != null){
this.params.addressName = addressNameApiMap.get(province);
+ this.params.addressName1 = addressNameApiMap.get(province); //20230323 lt DB202303088261 涓ょエ鍒� add
}else{
this.params.addressName = ' ';
+ this.params.addressName1 = ' '; //20230323 lt DB202303088261 涓ょエ鍒� add
}
this.params.address = this.shipmentAddress.Address__c;
diff --git a/force-app/main/default/classes/SendConsumableordertosap.cls b/force-app/main/default/classes/SendConsumableordertosap.cls
index b90d66b..be16bbe 100644
--- a/force-app/main/default/classes/SendConsumableordertosap.cls
+++ b/force-app/main/default/classes/SendConsumableordertosap.cls
@@ -17,6 +17,7 @@
SalesManager__r.Province_Text__c,
Order_effective_contact__c,
Order_ProType__c,
+ Order_effective_contact__r.OSH_Dealer__c, //DB202303088261 瀹夊窘涓ょエ鍒� lt 20230314 add
IS_Price_Apply__c // 2018/11/05 CHAN-B686DZ 鍒ゆ柇鏄惁浠锋牸鐢宠
FROM
Consumable_order__c
@@ -66,6 +67,7 @@
Contract_Decide_Start_Date__c,
Contract_Decide_End_Date__c,
Agent_Ref__c,
+ OSH_Dealer__c, //DB202303088261 瀹夊窘涓ょエ鍒� lt 20230314 add
RecordtypeId
FROM
Account
@@ -147,6 +149,7 @@
// TODO 鍖婚櫌
opp.Agency1__c = ord[0].Dealer_Info__c;
opp.Hospital__c = ordContract[0].Id;
+
if(ord[0].Order_ProType__c == 'ET'){
opp.Opportunity_Category__c = 'ET';
opp.Opp_order_Type__c = 'ET';
@@ -169,6 +172,14 @@
//CHAN-B42D6F 瀹夊窘ET鐗圭害缁忛攢鍟嗘潵鐨勮浠� SAP涓婁紶鐪� 绱ф�ュ搴斾负鍖椾含 浠ュ悗浼氫慨鏀� TODO
//CHAN-BTF64C 瀹夊窘ENG缁忛攢鍟嗙殑璇环榛樿SAP涓婁紶鐪佷慨鏀� update by rentongxiao 2020-09-14
// if(ord[0].SalesManager__r.Province_Text__c == '瀹夊窘鐪�'){
+
+ //DB202303088261 瀹夊窘涓ょエ鍒� lt 20230314 start ord[0].SalesManager__r.Province_Text__c == '瀹夊窘鐪�' &&
+ if(ord[0].Order_effective_contact__r.OSH_Dealer__c == TRUE){
+ opp.SAP_Province__c = 'OSH-瀹夊窘鐪�';
+ // System.debug('---lt123---SAP涓婁紶鐪�1---'+opp.SAP_Province__c);
+ }
+ else
+ //DB202303088261 瀹夊窘涓ょエ鍒� lt 20230314 end
if(ord[0].SalesManager__r.Province_Text__c == '瀹夊窘鐪�' && opp.Opportunity_Category__c == 'ET'){
opp.SAP_Province__c = '鍖椾含甯�';
}else{
diff --git a/force-app/main/default/classes/SendConsumableordertosapTest.cls b/force-app/main/default/classes/SendConsumableordertosapTest.cls
index 660dad3..1330317 100644
--- a/force-app/main/default/classes/SendConsumableordertosapTest.cls
+++ b/force-app/main/default/classes/SendConsumableordertosapTest.cls
@@ -99,6 +99,7 @@
Product_Register__c = prc.Id
);
insert prlc;
+
user MyUser_Test1 = New User(ContactId = core1.Id,
Alias = 'newUser1',
Email='newuser1@testorg.com',
@@ -110,7 +111,16 @@
ProfileId = prof.Id,
TimeZoneSidKey='Asia/Shanghai',
UserName='testUser1@testorg.com');
- insert MyUser_Test1;
+
+ //lt
+ if (Test.isRunningTest()) {
+ System.runAs(new User(Id = UserInfo.getUserId())){
+ insert MyUser_Test1;
+ }
+ }
+ //lt
+
+ // insert MyUser_Test1;
//缁忛攢鍟嗘湁鏁堝悎鍚�
Account myAccount2 = new Account(name='Testaccount002',
RecordTypeId = rectContract[0].Id,
diff --git a/force-app/main/default/classes/searchContractController.cls b/force-app/main/default/classes/searchContractController.cls
index ffc617c..cdc0713 100644
--- a/force-app/main/default/classes/searchContractController.cls
+++ b/force-app/main/default/classes/searchContractController.cls
@@ -4,41 +4,55 @@
public String searchName {get;set;} // 妞滅储鏂囧瓧鍒�
private String ctype;
Date todayDate = Date.today();
+
+ private Boolean OSHFLG;//lt 20230517 瀹夊窘涓ょエ鍒� add
+
public searchContractController() {
ctype = ApexPages.currentPage().getParameters().get('Ctype');
todayDate = Date.today();
}
public void init(){
- User useracc = [SELECT accountid FROM user WHERE id = :UserInfo.getUserId() ];
+ //lt 20230517 瀹夊窘涓ょエ鍒� add ,OSHFLG__c
+ User useracc = [SELECT accountid,OSHFLG__c FROM user WHERE id = :UserInfo.getUserId() ];
+ OSHFLG = Useracc.OSHFLG__c; //lt 20230517 瀹夊窘涓ょエ鍒� add
+
accountid = Useracc.accountid;
at = [SELECT id,Name,State_Master__c,State_Master__r.Name,Sales_Section__c,
Contract_Decide_Start_Date__c,Contract_Decide_End_Date__c
+ // ,OSH_Dealer__c //20230323 lt DB202303088261 涓ょエ鍒� add
FROM Account
WHERE ParentId = :accountid
- AND Contact_Type__c like :ctype
+ AND Contact_Type__c like :ctype
AND Contract_Decide_Start_Date__c <= :Date.Today()
AND Contract_Decide_End_Date__c >= :Date.Today()
- AND Secondary_contract__c = false];
+ AND Secondary_contract__c = false
+ AND OSH_Dealer__c =: OSHFLG //lt 20230517 瀹夊窘涓ょエ鍒� add
+ ];
+ // System.debug('lt123---1---'+at);
}
public PageReference serContact(){
at = Database.query(this.makeSoql(searchName,todayDate));
+ // System.debug('lt123---2---'+at);
return null;
}
private String makeSoql(String CateName,Date timetest){
String soql = 'SELECT id,Name,State_Master__c,State_Master__r.Name,Sales_Section__c,';
- soql += ' Contract_Decide_Start_Date__c,Contract_Decide_End_Date__c FROM Account';
+ soql += ' Contract_Decide_Start_Date__c,Contract_Decide_End_Date__c,OSH_Dealer__c FROM Account'; //20230323 lt DB202303088261 涓ょエ鍒� add ,OSH_Dealer__c
soql += ' where ParentId = \'' + this.accountid + '\'' ;
+ soql += ' AND OSH_Dealer__c = ' + this.OSHFLG + '' ; //lt 20230517 瀹夊窘涓ょエ鍒� add
soql += ' AND Secondary_contract__c = false' ;
- soql += ' AND Contact_Type__c like \'%' + String.escapeSingleQuotes(ctype.replaceAll('%', '\\%')) + '%\'';
+ soql += ' AND Contact_Type__c like \'%' + String.escapeSingleQuotes(ctype.replaceAll('%', '\\%')) + '%\'';
soql += ' AND Contract_Decide_Start_Date__c <=' + String.valueOf(timetest).substring(0, 10);
soql += ' AND Contract_Decide_End_Date__c >= ' + String.valueOf(timetest).substring(0, 10);
if(!String.isBlank(CateName)){
soql += ' AND Name like \'%' + String.escapeSingleQuotes(CateName.replaceAll('%', '\\%')) + '%\'';
}
+ // System.debug('lt123---3---'+soql);
return soql;
+
}
}
\ No newline at end of file
diff --git a/force-app/main/default/classes/searchContractControllerTest.cls b/force-app/main/default/classes/searchContractControllerTest.cls
index 15d4ed1..0fdde2e 100644
--- a/force-app/main/default/classes/searchContractControllerTest.cls
+++ b/force-app/main/default/classes/searchContractControllerTest.cls
@@ -12,7 +12,7 @@
return;
}
- Profile prof = [select Id from Profile where Name ='901_缁忛攢鍟嗙ぞ鍖烘櫘閫氭潈闄恄2閲嶉獙璇�'];
+ Profile prof = [select Id from Profile where Name ='901_缁忛攢鍟嗙ぞ鍖烘櫘閫氭潈闄恄2閲嶉獙璇�(ET)'];
Account myAccount2 = new Account(name='Testaccount002',Dealer_discount__c =20,RecordTypeId = rectCo[0].Id,Product_Limit_Date__c = 'Test01|5|55,Test02|2|4',ET_SP_Dealer__c = true);
insert myAccount2;
Account contact = new Account(name='Testaccount002',RecordTypeId = rectCotac[0].Id,SpecialDealerName__c = 'Testaccount002',ParentId = myAccount2.Id,Agent_Ref__c = myAccount2.Id,Delete_Flag__c = false,Contract_Department_Class__c = 'ET',Contract_Decide_Start_Date__c = Date.today().addDays(-1),Contract_Decide_End_Date__c = Date.today().addDays(1),AgentCode_Ext__c = '9999900',ET_SP_Dealer__c = true);
@@ -21,7 +21,14 @@
Contact core = new Contact(email='jplumber@salesforce.com', firstname='Joe',lastname='Plumber',accountid=myAccount2.id);
insert core;
user MyUser_Test = New User(ContactId = core.id,Alias = 'newUser',Email='newuser@testorg.com',EmailEncodingKey='UTF-8', LastName='TestUser', LanguageLocaleKey='zh_CN',LocaleSidKey='zh_CN', ProfileId = prof.Id,TimeZoneSidKey='Asia/Shanghai', UserName='testUser@testorg.com');
- insert MyUser_Test;
+ //lt
+ if (Test.isRunningTest()) {
+ System.runAs(new User(Id = UserInfo.getUserId())){
+ insert MyUser_Test;
+ }
+ }
+ //lt
+ // insert MyUser_Test;
system.runAs(MyUser_Test){
PageReference page = new PageReference('/apex/searchContract?Ctype=ET');
page.setRedirect(true);
diff --git a/force-app/main/default/pages/Consumable.page b/force-app/main/default/pages/Consumable.page
index 80827a2..f4db9ed 100644
--- a/force-app/main/default/pages/Consumable.page
+++ b/force-app/main/default/pages/Consumable.page
@@ -478,7 +478,8 @@
<td colspan="2">鍚� 鍚岋細</td>
<td colspan="2">
<div style="width:2px;height:20px;background-color:red; position:absolute;margin-right:5px;"></div>
- <apex:inputText id="OEC" value="{!contractName}" onclick="searchContract('{!agencyProType}')" style="width:200px" onfocus="if (j$(escapeVfId('allPage:allForm:allBlock:searchBlock:tempidPp')).value() != 'tempId' && j$(escapeVfId('allPage:allForm:allBlock:searchBlock:tempidPp')).value() != '' && j$(escapeVfId('allPage:allForm:allBlock:searchBlock:OECid')).value() != '' && '{!methodType}' == 'promotionorder'){searchPProductJs('0');return false;}"/>
+ <!-- lt 20230526 瀹夊窘涓ょエ鍒� update agencyProType - agencyProType1 -->
+ <apex:inputText id="OEC" value="{!contractName}" onclick="searchContract('{!agencyProType1}')" style="width:200px" onfocus="if (j$(escapeVfId('allPage:allForm:allBlock:searchBlock:tempidPp')).value() != 'tempId' && j$(escapeVfId('allPage:allForm:allBlock:searchBlock:tempidPp')).value() != '' && j$(escapeVfId('allPage:allForm:allBlock:searchBlock:OECid')).value() != '' && '{!methodType}' == 'promotionorder'){searchPProductJs('0');return false;}"/>
<apex:inputHidden id="OECid" value="{!contractId}" />
<apex:inputHidden id="tempidPp" value="{!tempidPp}" />
</td>
diff --git a/force-app/main/default/pages/PrintConsumblePDF.page b/force-app/main/default/pages/PrintConsumblePDF.page
index 4704377..0089545 100644
--- a/force-app/main/default/pages/PrintConsumblePDF.page
+++ b/force-app/main/default/pages/PrintConsumblePDF.page
@@ -59,13 +59,13 @@
</td>
<td>
<div style="height:25px;"></div>
- <div style="height:25px;">{!$Label.Quote_Department}</div>
+ <!-- <div style="height:25px;">{!$Label.Quote_Department}</div> --> <!-- 20230323 lt DB202303088261 涓ょエ鍒� -->
<div style="height:25px;"></div>
<div style="height:25px;"></div>
</td>
<td>
<div style="height:25px;"> </div>
- <div style="height:25px;">: </div>
+ <!-- <div style="height:25px;">: </div> --> <!-- 20230323 lt DB202303088261 涓ょエ鍒� -->
<div style="height:25px;"> </div>
<div style="height:25px;"> </div>
</td>
diff --git a/force-app/main/default/pages/QuotePDF.page b/force-app/main/default/pages/QuotePDF.page
index 7337844..0bd4eed 100644
--- a/force-app/main/default/pages/QuotePDF.page
+++ b/force-app/main/default/pages/QuotePDF.page
@@ -186,9 +186,11 @@
<div class="footerAddress">
<div>
- 鈻!params.addressName}銆�銆�銆�<br />
+ <!-- 20230323 lt DB202303088261 涓ょエ鍒� update addressName === addressName1 -->
+ 鈻!params.addressName1}銆�銆�銆�<br />
{!params.address}锛堥偖缂栵細{!params.postCode}锛�
</div>
+
<!-- <div style="height: 10px;"></div>
<div>
鈻″ゥ鏋楀反鏂紙鍖椾含锛夐攢鍞湇鍔℃湁闄愬叕鍙镐笂娴峰垎鍏徃銆�銆�銆�<br />
--
Gitblit v1.9.1