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/LexConInvoicedetailsControllerTest.cls | 154 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 154 insertions(+), 0 deletions(-)
diff --git a/force-app/main/default/classes/LexConInvoicedetailsControllerTest.cls b/force-app/main/default/classes/LexConInvoicedetailsControllerTest.cls
index 80a9a3c..57e5f15 100644
--- a/force-app/main/default/classes/LexConInvoicedetailsControllerTest.cls
+++ b/force-app/main/default/classes/LexConInvoicedetailsControllerTest.cls
@@ -1,6 +1,7 @@
@isTest
private class LexConInvoicedetailsControllerTest {
@isTest
+<<<<<<< HEAD
static void all() {
User myUser_test;
Account myAccount1;
@@ -159,6 +160,70 @@
TestList1.Order_date__c = Date.today();
TestList2.Deliver_date__c = Date.today();
insert new List<Consumable_order__c>{ testList1, testList2 };
+=======
+ static void all() {
+ User myUser_test;
+ Account myAccount1;
+ Account myAccount2;
+ User thisUser = [ select Id from User where Id = :UserInfo.getUserId()];
+ System.runAs(thisUser){
+ Profile prof = [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;
+ }
+ List<RecordType> rectHos = [select Id from RecordType where IsActive = true and SobjectType = 'Account' and Name = '鐥呴櫌'];
+ if (rectHos.size() == 0) {
+ return;
+ }
+ myAccount1 = new Account(Name='testaccount001',Dealer_discount__c =10,RecordTypeId = rectCo[0].Id );
+ myAccount2 = new Account(Name='testaccount002',Dealer_discount__c =20,RecordTypeId = rectHos[0].Id );
+ insert myAccount1;
+ insert myAccount2;
+ 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 = prof.Id, TimeZoneSidKey='Asia/Shanghai', UserName='testUser@testorg.com', UserPro_Type__c='ENG', Work_Location__c='鍖椾含');
+ insert myUser_test;
+ }
+ System.runAs(myUser_test){
+ //浜у搧淇℃伅
+ Product2 prod01 = new Product2(Name='Test01',ProductCode='Test01',Asset_Model_No__c = 'Test01',SFDA_Status__c = '鏈夊姽',Dealer_special_Object__c = true,Packing_list_manual__c=1,Manual_Entry__c = false);
+ Product2 prod02 = new Product2(Name='Test02',ProductCode='Test02',Asset_Model_No__c = 'Test02',SFDA_Status__c = '鏈夊姽',Dealer_special_Object__c = true,Packing_list_manual__c=1,Manual_Entry__c = false);
+ Product2 prod03 = new Product2(Name='Test03',ProductCode='Test03',Asset_Model_No__c = 'Test03',SFDA_Status__c = '鏈夊姽',Dealer_special_Object__c = true,Packing_list_manual__c=1,Manual_Entry__c = false);
+ Product2 prod04 = new Product2(Name='Test04',ProductCode='Test04',Asset_Model_No__c = 'Test04',SFDA_Status__c = '鏈夊姽',Dealer_special_Object__c = true,Packing_list_manual__c=2,Manual_Entry__c = false);
+ Product2 prod05 = new Product2(Name='Test05',ProductCode='Test05',Asset_Model_No__c = 'Test05',SFDA_Status__c = '鏈夊姽',Dealer_special_Object__c = true,Packing_list_manual__c=1,Manual_Entry__c = false);
+ Product2 prod06 = new Product2(Name='Test06',ProductCode='Test06',Asset_Model_No__c = 'Test06',SFDA_Status__c = '鏈夊姽',Dealer_special_Object__c = true,Packing_list_manual__c=1,Manual_Entry__c = false);
+ insert new Product2[] {prod01, prod02,prod03,prod04, prod05, prod06};
+ Product2__c pro1 = new Product2__c(Name='Pro001',OT_CODE_Text__c='Test001',Product2__c = prod01.Id);
+ Product2__c pro2 = new Product2__c(Name='Pro002',OT_CODE_Text__c='Test002',Product2__c = prod02.Id);
+ Product2__c pro3 = new Product2__c(Name='Pro004',OT_CODE_Text__c='Test004',Product2__c = prod03.Id);
+ Product2__c pro4 = new Product2__c(Name='Pro005',OT_CODE_Text__c='Test005',Product2__c = prod04.Id);
+ Product2__c pro5 = new Product2__c(Name='Pro003',OT_CODE_Text__c='Test003',Product2__c = prod05.Id);
+ Product2__c pro6 = new Product2__c(Name='Pro006',OT_CODE_Text__c='Test006',Product2__c = prod06.Id);
+ insert new Product2__c[] {pro4, pro5,pro6,pro1, pro2, pro3};
+ //鍙戠エ
+ Consumable_order__c invoiceorder = new Consumable_order__c();
+ invoiceorder.Name='invoice02';
+ invoiceorder.Order_type__c = '鍙戠エ';
+ invoiceorder.Invoice_status__c='宸插畬鎴�';
+ invoiceorder.Invoice_Date__c = Date.today();
+ invoiceorder.RecordTypeid = System.Label.RT_ConOrder_Invoice;
+ invoiceorder.Dealer_info__c= myAccount1.Id;
+ // createId.Order_ForHospital__c = myAccount2.Id;
+ invoiceorder.SummonsForDirction__c='鐩存帴閿�鍞粰鍖婚櫌';
+ invoiceorder.Order_status__c='鑽夋涓�';
+ insert invoiceorder;
+
+ //鍑哄簱鍗曚俊鎭�
+ //鍑哄簱鍗�
+ Consumable_order__c testList1 = new Consumable_order__c(Name='Test1',Summons_Sale_Status__c='鍑鸿揣',SummonsStatus_c__c='宸插畬鎴�',SummonsForDirction__c='鐩存帴閿�鍞粰鍖婚櫌',Order_status__c='鑽夋涓�',Order_type__c='浼犵エ',Dealer_info__c=myAccount1.Id,ConInvoice_Code__c = invoiceorder.id);
+ Consumable_order__c testList2 = new Consumable_order__c(Name='Test2',Summons_Sale_Status__c='鍑鸿揣',SummonsStatus_c__c='宸插畬鎴�',SummonsForDirction__c='鐩存帴閿�鍞粰鍖婚櫌',Order_status__c='宸叉彁浜�',Order_type__c='浼犵エ',Dealer_info__c=myAccount1.Id,ConInvoice_Code__c = invoiceorder.id);
+ TestList1.Order_date__c = Date.today().addDays(2);
+ TestList2.Order_date__c = Date.today().addDays(2);
+ TestList1.Order_date__c = Date.today();
+ TestList2.Deliver_date__c=Date.today();
+ insert new Consumable_order__c[]{testList1,testList2};
+>>>>>>> LEXCommunityLiJun
List<Consumable_Orderdetails__c> invoiceList = new List<Consumable_Orderdetails__c>();
//鍙戠エ鏄庣粏1
@@ -173,10 +238,17 @@
invoicedet1.Shipment_Count__c = 1;
invoicedet1.Invoice_Unitprice__c = 1;
invoicedet1.Delivery_List_RMB__c = 1;
+<<<<<<< HEAD
invoicedet1.InvoicedProCost_RMB__c = 1;
invoicedet1.Invoice_Unit__c = '涓�';
invoicedet1.Invoiced_Procount__c = 3;
invoicedet1.RrturnPro_count__c = 3;
+=======
+ invoicedet1.InvoicedProCost_RMB__c =1;
+ invoicedet1.Invoice_Unit__c = '涓�';
+ invoicedet1.Invoiced_Procount__c = 3;
+ invoicedet1.RrturnPro_count__c =3;
+>>>>>>> LEXCommunityLiJun
invoiceList.add(invoicedet1);
Consumable_orderdetails__c invoicedet2 = new Consumable_orderdetails__c();
@@ -190,10 +262,17 @@
invoicedet2.Shipment_Count__c = 1;
invoicedet2.Invoice_Unitprice__c = 1;
invoicedet2.Delivery_List_RMB__c = 1;
+<<<<<<< HEAD
invoicedet2.InvoicedProCost_RMB__c = 1;
invoicedet2.Invoice_Unit__c = '涓�';
invoicedet2.Invoiced_Procount__c = 3;
invoicedet2.RrturnPro_count__c = 3;
+=======
+ invoicedet2.InvoicedProCost_RMB__c =1;
+ invoicedet2.Invoice_Unit__c = '涓�';
+ invoicedet2.Invoiced_Procount__c = 3;
+ invoicedet2.RrturnPro_count__c =3;
+>>>>>>> LEXCommunityLiJun
invoiceList.add(invoicedet2);
Consumable_orderdetails__c invoicedet3 = new Consumable_orderdetails__c();
@@ -209,8 +288,13 @@
invoicedet3.Delivery_List_RMB__c = 2.0;
invoicedet3.Invoice_Unitprice__c = 1;
invoicedet3.InvoicedProCost_RMB__c = 1;
+<<<<<<< HEAD
invoicedet3.Invoiced_Procount__c = 3;
invoicedet3.RrturnPro_count__c = 3;
+=======
+ invoicedet3.Invoiced_Procount__c = 3;
+ invoicedet3.RrturnPro_count__c =3;
+>>>>>>> LEXCommunityLiJun
invoiceList.add(invoicedet3);
insert invoiceList;
@@ -228,8 +312,13 @@
orderdet1.Delivery_List_RMB__c = 2.0;
orderdet1.Invoice_Unitprice__c = 1;
orderdet1.InvoicedProCost_RMB__c = 1;
+<<<<<<< HEAD
orderdet1.Invoiced_Procount__c = 3;
orderdet1.RrturnPro_count__c = 3;
+=======
+ orderdet1.Invoiced_Procount__c = 3;
+ orderdet1.RrturnPro_count__c =3;
+>>>>>>> LEXCommunityLiJun
orderdet1.Invoice_Unit__c = '涓�';
codList.add(orderdet1);
@@ -244,8 +333,13 @@
orderdet2.Delivery_List_RMB__c = 2.0;
orderdet2.Invoice_Unitprice__c = 1;
orderdet2.InvoicedProCost_RMB__c = 1;
+<<<<<<< HEAD
orderdet2.Invoiced_Procount__c = 3;
orderdet2.RrturnPro_count__c = 3;
+=======
+ orderdet2.Invoiced_Procount__c = 3;
+ orderdet2.RrturnPro_count__c =3;
+>>>>>>> LEXCommunityLiJun
orderdet2.Invoice_Unit__c = '鐩�';
codList.add(orderdet2);
@@ -260,12 +354,22 @@
orderdet3.Delivery_List_RMB__c = 2.0;
orderdet3.Invoice_Unitprice__c = 1;
orderdet3.InvoicedProCost_RMB__c = 1;
+<<<<<<< HEAD
orderdet3.Invoiced_Procount__c = 3;
orderdet3.RrturnPro_count__c = 3;
orderdet3.Invoice_Unit__c = '涓�';
orderdet3.Invoiced_Count__c = 3;
codList.add(orderdet3);
+=======
+ orderdet3.Invoiced_Procount__c = 3;
+ orderdet3.RrturnPro_count__c =3;
+ orderdet3.Invoice_Unit__c = '涓�';
+ orderdet3.Invoiced_Count__c= 3;
+ codList.add(orderdet3);
+
+
+>>>>>>> LEXCommunityLiJun
Consumable_orderdetails__c orderdet4 = new Consumable_orderdetails__c();
orderdet4.Name = 'Test1_0010031';
orderdet4.Consumable_order__c = testList1.Id;
@@ -277,10 +381,17 @@
orderdet4.Delivery_List_RMB__c = 2.0;
orderdet4.Invoice_Unitprice__c = 1;
orderdet4.InvoicedProCost_RMB__c = 1;
+<<<<<<< HEAD
orderdet4.Invoiced_Procount__c = 3;
orderdet4.RrturnPro_count__c = 3;
orderdet4.Invoice_Unit__c = '鐩�';
orderdet4.Invoiced_Count__c = 3;
+=======
+ orderdet4.Invoiced_Procount__c = 3;
+ orderdet4.RrturnPro_count__c =3;
+ orderdet4.Invoice_Unit__c = '鐩�';
+ orderdet4.Invoiced_Count__c= 3;
+>>>>>>> LEXCommunityLiJun
codList.add(orderdet4);
Consumable_orderdetails__c orderdet5 = new Consumable_orderdetails__c();
@@ -293,9 +404,15 @@
orderdet5.Invoice_Unit__c = '涓�';
orderdet5.Shipment_Count__c = 11;
orderdet5.Delivery_List_RMB__c = 2.0;
+<<<<<<< HEAD
orderdet5.Invoiced_Procount__c = 3;
orderdet5.RrturnPro_count__c = 3;
orderdet5.Invoiced_Count__c = 3;
+=======
+ orderdet5.Invoiced_Procount__c = 3;
+ orderdet5.RrturnPro_count__c =3;
+ orderdet5.Invoiced_Count__c= 3;
+>>>>>>> LEXCommunityLiJun
codList.add(orderdet5);
Consumable_orderdetails__c orderdet6 = new Consumable_orderdetails__c();
@@ -308,9 +425,15 @@
orderdet6.Invoice_Unit__c = '鐩�';
orderdet6.Shipment_Count__c = 11;
orderdet6.Delivery_List_RMB__c = 2.0;
+<<<<<<< HEAD
orderdet6.Invoiced_Procount__c = 3;
orderdet6.RrturnPro_count__c = 3;
orderdet6.Invoiced_Count__c = 3;
+=======
+ orderdet6.Invoiced_Procount__c = 3;
+ orderdet6.RrturnPro_count__c =3;
+ orderdet6.Invoiced_Count__c= 3;
+>>>>>>> LEXCommunityLiJun
codList.add(orderdet6);
Consumable_orderdetails__c orderdet7 = new Consumable_orderdetails__c();
@@ -324,6 +447,7 @@
orderdet7.Invoice_Unit__c = '涓�';
orderdet7.Shipment_Count__c = 11;
orderdet7.Delivery_List_RMB__c = 2.0;
+<<<<<<< HEAD
orderdet7.Invoiced_Procount__c = 3;
orderdet7.Invoiced_Count__c = 3;
orderdet7.RrturnPro_count__c = 3;
@@ -354,3 +478,33 @@
}
}
}
+=======
+ orderdet7.Invoiced_Procount__c = 3;
+ orderdet7.Invoiced_Count__c= 3;
+ orderdet7.RrturnPro_count__c =3;
+ codList.add(orderdet7);
+ insert codList;
+
+ LexConInvoicedetailsController.init(testList1.Id,invoiceorder.Id);
+ //搴忓垪鍖朖son
+
+
+ System.Test.startTest();
+ System.debug('===>鏁版嵁'+LexConInvoicedetailsController.consumableorderdetails1Records);
+ List<LexConInvoicedetailsController.ConsumableorderdetailsInfo> inList = LexConInvoicedetailsController.consumableorderdetails1Records;
+ LexConInvoicedetailsController.save(JSON.serialize(LexConInvoicedetailsController.consumableorderdetails1Records),invoiceorder.Id,testList1.Id);
+
+ List<LexConInvoicedetailsController.ConsumableorderdetailsInfo> inList1 = new List<LexConInvoicedetailsController.ConsumableorderdetailsInfo>();
+ for(LexConInvoicedetailsController.ConsumableorderdetailsInfo ass:inList){
+ ass.check= true;
+ ass.invoiceCount= 1;
+ ass.esd.Invoice_Unit__c = '涓�';
+ inList1.add(ass);
+ }
+ LexConInvoicedetailsController.save(JSON.serialize(inList1),invoiceorder.Id,testList1.Id);
+ System.Test.stopTest();
+
+ }
+ }
+}
+>>>>>>> LEXCommunityLiJun
--
Gitblit v1.9.1