From 042735c4d44e740121dbbb52257617d348a1c391 Mon Sep 17 00:00:00 2001
From: fuyu <fuyu@prec-tech.com>
Date: 星期一, 06 三月 2023 13:39:38 +0800
Subject: [PATCH] Merge branch '进口单证+obsap+导入'

---
 force-app/main/default/classes/AttachmentDisplayControllerTest.cls |   36 ++++++++++++++++++++++++++++++++++++
 1 files changed, 36 insertions(+), 0 deletions(-)

diff --git a/force-app/main/default/classes/AttachmentDisplayControllerTest.cls b/force-app/main/default/classes/AttachmentDisplayControllerTest.cls
index f484432..79a56fc 100644
--- a/force-app/main/default/classes/AttachmentDisplayControllerTest.cls
+++ b/force-app/main/default/classes/AttachmentDisplayControllerTest.cls
@@ -194,13 +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';
@@ -213,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';
@@ -234,7 +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;
 
@@ -248,7 +262,10 @@
         FrameNumManage5.MaterialDepict__c = 'wuliaomiaoshu5';
         FrameNumManage5.InspectionCard__c = '涓嶅嚭璇�';
         FrameNumManage5.signInForm__c = eSignForm.Id;
+<<<<<<< HEAD
+=======
         FrameNumManage5.ApplyList_Select__c =FileName1.Id;
+>>>>>>> 杩涘彛鍗曡瘉+obsap+瀵煎叆
 
         insert FrameNumManage5;
 
@@ -262,7 +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;
 
@@ -281,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';
@@ -289,8 +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;
 
@@ -304,8 +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();
@@ -318,8 +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;
 
@@ -333,8 +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;
 

--
Gitblit v1.9.1