Merge branch '进口单证+obsap+导入'

fuyu

2023-03-06 042735c4d44e740121dbbb52257617d348a1c391

 force-app/main/default/classes/AttachmentDisplayControllerTest.cls

@@ -194,12 +194,20 @@
        FrameNumManage1.Material__c = 'wuliaoceshi';
        FrameNumManage1.MaterialDepict__c = 'wuliaomiaoshu';
        FrameNumManage1.signInForm__c = eSignForm.Id;
<<<<<<< HEAD
=======
        FrameNumManage1.InspectionCard_Select__c =FileName2.Id;
>>>>>>> 进口单证+obsap+导入

        insert FrameNumManage1;

        FrameNumManage__c FrameNumManage2 = new FrameNumManage__c();
        FrameNumManage2.Name = '测试2';
<<<<<<< HEAD
        FrameNumManage2.ManagementCode__c ='KVZFI';
=======
        FrameNumManage2.ManagementCode__c ='KVZFI2';
>>>>>>> 进口单证+obsap+导入
        FrameNumManage2.ApplyList__c = 'ceshiyi2';
        FrameNumManage2.Num__c = 2;
        FrameNumManage2.SerialNumber__c = '22R';
@@ -212,7 +220,11 @@
        insert FrameNumManage2;
        FrameNumManage__c FrameNumManage3 = new FrameNumManage__c();
        FrameNumManage3.Name = '测试3';
<<<<<<< HEAD
        FrameNumManage3.ManagementCode__c ='KVZFI';
=======
        FrameNumManage3.ManagementCode__c ='KVZFI3';
>>>>>>> 进口单证+obsap+导入
        FrameNumManage3.ApplyList__c = 'ceshiyi2';
        FrameNumManage3.Num__c = 2;
        FrameNumManage3.SerialNumber__c = '22R';
@@ -233,6 +245,10 @@
        FrameNumManage4.MaterialDepict__c = 'wuliaomiaoshu4';
        FrameNumManage4.signInForm__c = eSignForm.Id;
        FrameNumManage4.Asset__c = ast.Id;
<<<<<<< HEAD
=======
        FrameNumManage4.ApplyList_Select__c =FileName1.Id;
>>>>>>> 进口单证+obsap+导入

        insert FrameNumManage4;

@@ -246,6 +262,10 @@
        FrameNumManage5.MaterialDepict__c = 'wuliaomiaoshu5';
        FrameNumManage5.InspectionCard__c = '不出证';
        FrameNumManage5.signInForm__c = eSignForm.Id;
<<<<<<< HEAD
=======
        FrameNumManage5.ApplyList_Select__c =FileName1.Id;
>>>>>>> 进口单证+obsap+导入

        insert FrameNumManage5;

@@ -259,6 +279,10 @@
        FrameNumManage6.MaterialDepict__c = 'wuliaomiaoshu6';
        FrameNumManage6.InspectionCard__c = 'ceshiyi2';
        FrameNumManage6.signInForm__c = eSignForm.Id;
<<<<<<< HEAD
=======
        FrameNumManage6.ApplyList_Select__c =FileName1.Id;
>>>>>>> 进口单证+obsap+导入

        insert FrameNumManage6;

@@ -277,7 +301,11 @@

        FrameNumManage__c FrameNumManage8 = new FrameNumManage__c();
        FrameNumManage8.Name = '测试8';
<<<<<<< HEAD
        FrameNumManage8.ManagementCode__c ='KVZFI5';
=======
        FrameNumManage8.ManagementCode__c ='KVZFI8';
>>>>>>> 进口单证+obsap+导入
        FrameNumManage8.ApplyList__c = 'ceshiyi8';
        FrameNumManage8.Num__c = 2;
        FrameNumManage8.SerialNumber__c = '22R';
@@ -285,6 +313,11 @@
        FrameNumManage8.MaterialDepict__c = 'wuliaomiaoshu5';
        FrameNumManage8.InspectionCard__c = 'ceshiyi1';
        FrameNumManage8.signInForm__c = eSignForm.Id;
<<<<<<< HEAD
=======
        FrameNumManage8.ApplyList_Select__c =FileName1.Id;
        FrameNumManage8.InspectionCard_Select__c =FileName2.Id;
>>>>>>> 进口单证+obsap+导入

        insert FrameNumManage8;

@@ -298,6 +331,11 @@
        FrameNumManage9.MaterialDepict__c = 'wuliaomiaoshu9';
        FrameNumManage9.InspectionCard__c = '';
        FrameNumManage9.signInForm__c = eSignForm1.Id;
<<<<<<< HEAD
=======
        FrameNumManage9.ApplyList_Select__c =FileName1.Id;
        FrameNumManage9.InspectionCard_Select__c =FileName2.Id;
>>>>>>> 进口单证+obsap+导入

        insert FrameNumManage9;
        FrameNumManage__c FrameNumManage10 = new FrameNumManage__c();
@@ -310,6 +348,11 @@
        FrameNumManage10.MaterialDepict__c = 'wuliaomiaoshu10';
        FrameNumManage10.InspectionCard__c = '';
        FrameNumManage10.signInForm__c = eSignForm1.Id;
<<<<<<< HEAD
=======
        FrameNumManage10.ApplyList_Select__c =FileName1.Id;
        FrameNumManage10.InspectionCard_Select__c =FileName2.Id;
>>>>>>> 进口单证+obsap+导入

        insert FrameNumManage10;

@@ -323,6 +366,11 @@
        FrameNumManage11.MaterialDepict__c = 'wuliaomiaoshu11';
        FrameNumManage11.InspectionCard__c = '';
        FrameNumManage11.signInForm__c = eSignForm1.Id;
<<<<<<< HEAD
=======
        FrameNumManage11.ApplyList_Select__c =FileName1.Id;
        FrameNumManage11.InspectionCard_Select__c =FileName2.Id;
>>>>>>> 进口单证+obsap+导入

        insert FrameNumManage11;