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/LexConInvoiceViewControllerTest.cls |  516 ++++++++------------------------------------------------
 1 files changed, 76 insertions(+), 440 deletions(-)

diff --git a/force-app/main/default/classes/LexConInvoiceViewControllerTest.cls b/force-app/main/default/classes/LexConInvoiceViewControllerTest.cls
index 82f618f..ad6a913 100644
--- a/force-app/main/default/classes/LexConInvoiceViewControllerTest.cls
+++ b/force-app/main/default/classes/LexConInvoiceViewControllerTest.cls
@@ -11,24 +11,12 @@
         User thisUser = [SELECT Id FROM User WHERE Id = :UserInfo.getUserId()];
         System.runAs(thisUser) {
             // Profile prof = [select Id from Profile where Name ='901_缁忛攢鍟嗙ぞ鍖烘櫘閫氭潈闄恄2閲嶉獙璇�'];
-            Profile prof = [
-                SELECT Id
-                FROM Profile
-                WHERE Name = '901_缁忛攢鍟嗙ぞ鍖烘櫘閫氭潈闄恄2閲嶉獙璇�(ET)'
-            ];
-            List<RecordType> rectCo = [
-                SELECT Id
-                FROM RecordType
-                WHERE IsActive = TRUE AND SobjectType = 'Account' AND Name = '璨╁2搴�'
-            ];
+            Profile prof = [SELECT Id FROM Profile WHERE Name = '901_缁忛攢鍟嗙ぞ鍖烘櫘閫氭潈闄恄2閲嶉獙璇�(ET)'];
+            List<RecordType> rectCo = [SELECT Id FROM RecordType WHERE IsActive = TRUE AND SobjectType = 'Account' AND Name = '璨╁2搴�'];
             if (rectCo.size() == 0) {
                 return;
             }
-            List<RecordType> rectHos = [
-                SELECT Id
-                FROM RecordType
-                WHERE IsActive = TRUE AND SobjectType = 'Account' AND Name = '鐥呴櫌'
-            ];
+            List<RecordType> rectHos = [SELECT Id FROM RecordType WHERE IsActive = TRUE AND SobjectType = 'Account' AND Name = '鐥呴櫌'];
             if (rectHos.size() == 0) {
                 return;
             }
@@ -85,25 +73,10 @@
     }
     static testMethod void conInvoiceViewTestedit_1() {
         user curUser = [SELECT Id FROM User WHERE LastName = 'TestUser' LIMIT 1];
-        Account acc = [
-            SELECT Id
-            FROM Account
-            WHERE name = 'Testaccount002'
-            LIMIT 1
-        ];
+        Account acc = [SELECT Id FROM Account WHERE name = 'Testaccount002' LIMIT 1];
         Account hosp1 = [SELECT Id FROM Account WHERE name = 'Testhosp001' LIMIT 1];
-        Account agency1 = [
-            SELECT Id
-            FROM Account
-            WHERE name = 'Testhosp001'
-            LIMIT 1
-        ];
-        Account agency2 = [
-            SELECT Id
-            FROM Account
-            WHERE name = 'Testhosp002'
-            LIMIT 1
-        ];
+        Account agency1 = [SELECT Id FROM Account WHERE name = 'Testhosp001' LIMIT 1];
+        Account agency2 = [SELECT Id FROM Account WHERE name = 'Testhosp002' LIMIT 1];
 
         System.runAs(curUser) {
             //浜у搧淇℃伅
@@ -141,11 +114,7 @@
             //invoiceorder.Order_ProType__c = 'ET';
             insert invoiceorder;
 
-            invoiceorder = [
-                SELECT id, Name
-                FROM Consumable_order__c
-                WHERE id = :invoiceorder.id
-            ];
+            invoiceorder = [SELECT id, Name FROM Consumable_order__c WHERE id = :invoiceorder.id];
             //鍑哄簱鍗�
 
             Consumable_order__c testList1 = new Consumable_order__c(
@@ -283,25 +252,10 @@
 
     static testMethod void conInvoiceViewTestedit_2() {
         user curUser = [SELECT Id FROM User WHERE LastName = 'TestUser' LIMIT 1];
-        Account acc = [
-            SELECT Id
-            FROM Account
-            WHERE name = 'Testaccount002'
-            LIMIT 1
-        ];
+        Account acc = [SELECT Id FROM Account WHERE name = 'Testaccount002' LIMIT 1];
         Account hosp1 = [SELECT Id FROM Account WHERE name = 'Testhosp001' LIMIT 1];
-        Account agency1 = [
-            SELECT Id
-            FROM Account
-            WHERE name = 'Testhosp001'
-            LIMIT 1
-        ];
-        Account agency2 = [
-            SELECT Id
-            FROM Account
-            WHERE name = 'Testhosp002'
-            LIMIT 1
-        ];
+        Account agency1 = [SELECT Id FROM Account WHERE name = 'Testhosp001' LIMIT 1];
+        Account agency2 = [SELECT Id FROM Account WHERE name = 'Testhosp002' LIMIT 1];
         System.runAs(curUser) {
             //鍙戠エ淇℃伅
             Consumable_order__c invoiceorder = new Consumable_order__c();
@@ -316,11 +270,7 @@
             //invoiceorder.Order_ProType__c = 'ET';
             insert invoiceorder;
 
-            invoiceorder = [
-                SELECT id, Name
-                FROM Consumable_order__c
-                WHERE id = :invoiceorder.id
-            ];
+            invoiceorder = [SELECT id, Name FROM Consumable_order__c WHERE id = :invoiceorder.id];
 
             Consumable_order__c testList1 = new Consumable_order__c(
                 Name = 'Test1',
@@ -402,25 +352,10 @@
 
     static testMethod void conInvoiceViewTestedit_3() {
         user curUser = [SELECT Id FROM User WHERE LastName = 'TestUser' LIMIT 1];
-        Account acc = [
-            SELECT Id
-            FROM Account
-            WHERE name = 'Testaccount002'
-            LIMIT 1
-        ];
+        Account acc = [SELECT Id FROM Account WHERE name = 'Testaccount002' LIMIT 1];
         Account hosp1 = [SELECT Id FROM Account WHERE name = 'Testhosp001' LIMIT 1];
-        Account agency1 = [
-            SELECT Id
-            FROM Account
-            WHERE name = 'Testhosp001'
-            LIMIT 1
-        ];
-        Account agency2 = [
-            SELECT Id
-            FROM Account
-            WHERE name = 'Testhosp002'
-            LIMIT 1
-        ];
+        Account agency1 = [SELECT Id FROM Account WHERE name = 'Testhosp001' LIMIT 1];
+        Account agency2 = [SELECT Id FROM Account WHERE name = 'Testhosp002' LIMIT 1];
         System.runAs(curUser) {
             //浜у搧淇℃伅
             Product2 prod01 = new Product2(
@@ -448,11 +383,7 @@
             //invoiceorder.Order_ProType__c = 'ET';
             insert invoiceorder;
 
-            invoiceorder = [
-                SELECT id, Name
-                FROM Consumable_order__c
-                WHERE id = :invoiceorder.id
-            ];
+            invoiceorder = [SELECT id, Name FROM Consumable_order__c WHERE id = :invoiceorder.id];
 
             Consumable_order__c testList1 = new Consumable_order__c(
                 Name = 'Test1',
@@ -542,25 +473,10 @@
     //鏂板缓鍙戠エ 浠ュ強缂栬緫鍙戠エinvoiceId== NULL and deliveryId== NULL
     static testMethod void conInvoiceViewTestinit() {
         user curUser = [SELECT Id FROM User WHERE LastName = 'TestUser' LIMIT 1];
-        Account acc = [
-            SELECT Id
-            FROM Account
-            WHERE name = 'Testaccount002'
-            LIMIT 1
-        ];
+        Account acc = [SELECT Id FROM Account WHERE name = 'Testaccount002' LIMIT 1];
         Account hosp1 = [SELECT Id FROM Account WHERE name = 'Testhosp001' LIMIT 1];
-        Account agency1 = [
-            SELECT Id
-            FROM Account
-            WHERE name = 'Testhosp001'
-            LIMIT 1
-        ];
-        Account agency2 = [
-            SELECT Id
-            FROM Account
-            WHERE name = 'Testhosp002'
-            LIMIT 1
-        ];
+        Account agency1 = [SELECT Id FROM Account WHERE name = 'Testhosp001' LIMIT 1];
+        Account agency2 = [SELECT Id FROM Account WHERE name = 'Testhosp002' LIMIT 1];
 
         System.runAs(curUser) {
             //浜у搧淇℃伅
@@ -598,11 +514,7 @@
             //invoiceorder.Order_ProType__c = 'ET';
             insert invoiceorder;
 
-            invoiceorder = [
-                SELECT id, Name
-                FROM Consumable_order__c
-                WHERE id = :invoiceorder.id
-            ];
+            invoiceorder = [SELECT id, Name FROM Consumable_order__c WHERE id = :invoiceorder.id];
             //鍑哄簱鍗�
             //Consumable_order__c testList1 = new Consumable_order__c(Name='Test1',Summons_Sale_Status__c='鍑鸿揣',SummonsStatus_c__c='宸插畬鎴�',Order_ForHospital__c =hosp1.Id,SummonsForDirction__c='鐩存帴閿�鍞粰鍖婚櫌',Order_status__c='鑽夋涓�',Order_type__c='浼犵エ',Order_ForDealer__c = agency1.Id, Dealer_info__c=myAccount1.Id,ConInvoice_Code__c = invoiceorder.id);
             //Consumable_order__c testList2 = new Consumable_order__c(Name='Test2',Summons_Sale_Status__c='鍑鸿揣',SummonsStatus_c__c='宸插畬鎴�',Order_ForHospital__c =hosp1.Id,SummonsForDirction__c='鐩存帴閿�鍞粰鍖婚櫌',Order_status__c='宸叉彁浜�',Order_type__c='浼犵エ',Order_ForDealer__c = agency1.Id, Dealer_info__c=myAccount1.Id,ConInvoice_Code__c = invoiceorder.id);
@@ -736,25 +648,10 @@
     //鏂板缓鍙戠エ 浠ュ強缂栬緫鍙戠エinvoiceId== NULL and deliveryId<> NULL
     static testMethod void conInvoiceViewTestinit_1() {
         user curUser = [SELECT Id FROM User WHERE LastName = 'TestUser' LIMIT 1];
-        Account acc = [
-            SELECT Id
-            FROM Account
-            WHERE name = 'Testaccount002'
-            LIMIT 1
-        ];
+        Account acc = [SELECT Id FROM Account WHERE name = 'Testaccount002' LIMIT 1];
         Account hosp1 = [SELECT Id FROM Account WHERE name = 'Testhosp001' LIMIT 1];
-        Account agency1 = [
-            SELECT Id
-            FROM Account
-            WHERE name = 'Testhosp001'
-            LIMIT 1
-        ];
-        Account agency2 = [
-            SELECT Id
-            FROM Account
-            WHERE name = 'Testhosp002'
-            LIMIT 1
-        ];
+        Account agency1 = [SELECT Id FROM Account WHERE name = 'Testhosp001' LIMIT 1];
+        Account agency2 = [SELECT Id FROM Account WHERE name = 'Testhosp002' LIMIT 1];
         System.runAs(curUser) {
             //浜у搧淇℃伅
             Product2 prod01 = new Product2(
@@ -790,11 +687,7 @@
             invoiceorder.Dealer_Info__c = acc.Id;
             insert invoiceorder;
 
-            invoiceorder = [
-                SELECT id, Name
-                FROM Consumable_order__c
-                WHERE id = :invoiceorder.id
-            ];
+            invoiceorder = [SELECT id, Name FROM Consumable_order__c WHERE id = :invoiceorder.id];
             //鍑哄簱鍗�
             //Consumable_order__c testList1 = new Consumable_order__c(Name='Test1',Summons_Sale_Status__c='鍑鸿揣',SummonsStatus_c__c='宸插畬鎴�',Order_ForHospital__c =hosp1.Id,SummonsForDirction__c='鐩存帴閿�鍞粰鍖婚櫌',Order_status__c='鑽夋涓�',Order_type__c='浼犵エ',Order_ForDealer__c = agency1.Id, Dealer_info__c=myAccount1.Id,ConInvoice_Code__c = invoiceorder.id);
             //Consumable_order__c testList2 = new Consumable_order__c(Name='Test2',Summons_Sale_Status__c='鍑鸿揣',SummonsStatus_c__c='宸插畬鎴�',Order_ForHospital__c =hosp1.Id,SummonsForDirction__c='鐩存帴閿�鍞粰鍖婚櫌',Order_status__c='宸叉彁浜�',Order_type__c='浼犵エ',Order_ForDealer__c = agency1.Id, Dealer_info__c=myAccount1.Id,ConInvoice_Code__c = invoiceorder.id);
@@ -929,25 +822,10 @@
     //鏂板缓鍙戠エ 浠ュ強缂栬緫鍙戠エinvoiceId<> NULL
     static testMethod void conInvoiceViewTestinit_2() {
         user curUser = [SELECT Id FROM User WHERE LastName = 'TestUser' LIMIT 1];
-        Account acc = [
-            SELECT Id
-            FROM Account
-            WHERE name = 'Testaccount002'
-            LIMIT 1
-        ];
+        Account acc = [SELECT Id FROM Account WHERE name = 'Testaccount002' LIMIT 1];
         Account hosp1 = [SELECT Id FROM Account WHERE name = 'Testhosp001' LIMIT 1];
-        Account agency1 = [
-            SELECT Id
-            FROM Account
-            WHERE name = 'Testhosp001'
-            LIMIT 1
-        ];
-        Account agency2 = [
-            SELECT Id
-            FROM Account
-            WHERE name = 'Testhosp002'
-            LIMIT 1
-        ];
+        Account agency1 = [SELECT Id FROM Account WHERE name = 'Testhosp001' LIMIT 1];
+        Account agency2 = [SELECT Id FROM Account WHERE name = 'Testhosp002' LIMIT 1];
         System.runAs(curUser) {
             //浜у搧淇℃伅
             Product2 prod01 = new Product2(
@@ -983,11 +861,7 @@
             invoiceorder.Dealer_Info__c = acc.Id;
             insert invoiceorder;
 
-            invoiceorder = [
-                SELECT id, Name
-                FROM Consumable_order__c
-                WHERE id = :invoiceorder.id
-            ];
+            invoiceorder = [SELECT id, Name FROM Consumable_order__c WHERE id = :invoiceorder.id];
             //鍑哄簱鍗�
             //Consumable_order__c testList1 = new Consumable_order__c(Name='Test1',Summons_Sale_Status__c='鍑鸿揣',SummonsStatus_c__c='宸插畬鎴�',Order_ForHospital__c =hosp1.Id,SummonsForDirction__c='鐩存帴閿�鍞粰鍖婚櫌',Order_status__c='鑽夋涓�',Order_type__c='浼犵エ',Order_ForDealer__c = agency1.Id, Dealer_info__c=myAccount1.Id,ConInvoice_Code__c = invoiceorder.id);
             //Consumable_order__c testList2 = new Consumable_order__c(Name='Test2',Summons_Sale_Status__c='鍑鸿揣',SummonsStatus_c__c='宸插畬鎴�',Order_ForHospital__c =hosp1.Id,SummonsForDirction__c='鐩存帴閿�鍞粰鍖婚櫌',Order_status__c='宸叉彁浜�',Order_type__c='浼犵エ',Order_ForDealer__c = agency1.Id, Dealer_info__c=myAccount1.Id,ConInvoice_Code__c = invoiceorder.id);
@@ -1132,25 +1006,10 @@
     }
     static testMethod void conInvoiceViewTestoutOrderchange() {
         user curUser = [SELECT Id FROM User WHERE LastName = 'TestUser' LIMIT 1];
-        Account acc = [
-            SELECT Id
-            FROM Account
-            WHERE name = 'Testaccount002'
-            LIMIT 1
-        ];
+        Account acc = [SELECT Id FROM Account WHERE name = 'Testaccount002' LIMIT 1];
         Account hosp1 = [SELECT Id FROM Account WHERE name = 'Testhosp001' LIMIT 1];
-        Account agency1 = [
-            SELECT Id
-            FROM Account
-            WHERE name = 'Testhosp001'
-            LIMIT 1
-        ];
-        Account agency2 = [
-            SELECT Id
-            FROM Account
-            WHERE name = 'Testhosp002'
-            LIMIT 1
-        ];
+        Account agency1 = [SELECT Id FROM Account WHERE name = 'Testhosp001' LIMIT 1];
+        Account agency2 = [SELECT Id FROM Account WHERE name = 'Testhosp002' LIMIT 1];
         System.runAs(curUser) {
             //浜у搧淇℃伅
             Product2 prod01 = new Product2(
@@ -1186,11 +1045,7 @@
             invoiceorder.Dealer_Info__c = acc.Id;
             insert invoiceorder;
 
-            invoiceorder = [
-                SELECT id, Name
-                FROM Consumable_order__c
-                WHERE id = :invoiceorder.id
-            ];
+            invoiceorder = [SELECT id, Name FROM Consumable_order__c WHERE id = :invoiceorder.id];
             //鍑哄簱鍗�
 
             Consumable_order__c testList1 = new Consumable_order__c(
@@ -1288,25 +1143,10 @@
 
     static testMethod void conInvoiceViewTestgetdefaultMapinfo() {
         user curUser = [SELECT Id FROM User WHERE LastName = 'TestUser' LIMIT 1];
-        Account acc = [
-            SELECT Id
-            FROM Account
-            WHERE name = 'Testaccount002'
-            LIMIT 1
-        ];
+        Account acc = [SELECT Id FROM Account WHERE name = 'Testaccount002' LIMIT 1];
         Account hosp1 = [SELECT Id FROM Account WHERE name = 'Testhosp001' LIMIT 1];
-        Account agency1 = [
-            SELECT Id
-            FROM Account
-            WHERE name = 'Testhosp001'
-            LIMIT 1
-        ];
-        Account agency2 = [
-            SELECT Id
-            FROM Account
-            WHERE name = 'Testhosp002'
-            LIMIT 1
-        ];
+        Account agency1 = [SELECT Id FROM Account WHERE name = 'Testhosp001' LIMIT 1];
+        Account agency2 = [SELECT Id FROM Account WHERE name = 'Testhosp002' LIMIT 1];
         System.runAs(curUser) {
             //浜у搧淇℃伅
             Product2 prod01 = new Product2(
@@ -1342,11 +1182,7 @@
             invoiceorder.Dealer_Info__c = acc.Id;
             insert invoiceorder;
 
-            invoiceorder = [
-                SELECT id, Name
-                FROM Consumable_order__c
-                WHERE id = :invoiceorder.id
-            ];
+            invoiceorder = [SELECT id, Name FROM Consumable_order__c WHERE id = :invoiceorder.id];
             //鍑哄簱鍗�
 
             Consumable_order__c testList1 = new Consumable_order__c(
@@ -1449,25 +1285,10 @@
     //浠庡嚭搴撳崟鐩存帴寮�绁�
     static testMethod void conInvoiceViewRedirectTest() {
         user curUser = [SELECT Id FROM User WHERE LastName = 'TestUser' LIMIT 1];
-        Account acc = [
-            SELECT Id
-            FROM Account
-            WHERE name = 'Testaccount002'
-            LIMIT 1
-        ];
+        Account acc = [SELECT Id FROM Account WHERE name = 'Testaccount002' LIMIT 1];
         Account hosp1 = [SELECT Id FROM Account WHERE name = 'Testhosp001' LIMIT 1];
-        Account agency1 = [
-            SELECT Id
-            FROM Account
-            WHERE name = 'Testhosp001'
-            LIMIT 1
-        ];
-        Account agency2 = [
-            SELECT Id
-            FROM Account
-            WHERE name = 'Testhosp002'
-            LIMIT 1
-        ];
+        Account agency1 = [SELECT Id FROM Account WHERE name = 'Testhosp001' LIMIT 1];
+        Account agency2 = [SELECT Id FROM Account WHERE name = 'Testhosp002' LIMIT 1];
         System.runAs(curUser) {
             //浜у搧淇℃伅
             Product2 prod01 = new Product2(
@@ -1503,11 +1324,7 @@
             invoiceorder.Dealer_Info__c = acc.Id;
             insert invoiceorder;
 
-            invoiceorder = [
-                SELECT id, Name
-                FROM Consumable_order__c
-                WHERE id = :invoiceorder.id
-            ];
+            invoiceorder = [SELECT id, Name FROM Consumable_order__c WHERE id = :invoiceorder.id];
             //鍑哄簱鍗�
             //Consumable_order__c testList1 = new Consumable_order__c(Name='Test1',Summons_Sale_Status__c='鍑鸿揣',SummonsStatus_c__c='宸插畬鎴�',Order_ForHospital__c =hosp1.Id,SummonsForDirction__c='鐩存帴閿�鍞粰鍖婚櫌',Order_status__c='鑽夋涓�',Order_type__c='浼犵エ',Order_ForDealer__c = agency1.Id, Dealer_info__c=myAccount1.Id,ConInvoice_Code__c = invoiceorder.id);
             //Consumable_order__c testList2 = new Consumable_order__c(Name='Test2',Summons_Sale_Status__c='鍑鸿揣',SummonsStatus_c__c='宸插畬鎴�',Order_ForHospital__c =hosp1.Id,SummonsForDirction__c='鐩存帴閿�鍞粰鍖婚櫌',Order_status__c='宸叉彁浜�',Order_type__c='浼犵エ',Order_ForDealer__c = agency1.Id, Dealer_info__c=myAccount1.Id,ConInvoice_Code__c = invoiceorder.id);
@@ -1643,25 +1460,10 @@
     //鎻愪氦
     static testMethod void conInvoiceViewTestapproval() {
         user curUser = [SELECT Id FROM User WHERE LastName = 'TestUser' LIMIT 1];
-        Account acc = [
-            SELECT Id
-            FROM Account
-            WHERE name = 'Testaccount002'
-            LIMIT 1
-        ];
+        Account acc = [SELECT Id FROM Account WHERE name = 'Testaccount002' LIMIT 1];
         Account hosp1 = [SELECT Id FROM Account WHERE name = 'Testhosp001' LIMIT 1];
-        Account agency1 = [
-            SELECT Id
-            FROM Account
-            WHERE name = 'Testhosp001'
-            LIMIT 1
-        ];
-        Account agency2 = [
-            SELECT Id
-            FROM Account
-            WHERE name = 'Testhosp002'
-            LIMIT 1
-        ];
+        Account agency1 = [SELECT Id FROM Account WHERE name = 'Testhosp001' LIMIT 1];
+        Account agency2 = [SELECT Id FROM Account WHERE name = 'Testhosp002' LIMIT 1];
         System.runAs(curUser) {
             //浜у搧淇℃伅
             Product2 prod01 = new Product2(
@@ -1698,11 +1500,7 @@
             invoiceorder.Dealer_Info__c = acc.Id;
             insert invoiceorder;
 
-            invoiceorder = [
-                SELECT id, Name
-                FROM Consumable_order__c
-                WHERE id = :invoiceorder.id
-            ];
+            invoiceorder = [SELECT id, Name FROM Consumable_order__c WHERE id = :invoiceorder.id];
             //鍑哄簱鍗�
             //Consumable_order__c testList1 = new Consumable_order__c(Name='Test1',Summons_Sale_Status__c='鍑鸿揣',SummonsStatus_c__c='宸插畬鎴�',Order_ForHospital__c =hosp1.Id,SummonsForDirction__c='鐩存帴閿�鍞粰鍖婚櫌',Order_status__c='鑽夋涓�',Order_type__c='浼犵エ',Order_ForDealer__c = agency1.Id, Dealer_info__c=myAccount1.Id,ConInvoice_Code__c = invoiceorder.id);
             //Consumable_order__c testList2 = new Consumable_order__c(Name='Test2',Summons_Sale_Status__c='鍑鸿揣',SummonsStatus_c__c='宸插畬鎴�',Order_ForHospital__c =hosp1.Id,SummonsForDirction__c='鐩存帴閿�鍞粰鍖婚櫌',Order_status__c='宸叉彁浜�',Order_type__c='浼犵エ',Order_ForDealer__c = agency1.Id, Dealer_info__c=myAccount1.Id,ConInvoice_Code__c = invoiceorder.id);
@@ -1925,24 +1723,9 @@
     //鎻愪氦鍙戠エ
     static testMethod void conInvoice_approval() {
         user curUser = [SELECT Id FROM User WHERE LastName = 'TestUser' LIMIT 1];
-        Account acc = [
-            SELECT Id
-            FROM Account
-            WHERE name = 'Testaccount002'
-            LIMIT 1
-        ];
-        Account agency1 = [
-            SELECT Id
-            FROM Account
-            WHERE name = 'Testhosp001'
-            LIMIT 1
-        ];
-        Account agency2 = [
-            SELECT Id
-            FROM Account
-            WHERE name = 'Testhosp002'
-            LIMIT 1
-        ];
+        Account acc = [SELECT Id FROM Account WHERE name = 'Testaccount002' LIMIT 1];
+        Account agency1 = [SELECT Id FROM Account WHERE name = 'Testhosp001' LIMIT 1];
+        Account agency2 = [SELECT Id FROM Account WHERE name = 'Testhosp002' LIMIT 1];
         Account hosp1 = [SELECT Id FROM Account WHERE name = 'Testhosp001' LIMIT 1];
         Oly_TriggerHandler.bypass('ConsumableAssetHander');
         Oly_TriggerHandler.bypass('Oly_TriggerHandler');
@@ -2123,25 +1906,10 @@
     //鏂板缓鍙戠エ 浠ュ強缂栬緫鍙戠エ invoiceId<>null
     static testMethod void rentestreopen() {
         user curUser = [SELECT Id FROM User WHERE LastName = 'TestUser' LIMIT 1];
-        Account acc = [
-            SELECT Id
-            FROM Account
-            WHERE name = 'Testaccount002'
-            LIMIT 1
-        ];
+        Account acc = [SELECT Id FROM Account WHERE name = 'Testaccount002' LIMIT 1];
         Account hosp1 = [SELECT Id FROM Account WHERE name = 'Testhosp001' LIMIT 1];
-        Account agency1 = [
-            SELECT Id
-            FROM Account
-            WHERE name = 'Testhosp001'
-            LIMIT 1
-        ];
-        Account agency2 = [
-            SELECT Id
-            FROM Account
-            WHERE name = 'Testhosp002'
-            LIMIT 1
-        ];
+        Account agency1 = [SELECT Id FROM Account WHERE name = 'Testhosp001' LIMIT 1];
+        Account agency2 = [SELECT Id FROM Account WHERE name = 'Testhosp002' LIMIT 1];
         System.runAs(curUser) {
             //浜у搧淇℃伅
             Product2 prod01 = new Product2(
@@ -2178,11 +1946,7 @@
             //invoiceorder.Order_ProType__c = 'ET';
             insert invoiceorder;
 
-            invoiceorder = [
-                SELECT id, Name
-                FROM Consumable_order__c
-                WHERE id = :invoiceorder.id
-            ];
+            invoiceorder = [SELECT id, Name FROM Consumable_order__c WHERE id = :invoiceorder.id];
             //鍑哄簱鍗�
 
             Consumable_order__c testList1 = new Consumable_order__c(
@@ -2375,25 +2139,10 @@
     //鏂板缓鍙戠エ 浠ュ強缂栬緫鍙戠エ invoiceId<>null
     static testMethod void rentestreopen001() {
         user curUser = [SELECT Id FROM User WHERE LastName = 'TestUser' LIMIT 1];
-        Account acc = [
-            SELECT Id
-            FROM Account
-            WHERE name = 'Testaccount002'
-            LIMIT 1
-        ];
+        Account acc = [SELECT Id FROM Account WHERE name = 'Testaccount002' LIMIT 1];
         Account hosp1 = [SELECT Id FROM Account WHERE name = 'Testhosp001' LIMIT 1];
-        Account agency1 = [
-            SELECT Id
-            FROM Account
-            WHERE name = 'Testhosp001'
-            LIMIT 1
-        ];
-        Account agency2 = [
-            SELECT Id
-            FROM Account
-            WHERE name = 'Testhosp002'
-            LIMIT 1
-        ];
+        Account agency1 = [SELECT Id FROM Account WHERE name = 'Testhosp001' LIMIT 1];
+        Account agency2 = [SELECT Id FROM Account WHERE name = 'Testhosp002' LIMIT 1];
         System.runAs(curUser) {
             //浜у搧淇℃伅
             Product2 prod01 = new Product2(
@@ -2430,11 +2179,7 @@
             //invoiceorder.Order_ProType__c = 'ET';
             insert invoiceorder;
 
-            invoiceorder = [
-                SELECT id, Name
-                FROM Consumable_order__c
-                WHERE id = :invoiceorder.id
-            ];
+            invoiceorder = [SELECT id, Name FROM Consumable_order__c WHERE id = :invoiceorder.id];
             //鍑哄簱鍗�
 
             Consumable_order__c testList1 = new Consumable_order__c(
@@ -2582,25 +2327,10 @@
     //鏂板缓鍙戠エ 浠ュ強缂栬緫鍙戠エ invoiceId<>null
     static testMethod void allinit() {
         user curUser = [SELECT Id FROM User WHERE LastName = 'TestUser' LIMIT 1];
-        Account acc = [
-            SELECT Id
-            FROM Account
-            WHERE name = 'Testaccount002'
-            LIMIT 1
-        ];
+        Account acc = [SELECT Id FROM Account WHERE name = 'Testaccount002' LIMIT 1];
         Account hosp1 = [SELECT Id FROM Account WHERE name = 'Testhosp001' LIMIT 1];
-        Account agency1 = [
-            SELECT Id
-            FROM Account
-            WHERE name = 'Testhosp001'
-            LIMIT 1
-        ];
-        Account agency2 = [
-            SELECT Id
-            FROM Account
-            WHERE name = 'Testhosp002'
-            LIMIT 1
-        ];
+        Account agency1 = [SELECT Id FROM Account WHERE name = 'Testhosp001' LIMIT 1];
+        Account agency2 = [SELECT Id FROM Account WHERE name = 'Testhosp002' LIMIT 1];
         System.runAs(curUser) {
             //鍑嗗鏁版嵁
             // Consumable_order__c  Id = deliveryId  //鍑哄簱鍗�
@@ -2641,11 +2371,7 @@
             //invoiceorder.Order_ProType__c = 'ET';
             insert invoiceorder;
 
-            invoiceorder = [
-                SELECT id, Name
-                FROM Consumable_order__c
-                WHERE id = :invoiceorder.id
-            ];
+            invoiceorder = [SELECT id, Name FROM Consumable_order__c WHERE id = :invoiceorder.id];
             //鍑哄簱鍗�
 
             Consumable_order__c testList1 = new Consumable_order__c(
@@ -2798,25 +2524,10 @@
     }
     static testMethod void allsave() {
         user curUser = [SELECT Id FROM User WHERE LastName = 'TestUser' LIMIT 1];
-        Account acc = [
-            SELECT Id
-            FROM Account
-            WHERE name = 'Testaccount002'
-            LIMIT 1
-        ];
+        Account acc = [SELECT Id FROM Account WHERE name = 'Testaccount002' LIMIT 1];
         Account hosp1 = [SELECT Id FROM Account WHERE name = 'Testhosp001' LIMIT 1];
-        Account agency1 = [
-            SELECT Id
-            FROM Account
-            WHERE name = 'Testhosp001'
-            LIMIT 1
-        ];
-        Account agency2 = [
-            SELECT Id
-            FROM Account
-            WHERE name = 'Testhosp002'
-            LIMIT 1
-        ];
+        Account agency1 = [SELECT Id FROM Account WHERE name = 'Testhosp001' LIMIT 1];
+        Account agency2 = [SELECT Id FROM Account WHERE name = 'Testhosp002' LIMIT 1];
         System.runAs(curUser) {
             //鍙戠エ淇℃伅
             Consumable_order__c invoiceorder = new Consumable_order__c();
@@ -2875,25 +2586,10 @@
     }
     static testMethod void allsave1() {
         user curUser = [SELECT Id FROM User WHERE LastName = 'TestUser' LIMIT 1];
-        Account acc = [
-            SELECT Id
-            FROM Account
-            WHERE name = 'Testaccount002'
-            LIMIT 1
-        ];
+        Account acc = [SELECT Id FROM Account WHERE name = 'Testaccount002' LIMIT 1];
         Account hosp1 = [SELECT Id FROM Account WHERE name = 'Testhosp001' LIMIT 1];
-        Account agency1 = [
-            SELECT Id
-            FROM Account
-            WHERE name = 'Testhosp001'
-            LIMIT 1
-        ];
-        Account agency2 = [
-            SELECT Id
-            FROM Account
-            WHERE name = 'Testhosp002'
-            LIMIT 1
-        ];
+        Account agency1 = [SELECT Id FROM Account WHERE name = 'Testhosp001' LIMIT 1];
+        Account agency2 = [SELECT Id FROM Account WHERE name = 'Testhosp002' LIMIT 1];
         System.runAs(curUser) {
             //鍙戠エ淇℃伅
             Consumable_order__c invoiceorder = new Consumable_order__c();
@@ -3013,25 +2709,10 @@
 
     static testMethod void allsave2() {
         user curUser = [SELECT Id FROM User WHERE LastName = 'TestUser' LIMIT 1];
-        Account acc = [
-            SELECT Id
-            FROM Account
-            WHERE name = 'Testaccount002'
-            LIMIT 1
-        ];
+        Account acc = [SELECT Id FROM Account WHERE name = 'Testaccount002' LIMIT 1];
         Account hosp1 = [SELECT Id FROM Account WHERE name = 'Testhosp001' LIMIT 1];
-        Account agency1 = [
-            SELECT Id
-            FROM Account
-            WHERE name = 'Testhosp001'
-            LIMIT 1
-        ];
-        Account agency2 = [
-            SELECT Id
-            FROM Account
-            WHERE name = 'Testhosp002'
-            LIMIT 1
-        ];
+        Account agency1 = [SELECT Id FROM Account WHERE name = 'Testhosp001' LIMIT 1];
+        Account agency2 = [SELECT Id FROM Account WHERE name = 'Testhosp002' LIMIT 1];
         System.runAs(curUser) {
             //鍙戠エ淇℃伅
             Consumable_order__c invoiceorder = new Consumable_order__c();
@@ -3089,25 +2770,10 @@
 
     static testMethod void allsave3() {
         user curUser = [SELECT Id FROM User WHERE LastName = 'TestUser' LIMIT 1];
-        Account acc = [
-            SELECT Id
-            FROM Account
-            WHERE name = 'Testaccount002'
-            LIMIT 1
-        ];
+        Account acc = [SELECT Id FROM Account WHERE name = 'Testaccount002' LIMIT 1];
         Account hosp1 = [SELECT Id FROM Account WHERE name = 'Testhosp001' LIMIT 1];
-        Account agency1 = [
-            SELECT Id
-            FROM Account
-            WHERE name = 'Testhosp001'
-            LIMIT 1
-        ];
-        Account agency2 = [
-            SELECT Id
-            FROM Account
-            WHERE name = 'Testhosp002'
-            LIMIT 1
-        ];
+        Account agency1 = [SELECT Id FROM Account WHERE name = 'Testhosp001' LIMIT 1];
+        Account agency2 = [SELECT Id FROM Account WHERE name = 'Testhosp002' LIMIT 1];
         System.runAs(curUser) {
             Product2 prod01 = new Product2(
                 Name = 'Test01',
@@ -3222,25 +2888,10 @@
 
     static testMethod void allsave4() {
         user curUser = [SELECT Id FROM User WHERE LastName = 'TestUser' LIMIT 1];
-        Account acc = [
-            SELECT Id
-            FROM Account
-            WHERE name = 'Testaccount002'
-            LIMIT 1
-        ];
+        Account acc = [SELECT Id FROM Account WHERE name = 'Testaccount002' LIMIT 1];
         Account hosp1 = [SELECT Id FROM Account WHERE name = 'Testhosp001' LIMIT 1];
-        Account agency1 = [
-            SELECT Id
-            FROM Account
-            WHERE name = 'Testhosp001'
-            LIMIT 1
-        ];
-        Account agency2 = [
-            SELECT Id
-            FROM Account
-            WHERE name = 'Testhosp002'
-            LIMIT 1
-        ];
+        Account agency1 = [SELECT Id FROM Account WHERE name = 'Testhosp001' LIMIT 1];
+        Account agency2 = [SELECT Id FROM Account WHERE name = 'Testhosp002' LIMIT 1];
         System.runAs(curUser) {
             //鍙戠エ淇℃伅
             Consumable_order__c invoiceorder = new Consumable_order__c();
@@ -3301,12 +2952,7 @@
 
     static testMethod void allsave5() {
         user curUser = [SELECT Id FROM User WHERE LastName = 'TestUser' LIMIT 1];
-        Account acc = [
-            SELECT Id
-            FROM Account
-            WHERE name = 'Testaccount002'
-            LIMIT 1
-        ];
+        Account acc = [SELECT Id FROM Account WHERE name = 'Testaccount002' LIMIT 1];
         System.runAs(curUser) {
             //浜у搧淇℃伅
             Product2 prod01 = new Product2(
@@ -3425,12 +3071,7 @@
 
     static testMethod void allsave6() {
         user curUser = [SELECT Id FROM User WHERE LastName = 'TestUser' LIMIT 1];
-        Account acc = [
-            SELECT Id
-            FROM Account
-            WHERE name = 'Testaccount002'
-            LIMIT 1
-        ];
+        Account acc = [SELECT Id FROM Account WHERE name = 'Testaccount002' LIMIT 1];
         System.runAs(curUser) {
             //浜у搧淇℃伅
             Product2 prod01 = new Product2(
@@ -3573,12 +3214,7 @@
 
     static testMethod void allsave7() {
         user curUser = [SELECT Id FROM User WHERE LastName = 'TestUser' LIMIT 1];
-        Account acc = [
-            SELECT Id
-            FROM Account
-            WHERE name = 'Testaccount002'
-            LIMIT 1
-        ];
+        Account acc = [SELECT Id FROM Account WHERE name = 'Testaccount002' LIMIT 1];
         System.runAs(curUser) {
             //浜у搧淇℃伅
             Product2 prod01 = new Product2(

--
Gitblit v1.9.1