From 36d15f189de2e83ce2576715dac30c3c260388dd Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 14:47:50 +0800
Subject: [PATCH] fixconflict
---
force-app/main/default/classes/LexTopPageControllerTest.cls | 292 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 292 insertions(+), 0 deletions(-)
diff --git a/force-app/main/default/classes/LexTopPageControllerTest.cls b/force-app/main/default/classes/LexTopPageControllerTest.cls
index 4a5f5d0..192063c 100644
--- a/force-app/main/default/classes/LexTopPageControllerTest.cls
+++ b/force-app/main/default/classes/LexTopPageControllerTest.cls
@@ -1,12 +1,21 @@
@IsTest
private class LexTopPageControllerTest {
@IsTest
+<<<<<<< HEAD
static void testMethod1() {
User currentUser = [SELECT Id FROM User WHERE Id = :UserInfo.getUserId()];
NoteStay__c n = new NoteStay__c(Name = 'NoteStay', IsStay__c = true);
insert n;
Test.startTest();
System.runAs(currentUser) {
+=======
+ static void testMethod1(){
+ User currentUser = [SELECT Id FROM User WHERE Id = :UserInfo.getUserId()];
+ NoteStay__c n = new NoteStay__c(Name = 'NoteStay',IsStay__c = true);
+ insert n;
+ Test.startTest();
+ System.runAs(currentUser){
+>>>>>>> LEXCommunityLiJun
LexTopPageController.initAgency();
LexTopPageController.initPage(20, 1);
}
@@ -14,6 +23,7 @@
}
@IsTest
+<<<<<<< HEAD
static void testMethod2() {
user MyUser_Test;
Account myAccount1;
@@ -207,6 +217,144 @@
dataForProductCount5.Box_Piece__c = '鐩�';
conList1.add(dataForProductCount5);
insert conList1;
+=======
+ static void testMethod2(){
+ user MyUser_Test;
+ Account myAccount1;
+ User thisUser = [ select Id from User where Id = :UserInfo.getUserId()];
+ NoteStay__c n = new NoteStay__c(Name = 'NoteStay',IsStay__c = true);
+ insert n;
+ System.runAs(thisUser){
+ Profile prof1 = [select Id from Profile where Name ='901_缁忛攢鍟嗙ぞ鍖烘櫘閫氭潈闄恄2閲嶉獙璇�(ET)'];
+ List<RecordType> rectCo = [select Id from RecordType where IsActive = true and SobjectType = 'Account' and Name = '璨╁２搴�'];
+ if (rectCo.size() == 0) {
+ return;
+ }
+ StaticParameter.EscapeConsumableOrderDetail2Trigger = true;
+
+ RecordType rectCoO = [select Id from RecordType where IsActive = true and SobjectType = 'Account' and Name = '鐥呴櫌'];
+ Account olympus = new Account(RecordTypeId = rectCoO.Id, AgentCode_Ext__c = '9999900', Name = 'olympus');
+ insert olympus;
+ myAccount1 = new Account(name='Testaccount001',Dealer_discount__c =10,RecordTypeId = rectCo[0].Id,AgentCode_Ext__c = '8888888',Product_Limit_Date__c = 'Test07|3|100,Test08|10|50');
+ insert myAccount1;
+ Contact core = new Contact(email='jplumber@salesforce.com', firstname='Joe',lastname='Plumber',accountid=myAccount1.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 = prof1.Id,TimeZoneSidKey='Asia/Shanghai', UserName='testUser@testorg.com',Work_Location__c = '閲嶅簡');
+ insert MyUser_Test;
+
+ }
+
+ system.runAs(MyUser_Test){
+ //浜у搧鏁版嵁
+ Product2 prod07 = new Product2(Name='Test07',ProductCode='Test07',Asset_Model_No__c = 'Test07',SFDA_Status__c = '鏈夊姽',Dealer_special_Object__c = true,Packing_list_manual__c = 1,Manual_Entry__c = false);
+ Product2 prod08 = new Product2(Name='Test08',ProductCode='Test08',Asset_Model_No__c = 'Test08',SFDA_Status__c = '鏈夊姽',Dealer_special_Object__c = true,Packing_list_manual__c = 1,Manual_Entry__c = false);
+ Product2 prod09 = new Product2(Name='Test09',ProductCode='Test09',Asset_Model_No__c = 'Test09',SFDA_Status__c = '鏈夊姽',Dealer_special_Object__c = true,Packing_list_manual__c = 1,Manual_Entry__c = false);
+ insert new Product2[] {prod07,prod08,prod09};
+
+ //鍒朵綔浜у搧
+ Product2__c proG = new Product2__c(Name='MH-155:鐧藉钩琛″附',OT_CODE_Text__c='Test001',Product2__c = prod07.Id);
+ insert proG;
+ Product2__c proH = new Product2__c(Name='MB-677:BNC鐢电紗',OT_CODE_Text__c='Test002',Product2__c = prod08.Id);
+ insert proH;
+ Product2__c proF = new Product2__c(Name='TooMAJ-643R:姘村泭闉樼003',OT_CODE_Text__c='Test003',Product2__c = prod09.Id);
+ insert proF;
+
+
+ //璁㈠崟
+ Consumable_order__c order = new Consumable_order__c();
+ order.Name = 'testMing';
+ order.Order_status__c = '鎵瑰噯';
+ order.RecordTypeid = System.Label.RT_ConOrder_Order;
+ order.Dealer_Info__c = myAccount1.id;
+ order.Inventory_date__c = Date.today();
+ order.Order_type__c = '璁㈠崟';
+ order.Order_ProType__c = 'ET';
+ insert order;
+ //鍒拌揣
+ Consumable_order__c order2 = new Consumable_order__c();
+ order2.Name = 'testMing1';
+ order2.Order_status__c = '鎵瑰噯';
+ order2.RecordTypeid = '01210000000c9dqAAA';
+ order2.Dealer_Info__c = myAccount1.id;
+ order2.Order_type__c = '鍒拌揣';
+ order2.Order_ProType__c = 'ET';
+ insert order2;
+
+ List<Consumable_order_details2__c> conList = new List<Consumable_order_details2__c>();
+ //鍒朵綔Consumable_order_details__c-------ProductCount
+ // 閿�鍞�
+ Consumable_order_details2__c dataForProductCount7 = new Consumable_order_details2__c();
+ dataForProductCount7.Bar_Code__c = '123456789298k250AAAAA';
+ dataForProductCount7.Sterilization_limit__c = Date.today().addDays(2);
+ dataForProductCount7.Arrive_date__c = Date.today();
+ dataForProductCount7.RecordTypeid = System.Label.RT_ConOrderDetail2_Delivery;
+ dataForProductCount7.Consumable_Product__c = proH.id;
+ dataForProductCount7.Asset_Model_No__c = proH.Asset_Model_No__c;
+ dataForProductCount7.Box_Piece__c = '鐩�';
+ dataForProductCount7.Used_date__c = Date.today();
+ dataForProductCount7.Consumable_order_minor__c = order.id;
+
+ conList.add(dataForProductCount7);
+ // 鍦ㄥ簱 杩囨湡 鐩�
+ Consumable_order_details2__c dataForProduct = new Consumable_order_details2__c();
+ dataForProduct.Bar_Code__c = '123456789498k250BBBBB';
+ dataForProduct.Sterilization_limit__c = Date.today().addDays(-2);
+ dataForProduct.Arrive_date__c = Date.today();
+ dataForProduct.RecordTypeid = System.Label.RT_ConOrderDetail2_Delivery;
+ dataForProduct.Consumable_Product__c = proF.id;
+ dataForProduct.Asset_Model_No__c = proF.Asset_Model_No__c;
+ dataForProduct.Box_Piece__c = '鐩�';
+ dataForProduct.Consumable_order_minor__c = order.id;
+
+ conList.add(dataForProduct);
+ // 鍦ㄥ簱 杩囨湡 涓�
+ Consumable_order_details2__c dataForProductCount3 = new Consumable_order_details2__c();
+ dataForProductCount3.Bar_Code__c = '123456788398k250CCCCC';
+ dataForProductCount3.Sterilization_limit__c = Date.today().addDays(-2);
+ dataForProductCount3.Arrive_date__c = Date.today();
+ dataForProductCount3.RecordTypeid = System.Label.RT_ConOrderDetail2_Delivery;
+ dataForProductCount3.Consumable_Product__c = proG.id;
+ dataForProductCount3.Asset_Model_No__c = proG.Asset_Model_No__c;
+ dataForProductCount3.Box_Piece__c = '涓�';
+ dataForProductCount3.RemoveBox_No__c = 1;
+ dataForProductCount3.Consumable_order_minor__c = order.id;
+ conList.add(dataForProductCount3);
+ insert conList;
+
+ //杩囨湡搴撳瓨姹囨�讳俊鎭� add by Wang Xueqin
+ List<Consumable_order_details2__c> conList1 = new List<Consumable_order_details2__c>();
+ Consumable_order_details2__c dataForProductCount4 = new Consumable_order_details2__c();
+ dataForProductCount4.Bar_Code__c = '1001';
+ dataForProductCount4.Arrive_date__c = Date.today();
+ dataForProductCount4.Send_Date__c = null;
+ dataForProductCount4.Used_date__c = null;
+ dataForProductCount4.Return_date__c = null;
+ dataForProductCount4.Lose_Flag__c = false;
+ dataForProductCount4.Cancellation_Flag__c = false;
+ dataForProductCount4.Consumable_Product__c = proG.Id;
+ dataForProductCount4.Consumable_Arrived_order__c = order2.id;
+ dataForProductCount4.Used_account__c = myAccount1.Id;
+ dataForProductCount4.Sterilization_limit__c = Date.today().addDays(-2);
+ dataForProductCount4.Box_Piece__c = '鐩�';
+ conList1.add(dataForProductCount4);
+ System.debug('conList1==>'+conList1);
+ //鏌ヨ鎵�鏈夎繃鏈熷簱瀛�
+ Consumable_order_details2__c dataForProductCount5 = new Consumable_order_details2__c();
+ dataForProductCount5.Bar_Code__c = '1002';
+ dataForProductCount5.Arrive_date__c = Date.today();
+ dataForProductCount5.Send_Date__c = Date.today();
+ dataForProductCount5.Used_date__c = Date.today();
+ dataForProductCount5.Return_date__c = null;
+ dataForProductCount5.Lose_Flag__c = false;
+ dataForProductCount5.Cancellation_Flag__c = false;
+ dataForProductCount5.Consumable_Product__c = proG.Id;
+ dataForProductCount5.Consumable_Arrived_order__c = order2.id;
+ dataForProductCount5.Used_account__c = myAccount1.Id;
+ dataForProductCount5.Sterilization_limit__c = Date.today().addDays(-2);
+ dataForProductCount5.Box_Piece__c = '鐩�';
+ conList1.add(dataForProductCount5);
+ insert conList1;
+>>>>>>> LEXCommunityLiJun
Test.startTest();
LexTopPageController.initAgency();
LexTopPageController.initPage(20, 1);
@@ -215,6 +363,7 @@
}
@IsTest
+<<<<<<< HEAD
static void testMethod3() {
user MyUser_Test;
Account myAccount1;
@@ -407,6 +556,144 @@
dataForProductCount5.Box_Piece__c = '涓�';
conList1.add(dataForProductCount5);
insert conList1;
+=======
+ static void testMethod3(){
+ user MyUser_Test;
+ Account myAccount1;
+ User thisUser = [ select Id from User where Id = :UserInfo.getUserId()];
+ NoteStay__c n = new NoteStay__c(Name = 'NoteStay',IsStay__c = true);
+ insert n;
+ System.runAs(thisUser){
+ Profile prof1 = [select Id from Profile where Name ='901_缁忛攢鍟嗙ぞ鍖烘櫘閫氭潈闄恄2閲嶉獙璇�(ET)'];
+ List<RecordType> rectCo = [select Id from RecordType where IsActive = true and SobjectType = 'Account' and Name = '璨╁２搴�'];
+ if (rectCo.size() == 0) {
+ return;
+ }
+ StaticParameter.EscapeConsumableOrderDetail2Trigger = true;
+
+ RecordType rectCoO = [select Id from RecordType where IsActive = true and SobjectType = 'Account' and Name = '鐥呴櫌'];
+ Account olympus = new Account(RecordTypeId = rectCoO.Id, AgentCode_Ext__c = '9999900', Name = 'olympus');
+ insert olympus;
+ myAccount1 = new Account(name='Testaccount001',Dealer_discount__c =10,RecordTypeId = rectCo[0].Id,AgentCode_Ext__c = '8888888');
+ insert myAccount1;
+ Contact core = new Contact(email='jplumber@salesforce.com', firstname='Joe',lastname='Plumber',accountid=myAccount1.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 = prof1.Id,TimeZoneSidKey='Asia/Shanghai', UserName='testUser@testorg.com',Work_Location__c = '閲嶅簡');
+ insert MyUser_Test;
+
+ }
+
+ system.runAs(MyUser_Test){
+ //浜у搧鏁版嵁
+ Product2 prod07 = new Product2(Name='Test07',ProductCode='Test07',Asset_Model_No__c = 'Test07',SFDA_Status__c = '鏈夊姽',Dealer_special_Object__c = true,Packing_list_manual__c = 1,Manual_Entry__c = false);
+ Product2 prod08 = new Product2(Name='Test08',ProductCode='Test08',Asset_Model_No__c = 'Test08',SFDA_Status__c = '鏈夊姽',Dealer_special_Object__c = true,Packing_list_manual__c = 1,Manual_Entry__c = false);
+ Product2 prod09 = new Product2(Name='Test09',ProductCode='Test09',Asset_Model_No__c = 'Test09',SFDA_Status__c = '鏈夊姽',Dealer_special_Object__c = true,Packing_list_manual__c = 1,Manual_Entry__c = false);
+ insert new Product2[] {prod07,prod08,prod09};
+
+ //鍒朵綔浜у搧
+ Product2__c proG = new Product2__c(Name='MH-155:鐧藉钩琛″附',OT_CODE_Text__c='Test001',Product2__c = prod07.Id);
+ insert proG;
+ Product2__c proH = new Product2__c(Name='MB-677:BNC鐢电紗',OT_CODE_Text__c='Test002',Product2__c = prod08.Id);
+ insert proH;
+ Product2__c proF = new Product2__c(Name='TooMAJ-643R:姘村泭闉樼003',OT_CODE_Text__c='Test003',Product2__c = prod09.Id);
+ insert proF;
+
+
+ //璁㈠崟
+ Consumable_order__c order = new Consumable_order__c();
+ order.Name = 'testMing';
+ order.Order_status__c = '鎵瑰噯';
+ order.RecordTypeid = System.Label.RT_ConOrder_Order;
+ order.Dealer_Info__c = myAccount1.id;
+ order.Inventory_date__c = Date.today();
+ order.Order_type__c = '璁㈠崟';
+ order.Order_ProType__c = 'ET';
+ insert order;
+ //鍒拌揣
+ Consumable_order__c order2 = new Consumable_order__c();
+ order2.Name = 'testMing1';
+ order2.Order_status__c = '鎵瑰噯';
+ order2.RecordTypeid = '01210000000c9dqAAA';
+ order2.Dealer_Info__c = myAccount1.id;
+ order2.Order_type__c = '鍒拌揣';
+ order2.Order_ProType__c = 'ET';
+ insert order2;
+
+ List<Consumable_order_details2__c> conList = new List<Consumable_order_details2__c>();
+ //鍒朵綔Consumable_order_details__c-------ProductCount
+ // 閿�鍞�
+ Consumable_order_details2__c dataForProductCount7 = new Consumable_order_details2__c();
+ dataForProductCount7.Bar_Code__c = '123456789298k250AAAAA';
+ dataForProductCount7.Sterilization_limit__c = Date.today().addDays(2);
+ dataForProductCount7.Arrive_date__c = Date.today();
+ dataForProductCount7.RecordTypeid = System.Label.RT_ConOrderDetail2_Delivery;
+ dataForProductCount7.Consumable_Product__c = proH.id;
+ dataForProductCount7.Asset_Model_No__c = proH.Asset_Model_No__c;
+ dataForProductCount7.Box_Piece__c = '涓�';
+ dataForProductCount7.Used_date__c = Date.today();
+ dataForProductCount7.Consumable_order_minor__c = order.id;
+
+ conList.add(dataForProductCount7);
+ // 鍦ㄥ簱 杩囨湡 鐩�
+ Consumable_order_details2__c dataForProduct = new Consumable_order_details2__c();
+ dataForProduct.Bar_Code__c = '123456789498k250BBBBB';
+ dataForProduct.Sterilization_limit__c = Date.today().addDays(-2);
+ dataForProduct.Arrive_date__c = Date.today();
+ dataForProduct.RecordTypeid = System.Label.RT_ConOrderDetail2_Delivery;
+ dataForProduct.Consumable_Product__c = proF.id;
+ dataForProduct.Asset_Model_No__c = proF.Asset_Model_No__c;
+ dataForProduct.Box_Piece__c = '涓�';
+ dataForProduct.Consumable_order_minor__c = order.id;
+
+ conList.add(dataForProduct);
+ // 鍦ㄥ簱 杩囨湡 涓�
+ Consumable_order_details2__c dataForProductCount3 = new Consumable_order_details2__c();
+ dataForProductCount3.Bar_Code__c = '123456788398k250CCCCC';
+ dataForProductCount3.Sterilization_limit__c = Date.today().addDays(-2);
+ dataForProductCount3.Arrive_date__c = Date.today();
+ dataForProductCount3.RecordTypeid = System.Label.RT_ConOrderDetail2_Delivery;
+ dataForProductCount3.Consumable_Product__c = proG.id;
+ dataForProductCount3.Asset_Model_No__c = proG.Asset_Model_No__c;
+ dataForProductCount3.Box_Piece__c = '涓�';
+ dataForProductCount3.RemoveBox_No__c = 1;
+ dataForProductCount3.Consumable_order_minor__c = order.id;
+ conList.add(dataForProductCount3);
+ insert conList;
+
+ //杩囨湡搴撳瓨姹囨�讳俊鎭� add by Wang Xueqin
+ List<Consumable_order_details2__c> conList1 = new List<Consumable_order_details2__c>();
+ Consumable_order_details2__c dataForProductCount4 = new Consumable_order_details2__c();
+ dataForProductCount4.Bar_Code__c = '1001';
+ dataForProductCount4.Arrive_date__c = Date.today();
+ dataForProductCount4.Send_Date__c = null;
+ dataForProductCount4.Used_date__c = null;
+ dataForProductCount4.Return_date__c = null;
+ dataForProductCount4.Lose_Flag__c = false;
+ dataForProductCount4.Cancellation_Flag__c = false;
+ dataForProductCount4.Consumable_Product__c = proG.Id;
+ dataForProductCount4.Consumable_Arrived_order__c = order2.id;
+ dataForProductCount4.Used_account__c = myAccount1.Id;
+ dataForProductCount4.Sterilization_limit__c = Date.today().addDays(-2);
+ dataForProductCount4.Box_Piece__c = '涓�';
+ conList1.add(dataForProductCount4);
+ System.debug('conList1==>'+conList1);
+ //鏌ヨ鎵�鏈夎繃鏈熷簱瀛�
+ Consumable_order_details2__c dataForProductCount5 = new Consumable_order_details2__c();
+ dataForProductCount5.Bar_Code__c = '1002';
+ dataForProductCount5.Arrive_date__c = Date.today();
+ dataForProductCount5.Send_Date__c = Date.today();
+ dataForProductCount5.Used_date__c = Date.today();
+ dataForProductCount5.Return_date__c = null;
+ dataForProductCount5.Lose_Flag__c = false;
+ dataForProductCount5.Cancellation_Flag__c = false;
+ dataForProductCount5.Consumable_Product__c = proG.Id;
+ dataForProductCount5.Consumable_Arrived_order__c = order2.id;
+ dataForProductCount5.Used_account__c = myAccount1.Id;
+ dataForProductCount5.Sterilization_limit__c = Date.today().addDays(-2);
+ dataForProductCount5.Box_Piece__c = '涓�';
+ conList1.add(dataForProductCount5);
+ insert conList1;
+>>>>>>> LEXCommunityLiJun
Test.startTest();
LexTopPageController.initAgency();
LexTopPageController.initPage(20, 1);
@@ -421,4 +708,9 @@
Test.stopTest();
}
}
+<<<<<<< HEAD
}
+=======
+
+}
+>>>>>>> LEXCommunityLiJun
--
Gitblit v1.9.1