force-app/main/default/classes/EquipmentSetShippmentReceived3Controller.cls
@@ -563,7 +563,7 @@ if(ocList[0].IsWorkDay__c == 0){ for(OlympusCalendar__c oc:ocList){ if(oc.IsWorkDay__c == 1){ startTime = oc.Date__c; startTime = Datetime.newInstance(oc.Date__c.year(),oc.Date__c.month(),oc.Date__c.day(),0,0,0); startDate = oc.Date__c; startFlag = true; break; @@ -574,7 +574,7 @@ if(ocList[ocList.size() - 1].IsWorkDay__c == 0){ for(Integer i = ocList.size() - 1; i <= 0;i--){ if(ocList[i].IsWorkDay__c == 1){ endTime = ocList[i].Date__c.addDays(1); endTime = Datetime.newInstance(ocList[i].Date__c.addDays(1).year(),ocList[i].Date__c.addDays(1).month(),ocList[i].Date__c.addDays(1).day(),0,0,0); endDate = ocList[i].Date__c.addDays(1); endFlag = true; break; @@ -647,7 +647,8 @@ return null; } catch (Exception ex) { system.debug('=====' + ex.getMessage()); ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, ex.getDmlMessage(0))); // ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, ex.getDmlMessage(0))); ApexPages.addMessages(ex); Database.rollback(sp); done_flg = false; return null; force-app/main/default/classes/EquipmentSetShippmentReceived3CtrlTest.cls
@@ -26,6 +26,13 @@ StaticParameter.EscapeNFM001Trigger = true; Oly_TriggerHandler.bypass(ContactTriggerHandler.class.getName()); Oly_TriggerHandler.bypass(AgencyHospitalHandler.class.getName()); // 20220316 ljh add start // 奥林巴斯日历 OlympusCalendar__c oc = new OlympusCalendar__c(); oc.Date__c = System.Today(); oc.Before_1_WorkDay__c = oc.Date__c.addDays(-1); insert oc; // 20220316 ljh add end // システム管理者 User user = new User(Test_staff__c = true); user.LastName = '_サンブリッジ1'; @@ -552,6 +559,13 @@ StaticParameter.EscapeNFM001Trigger = true; Oly_TriggerHandler.bypass(ContactTriggerHandler.class.getName()); Oly_TriggerHandler.bypass(AgencyHospitalHandler.class.getName()); // 20220316 ljh add start // 奥林巴斯日历 OlympusCalendar__c oc = new OlympusCalendar__c(); oc.Date__c = System.Today(); oc.Before_1_WorkDay__c = oc.Date__c.addDays(-1); insert oc; // 20220316 ljh add end // システム管理者 User user = new User(Test_staff__c = true); user.LastName = '_サンブリッジ1'; force-app/main/default/classes/RentalFixtureSetAssignAgencyController.cls
@@ -1,3 +1,4 @@ // RentalFixtureSetAssignAgencyCtrlTest public with sharing class RentalFixtureSetAssignAgencyController { public List<EsdInfo> esdList { get; set; } public FixtureDeliverySlip__c slip { get; set; } @@ -48,6 +49,7 @@ + ', Loaner_cancel_request__c'//20210707 SFDC-C448KZ you + ', Equipment_Type_F__c' //20210508 LJH ADD 1672 + ', Wei_Assigned_Cnt__c' // 20210624 ljh add SFDC-C448GR start + ', Campaign__r.IF_Approved__c' // 20220315 ljh add + ', Campaign__r.Meeting_Approved_No__c' // 20220315 ljh add + ', Campaign__r.Approved_Status__c' // 20220315 ljh add + ' FROM Rental_Apply__c' @@ -1854,7 +1856,7 @@ if(ocList[0].IsWorkDay__c == 0){ for(OlympusCalendar__c oc:ocList){ if(oc.IsWorkDay__c == 1){ startTime = oc.Date__c; startTime = Datetime.newInstance(oc.Date__c.year(),oc.Date__c.month(),oc.Date__c.day(),0,0,0); startDate = oc.Date__c; startFlag = true; break; @@ -1865,7 +1867,7 @@ if(ocList[ocList.size() - 1].IsWorkDay__c == 0){ for(Integer i = ocList.size() - 1; i <= 0;i--){ if(ocList[i].IsWorkDay__c == 1){ endTime = ocList[i].Date__c.addDays(1); endTime = Datetime.newInstance(ocList[i].Date__c.addDays(1).year(),ocList[i].Date__c.addDays(1).month(),ocList[i].Date__c.addDays(1).day(),0,0,0); endDate = ocList[i].Date__c.addDays(1); endFlag = true; break; @@ -1943,7 +1945,8 @@ } catch (Exception ex) { system.debug('=====' + ex.getMessage()); ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, ex.getDmlMessage(0))); // ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, ex.getDmlMessage(0))); ApexPages.addMessages(ex); Database.rollback(sp); // 运输单插入成功，但明细或申请更新失败时，运输单的假Id要清掉 if(insertSlip) { force-app/main/default/classes/RentalFixtureSetAssignAgencyCtrlTest.cls
@@ -2,6 +2,13 @@ private class RentalFixtureSetAssignAgencyCtrlTest { private static User u; static void setupTestData(Boolean hasAnother) { // 20220316 ljh add start // 奥林巴斯日历 OlympusCalendar__c oc = new OlympusCalendar__c(); oc.Date__c = System.Today(); oc.Before_1_WorkDay__c = oc.Date__c.addDays(-1); insert oc; // 20220316 ljh add end System.runAs(new User(Id = Userinfo.getUserId())) { StaticParameter.EscapeNFM001AgencyContractTrigger = true; StaticParameter.EscapeNFM001Trigger = true; @@ -72,9 +79,10 @@ insert dep; // 产品 // 20220317 ljh Fixture_Model_No__c和配套的 主体备品配套明细型号应该一致 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', Fixture_Model_No__c='modelNo1',Serial_Lot_No__c='S/N tracing', Fixture_Model_No_T__c = 'modelNo1', 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', @@ -89,8 +97,8 @@ //20210524 ljh add 1829 start // 产品 Product2 pro10 = new Product2(Name='name010',IsActive=true,Family='GI', Fixture_Model_No__c='n010',Serial_Lot_No__c='S/N tracing', Fixture_Model_No_T__c = 'n010', Asset_Model_No__c = 'Pro10', Fixture_Model_No__c='modelNo10',Serial_Lot_No__c='S/N tracing', Fixture_Model_No_T__c = 'modelNo10', Asset_Model_No__c = 'Pro10', ProductCode_Ext__c='pc010',Manual_Entry__c=false); Product2 pro20 = new Product2(Name='name020',IsActive=true,Family='GI', Fixture_Model_No__c='n020',Serial_Lot_No__c='Lot tracing', @@ -523,6 +531,7 @@ // 申请单变为已批准 raObj.Status__c = '已批准'; raObj.Request_approval_time__c = Datetime.now().addDays(-1);// 20220317 ljh add 审批时间 update raObj; } @@ -632,7 +641,7 @@ controller.init(); // 第一次分配 controller.esdList[0].checked = true; controller.parentObj.Asset_loaner_start_day__c = Date.today()+1;//20210513 ljh update controller.parentObj.Asset_loaner_start_day__c = Date.today().addDays(1);//20210513 ljh update controller.applyDate(); controller.stepName = '分配'; @@ -644,7 +653,7 @@ // controller.esdList[0].checked = true; // controller.stockDown();// 20210624 ljh update SFDC-C448GR ref = new PageReference('/apex/RentalFixtureSetAssignAgency?pt_recid=' + esList[0].Id); /*ref = new PageReference('/apex/RentalFixtureSetAssignAgency?pt_recid=' + esList[0].Id); Test.setCurrentPage(ref); controller = new RentalFixtureSetAssignAgencyController(); // 下架后重新分配 @@ -653,7 +662,7 @@ controller.esdList[0].checked = true; controller.qrcode = '51110001;2;'+controller.esdList[0].rec.Rental_Apply_Equipment_Set__c; controller.scanAndMatch(); controller.assign(); controller.assign();*/ Test.stopTest(); @@ -745,7 +754,8 @@ } @isTest // 20220317 ljh 控制必须填，写在前端了所以这个不需要了 /*@isTest public static void test_cancelSet_error() { setupTestData(false); @@ -762,10 +772,9 @@ Test.stopTest(); List<Apexpages.message> msgs = ApexPages.getMessages(); //System.assertEquals('取消理由和取消理由备注不可为空！', msgs[0].getDetail()); //System.debug('init Error'); } System.assertEquals('取消理由和取消理由备注不可为空！', msgs[0].getDetail()); System.debug('init Error'); }*/ @isTest public static void test_shipment() { @@ -801,12 +810,10 @@ controller.parentObj.Delivery_Agency__c = '北京市'; controller.shipment(); Test.stopTest(); //System.assertEquals(true, controller.done_flg); //List<Apexpages.message> msgs = ApexPages.getMessages(); //System.assertEquals('必须填写【物流公司】', msgs[0].getDetail()); //System.debug('init Error'); System.assertEquals(true, controller.done_flg); // 20220317 ljh add 验证数据使用 start // List<Apexpages.message> msgs = ApexPages.getMessages(); // System.assertEquals('test', msgs[0].getDetail()); } @isTest @@ -841,8 +848,8 @@ Test.stopTest(); List<Apexpages.message> msgs = ApexPages.getMessages(); //System.assertEquals('n01未分配不可发货！', msgs[0].getDetail()); System.debug('init Success'); System.assertEquals('发货-办事处为空,不能发货', msgs[0].getDetail()); System.debug('init Error'); } @@ -882,9 +889,4 @@ System.debug('init Success'); } /** static testMethod void updaue() { RentalFixtureSetAssignAgencyController.test();//先调用这个，然后继续补充测试类 } **/ }
