From c376deadef754aa59c002386c2f3c98904be37f8 Mon Sep 17 00:00:00 2001
From: 19626 <1962676589@qq.com>
Date: 星期四, 15 六月 2023 09:49:06 +0800
Subject: [PATCH] 测试类代码覆盖率优化

---
 force-app/main/default/classes/ConsumApplyEquipmentSetDetailHandlerTest.cls |  723 +++++++++++++++++++++++++++++++++++++++++++++++++++
 force-app/main/default/classes/NewQuoteEntryControllerTest.cls              |   34 ++
 force-app/main/default/classes/ConsumReassignControllerTest.cls             |   75 +++++
 3 files changed, 815 insertions(+), 17 deletions(-)

diff --git a/force-app/main/default/classes/ConsumApplyEquipmentSetDetailHandlerTest.cls b/force-app/main/default/classes/ConsumApplyEquipmentSetDetailHandlerTest.cls
index c17859e..c71fbe5 100644
--- a/force-app/main/default/classes/ConsumApplyEquipmentSetDetailHandlerTest.cls
+++ b/force-app/main/default/classes/ConsumApplyEquipmentSetDetailHandlerTest.cls
@@ -1,15 +1,722 @@
 @isTest
 private class ConsumApplyEquipmentSetDetailHandlerTest {
 
-    // 閫犲嚭閫夋嫨瀹屾槑缁嗙殑鐢宠
-    static testMethod void testBatch() {
-        ConsumTestDataFactory factory = new ConsumTestDataFactory();
-        factory.eachStepUpdate = false;
-        factory.setupTestData();
-        factory.selectDetails();
+    @TestSetup
+    static void setTestData(){
+        StaticParameter.EscapeNFM001AgencyContractTrigger = true;
+        StaticParameter.EscapeNFM001Trigger = true;
+        StaticParameter.EscapeAccountTrigger = true;
+        ControllerUtil.EscapeNFM001Trigger = true;
+
+        Oly_TriggerHandler.bypass(ContactTriggerHandler.class.getName());
+        Oly_TriggerHandler.bypass(AgencyHospitalHandler.class.getName());
+        // 鐪�
+        Address_Level__c al = new Address_Level__c();
+        al.Name = '鏉变含';
+        al.Level1_Code__c = 'CN-99';
+        al.Level1_Sys_No__c = '999999';
+        insert al;
+        // 甯�
+        Address_Level2__c al2 = new Address_Level2__c();
+        al2.Level1_Code__c = 'CN-99';
+        al2.Level1_Sys_No__c = '999999';
+        al2.Level1_Name__c = '鏉变含';
+        al2.Name = '娓嬭胺鍖�';
+        al2.Level2_Code__c = 'CN-9999';
+        al2.Level2_Sys_No__c = '9999999';
+        al2.Address_Level__c = al.id;
+        insert al2;
+        // 鐥呴櫌銈掍綔銈�
+        Account hospital = new Account();
+        hospital.recordtypeId = [Select Id FROM RecordType WHERE IsActive = true and SobjectType = 'Account' and DeveloperName = 'HP'].id;
+        hospital.Name = 'test hospital';
+        hospital.Is_Active__c = '鏈夊姽';
+        hospital.Attribute_Type__c = '鍗敓閮�';
+        hospital.Speciality_Type__c = '缁煎悎鍖婚櫌';
+        hospital.Grade__c = '涓�绾�';
+        hospital.OCM_Category__c = 'SLTV';
+        hospital.Is_Medical__c = '鍖荤枟鏈烘瀯';
+        hospital.State_Master__c = al.id;
+        hospital.City_Master__c = al2.id;
+        hospital.Town__c = '涓滀含';
+        insert hospital;
+
+        // 鎴︾暐绉戝銈掑緱銈�
+        Account strategicDep = new Account();
+        strategicDep.recordtypeId = [Select Id FROM RecordType WHERE IsActive = true and SobjectType = 'Account' and DeveloperName = 'Department_Class_OTH'].id;
+        strategicDep.Name = 'Olympus绀惧唴 鍏朵粬';
+        strategicDep.Department_Class_Label__c = '鍏朵粬';
+        strategicDep.Hospital__c = hospital.Id;
+        strategicDep.ParentId = hospital.Id;
+        insert strategicDep;
+
+        // 瑷虹檪绉戙倰浣溿倠
+        Account dep = new Account();
+        dep.recordtypeId = [Select Id FROM RecordType WHERE IsActive = true and SobjectType = 'Account' and DeveloperName = 'Department_OTH'].id;
+        dep.Name = 'test dep';
+        dep.AgentCode_Ext__c = '9999998';
+        dep.ParentId = strategicDep.Id;
+        dep.Department_Class__c = strategicDep.Id;
+        dep.Hospital__c = hospital.Id;
+        insert dep;
+
+        // 浜у搧
+        Product2 pro1 = new Product2(Name='name01',IsActive=true,Family='GI',
+                Fixture_Model_No__c='n01',Serial_Lot_No__c='S/N tracing',
+                Fixture_Model_No_T__c = 'n01', Asset_Model_No__c = 'Pro1',
+                ProductCode_Ext__c='pc01',Manual_Entry__c=false);
+        Product2 pro2 = new Product2(Name='name02',IsActive=true,Family='GI',
+                Fixture_Model_No__c='n02',Serial_Lot_No__c='Lot tracing',
+                Fixture_Model_No_T__c = 'n02', Asset_Model_No__c = 'Pro2',
+                ProductCode_Ext__c='pc02',Manual_Entry__c=false);
+
+        insert new Product2[] {pro1, pro2};
+        Asset asset2 = new Asset(Asset_Owner__c = 'Olympus');
+        asset2.RecordTypeId = System.Label.Asset_RecordType;
+        asset2.SerialNumber = 'asset2';
+        asset2.Name = 'asset2';
+        asset2.AccountId = dep.Id;
+        asset2.Department_Class__c = strategicDep.Id;
+        asset2.Hospital__c = hospital.Id;
+        asset2.Product2Id = pro2.Id;
+        asset2.Quantity = 100;
+        asset2.Status = '涓嶆槑';
+        asset2.Manage_type__c = '鏁伴噺绠$悊';
+        asset2.Loaner_accsessary__c = true;
+        asset2.Out_of_wh__c = 1;
+        asset2.Salesdepartment__c = '1.鍗庡寳钀ヤ笟鏈儴';
+        asset2.Internal_asset_location__c = '鍖椾含 澶囧搧涓績';
+        asset2.Product_category__c = 'GI';
+        asset2.Equipment_Type__c = '浜у搧璇曠敤';
+        asset2.SalesProvince__c = '鍖椾含';
+        asset2.CompanyOfEquipment__c = '鍖椾含';
+        asset2.Internal_Asset_number__c = '0002';
+        asset2.AssetManageConfirm__c = true;
+
+        insert asset2;
+        Consum_Apply__c ca = new Consum_Apply__c();
+        ca.Name = 'XXXX-YYYY_ZZZZ_1';
+        ca.Status__c = '鎵瑰噯';
+        ca.DataMigration_Flag__c = true;
+        insert ca;
+        Consum_Apply_Equipment_Set__c caes = new Consum_Apply_Equipment_Set__c();
+        caes.Consum_Apply__c = ca.Id;
+        caes.Consum_Start_Date__c = Date.today().addDays(20);
+        caes.DataMigration_Flag__c = true;
+        insert caes;
+       
+        Consum_Apply_Equipment_Set_Detail__c caesd = new Consum_Apply_Equipment_Set_Detail__c();
+        caesd.Name = 'test';
+        caesd.Shipment_request_time2__c = System.now();
+        caesd.DataMigration_Flag__c = false;
+        caesd.Consum_Apply__c = ca.Id;
+        caesd.Consum_Apply_Equipment_Set__c = caes.Id;
+        caesd.Consum_Start_Date__c = caes.Consum_Start_Date__c;
+        caesd.Trial_User__c = '鎴�';
+        caesd.Asset__c = asset2.id;
+        caesd.IndexFromUniqueKey__c = 0;
+        caesd.UniqueKey__c = '123';
+        caesd.Cancel_Select__c = false;
+        caesd.Follower_User__c = UserInfo.getUserId();
+        insert caesd; // 鑽夋涓�
+    }
+    // @isTest static testMethod void testTest1() {
+    //     System.Test.startTest();
+    //     Consum_Apply__c ca = new Consum_Apply__c();
+    //     ca.DataMigration_Flag__c = true;
+    //     insert ca;
+    //     Consum_Apply_Equipment_Set__c caes = new Consum_Apply_Equipment_Set__c();
+    //     caes.Consum_Apply__c = ca.Id;
+    //     caes.Consum_Start_Date__c = Date.today().addDays(20);
+    //     caes.DataMigration_Flag__c = true;
+    //     insert caes;
+    //     Consum_Apply_Equipment_Set_Detail__c caesd = new Consum_Apply_Equipment_Set_Detail__c();
+    //     caesd.DataMigration_Flag__c = true;
+    //     caesd.Consum_Apply__c = ca.Id;
+    //     caesd.Consum_Apply_Equipment_Set__c = caes.Id;
+    //     caesd.Consum_Start_Date__c = caes.Consum_Start_Date__c;
+    //     caesd.Trial_User__c = '鎴�';
+    //     caesd.Follower_User__c = UserInfo.getUserId();
+    //     insert caesd; // 鑽夋涓�
+    //     Consum_Apply_Equipment_Set_Detail__c ncaesd = [select Return_DeliverySlip__c from Consum_Apply_Equipment_Set_Detail__c where Id =: caesd.id];
+    //     FixtureDeliverySlip__c fdsObj = new FixtureDeliverySlip__c();
+    //     fdsObj.Name = '00001';
+    //     fdsObj.DeliveryCompany__c = '鍒╄';
+    //     fdsObj.Distributor_method__c = '闄嗚繍';
+    //     fdsObj.DeliveryType__c = '鍥炲瘎';
+    //     fdsObj.Wh_Staff__c = Userinfo.getUserId();
+    //     fdsObj.Shippment_loaner_time__c = System.now();
+    //     insert fdsObj;
+    //     ncaesd.Return_DeliverySlip__c = fdsObj.Id;
+    //     update ncaesd;
+    //     delete caesd;
+    //     delete caes;
+    //     delete ca;
+    //     System.Test.stopTest();
+    // }
+
+    @isTest static void test1(){
+        OlympusCalendar__c olympus_calendar = new OlympusCalendar__c();
+        olympus_calendar.Date__c = System.today().addDays(10);
+        olympus_calendar.OwnerId = UserInfo.getUserId();
+        insert olympus_calendar;
+        FixtureDeliverySlip__c fdsObj1 = new FixtureDeliverySlip__c();
+        fdsObj1.Name = '00001';
+        fdsObj1.DeliveryCompany__c = '鍒╄';
+        fdsObj1.Distributor_method__c = '闄嗚繍';
+        fdsObj1.DeliveryType__c = '鍥炲瘎';
+        fdsObj1.Wh_Staff__c = Userinfo.getUserId();
+        fdsObj1.Shippment_loaner_time__c = System.now();
+        insert fdsObj1;
+        FixtureDeliverySlip__c fdsObj2 = new FixtureDeliverySlip__c();
+        fdsObj2.Name = '00002';
+        fdsObj2.DeliveryCompany__c = '鍒╄';
+        fdsObj2.Distributor_method__c = '闄嗚繍';
+        fdsObj2.DeliveryType__c = '鍙戣揣';
+        fdsObj2.Wh_Staff__c = Userinfo.getUserId();
+        fdsObj2.Shippment_loaner_time__c = System.now();
+        insert fdsObj2;
+        Consum_Apply_Equipment_Set_Detail__c ncaesd = [select Return_DeliverySlip__c from Consum_Apply_Equipment_Set_Detail__c limit 1];
+        ncaesd.Received_Confirm__c = 'OK';
+        ncaesd.Return_DeliverySlip__c = fdsObj1.id;
+        ncaesd.DeliverySlip__c = fdsObj2.id;
+        ncaesd.Consum_Start_Date__c = System.today().addDays(10);
+        ncaesd.Select_Time__c = System.now();
+        update ncaesd;
+    }
+    @isTest static void testTest2() {
+        FixtureDeliverySlip__c fdsObj1 = new FixtureDeliverySlip__c();
+        fdsObj1.Name = '00001';
+        fdsObj1.DeliveryCompany__c = '鍒╄';
+        fdsObj1.Distributor_method__c = '闄嗚繍';
+        fdsObj1.DeliveryType__c = '鍥炲瘎';
+        fdsObj1.Wh_Staff__c = Userinfo.getUserId();
+        fdsObj1.Shippment_loaner_time__c = System.now();
+        insert fdsObj1;
+        FixtureDeliverySlip__c fdsObj2 = new FixtureDeliverySlip__c();
+        fdsObj2.Name = '00002';
+        fdsObj2.DeliveryCompany__c = '鍒╄';
+        fdsObj2.Distributor_method__c = '闄嗚繍';
+        fdsObj2.DeliveryType__c = '鍙戣揣';
+        fdsObj2.Wh_Staff__c = Userinfo.getUserId();
+        fdsObj2.Shippment_loaner_time__c = System.now();
+        insert fdsObj2;
+        Consum_Apply_Equipment_Set_Detail__c ncaesd = [select Return_DeliverySlip__c from Consum_Apply_Equipment_Set_Detail__c limit 1];
+        ncaesd.Received_Confirm__c = 'OK';
+        ncaesd.Return_DeliverySlip__c = fdsObj1.id;
+        ncaesd.DeliverySlip__c = fdsObj2.id;
+        update ncaesd;
+        ncaesd.Received_Confirm__c = '';
+        ncaesd.Asset_Center_Confirm__c = 'Ok';
+        ncaesd.Inspection_result__c = 'Ok';
+        ncaesd.Check_lost_Item_Final__c = '娑堣��';
+        ncaesd.Check_lost_Item__c = '娑堣��';
+        ncaesd.Inspection_result_after_Final__c = 'OK';
+        ncaesd.Inspection_result_after__c = 'OK';
+        ncaesd.Cancel_Select__c = true;
+        ncaesd.StockDown__c = true;
+        ncaesd.NG_Select_Again__C = false;
+        ncaesd.Cancel_Reason__c = '涓诲姩鍙栨秷';
+        update ncaesd;
+        delete ncaesd;
     }
 
-    static testMethod void testCoverUp() {
-        ConsumApplyEquipmentSetDetailHandler.test();
+    @isTest static void testTest3(){
+        Consum_Apply_Equipment_Set_Detail__c ncaesd = [select Return_DeliverySlip__c from Consum_Apply_Equipment_Set_Detail__c limit 1];
+        ncaesd.Check_lost_Item_Final__c = 'OK';
+        ncaesd.Asset__c = null;
+        update ncaesd;
+        ncaesd.Lost_item_giveup__c = false;
+        ncaesd.Check_lost_Item_Final__c = '娆犲搧';
+        update ncaesd;
     }
+
+    @isTest static void testTest4(){
+        Consum_Apply_Equipment_Set_Detail__c ncaesd = [select Return_DeliverySlip__c from Consum_Apply_Equipment_Set_Detail__c limit 1];
+        ncaesd.Check_lost_Item_Final__c = '';
+        update ncaesd;
+        ncaesd.Lost_item_giveup__c = false;
+        ncaesd.Check_lost_Item_Final__c = '娆犲搧';
+        update ncaesd;
+    }
+
+    @isTest static void testTest5(){
+        Consum_Apply_Equipment_Set_Detail__c ncaesd = [select Return_DeliverySlip__c from Consum_Apply_Equipment_Set_Detail__c limit 1];
+        ncaesd.Check_lost_Item_Final__c = '';
+        ncaesd.Confirm_Lost_Date__c = System.today();
+        update ncaesd;
+        ncaesd.Lost_item_giveup__c = true;
+        ncaesd.Check_lost_Item_Final__c = '娆犲搧';
+        update ncaesd;
+    }
+
+    @isTest static void testTest6(){
+        Consum_Apply_Equipment_Set_Detail__c ncaesd = [select Return_DeliverySlip__c from Consum_Apply_Equipment_Set_Detail__c limit 1];
+        ncaesd.Check_lost_Item_Final__c = '';
+        update ncaesd;
+        ncaesd.Lost_item_giveup__c = true;
+        ncaesd.Check_lost_Item_Final__c = '娑堣��';
+        update ncaesd;
+    }
+
+    @isTest static void testTest7(){
+        Consum_Apply_Equipment_Set_Detail__c ncaesd = [select Return_DeliverySlip__c from Consum_Apply_Equipment_Set_Detail__c limit 1];
+        ncaesd.Check_lost_Item_Final__c = 'OK';
+        ncaesd.Confirm_Lost_Date__c = System.today();
+        update ncaesd;
+        ncaesd.Lost_item_giveup__c = true;
+        ncaesd.Check_lost_Item_Final__c = '娆犲搧';
+        update ncaesd;
+    }
+
+    @isTest static void testTest8(){
+        Consum_Apply_Equipment_Set_Detail__c ncaesd = [select Return_DeliverySlip__c from Consum_Apply_Equipment_Set_Detail__c limit 1];
+        ncaesd.Check_lost_Item_Final__c = 'OK';
+        update ncaesd;
+        ncaesd.Lost_item_giveup__c = false;
+        ncaesd.Check_lost_Item_Final__c = '娆犲搧';
+        update ncaesd;
+    }
+
+    @isTest static void testTest9(){
+        Consum_Apply_Equipment_Set_Detail__c ncaesd = [select Return_DeliverySlip__c from Consum_Apply_Equipment_Set_Detail__c limit 1];
+        ncaesd.Check_lost_Item_Final__c = 'OK';
+        update ncaesd;
+        ncaesd.Check_lost_Item_Final__c = '娑堣��';
+        update ncaesd;
+    }
+
+    @isTest static void testTest10(){
+        Consum_Apply_Equipment_Set_Detail__c ncaesd = [select Return_DeliverySlip__c from Consum_Apply_Equipment_Set_Detail__c limit 1];
+        ncaesd.Check_lost_Item_Final__c = '娆犲搧';
+        ncaesd.Lost_item_giveup__c = false;
+        ncaesd.Confirm_Lost_Date__c = System.today();
+        update ncaesd;
+        ncaesd.Check_lost_Item_Final__c = '';
+        update ncaesd;
+    }
+
+    @isTest static void testTest11(){
+        Consum_Apply_Equipment_Set_Detail__c ncaesd = [select Return_DeliverySlip__c from Consum_Apply_Equipment_Set_Detail__c limit 1];
+        ncaesd.Check_lost_Item_Final__c = '娆犲搧';
+        ncaesd.Lost_item_giveup__c = false;
+        ncaesd.Confirm_Lost_Date__c = System.today();
+        update ncaesd;
+        ncaesd.Check_lost_Item_Final__c = 'OK';
+        update ncaesd;
+    }
+
+    @isTest static void testTest12(){
+        Consum_Apply_Equipment_Set_Detail__c ncaesd = [select Return_DeliverySlip__c from Consum_Apply_Equipment_Set_Detail__c limit 1];
+        ncaesd.Check_lost_Item_Final__c = '娆犲搧';
+        ncaesd.Lost_item_giveup__c = false;
+        ncaesd.Confirm_Lost_Date__c = System.today();
+        update ncaesd;
+        ncaesd.Lost_item_giveup__c = false;
+        update ncaesd;
+    }
+
+    @isTest static void testTest13(){
+        Consum_Apply_Equipment_Set_Detail__c ncaesd = [select Return_DeliverySlip__c from Consum_Apply_Equipment_Set_Detail__c limit 1];
+        ncaesd.Check_lost_Item_Final__c = '娆犲搧';
+        ncaesd.Lost_item_giveup__c = false;
+        ncaesd.Confirm_Lost_Date__c = System.today();
+        update ncaesd;
+        ncaesd.Check_lost_Item_Final__c = '娑堣��';
+        update ncaesd;
+    }
+
+    @isTest static void testTest14(){
+        Consum_Apply_Equipment_Set_Detail__c ncaesd = [select Return_DeliverySlip__c from Consum_Apply_Equipment_Set_Detail__c limit 1];
+        ncaesd.DataMigration_Flag__c  = true;
+        ncaesd.Check_lost_Item_Final__c = '娆犲搧';
+        ncaesd.Lost_item_giveup__c = true;
+        update ncaesd;
+        ncaesd.Lost_item_giveup__c = false;
+        ncaesd.Check_lost_Item_Final__c = '';
+        update ncaesd;
+    }
+
+    @isTest static void testTest15(){
+        Consum_Apply_Equipment_Set_Detail__c ncaesd = [select Return_DeliverySlip__c from Consum_Apply_Equipment_Set_Detail__c limit 1];
+        ncaesd.DataMigration_Flag__c = true;
+        ncaesd.Check_lost_Item_Final__c = '娆犲搧';
+        ncaesd.Lost_item_giveup__c = true;
+        update ncaesd;
+        ncaesd.Lost_item_giveup__c = false;
+        ncaesd.Check_lost_Item_Final__c = 'OK';
+        update ncaesd;
+    }
+
+    @isTest static void testTest16(){
+        Consum_Apply_Equipment_Set_Detail__c ncaesd = [select Return_DeliverySlip__c from Consum_Apply_Equipment_Set_Detail__c limit 1];
+        ncaesd.DataMigration_Flag__c = true;
+        ncaesd.Check_lost_Item_Final__c = '娆犲搧';
+        ncaesd.Lost_item_giveup__c = true;
+        update ncaesd;
+        ncaesd.Lost_item_giveup__c = false;
+        ncaesd.Check_lost_Item_Final__c = '娑堣��';
+        update ncaesd;
+    }
+
+    @isTest static void testTest17(){
+        Consum_Apply_Equipment_Set_Detail__c ncaesd = [select Return_DeliverySlip__c from Consum_Apply_Equipment_Set_Detail__c limit 1];
+        ncaesd.DataMigration_Flag__c = true;
+        ncaesd.Check_lost_Item_Final__c = '娑堣��';
+        update ncaesd;
+        ncaesd.Check_lost_Item_Final__c = '';
+        update ncaesd;
+    }
+
+
+    @isTest static void testTest18(){
+        Consum_Apply_Equipment_Set_Detail__c ncaesd = [select Return_DeliverySlip__c from Consum_Apply_Equipment_Set_Detail__c limit 1];
+        ncaesd.DataMigration_Flag__c = true;
+        ncaesd.Check_lost_Item_Final__c = '娑堣��';
+        update ncaesd;
+        ncaesd.Check_lost_Item_Final__c = 'OK';
+        update ncaesd;
+    }
+
+    @isTest static void testTest19(){
+        Consum_Apply_Equipment_Set_Detail__c ncaesd = [select Return_DeliverySlip__c from Consum_Apply_Equipment_Set_Detail__c limit 1];
+        ncaesd.DataMigration_Flag__c = true;
+        ncaesd.Check_lost_Item_Final__c = '娑堣��';
+        update ncaesd;
+        ncaesd.Check_lost_Item_Final__c = '娆犲搧';
+        ncaesd.Lost_item_giveup__c = false;
+        update ncaesd;
+    }
+
+    @isTest static void testTest20(){
+        Consum_Apply_Equipment_Set_Detail__c ncaesd = [select Return_DeliverySlip__c from Consum_Apply_Equipment_Set_Detail__c limit 1];
+        ncaesd.DataMigration_Flag__c = true;
+        ncaesd.Check_lost_Item_Final__c = '娑堣��';
+        update ncaesd;
+        ncaesd.Check_lost_Item_Final__c = '娆犲搧';
+        ncaesd.Lost_item_giveup__c = true;
+        update ncaesd;
+    }
+
+
+    @isTest static void testTest21(){
+        Consum_Apply_Equipment_Set_Detail__c ncaesd = [select Return_DeliverySlip__c from Consum_Apply_Equipment_Set_Detail__c limit 1];
+        ncaesd.Arrival_in_wh__c = false;
+        update ncaesd;
+        ncaesd.Arrival_in_wh__c = true;
+        ncaesd.Inspection_result_NG__c = '搴熷純';
+        update ncaesd;
+    }
+
+    @isTest static void testTest22(){
+        Consum_Apply_Equipment_Set_Detail__c ncaesd = [select Return_DeliverySlip__c from Consum_Apply_Equipment_Set_Detail__c limit 1];
+        ncaesd.Arrival_in_wh__c = true;
+        ncaesd.DataMigration_Flag__c = true;
+        ncaesd.Inspection_result_NG__c = '搴熷純';
+        update ncaesd;
+        ncaesd.Arrival_in_wh__c = false;
+        update ncaesd;
+    }
+
+    // @isTest static void testTest5(){
+    //     FixtureDeliverySlip__c fdsObj1 = new FixtureDeliverySlip__c();
+    //     fdsObj1.Name = '00001';
+    //     fdsObj1.DeliveryCompany__c = '鍒╄';
+    //     fdsObj1.Distributor_method__c = '闄嗚繍';
+    //     fdsObj1.DeliveryType__c = '鍥炲瘎';
+    //     fdsObj1.Wh_Staff__c = Userinfo.getUserId();
+    //     fdsObj1.Shippment_loaner_time__c = System.now();
+    //     insert fdsObj1;
+    //     FixtureDeliverySlip__c fdsObj2 = new FixtureDeliverySlip__c();
+    //     fdsObj2.Name = '00002';
+    //     fdsObj2.DeliveryCompany__c = '鍒╄';
+    //     fdsObj2.Distributor_method__c = '闄嗚繍';
+    //     fdsObj2.DeliveryType__c = '鍙戣揣';
+    //     fdsObj2.Wh_Staff__c = Userinfo.getUserId();
+    //     fdsObj2.Shippment_loaner_time__c = System.now();
+    //     insert fdsObj2;
+    //     Consum_Apply_Equipment_Set_Detail__c ncaesd = [select Return_DeliverySlip__c from Consum_Apply_Equipment_Set_Detail__c limit 1];
+    //     ncaesd.Shipment_request_time2__c = System.now();
+    //     ncaesd.Return_DeliverySlip__c = fdsObj1.Id;
+    //     ncaesd.DeliverySlip__c = fdsObj2.Id;
+    //     update ncaesd;
+    //     ncaesd.Received_Confirm__c = 'OK';
+    //     update ncaesd;
+    //     ncaesd.Received_Confirm__c = '';
+    //     ncaesd.Asset_Center_Confirm__c = 'Ok';
+    //     ncaesd.Inspection_result__c = 'Ok';
+    //     ncaesd.Check_lost_Item_Final__c = '娑堣��';
+    //     ncaesd.Check_lost_Item__c = '娑堣��';
+    //     ncaesd.Inspection_result_after_Final__c = 'OK';
+    //     ncaesd.Inspection_result_after__c = 'OK';
+    //     ncaesd.Cancel_Select__c = true;
+    //     ncaesd.StockDown__c = true;
+    //     ncaesd.NG_Select_Again__C = false;
+    //     ncaesd.Cancel_Reason__c = '涓诲姩鍙栨秷';
+    //     update ncaesd;
+    //     ncaesd.Check_lost_Item_Final__c = '娆犲搧';
+    //     update ncaesd;
+    //     ncaesd.Check_lost_Item_Final__c = '';
+    //     update ncaesd;
+    // }
+
+    // @isTest static void testTest6(){
+    //     FixtureDeliverySlip__c fdsObj1 = new FixtureDeliverySlip__c();
+    //     fdsObj1.Name = '00001';
+    //     fdsObj1.DeliveryCompany__c = '鍒╄';
+    //     fdsObj1.Distributor_method__c = '闄嗚繍';
+    //     fdsObj1.DeliveryType__c = '鍥炲瘎';
+    //     fdsObj1.Wh_Staff__c = Userinfo.getUserId();
+    //     fdsObj1.Shippment_loaner_time__c = System.now();
+    //     insert fdsObj1;
+    //     FixtureDeliverySlip__c fdsObj2 = new FixtureDeliverySlip__c();
+    //     fdsObj2.Name = '00002';
+    //     fdsObj2.DeliveryCompany__c = '鍒╄';
+    //     fdsObj2.Distributor_method__c = '闄嗚繍';
+    //     fdsObj2.DeliveryType__c = '鍙戣揣';
+    //     fdsObj2.Wh_Staff__c = Userinfo.getUserId();
+    //     fdsObj2.Shippment_loaner_time__c = System.now();
+    //     insert fdsObj2;
+    //     Consum_Apply_Equipment_Set_Detail__c ncaesd = [select Return_DeliverySlip__c from Consum_Apply_Equipment_Set_Detail__c limit 1];
+    //     ncaesd.Shipment_request_time2__c = System.now();
+    //     ncaesd.Return_DeliverySlip__c = fdsObj1.Id;
+    //     ncaesd.DeliverySlip__c = fdsObj2.Id;
+    //     update ncaesd;
+    //     ncaesd.Received_Confirm__c = 'OK';
+    //     update ncaesd;
+    //     ncaesd.Received_Confirm__c = '';
+    //     ncaesd.Asset_Center_Confirm__c = 'Ok';
+    //     ncaesd.Inspection_result__c = 'Ok';
+    //     ncaesd.Check_lost_Item_Final__c = '娑堣��';
+    //     ncaesd.Check_lost_Item__c = '娑堣��';
+    //     ncaesd.Inspection_result_after_Final__c = 'OK';
+    //     ncaesd.Inspection_result_after__c = 'OK';
+    //     ncaesd.Cancel_Select__c = true;
+    //     ncaesd.StockDown__c = true;
+    //     ncaesd.NG_Select_Again__C = false;
+    //     ncaesd.Cancel_Reason__c = '涓诲姩鍙栨秷';
+    //     update ncaesd;
+    //     ncaesd.Check_lost_Item_Final__c = '娆犲搧';
+    //     update ncaesd;
+    //     ncaesd.Check_lost_Item_Final__c = 'OK';
+    //     update ncaesd;
+    // }
+
+
+    // @isTest static void testTest7(){
+    //     FixtureDeliverySlip__c fdsObj1 = new FixtureDeliverySlip__c();
+    //     fdsObj1.Name = '00001';
+    //     fdsObj1.DeliveryCompany__c = '鍒╄';
+    //     fdsObj1.Distributor_method__c = '闄嗚繍';
+    //     fdsObj1.DeliveryType__c = '鍥炲瘎';
+    //     fdsObj1.Wh_Staff__c = Userinfo.getUserId();
+    //     fdsObj1.Shippment_loaner_time__c = System.now();
+    //     insert fdsObj1;
+    //     FixtureDeliverySlip__c fdsObj2 = new FixtureDeliverySlip__c();
+    //     fdsObj2.Name = '00002';
+    //     fdsObj2.DeliveryCompany__c = '鍒╄';
+    //     fdsObj2.Distributor_method__c = '闄嗚繍';
+    //     fdsObj2.DeliveryType__c = '鍙戣揣';
+    //     fdsObj2.Wh_Staff__c = Userinfo.getUserId();
+    //     fdsObj2.Shippment_loaner_time__c = System.now();
+    //     insert fdsObj2;
+    //     Consum_Apply_Equipment_Set_Detail__c ncaesd = [select Return_DeliverySlip__c from Consum_Apply_Equipment_Set_Detail__c limit 1];
+    //     ncaesd.Shipment_request_time2__c = System.now();
+    //     ncaesd.Return_DeliverySlip__c = fdsObj1.Id;
+    //     ncaesd.DeliverySlip__c = fdsObj2.Id;
+    //     update ncaesd;
+    //     ncaesd.Received_Confirm__c = 'OK';
+    //     update ncaesd;
+    //     ncaesd.Received_Confirm__c = '';
+    //     ncaesd.Asset_Center_Confirm__c = 'Ok';
+    //     ncaesd.Inspection_result__c = 'Ok';
+    //     ncaesd.Check_lost_Item_Final__c = '娑堣��';
+    //     ncaesd.Check_lost_Item__c = '娑堣��';
+    //     ncaesd.Inspection_result_after_Final__c = 'OK';
+    //     ncaesd.Inspection_result_after__c = 'OK';
+    //     ncaesd.Cancel_Select__c = true;
+    //     ncaesd.StockDown__c = true;
+    //     ncaesd.NG_Select_Again__C = false;
+    //     ncaesd.Cancel_Reason__c = '涓诲姩鍙栨秷';
+    //     update ncaesd;
+    //     ncaesd.Check_lost_Item_Final__c = '娆犲搧';
+    //     ncaesd.Lost_item_giveup__c = false;
+    //     update ncaesd;
+    //     ncaesd.Lost_item_giveup__c = true;
+    //     update ncaesd;
+    // }
+
+    // @isTest static void testTest8(){
+    //     FixtureDeliverySlip__c fdsObj1 = new FixtureDeliverySlip__c();
+    //     fdsObj1.Name = '00001';
+    //     fdsObj1.DeliveryCompany__c = '鍒╄';
+    //     fdsObj1.Distributor_method__c = '闄嗚繍';
+    //     fdsObj1.DeliveryType__c = '鍥炲瘎';
+    //     fdsObj1.Wh_Staff__c = Userinfo.getUserId();
+    //     fdsObj1.Shippment_loaner_time__c = System.now();
+    //     insert fdsObj1;
+    //     FixtureDeliverySlip__c fdsObj2 = new FixtureDeliverySlip__c();
+    //     fdsObj2.Name = '00002';
+    //     fdsObj2.DeliveryCompany__c = '鍒╄';
+    //     fdsObj2.Distributor_method__c = '闄嗚繍';
+    //     fdsObj2.DeliveryType__c = '鍙戣揣';
+    //     fdsObj2.Wh_Staff__c = Userinfo.getUserId();
+    //     fdsObj2.Shippment_loaner_time__c = System.now();
+    //     insert fdsObj2;
+    //     Consum_Apply_Equipment_Set_Detail__c ncaesd = [select Return_DeliverySlip__c from Consum_Apply_Equipment_Set_Detail__c limit 1];
+    //     ncaesd.Shipment_request_time2__c = System.now();
+    //     ncaesd.Return_DeliverySlip__c = fdsObj1.Id;
+    //     ncaesd.DeliverySlip__c = fdsObj2.Id;
+    //     update ncaesd;
+    //     ncaesd.Received_Confirm__c = 'OK';
+    //     update ncaesd;
+    //     ncaesd.Received_Confirm__c = '';
+    //     ncaesd.Asset_Center_Confirm__c = 'Ok';
+    //     ncaesd.Inspection_result__c = 'Ok';
+    //     ncaesd.Check_lost_Item_Final__c = '娑堣��';
+    //     ncaesd.Check_lost_Item__c = '娑堣��';
+    //     ncaesd.Inspection_result_after_Final__c = 'OK';
+    //     ncaesd.Inspection_result_after__c = 'OK';
+    //     ncaesd.Cancel_Select__c = true;
+    //     ncaesd.StockDown__c = true;
+    //     ncaesd.NG_Select_Again__C = false;
+    //     ncaesd.Cancel_Reason__c = '涓诲姩鍙栨秷';
+    //     update ncaesd;
+    //     ncaesd.Check_lost_Item_Final__c = '娑堣��';
+    //     ncaesd.Lost_item_giveup__c = false;
+    //     update ncaesd;
+    //     ncaesd.Check_lost_Item_Final__c = '';
+    //     ncaesd.Lost_item_giveup__c = true;
+    //     update ncaesd;
+    // }
+
+    // @isTest static void testTest9(){
+    //     FixtureDeliverySlip__c fdsObj1 = new FixtureDeliverySlip__c();
+    //     fdsObj1.Name = '00001';
+    //     fdsObj1.DeliveryCompany__c = '鍒╄';
+    //     fdsObj1.Distributor_method__c = '闄嗚繍';
+    //     fdsObj1.DeliveryType__c = '鍥炲瘎';
+    //     fdsObj1.Wh_Staff__c = Userinfo.getUserId();
+    //     fdsObj1.Shippment_loaner_time__c = System.now();
+    //     insert fdsObj1;
+    //     FixtureDeliverySlip__c fdsObj2 = new FixtureDeliverySlip__c();
+    //     fdsObj2.Name = '00002';
+    //     fdsObj2.DeliveryCompany__c = '鍒╄';
+    //     fdsObj2.Distributor_method__c = '闄嗚繍';
+    //     fdsObj2.DeliveryType__c = '鍙戣揣';
+    //     fdsObj2.Wh_Staff__c = Userinfo.getUserId();
+    //     fdsObj2.Shippment_loaner_time__c = System.now();
+    //     insert fdsObj2;
+    //     Consum_Apply_Equipment_Set_Detail__c ncaesd = [select Return_DeliverySlip__c from Consum_Apply_Equipment_Set_Detail__c limit 1];
+    //     ncaesd.Shipment_request_time2__c = System.now();
+    //     ncaesd.Return_DeliverySlip__c = fdsObj1.Id;
+    //     ncaesd.DeliverySlip__c = fdsObj2.Id;
+    //     update ncaesd;
+    //     ncaesd.Received_Confirm__c = 'OK';
+    //     update ncaesd;
+    //     ncaesd.Received_Confirm__c = '';
+    //     ncaesd.Asset_Center_Confirm__c = 'Ok';
+    //     ncaesd.Inspection_result__c = 'Ok';
+    //     ncaesd.Check_lost_Item_Final__c = '娑堣��';
+    //     ncaesd.Check_lost_Item__c = '娑堣��';
+    //     ncaesd.Inspection_result_after_Final__c = 'OK';
+    //     ncaesd.Inspection_result_after__c = 'OK';
+    //     ncaesd.Cancel_Select__c = true;
+    //     ncaesd.StockDown__c = true;
+    //     ncaesd.NG_Select_Again__C = false;
+    //     ncaesd.Cancel_Reason__c = '涓诲姩鍙栨秷';
+    //     update ncaesd;
+    //     ncaesd.Check_lost_Item_Final__c = '娆犲搧';
+    //     update ncaesd;
+    //     ncaesd.Check_lost_Item_Final__c = 'OK';
+    //     update ncaesd;
+    // }
+
+
+    // @isTest static void testTest10(){
+    //     FixtureDeliverySlip__c fdsObj1 = new FixtureDeliverySlip__c();
+    //     fdsObj1.Name = '00001';
+    //     fdsObj1.DeliveryCompany__c = '鍒╄';
+    //     fdsObj1.Distributor_method__c = '闄嗚繍';
+    //     fdsObj1.DeliveryType__c = '鍥炲瘎';
+    //     fdsObj1.Wh_Staff__c = Userinfo.getUserId();
+    //     fdsObj1.Shippment_loaner_time__c = System.now();
+    //     insert fdsObj1;
+    //     FixtureDeliverySlip__c fdsObj2 = new FixtureDeliverySlip__c();
+    //     fdsObj2.Name = '00002';
+    //     fdsObj2.DeliveryCompany__c = '鍒╄';
+    //     fdsObj2.Distributor_method__c = '闄嗚繍';
+    //     fdsObj2.DeliveryType__c = '鍙戣揣';
+    //     fdsObj2.Wh_Staff__c = Userinfo.getUserId();
+    //     fdsObj2.Shippment_loaner_time__c = System.now();
+    //     insert fdsObj2;
+    //     Consum_Apply_Equipment_Set_Detail__c ncaesd = [select Return_DeliverySlip__c from Consum_Apply_Equipment_Set_Detail__c limit 1];
+    //     ncaesd.Shipment_request_time2__c = System.now();
+    //     ncaesd.Return_DeliverySlip__c = fdsObj1.Id;
+    //     ncaesd.DeliverySlip__c = fdsObj2.Id;
+    //     update ncaesd;
+    //     ncaesd.Received_Confirm__c = 'OK';
+    //     update ncaesd;
+    //     ncaesd.Received_Confirm__c = '';
+    //     ncaesd.Asset_Center_Confirm__c = 'Ok';
+    //     ncaesd.Inspection_result__c = 'Ok';
+    //     ncaesd.Check_lost_Item_Final__c = '娑堣��';
+    //     ncaesd.Check_lost_Item__c = '娑堣��';
+    //     ncaesd.Inspection_result_after_Final__c = 'OK';
+    //     ncaesd.Inspection_result_after__c = 'OK';
+    //     ncaesd.Cancel_Select__c = true;
+    //     ncaesd.StockDown__c = true;
+    //     ncaesd.NG_Select_Again__C = false;
+    //     ncaesd.Cancel_Reason__c = '涓诲姩鍙栨秷';
+    //     update ncaesd;
+    //     ncaesd.Check_lost_Item_Final__c = '娆犲搧';
+    //     update ncaesd;
+    //     ncaesd.Lost_item_giveup__c = false;
+    //     update ncaesd;
+    // }
+    
+
+    // static testMethod void testTest2() {
+    //     Consum_Apply__c ca = new Consum_Apply__c();
+    //     ca.DataMigration_Flag__c = true;
+    //     insert ca;
+    //     Consum_Apply_Equipment_Set__c caes = new Consum_Apply_Equipment_Set__c();
+    //     caes.Consum_Apply__c = ca.Id;
+    //     caes.Consum_Start_Date__c = Date.today().addDays(20);
+    //     caes.DataMigration_Flag__c = true;
+    //     insert caes;
+    //     Consum_Apply_Equipment_Set_Detail__c caesd = new Consum_Apply_Equipment_Set_Detail__c();
+    //     caesd.DataMigration_Flag__c = true;
+    //     caesd.Consum_Apply__c = ca.Id;
+    //     caesd.Consum_Apply_Equipment_Set__c = caes.Id;
+    //     caesd.Consum_Start_Date__c = caes.Consum_Start_Date__c;
+    //     caesd.Trial_User__c = '鎴�';
+    //     caesd.Follower_User__c = UserInfo.getUserId();
+    //     insert caesd; // 鑽夋涓�
+        
+    //     System.Test.stopTest();
+    // }
+
+    // static testMethod void testTest3() {
+    //     System.Test.startTest();
+    //     Consum_Apply__c ca = new Consum_Apply__c();
+    //     ca.DataMigration_Flag__c = true;
+    //     insert ca;
+    //     Consum_Apply_Equipment_Set__c caes = new Consum_Apply_Equipment_Set__c();
+    //     caes.Consum_Apply__c = ca.Id;
+    //     caes.Consum_Start_Date__c = Date.today().addDays(20);
+    //     caes.DataMigration_Flag__c = true;
+    //     insert caes;
+    //     Consum_Apply_Equipment_Set_Detail__c caesd = new Consum_Apply_Equipment_Set_Detail__c();
+    //     caesd.DataMigration_Flag__c = true;
+    //     caesd.Consum_Apply__c = ca.Id;
+    //     caesd.Consum_Apply_Equipment_Set__c = caes.Id;
+    //     caesd.Consum_Start_Date__c = caes.Consum_Start_Date__c;
+    //     caesd.Trial_User__c = '鎴�';
+    //     caesd.Follower_User__c = UserInfo.getUserId();
+    //     insert caesd; // 鑽夋涓�
+    //     System.Test.stopTest();
+    // }
+   
+   
 }
\ No newline at end of file
diff --git a/force-app/main/default/classes/ConsumReassignControllerTest.cls b/force-app/main/default/classes/ConsumReassignControllerTest.cls
index ea64808..1fa0c58 100644
--- a/force-app/main/default/classes/ConsumReassignControllerTest.cls
+++ b/force-app/main/default/classes/ConsumReassignControllerTest.cls
@@ -1,6 +1,75 @@
 @isTest
 private class ConsumReassignControllerTest {
-    static testMethod void testCoverUp() {
-        ConsumReassignController.test();
-    }
+
+    @isTest(SeeAllData=true) static void test_init() {
+            RecordType rectCo = [select Id from RecordType where IsActive = true and SobjectType = 'Account' and DeveloperName = 'Hp'];
+            List<RecordType> rectDpt = [select Id from RecordType where IsActive = true and SobjectType = 'Account' and DeveloperName IN ('Department_GI', 'Department_BF') order by DeveloperName desc];
+
+            Account acc = new Account();
+            acc.RecordTypeId = rectCo.Id;
+            acc.Name = 'HP test1';
+            insert acc;
+
+            List<Account> dept = [select Id, Name from Account where ParentId = :acc.Id and Department_Class_Label__c IN ('娑堝寲绉�', '鍛煎惛绉�') order by Department_Class_Label__c];
+
+            Account depart1 = new Account();
+            depart1.RecordTypeId = rectDpt[0].Id;
+            depart1.Name         = '*';
+            depart1.Department_Name__c  = 'Gastoro Intestin Test';
+            depart1.ParentId            = dept[0].Id;
+            depart1.Department_Class__c = dept[0].Id;
+            depart1.Hospital__c         = acc.Id;
+
+            Account depart2 = new Account();
+            depart2.RecordTypeId = rectDpt[1].Id;
+            depart2.Name         = '*';
+            depart2.Department_Name__c  = '瑷虹檪绉�2';
+            depart2.ParentId            = dept[1].Id;
+            depart2.Department_Class__c = dept[1].Id;
+            depart2.Hospital__c         = acc.Id;
+            insert new Account[] {depart1, depart2};
+
+            Contact con = new Contact();
+            con.LastName = 'lastname2';
+            con.FirstName = 'firstname2';
+            con.Email = 'olympustest033@sunbridge.com';
+            con.MobilePhone = '99999999';
+            con.Work_Location_manual__c = 'location2';
+            con.Post_picklist__c = '閮ㄩ暱';
+            con.Job_Category_picklist__c = '閿�鍞帹骞�';
+            con.Hire_date_text__c = Date.today().addMonths(-6);
+            con.Gender_text__c = '鐢�';
+            con.dept__c = '鏈嶅姟鏈儴';
+            con.Pregnant_Rest__c = true;
+            insert con;
+            Consum_Apply__c ca = new Consum_Apply__c();
+            ca.DataMigration_Flag__c = true;
+            insert ca;
+            Consum_Apply_Equipment_Set__c caes = new Consum_Apply_Equipment_Set__c();
+            caes.Consum_Apply__c = ca.Id;
+            caes.Consum_Start_Date__c = Date.today().addDays(20);
+            caes.DataMigration_Flag__c = true;
+            insert caes;
+            Consum_Apply_Equipment_Set_Detail__c caesd = new Consum_Apply_Equipment_Set_Detail__c();
+            caesd.DataMigration_Flag__c = true;
+            caesd.Consum_Apply__c = ca.Id;
+            caesd.Consum_Apply_Equipment_Set__c = caes.Id;
+            caesd.Consum_Start_Date__c = caes.Consum_Start_Date__c;
+            caesd.Trial_User__c = '鎴�';
+            caesd.Follower_User__c = UserInfo.getUserId();
+            caesd.Received_Confirm__c = 'NG';
+            caesd.Asset_Center_Confirm__c = 'OK';
+            caesd.Cancel_Select__c = false;
+            insert caesd; // 鑽夋涓�
+            PageReference page = new PageReference('/apex/ConsumReassign?caid=' + ca.id);
+            System.Test.setCurrentPage(page);
+            ConsumReassignController consumReassignPage = new ConsumReassignController();
+            consumReassignPage.init();
+            System.debug(consumReassignPage);
+            for (ConsumReassignController.LineInfo lineInfo : consumReassignPage.lineInfoList) {
+                lineInfo.isSelect = true;
+            }
+            System.debug(consumReassignPage);
+            consumReassignPage.saveBtn();
+    } 
 }
\ No newline at end of file
diff --git a/force-app/main/default/classes/NewQuoteEntryControllerTest.cls b/force-app/main/default/classes/NewQuoteEntryControllerTest.cls
index f51a78c..004f214 100644
--- a/force-app/main/default/classes/NewQuoteEntryControllerTest.cls
+++ b/force-app/main/default/classes/NewQuoteEntryControllerTest.cls
@@ -78,6 +78,7 @@
     private static String agentName = 'test agent name';
 
     static testMethod void TestInit01() {
+        StaticParameter.EscapeOppandStaTrigger = true;
         system.debug('---------------------------------------Start initTest-----');
         NewQuoteEntryController QuotePage = new NewQuoteEntryController();
         //Line 119 User銇甉uote_Correct__c銆丵uote_Special_Operation__c銆丼AP_Send_OFF__c銈掋儐銈广儓銇熴倎銆�
@@ -142,6 +143,7 @@
     }
 
     static testMethod void testInit02() {
+        StaticParameter.EscapeOppandStaTrigger = true;
         system.debug('---------------------------------------Start initTest-----');
         Profile p = [select Id from Profile where id = :System.Label.ProfileId_SystemAdmin];
         User MacOwner = new User(Test_staff__c = true, Batch_User__c  = true, LastName = 'hp1', FirstName = 'owner1', Alias = 'hp', CommunityNickname = 'hpOwner1', Email = 'olympus_hpowner@sunbridge.com', Username = 'olympus_hpowner@sunbridge.com1', IsActive = true, EmailEncodingKey = 'ISO-2022-JP', TimeZoneSidKey = 'Asia/Tokyo', LocaleSidKey = 'ja_JP', LanguageLocaleKey = 'ja', ProfileId = p.id);
@@ -203,6 +205,7 @@
     }
 
     static testMethod void testInit02_01() {
+        StaticParameter.EscapeOppandStaTrigger = true;
         Profile p = [select Id from Profile where id = :System.Label.ProfileId_SystemAdmin];
         User MacOwner = new User(Test_staff__c = true, Batch_User__c  = true, LastName = 'hp1', FirstName = 'owner1', Alias = 'hp', CommunityNickname = 'hpOwner1', Email = 'olympus_hpowner@sunbridge.com', Username = 'olympus_hpowner@sunbridge.com1', IsActive = true, EmailEncodingKey = 'ISO-2022-JP', TimeZoneSidKey = 'Asia/Tokyo', LocaleSidKey = 'ja_JP', LanguageLocaleKey = 'ja', ProfileId = p.id);
         system.runAs(MacOwner) {
@@ -322,6 +325,7 @@
 //     }
 
     static testMethod void testInit02_2_01() {
+        StaticParameter.EscapeOppandStaTrigger = true;
         system.debug('---------------------------------------Start initTest-----');
         NewQuoteEntryController QuotePage = new NewQuoteEntryController();
         //Line 119 User銇甉uote_Correct__c銆丵uote_Special_Operation__c銆丼AP_Send_OFF__c銈掋儐銈广儓銇熴倎銆�
@@ -437,6 +441,8 @@
 //     }
 
     static testMethod void testInit04() {
+        ControllerUtil.EscapeNFM001Trigger = true;
+        StaticParameter.EscapeOppandStaTrigger = true;
         Profile p = [select Id from Profile where id = :System.Label.ProfileId_SystemAdmin];
         User MacOwner = new User(Test_staff__c = true, Batch_User__c  = true, LastName = 'hp1', FirstName = 'owner1', Alias = 'hp', CommunityNickname = 'hpOwner1', Email = 'olympus_hpowner@sunbridge.com', Username = 'olympus_hpowner@sunbridge.com1', IsActive = true, EmailEncodingKey = 'ISO-2022-JP', TimeZoneSidKey = 'Asia/Tokyo', LocaleSidKey = 'ja_JP', LanguageLocaleKey = 'ja', ProfileId = p.id);
         system.runAs(MacOwner) {
@@ -504,6 +510,7 @@
         }
     }
     static testMethod void testInit04_01() {
+        StaticParameter.EscapeOppandStaTrigger = true;
         Profile p = [select Id from Profile where id = :System.Label.ProfileId_SystemAdmin];
         User MacOwner = new User(Test_staff__c = true, Batch_User__c  = true, LastName = 'hp1', FirstName = 'owner1', Alias = 'hp', CommunityNickname = 'hpOwner1', Email = 'olympus_hpowner@sunbridge.com', Username = 'olympus_hpowner@sunbridge.com1', IsActive = true, EmailEncodingKey = 'ISO-2022-JP', TimeZoneSidKey = 'Asia/Tokyo', LocaleSidKey = 'ja_JP', LanguageLocaleKey = 'ja', ProfileId = p.id);
         system.runAs(MacOwner) {
@@ -561,6 +568,7 @@
     }
 
     static testMethod void testInit04_2() {
+        StaticParameter.EscapeOppandStaTrigger = true;
         Profile p = [select Id from Profile where id = :System.Label.ProfileId_SystemAdmin];
         User MacOwner = new User(Test_staff__c = true, Batch_User__c  = true, LastName = 'hp1', FirstName = 'owner1', Alias = 'hp', CommunityNickname = 'hpOwner1', Email = 'olympus_hpowner@sunbridge.com', Username = 'olympus_hpowner@sunbridge.com1', IsActive = true, EmailEncodingKey = 'ISO-2022-JP', TimeZoneSidKey = 'Asia/Tokyo', LocaleSidKey = 'ja_JP', LanguageLocaleKey = 'ja', ProfileId = p.id);
         system.runAs(MacOwner) {
@@ -629,6 +637,7 @@
     }
 
     static testMethod void testInit04_2_01() {
+        StaticParameter.EscapeOppandStaTrigger = true;
         NewQuoteEntryController QuotePage = new NewQuoteEntryController();
         String userId = UserInfo.getUserId();
         User u1 = [SELECT Id, Quote_Correct__c, Quote_Special_Operation__c, Cost_Referable__c FROM User WHERE Id = :userId];
@@ -676,10 +685,11 @@
         //瑕嬬銉囥兗銈挎绱�
         opprtunity = [SElECT Id, Opportunity_no__c, CurrencyIsoCode FROM Opportunity WHERE Id = :opp.id];
 
-        //test7( opp, quote , QuotePage);
+        test7( opp, quote , QuotePage);
         System.Test.stopTest();
     }
     static testMethod void TestInit05() {
+        StaticParameter.EscapeOppandStaTrigger = true;
         system.debug('---------------------------------------Start initTest-----');
         NewQuoteEntryController QuotePage = new NewQuoteEntryController();
         //Line 119 User銇甉uote_Correct__c銆丵uote_Special_Operation__c銆丼AP_Send_OFF__c銈掋儐銈广儓銇熴倎銆�
@@ -901,7 +911,7 @@
 
         delete quote;
 
-        Product2 product1 = new Product2( Name = '銉嗐偣銉堝晢鍝�');
+        Product2 product1 = new Product2( Name = '銉嗐偣銉堝晢鍝�', ProductCode = 'TST1000001', Asset_Model_No__c = 'TST1000001');
         insert product1;
         system.debug('##product.Id=[' + product1.Id + ']' );
 
@@ -978,7 +988,7 @@
 
 //        delete quote;
 
-            Product2 product1 = new Product2( Name = '銉嗐偣銉堝晢鍝�');
+            Product2 product1 = new Product2( Name = '銉嗐偣銉堝晢鍝�', ProductCode = 'TST1101101', Asset_Model_No__c = 'TST1101101', LastbuyProductFLG__c = true);
             insert product1;
             system.debug('##product.Id=[' + product1.Id + ']' );
 
@@ -1005,6 +1015,7 @@
         }
     }
     static testMethod void check_QuoteEntryController001() {
+        StaticParameter.EscapeOppandStaTrigger = true;
 
         RecordType recByoin = [select id from RecordType where IsActive = true and SobjectType = 'Account' and Name = :RC_BYOUIN limit 1];
         Account hospital = new Account(Name = '銉嗐偣銉堢梾闄�');
@@ -1161,6 +1172,9 @@
             controller.quoId = null;
             controller.enableSales = false;
             controller.init();
+            product2.Name = '11122';
+            update product2;
+            controller.init();
             controller.quo.MultiYearWarrantyTotalPrice__c = 1000;
             controller.dataCheck();
             controller.select_index = 0;
@@ -1242,6 +1256,7 @@
     }
     //娴嬭瘯绋嬪簭 娴嬪璐� 绮剧悽鎶�鏈� wql 2021/02/20 start
     static testMethod void check_QuoteEntryController002() {
+        StaticParameter.EscapeOppandStaTrigger = true;
 
         RecordType recByoin = [select id from RecordType where IsActive = true and SobjectType = 'Account' and Name = :RC_BYOUIN limit 1];
         Account hospital = new Account(Name = '銉嗐偣銉堢梾闄�');
@@ -1269,7 +1284,7 @@
         system.runAs(MacOwner) {
             Opportunity opp = new Opportunity( Name = 'aiueo', StageName = 'contact', CloseDate = Date.today());
             opp.Trade__c = '澶栬部';
-            opp.CurrencyIsoCode = CurrencyIso;
+            opp.CurrencyIsoCode = 'USD';
             opp.Sales_Root__c = '璨╁2搴�';
             opp.StageName = '寮曞悎';
             opp.owner_not_automatically_update__c = true;
@@ -1476,10 +1491,11 @@
             Apexpages.currentPage().getParameters().put('oppid', opp.id);
             NewQuoteEntryController controller = new NewQuoteEntryController();
             //Apexpages.currentPage().getParameters().put('id', quote.id);
-            controller.oppId = null;
-            controller.quoId = null;
+            controller.oppId = opp.id;
+            controller.quoId = quote.id;
             controller.enableSales = false;
             controller.init();
+            controller.ReservedProductVerification();
             controller.quo.MultiYearWarrantyTotalPrice__c = 1000;
             controller.dataCheck();
             controller.select_index = 0;
@@ -1577,6 +1593,7 @@
     }
 
     static testMethod void dataEntryTest() {
+        StaticParameter.EscapeOppandStaTrigger = true;
         Profile p = [select Id from Profile where id = :System.Label.ProfileId_SystemAdmin];
         User MacOwner = new User(Test_staff__c = true, Batch_User__c  = true, LastName = 'hp1', FirstName = 'owner1', Alias = 'hp', CommunityNickname = 'hpOwner1', Email = 'olympus_hpowner@sunbridge.com', Username = 'olympus_hpowner@sunbridge.com1', IsActive = true, EmailEncodingKey = 'ISO-2022-JP', TimeZoneSidKey = 'Asia/Tokyo', LocaleSidKey = 'ja_JP', LanguageLocaleKey = 'ja', ProfileId = p.id);
         system.runAs(MacOwner) {
@@ -1836,6 +1853,7 @@
 
        //娴嬭瘯闃胯タ璧涘 娴嬭瘯绋嬪簭 绮剧悽鎶�鏈� wql 2021/02/20 start
     static testMethod void check_QuoteEntryController003() {
+        StaticParameter.EscapeOppandStaTrigger = true;
 
         RecordType recByoin = [select id from RecordType where IsActive = true and SobjectType = 'Account' and Name = :RC_BYOUIN limit 1];
         Account hospital = new Account(Name = '銉嗐偣銉堢梾闄�');
@@ -2104,6 +2122,7 @@
 
     //20211015 lt start
     static testMethod void check_QuoteEntryController004() {
+        StaticParameter.EscapeOppandStaTrigger = true;
 
         RecordType recByoin = [select id from RecordType where IsActive = true and SobjectType = 'Account' and Name = :RC_BYOUIN limit 1];
         Account hospital = new Account(Name = '銉嗐偣銉堢梾闄�');
@@ -2405,6 +2424,7 @@
     }
 
     static testMethod void dataEntryTest1() {
+        StaticParameter.EscapeOppandStaTrigger = true;
         Profile p = [select Id from Profile where id = :System.Label.ProfileId_SystemAdmin];
         User MacOwner = new User(Test_staff__c = true, Batch_User__c  = true, LastName = 'hp1', FirstName = 'owner1', Alias = 'hp', CommunityNickname = 'hpOwner1', Email = 'olympus_hpowner@sunbridge.com', Username = 'olympus_hpowner@sunbridge.com1', IsActive = true, EmailEncodingKey = 'ISO-2022-JP', TimeZoneSidKey = 'Asia/Tokyo', LocaleSidKey = 'ja_JP', LanguageLocaleKey = 'ja', ProfileId = p.id);
         system.runAs(MacOwner) {
@@ -2639,6 +2659,7 @@
             //controller.dataEntry();
             //controller.dataCheck();
             controller.QuoteDecision();
+            controller.quoId = quote.id;
             controller.Print();
 
             actList = new List<NewQuoteEntryController.QELine>();
@@ -2676,6 +2697,7 @@
     }
     //20211015 lt end
     static testMethod void dataEntryTest2() {
+        StaticParameter.EscapeOppandStaTrigger = true;
         RecordType recByoin = [select id from RecordType where IsActive = true and SobjectType = 'Account' and Name = :RC_BYOUIN limit 1];
         Account hospital = new Account(Name = '銉嗐偣銉堢梾闄�');
         hospital.RecordTypeId = recByoin.id;

--
Gitblit v1.9.1