From e6068da47c1bef5517c9e5fdc8c726766867ad4e Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 15:10:02 +0800
Subject: [PATCH] Merge branch 'master' into LEXUpgrade2023-Deloitte

---
 force-app/main/default/classes/LexCancelRemoveBoxControllerTest.cls |  567 -------------------------------------------------------
 1 files changed, 8 insertions(+), 559 deletions(-)

diff --git a/force-app/main/default/classes/LexCancelRemoveBoxControllerTest.cls b/force-app/main/default/classes/LexCancelRemoveBoxControllerTest.cls
index 498c24f..670ea0c 100644
--- a/force-app/main/default/classes/LexCancelRemoveBoxControllerTest.cls
+++ b/force-app/main/default/classes/LexCancelRemoveBoxControllerTest.cls
@@ -1,30 +1,17 @@
 @IsTest
 private class LexCancelRemoveBoxControllerTest {
-<<<<<<< HEAD
     static testMethod void testMethod1() {
-=======
-    static testMethod void testMethod1(){
->>>>>>> LEXCommunityLiJun
         Oly_TriggerHandler.bypass('ConsumableAssetHander');
         Oly_TriggerHandler.bypass('Oly_TriggerHandler');
         user myUser_test;
         Account myAccount2;
-<<<<<<< HEAD
         User thisUser = [SELECT Id FROM User WHERE Id = :UserInfo.getUserId()];
         System.runAs(thisUser) {
-            List<RecordType> rectCo = [
-                SELECT Id
-                FROM RecordType
-                WHERE IsActive = TRUE AND SobjectType = 'Account' AND Name = '璨╁2搴�'
-            ];
+            List<RecordType> rectCo = [SELECT Id FROM RecordType WHERE IsActive = TRUE AND SobjectType = 'Account' AND Name = '璨╁2搴�'];
             if (rectCo.size() == 0) {
                 return;
             }
-            Profile prof = [
-                SELECT Id
-                FROM Profile
-                WHERE Name = '901_缁忛攢鍟嗙ぞ鍖烘櫘閫氭潈闄恄2閲嶉獙璇�(ET Email)'
-            ];
+            Profile prof = [SELECT Id FROM Profile WHERE Name = '901_缁忛攢鍟嗙ぞ鍖烘櫘閫氭潈闄恄2閲嶉獙璇�(ET Email)'];
 
             myAccount2 = new Account(
                 name = 'Testaccount002',
@@ -102,45 +89,6 @@
             insert Order1;
             List<Consumable_order_details2__c> conList = new List<Consumable_order_details2__c>();
 
-=======
-        User thisUser = [ select Id from User where Id = :UserInfo.getUserId()];
-        System.runAs(thisUser){
-            List<RecordType> rectCo = [select Id from RecordType where IsActive = true and SobjectType = 'Account' and Name = '璨╁2搴�'];
-            if (rectCo.size() == 0) {
-                return;
-            }
-            Profile prof = [select Id from Profile where Name ='901_缁忛攢鍟嗙ぞ鍖烘櫘閫氭潈闄恄2閲嶉獙璇�(ET Email)'];
-            
-            myAccount2 = new Account(name='Testaccount002',Dealer_discount__c =20,RecordTypeId = rectCo[0].Id,AgentCode_Ext__c = '9999900');
-            insert myAccount2;
-    
-            Contact 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;
-        }
-        System.runAs(MyUser_Test){
-            Product2 prod01 = new Product2(Name='Test01',ProductCode='Test01',Asset_Model_No__c = 'Test01',SFDA_Status__c = '鏈夊姽',JANCODE__c = '04953170200311',Dealer_special_Object__c = true,Packing_list_manual__c = 5,Manual_Entry__c = false);
-            Product2 prod02 = new Product2(Name='Test02',ProductCode='Test02',Asset_Model_No__c = 'Test02',SFDA_Status__c = '鏈夊姽',JANCODE__c = '04953170200312',Dealer_special_Object__c = true,Packing_list_manual__c = 5,Manual_Entry__c = false);
-            Product2 prod03 = new Product2(Name='Test03',ProductCode='Test03',Asset_Model_No__c = 'Test03',SFDA_Status__c = '鏈夊姽',JANCODE__c = '04953170200313',Dealer_special_Object__c = true,Packing_list_manual__c = 1,Manual_Entry__c = false);
-            insert new Product2[]{prod01,prod02,prod03};
-            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='Pro003',OT_CODE_Text__c='Test003',Product2__c = prod03.Id);
-            insert new Product2__c[] {pro1, pro2,pro3};
-            //璁㈠崟
-            Consumable_order__c Order1 = new Consumable_order__c();
-            Order1.Name = 'OCM_01_001';
-            Order1.Order_status__c = '鎵瑰噯';
-            Order1.Order_type__c = '璁㈠崟';
-            Order1.Dealer_Info__c = myAccount2.Id;
-            Order1.RecordTypeid = System.Label.RT_ConOrder_Delivery;
-            Order1.Order_ProType__c = 'ET';
-            insert  Order1;
-            List<Consumable_order_details2__c> conList = new List<Consumable_order_details2__c>();
-            
-
->>>>>>> LEXCommunityLiJun
             //daoku
             Consumable_order_details2__c Orderdet2 = new Consumable_order_details2__c();
             Orderdet2.Name = 'OCM_01_001001';
@@ -151,13 +99,8 @@
             Orderdet2.Bar_Code__c = '01049531702003111115120017181000105ZK250BXJRF';
             Orderdet2.Used_date__c = null;
             Orderdet2.Lose_Flag__c = false;
-<<<<<<< HEAD
             Orderdet2.Return_date__c = null;
             Orderdet2.Send_Date__c = null;
-=======
-            Orderdet2.Return_date__c= null;
-            Orderdet2.Send_Date__c= null;
->>>>>>> LEXCommunityLiJun
             Orderdet2.Box_Piece__c = '鐩�';
             conList.add(Orderdet2);
             // insert Orderdet2;
@@ -171,7 +114,6 @@
             Orderdet3.Arrive_date__c = Date.today();
             Orderdet3.Send_Date__c = Date.today();
             Orderdet3.Box_Piece__c = '涓�';
-<<<<<<< HEAD
             Orderdet3.RemoveBox_date__c = Date.today();
             Orderdet3.Bar_Code__c = '01049531702003111115120017181000105ZK250BXJRA';
             Orderdet3.Used_date__c = null;
@@ -179,17 +121,6 @@
             Orderdet3.Return_date__c = null;
             conList.add(Orderdet3);
             // insert Orderdet3;
-=======
-            Orderdet3.RemoveBox_date__c= Date.today();
-            Orderdet3.Bar_Code__c = '01049531702003111115120017181000105ZK250BXJRA';
-            Orderdet3.Used_date__c = null;
-            Orderdet3.Lose_Flag__c = false;
-            Orderdet3.Return_date__c= null;
-            conList.add(Orderdet3);
-            // insert Orderdet3;
-       
-
->>>>>>> LEXCommunityLiJun
 
             //sale
             Consumable_order_details2__c Orderdet4 = new Consumable_order_details2__c();
@@ -199,7 +130,6 @@
             Orderdet4.Asset_Model_No__c = 'Test02';
             Orderdet4.Arrive_date__c = Date.today();
             Orderdet4.Box_Piece__c = '涓�';
-<<<<<<< HEAD
             Orderdet4.RemoveBox_date__c = Date.today();
             Orderdet4.Bar_Code__c = '011495317020843711170400172003311074K250CXSDS';
             Orderdet4.Lose_Flag__c = false;
@@ -208,17 +138,6 @@
             // insert Orderdet4;
             conList.add(Orderdet4);
 
-=======
-            Orderdet4.RemoveBox_date__c= Date.today();
-            Orderdet4.Bar_Code__c = '011495317020843711170400172003311074K250CXSDS';
-            Orderdet4.Lose_Flag__c = false;
-            Orderdet4.Return_date__c= null;
-            Orderdet4.Used_date__c= Date.today();
-            // insert Orderdet4;
-            conList.add(Orderdet4);
-
-
->>>>>>> LEXCommunityLiJun
             //ProductPacking_list_manual__c=1
             Consumable_order_details2__c Orderdet5 = new Consumable_order_details2__c();
             Orderdet5.Name = 'OCM_01_001004';
@@ -228,29 +147,17 @@
             Orderdet5.Arrive_date__c = Date.today();
             //Orderdet5.Used_date__c = Date.today();
             Orderdet5.Box_Piece__c = '鐩�';
-<<<<<<< HEAD
             Orderdet5.RemoveBox_date__c = Date.today();
             Orderdet5.Used_date__c = null;
             Orderdet5.Lose_Flag__c = false;
             Orderdet5.Return_date__c = null;
             Orderdet5.Send_Date__c = null;
-=======
-            Orderdet5.RemoveBox_date__c= Date.today();
-            Orderdet5.Used_date__c = null;
-            Orderdet5.Lose_Flag__c = false;
-            Orderdet5.Return_date__c= null;
-            Orderdet5.Send_Date__c=null;
->>>>>>> LEXCommunityLiJun
             Orderdet5.Bar_Code__c = '010495317014059411170400172203311074K250DCWQW';
             // insert Orderdet5;
             conList.add(Orderdet5);
 
             //pandian
-<<<<<<< HEAD
             Consumable_order_details2__c Orderdet7 = new Consumable_order_details2__c();
-=======
-         Consumable_order_details2__c Orderdet7 = new Consumable_order_details2__c();
->>>>>>> LEXCommunityLiJun
             Orderdet7.Name = 'OCM_01_001004';
             Orderdet7.Consumable_order_minor__c = Order1.Id;
             Orderdet7.Consumable_Product__c = pro2.Id;
@@ -258,21 +165,12 @@
             Orderdet7.Box_Piece__c = '鐩�';
             Orderdet7.Lose_Flag__c = false;
             Orderdet7.Bar_Code__c = '010495317014059411170400172203311074K250DBVUD';
-<<<<<<< HEAD
             Orderdet7.RemoveBox_date__c = Date.today();
             Orderdet7.Inventory_date__c = Date.today();
             // insert Orderdet7;
             conList.add(Orderdet7);
 
             Consumable_order_details2__c Orderdet8 = new Consumable_order_details2__c();
-=======
-            Orderdet7.RemoveBox_date__c= Date.today();
-            Orderdet7.Inventory_date__c= Date.today();
-            // insert Orderdet7;
-            conList.add(Orderdet7);
-
-            Consumable_order_details2__c Orderdet8= new Consumable_order_details2__c();
->>>>>>> LEXCommunityLiJun
             Orderdet8.Name = 'OCM_01_001004';
             Orderdet8.Consumable_order_minor__c = Order1.Id;
             Orderdet8.Consumable_Product__c = pro2.Id;
@@ -283,22 +181,14 @@
             Orderdet8.Bar_Code__c = '1683272847250250WZIOF';
             Orderdet8.Used_date__c = null;
             Orderdet8.Lose_Flag__c = false;
-<<<<<<< HEAD
             Orderdet8.Return_date__c = null;
             Orderdet8.RemoveBox_date__c = Date.today();
             Orderdet8.Send_Date__c = null;
             Orderdet8.RemoveBox_No__c = 3;
-=======
-            Orderdet8.Return_date__c= null;
-            Orderdet8.RemoveBox_date__c=Date.today();
-            Orderdet8.Send_Date__c=null;
-            Orderdet8.RemoveBox_No__c =3;
->>>>>>> LEXCommunityLiJun
             conList.add(Orderdet8);
             insert conList;
             // insert Orderdet8;
 
-<<<<<<< HEAD
             System.Test.startTest();
             LexCancelRemoveBoxController.init();
             // LexCancelRemoveBoxController.getinventorysize();
@@ -311,42 +201,17 @@
 
     }
     static testMethod void testMethod2() {
-=======
-           
-            System.Test.startTest();
-            LexCancelRemoveBoxController.init();
-            // LexCancelRemoveBoxController.getinventorysize();
-            LexCancelRemoveBoxController.searchConsumableorderdetails('1683272847250250WZIOF','鎹峰皵鍖荤枟(娴峰崡锛夋湁闄愬叕鍙�','娣卞湷','ENG');
-            LexCancelRemoveBoxController.searchConsumableorderdetails('','鎹峰皵鍖荤枟(娴峰崡锛夋湁闄愬叕鍙�','娣卞湷','ENG');
-            LexCancelRemoveBoxController.cancelRemoveBoxConfirm(JSON.serialize(conList),'鎹峰皵鍖荤枟(娴峰崡锛夋湁闄愬叕鍙�','娣卞湷','ENG');
-
-            System.Test.stopTest();
-
-        }
-
-    }
-    static testMethod void testMethod2(){
->>>>>>> LEXCommunityLiJun
         Oly_TriggerHandler.bypass('ConsumableAssetHander');
         Oly_TriggerHandler.bypass('Oly_TriggerHandler');
         user myUser_test;
         Account myAccount2;
-<<<<<<< HEAD
         User thisUser = [SELECT Id FROM User WHERE Id = :UserInfo.getUserId()];
         System.runAs(thisUser) {
-            List<RecordType> rectCo = [
-                SELECT Id
-                FROM RecordType
-                WHERE IsActive = TRUE AND SobjectType = 'Account' AND Name = '璨╁2搴�'
-            ];
+            List<RecordType> rectCo = [SELECT Id FROM RecordType WHERE IsActive = TRUE AND SobjectType = 'Account' AND Name = '璨╁2搴�'];
             if (rectCo.size() == 0) {
                 return;
             }
-            Profile prof = [
-                SELECT Id
-                FROM Profile
-                WHERE Name = '901_缁忛攢鍟嗙ぞ鍖烘櫘閫氭潈闄恄2閲嶉獙璇�(ET Email)'
-            ];
+            Profile prof = [SELECT Id FROM Profile WHERE Name = '901_缁忛攢鍟嗙ぞ鍖烘櫘閫氭潈闄恄2閲嶉獙璇�(ET Email)'];
 
             myAccount2 = new Account(
                 name = 'Testaccount002',
@@ -404,50 +269,6 @@
             con.Bar_Code__c = '1682414917514250XSCYW';
             conList.add(con);
 
-=======
-        User thisUser = [ select Id from User where Id = :UserInfo.getUserId()];
-        System.runAs(thisUser){
-            List<RecordType> rectCo = [select Id from RecordType where IsActive = true and SobjectType = 'Account' and Name = '璨╁2搴�'];
-            if (rectCo.size() == 0) {
-                return;
-            }
-            Profile prof = [select Id from Profile where Name ='901_缁忛攢鍟嗙ぞ鍖烘櫘閫氭潈闄恄2閲嶉獙璇�(ET Email)'];
-            
-            myAccount2 = new Account(name='Testaccount002',Dealer_discount__c =20,RecordTypeId = rectCo[0].Id,AgentCode_Ext__c = '9999900');
-            insert myAccount2;
-    
-            Contact 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',Work_Location__c ='閲嶅簡');
-            insert MyUser_Test;
-        }
-        System.runAs(MyUser_Test){
-             //璁㈠崟
-             Consumable_order__c Order1 = new Consumable_order__c();
-             Order1.Name = 'OCM_01_001';
-             Order1.Order_status__c = '鎵瑰噯';
-             Order1.Order_type__c = '鍒拌揣';
-             Order1.Dealer_Info__c = myAccount2.Id;
-             Order1.RecordTypeid = '01210000000c9dqAAA';
-             Order1.Order_ProType__c = 'ET';
-             insert  Order1;
-           
-            List<Consumable_order_details2__c> conList = new  List<Consumable_order_details2__c>();
-            List<Consumable_order_details2__c> conList1 = new  List<Consumable_order_details2__c>();
-            Consumable_order_details2__c con = new Consumable_order_details2__c();
-            con.Consumable_Arrived_order__c = Order1.Id;
-            con.Send_Date__c = null;
-            con.Used_date__c = null;
-            con.Return_date__c = null;
-            con.Lose_Flag__c = false;
-            con.Box_Piece__c = '涓�';
-            con.RemoveBox_date__c = Date.today();
-            con.Arrive_date__c = Date.today();
-            con.RemoveBox_No__c = 2;
-            con.Bar_Code__c = '1682414917514250XSCYW';
-            conList.add(con);
-
->>>>>>> LEXCommunityLiJun
             Consumable_order_details2__c con1 = new Consumable_order_details2__c();
             con1.Consumable_Arrived_order__c = Order1.Id;
             con1.Send_Date__c = null;
@@ -460,7 +281,6 @@
             con.RemoveBox_No__c = 1;
             con1.Bar_Code__c = '1682414917514250XSCYW';
             conList.add(con1);
-<<<<<<< HEAD
             insert (conList);
             System.debug('conList' + conList);
             System.Test.startTest();
@@ -476,19 +296,11 @@
         Account myAccount2;
         User thisUser = [SELECT Id FROM User WHERE Id = :UserInfo.getUserId()];
         System.runAs(thisUser) {
-            List<RecordType> rectCo = [
-                SELECT Id
-                FROM RecordType
-                WHERE IsActive = TRUE AND SobjectType = 'Account' AND Name = '璨╁2搴�'
-            ];
+            List<RecordType> rectCo = [SELECT Id FROM RecordType WHERE IsActive = TRUE AND SobjectType = 'Account' AND Name = '璨╁2搴�'];
             if (rectCo.size() == 0) {
                 return;
             }
-            Profile prof = [
-                SELECT Id
-                FROM Profile
-                WHERE Name = '901_缁忛攢鍟嗙ぞ鍖烘櫘閫氭潈闄恄2閲嶉獙璇�(ET Email)'
-            ];
+            Profile prof = [SELECT Id FROM Profile WHERE Name = '901_缁忛攢鍟嗙ぞ鍖烘櫘閫氭潈闄恄2閲嶉獙璇�(ET Email)'];
             myAccount2 = new Account(name = 'Testaccount003', Dealer_discount__c = 20, RecordTypeId = rectCo[0].Id, AgentCode_Ext__c = '2');
             insert myAccount2;
             Contact core = new Contact(email = 'wan@salesforce.com', firstname = 'wan', lastname = 'Plumbers', accountid = myAccount2.id);
@@ -705,19 +517,11 @@
         Account myAccount2;
         User thisUser = [SELECT Id FROM User WHERE Id = :UserInfo.getUserId()];
         System.runAs(thisUser) {
-            List<RecordType> rectCo = [
-                SELECT Id
-                FROM RecordType
-                WHERE IsActive = TRUE AND SobjectType = 'Account' AND Name = '璨╁2搴�'
-            ];
+            List<RecordType> rectCo = [SELECT Id FROM RecordType WHERE IsActive = TRUE AND SobjectType = 'Account' AND Name = '璨╁2搴�'];
             if (rectCo.size() == 0) {
                 return;
             }
-            Profile prof = [
-                SELECT Id
-                FROM Profile
-                WHERE Name = '901_缁忛攢鍟嗙ぞ鍖烘櫘閫氭潈闄恄2閲嶉獙璇�(ET Email)'
-            ];
+            Profile prof = [SELECT Id FROM Profile WHERE Name = '901_缁忛攢鍟嗙ぞ鍖烘櫘閫氭潈闄恄2閲嶉獙璇�(ET Email)'];
             myAccount2 = new Account(name = 'Testaccount003', Dealer_discount__c = 20, RecordTypeId = rectCo[0].Id, AgentCode_Ext__c = '2');
             insert myAccount2;
             Contact core = new Contact(email = 'wan@salesforce.com', firstname = 'wan', lastname = 'Plumbers', accountid = myAccount2.id);
@@ -993,359 +797,4 @@
             System.Test.stopTest();
         }
     }
-=======
-            insert(conList);
-            System.debug('conList'+conList);
-            System.Test.startTest();
-            LexCancelRemoveBoxController.cancelRemoveBoxConfirm(JSON.serialize(conList),'Testaccount002','閲嶅簡','ET');
-            LexCancelRemoveBoxController.cancelRemoveBoxConfirm(JSON.serialize(conList1),'Testaccount002','閲嶅簡','ET');
-            System.Test.stopTest();
-    } 
->>>>>>> LEXCommunityLiJun
 }
-    static testMethod void testMethod3(){
-        Oly_TriggerHandler.bypass('ConsumableAssetHander');
-        Oly_TriggerHandler.bypass('Oly_TriggerHandler');
-        User myUser_test;
-        Account myAccount2;
-        User thisUser = [ select Id from User where Id = :UserInfo.getUserId()];
-        System.runAs(thisUser){
-            List<RecordType> rectCo = [select Id from RecordType where IsActive = true and SobjectType = 'Account' and Name = '璨╁2搴�'];
-            if (rectCo.size() == 0) {
-                return;
-            }
-            Profile prof = [select Id from Profile where Name ='901_缁忛攢鍟嗙ぞ鍖烘櫘閫氭潈闄恄2閲嶉獙璇�(ET Email)'];
-            myAccount2 = new Account(name='Testaccount003',Dealer_discount__c =20,RecordTypeId = rectCo[0].Id,AgentCode_Ext__c = '2');
-            insert myAccount2;
-            Contact core = new Contact(email='wan@salesforce.com', firstname='wan',lastname='Plumbers',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', UserPro_Type__c='ENG', Work_Location__c='鍖椾含');
-            insert myUser_test;
-            System.debug('MyUser_Test'+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,SFDA_Expiration_Date__c= Date.today(),Category5__c = 'test01',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,SFDA_Expiration_Date__c= Date.today(),Category5__c = 'test02',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,SFDA_Expiration_Date__c= Date.today(),Category5__c = 'test03',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,SFDA_Expiration_Date__c= Date.today(),Category5__c = 'test04',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,SFDA_Expiration_Date__c= Date.today(),Category5__c = 'test05',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,SFDA_Expiration_Date__c= Date.today(),Category5__c = 'test06',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 Order1 = new Consumable_order__c();
-            Order1.Name = 'OCM_01';
-            Order1.Order_status__c = '鎵瑰噯';
-            Order1.Order_type__c = '璁㈠崟';
-            Order1.Dealer_Info__c = myAccount2.Id;
-            Order1.RecordTypeid = System.Label.RT_ConOrder_Delivery;
-            Order1.Order_ProType__c = 'ENG';
-            insert  Order1;
-            //鍑鸿揣
-            Consumable_order__c Order2 = new Consumable_order__c();
-            Order2.Name = 'OCM_01';
-            Order2.Order_status__c = '鎵瑰噯';
-            Order2.Order_type__c = '璁㈠崟';
-            Order2.Dealer_Info__c = myAccount2.Id;
-            Order2.RecordTypeid = '012100000006Jx9AAE';
-            Order2.Order_ProType__c = 'ENG';
-            insert  Order2;
-
-            List<Consumable_order_details2__c> conList = new List<Consumable_order_details2__c> ();
-            List<Consumable_order_details2__c> conList1 = new List<Consumable_order_details2__c> ();
-            List<Consumable_order_details2__c> conList2 = new List<Consumable_order_details2__c> ();
-            //浜у搧绫诲瀷涓嶅悓
-            Consumable_order_details2__c con = new Consumable_order_details2__c();
-            con.Name = 'OCM_01_001001';
-            con.Consumable_order_minor__c = Order1.Id;
-            con.Consumable_Product__c = pro2.Id;
-            con.Asset_Model_No__c = 'Test01';
-            con.Arrive_date__c = Date.today();
-            con.Bar_Code__c = '10061';
-            con.Used_date__c = null;
-            con.Lose_Flag__c = false;
-            con.Return_date__c= null;
-            con.Send_Date__c= null;
-            con.Box_Piece__c = '鐩�';
-            conList.add(con);
-            insert conList;
-
-            //浜у搧绫诲瀷涓嶅悓
-            Consumable_order_details2__c con1 = new Consumable_order_details2__c();
-            con1.Consumable_Product__c = pro2.Id;
-            con1.Consumable_order_minor__c = Order1.Id;
-            con1.Bar_Code__c = '10011';
-            con1.Arrive_date__c = Date.today();
-            conList1.add(con1);
-            //娌℃湁鎷嗙洅
-            Consumable_order_details2__c con2 = new Consumable_order_details2__c();
-            con2.Send_Date__c =null;
-            con2.Used_date__c = null;
-            con2.Lose_Flag__c = false;
-            con2.Box_Piece__c = '鐩�';
-            con2.Consumable_Product__c = pro2.Id;
-            con2.Consumable_order_minor__c = Order1.Id;
-            con2.Bar_Code__c = '10021';
-            con2.Arrive_date__c = Date.today();
-            con2.RemoveBox_date__c = null;
-            conList1.add(con2);
-            insert conList1;
-
-            //宸插嚭璐� 鏈埌璐�
-            Consumable_order_details2__c con3 = new Consumable_order_details2__c();
-            con3.Arrive_date__c = null;
-            con3.Send_Date__c =null;
-            con3.Used_date__c = null;
-            con3.Return_date__c = null;
-            con3.Lose_Flag__c = false;
-            con3.Box_Piece__c = '鐩�';
-            con3.Consumable_Arrived_order__c = Order2.Id;
-            con3.Consumable_Product__c = pro2.Id;
-            con3.Bar_Code__c = '10031';
-            conList2.add(con3);
-            //鎷嗙洅宸插嚭璐�
-            Consumable_order_details2__c con4 = new Consumable_order_details2__c();
-            con4.Arrive_date__c = Date.today();
-            con4.Send_Date__c = Date.today();
-            con4.Return_date__c = null;
-            con4.Used_date__c = null;
-            con4.Lose_Flag__c = false;
-            con4.Box_Piece__c = '涓�';
-            con4.RemoveBox_date__c = Date.today();
-            con4.Consumable_Arrived_order__c = Order2.Id;
-            con4.Consumable_Product__c = pro2.Id;
-            con4.Bar_Code__c = '10041';
-            conList2.add(con4);
-            insert conList2;
-
-            System.Test.startTest();
-            LexCancelRemoveBoxController.barcode = '1004\n1003\n1002\n1001';
-            LexCancelRemoveBoxController.searchConsumableorderdetails('10061\n10051\n10041\n10031\n10021\n10011','Testaccount003','閲嶅簡','ET');
-            String str = '璇ュ晢鍝佸瓨鍦ㄧ洏鐐瑰饱鍘�';
-            String errorReason = '';
-            LexCancelRemoveBoxController.ConsumableorderdetailsInfo c2 = new LexCancelRemoveBoxController.ConsumableorderdetailsInfo(con,str);
-            c2.esd = con;
-            c2.Prod = con.Consumable_product__r;
-            c2.oldConsumableCount = con.name;
-            c2.ErrorReason  = str;
-            LexCancelRemoveBoxController.ConsumableorderdetailsInfo c1 = new LexCancelRemoveBoxController.ConsumableorderdetailsInfo(con2);
-            c1.esd = con;
-            c1.Prod = con.Consumable_product__r;
-            c1.oldConsumableCount = con.name;
-            c1.compareTo(c2);
-            System.Test.stopTest();
-        }
-    }
-    static testMethod void testMethod4(){
-        Oly_TriggerHandler.bypass('ConsumableAssetHander');
-        Oly_TriggerHandler.bypass('Oly_TriggerHandler');
-        User myUser_test;
-        Account myAccount2;
-        User thisUser = [ select Id from User where Id = :UserInfo.getUserId()];
-        System.runAs(thisUser){
-            List<RecordType> rectCo = [select Id from RecordType where IsActive = true and SobjectType = 'Account' and Name = '璨╁2搴�'];
-            if (rectCo.size() == 0) {
-                return;
-            }
-            Profile prof = [select Id from Profile where Name ='901_缁忛攢鍟嗙ぞ鍖烘櫘閫氭潈闄恄2閲嶉獙璇�(ET Email)'];
-            myAccount2 = new Account(name='Testaccount003',Dealer_discount__c =20,RecordTypeId = rectCo[0].Id,AgentCode_Ext__c = '2');
-            insert myAccount2;
-            Contact core = new Contact(email='wan@salesforce.com', firstname='wan',lastname='Plumbers',accountid=myAccount2.id);
-            insert core;
-            MyUser_Test = New User(ContactId = core.id,Alias = 'newWang',Email='newWang@testorg.com',EmailEncodingKey='UTF-8', LastName='TestUserWang', LanguageLocaleKey='zh_CN',LocaleSidKey='zh_CN', ProfileId = prof.Id,TimeZoneSidKey='Asia/Shanghai', UserName='testUserWang@testorg.com',Work_Location__c ='閲嶅簡');
-            insert MyUser_Test;
-            System.debug('MyUser_Test'+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,SFDA_Expiration_Date__c= Date.today(),Category5__c = 'test01',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,SFDA_Expiration_Date__c= Date.today(),Category5__c = 'test02',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,SFDA_Expiration_Date__c= Date.today(),Category5__c = 'test03',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,SFDA_Expiration_Date__c= Date.today(),Category5__c = 'test04',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,SFDA_Expiration_Date__c= Date.today(),Category5__c = 'test05',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,SFDA_Expiration_Date__c= Date.today(),Category5__c = 'test06',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};
-            List<Consumable_order__c> orderList = new List<Consumable_order__c>(); 
-            //閿�鍞�
-            Consumable_order__c Order1 = new Consumable_order__c();
-            Order1.Name = 'OCM_01';
-            Order1.Order_status__c = '鎵瑰噯';
-            Order1.Order_type__c = '閿�鍞�';
-            Order1.Dealer_Info__c = myAccount2.Id;
-            Order1.RecordTypeid = '01210000000c9duAAA';
-            Order1.Order_ProType__c = 'ENG';
-            orderList.add(Order1);
-            //杩斿搧		
-            Consumable_order__c Order2 = new Consumable_order__c();
-            Order2.Name = 'OCM_01';
-            Order2.Order_status__c = '鎵瑰噯';
-            Order2.Order_type__c = '杩斿搧';
-            Order2.Dealer_Info__c = myAccount2.Id;
-            Order2.RecordTypeid = '012100000006Jx4AAE';
-            Order2.Order_ProType__c = 'ENG';
-            orderList.add(Order2);
-            //鐩樼偣
-            Consumable_order__c Order3 = new Consumable_order__c();
-            Order3.Name = 'OCM_01';
-            Order3.Order_status__c = '鎵瑰噯';
-            Order3.Order_type__c = '鐩樼偣';
-            Order3.Dealer_Info__c = myAccount2.Id;
-            Order3.RecordTypeid = '01210000000c9dsAAA';
-            Order3.Order_ProType__c = 'ENG';
-            orderList.add(Order3);
-            //鍙戣揣
-            Consumable_order__c Order4 = new Consumable_order__c();
-            Order4.Name = 'OCM_0122';
-            Order4.Order_status__c = '鎵瑰噯';
-            Order4.Order_type__c = '璁㈠崟';
-            Order4.Dealer_Info__c = myAccount2.Id;
-            Order4.RecordTypeid = '01210000000c9drAAA';
-            Order4.Order_ProType__c = 'ET';
-            Order4.ContractNo__c = '';
-            orderList.add(Order4);
-            insert orderList;
-
-            List<Consumable_order_details2__c> conList = new List<Consumable_order_details2__c> ();
-            List<Consumable_order_details2__c> conList1 = new List<Consumable_order_details2__c> ();
-            List<Consumable_order_details2__c> conList2 = new List<Consumable_order_details2__c> ();
-            //鎷嗙洅宸查攢鍞�
-            Consumable_order_details2__c con4 = new Consumable_order_details2__c();
-            con4.Arrive_date__c = Date.today();
-            con4.Deliver_date__c = Date.today();
-            con4.Sterilization_limit__c = Date.today();
-            con4.Send_Date__c = null;
-            con4.Return_date__c = null;
-            con4.Used_date__c = Date.today();
-            con4.Lose_Flag__c = false;
-            con4.Box_Piece__c = '涓�';
-            con4.RemoveBox_date__c = Date.today();	
-            con4.RecordTypeId = '01210000000kUDKAA2';
-            con4.Consumable_Product__c = pro2.Id;
-            con4.Bar_Code__c = '100611';
-            conList.add(con4);
-            insert conList;
-
-            //鎷嗙洅杩斿搧
-            Consumable_order_details2__c con5 = new Consumable_order_details2__c();
-            con5.Arrive_date__c = Date.today();
-            con5.Return_date__c = Date.today();
-            con5.Deliver_date__c = Date.today();
-            con5.Send_Date__c = null;
-            con5.Sterilization_limit__c = Date.today();
-            con5.Used_date__c = Date.today();
-            con5.Box_Piece__c = '涓�';
-            con5.RemoveBox_date__c = Date.today();	
-            con5.RecordTypeId = '01210000000kUDPAA2';
-            con5.Consumable_Product__c = pro2.Id;
-            con5.Consumable_order_minor__c = Order4.Id;
-            con5.Bar_Code__c = '10061';
-            conList1.add(con5);
-            insert conList1;
-
-            //鎷嗙洅鍚庣洏鐐硅繃
-            Consumable_order_details2__c con6 = new Consumable_order_details2__c();
-            con6.Inventory_date__c = Date.today();
-            con6.Box_Piece__c = '涓�';
-            con6.RemoveBox_date__c = Date.today();
-            con6.Send_Date__c = null;
-            con6.Deliver_date__c = Date.today();
-            con6.Sterilization_limit__c = Date.today();
-            con6.RecordTypeId = '01210000000kUDKAA2';
-            con6.Consumable_Arrived_order__c = Order3.Id;
-            con6.Consumable_Product__c = pro2.Id;
-            con6.Bar_Code__c = '10078';
-            conList2.add(con6);
-            insert conList2;
-
-            List<Consumable_order_details2__c> conList3 = new List<Consumable_order_details2__c> ();
-            //鎷嗙洅宸插嚭璐�
-            Consumable_order_details2__c con3 = new Consumable_order_details2__c();
-            con3.Arrive_date__c = Date.today();
-            con3.Send_Date__c = Date.today();
-            con3.Return_date__c = null;
-            con3.Used_date__c = null;
-            con3.Lose_Flag__c = false;
-            con3.Box_Piece__c = '涓�';
-            con3.Deliver_date__c =  Date.today();	
-            con3.RemoveBox_date__c = Date.today();
-            con3.RecordTypeId = '01210000000kUDKAA2';
-            con3.Consumable_Product__c = pro2.Id;
-            con3.Consumable_order_minor__c = Order4.Id;
-            con3.Bar_Code__c = '100999';
-            con3.Sterilization_limit__c = Date.today();
-            conList3.add(con3);
-            insert conList3;
-        
-
-            //reset
-            // Consumable_order_details2__c con1 = new Consumable_order_details2__c();
-            // con1.Intra_Trade_List_RMB__c = 1000;
-            // con1.Asset_Model_No__c = 'test';
-            // con1.Sterilization_limit__c = Date.today();
-            // con1.Deliver_date__c =  Date.today();
-            // con1.Arrive_date__c = Date.today();
-            // con1.Send_Date__c = null;
-            // con1.Used_date__c = null;
-            // con1.Return_date__c = null;
-            // con1.Lose_Flag__c = false;
-            // con1.Box_Piece__c = '涓�';
-
-            // con1.Consumable_order_minor__c = Order4.Id;
-            // con1.Guarantee_period_for_products__c =  Date.today();
-            // con1.Consumable_Product__c = pro2.Id;
-            // con1.Bar_Code__c = '1009999';
-            // conList2.add(con1);
-            // insert conList2;
-
-            // List<Consumable_order_details2__c> conList3 = new List<Consumable_order_details2__c> ();
-            // Consumable_order_details2__c con9 = new Consumable_order_details2__c();
-            // con9.RemoveBox_date__c = Date.today();
-            // con9.Bar_Code__c = '100112';
-            // con9.Arrive_date__c = Date.today();
-            // con9.Send_Date__c = null;
-            // con9.Used_date__c = null;
-            // con9.Return_date__c = null;
-            // con9.Lose_Flag__c = false;
-            // con9.Box_Piece__c = '涓�';
-            // con9.RemoveBox_No__c = 9;
-            // conList3.add(con9);
-            // LexCancelRemoveBoxController.searchConsumableorderdetails('100112','Testaccount003','閲嶅簡','ET');
-
-        
-
-            //orderDetails2
-            // Consumable_order_details2__c con00 = new Consumable_order_details2__c();
-            // con00.Box_Piece__c = '涓�';
-            // con00.RemoveBox_date__c = Date.today();
-            // con00.RemoveBox_No__c = 1;
-            // con00.ContractNo_text__c = '';
-            // con00.Consumable_order_minor__c = Order4.Id;
-            // con00.Bar_Code__c = '10099999989';
-            // conList3.add(con00);
-
-            // insert conList3;
-            System.Test.startTest();
-            LexCancelRemoveBoxController CancelRemoveBoxController = new LexCancelRemoveBoxController();
-            LexCancelRemoveBoxController.searchConsumableorderdetails('100611\n10078\n10099\n1009999\n100999','Testaccount003','閲嶅簡','ET');
-            LexCancelRemoveBoxController.searchConsumableorderdetails('100611\n10078\n10061\n10051\n10041\n10031\n10021\n10011','Testaccount003','鍖椾含','ET');
-            LexCancelRemoveBoxController.searchConsumableorderdetails('100611\n10078\n10061\n10051\n10041\n10031\n10021\n10011','Testaccount003','閲嶅簡','ET');
-            System.Test.stopTest();
-
-
-        }
-    }
-}
\ No newline at end of file

--
Gitblit v1.9.1