OlyMEBG.git - Gitblit

			@@ -1,5 +1,51 @@
			@isTest
			private class ArriveGoodsControllerTest {
			<<<<<<< HEAD
			//选择等待入库,包括01 和241
			@isTest
			static void arriveWithID() {
			// // TO DO: implement unit test
			List<RecordType> rectCo = [
			SELECT Id
			FROM RecordType
			WHERE IsActive = TRUE AND SobjectType = 'Account' AND Name = '販売店'
			];
			if (rectCo.size() == 0) {
			return;
			}
			// Profile prof = [select Id from Profile where Name ='901_经销商社区普通权限_2重验证(ET Email)'];
			Profile prof = [
			SELECT Id
			FROM Profile
			WHERE Name = '901_经销商社区普通权限_2重验证(ET)'
			];

			Account myAccount2 = new Account(
			name = 'Testaccount002',
			Dealer_discount__c = 20,
			RecordTypeId = rectCo[0].Id,
			AgentCode_Ext__c = '9999900'
			);
			Account myAccount1 = new Account(name = 'Testaccount001', Dealer_discount__c = 30, RecordTypeId = rectCo[0].Id);
			insert new List<account>{ myAccount1, myAccount2 };

			Contact core = new Contact(email = 'jplumber@salesforce.com', firstname = 'Joe', lastname = 'Plumber', accountid = myAccount1.id);
			insert core;
			user MyUser_Test = new User(
			ContactId = core.id,
			Alias = 'newUser',
			Email = 'newuser@testorg.com',
			EmailEncodingKey = 'UTF-8',
			LastName = 'TestUser',
			LanguageLocaleKey = 'zh_CN',
			LocaleSidKey = 'zh_CN',
			ProfileId = prof.Id,
			TimeZoneSidKey = 'Asia/Shanghai',
			UserName = 'testUser@testorg.com',
			UserPro_Type__c = 'ET'
			);
			System.runAs(new User(Id = UserInfo.getUserId())) {
			=======

			//选择等待入库,包括01 和241
			@isTest
			@@ -21,6 +67,7 @@
			insert core;
			user MyUser_Test = New User(ContactId = core.id,Alias = 'newUser',Email='newuser@testorg.com',EmailEncodingKey='UTF-8', LastName='TestUser', LanguageLocaleKey='zh_CN',LocaleSidKey='zh_CN', ProfileId = prof.Id,TimeZoneSidKey='Asia/Shanghai', UserName='testUser@testorg.com',UserPro_Type__c = 'ET');
			System.runAs(new User(Id = UserInfo.getUserId())){
			>>>>>>> LEXCommunityLiJun
			insert MyUser_Test;
			}

			@@ -28,6 +75,31 @@
			// Product2 prod01 = new Product2(Name='Test01',ProductCode='Test01',Asset_Model_No__c = 'Test01',SFDA_Status__c = '有効',JANCODE__c = '04953170200311',Dealer_special_Object__c = true,Manual_Entry__c = false);
			// Product2 prod02 = new Product2(Name='Test02',ProductCode='Test02',Asset_Model_No__c = 'Test02',SFDA_Status__c = '有効',JANCODE__c = '04953170200312',Dealer_special_Object__c = true,Manual_Entry__c = false);
			// insert new Product2[] {prod01,prod02};
			<<<<<<< HEAD
			System.runAs(MyUser_Test) {
			Product2 prod01 = new Product2(
			Name = 'Test01',
			ProductCode = 'Test01',
			Asset_Model_No__c = 'Test01',
			SFDA_Status__c = '有効',
			JANCODE__c = '04953170200311',
			Dealer_special_Object__c = true,
			Manual_Entry__c = false
			);
			Product2 prod02 = new Product2(
			Name = 'Test02',
			ProductCode = 'Test02',
			Asset_Model_No__c = 'Test02',
			SFDA_Status__c = '有効',
			JANCODE__c = '04953170200312',
			Dealer_special_Object__c = true,
			Manual_Entry__c = false
			);
			insert new List<Product2>{ prod01, prod02 };
			Product2__c pro1 = new Product2__c(Name = 'Pro001', OT_CODE_Text__c = 'N3047730', Product2__c = prod01.Id);
			Product2__c pro2 = new Product2__c(Name = 'Pro002', OT_CODE_Text__c = 'N3047731', Product2__c = prod02.Id);
			insert new List<Product2__c>{ pro1, pro2 };
			=======
			system.runAs(MyUser_Test){
			Product2 prod01 = new Product2(Name='Test01',ProductCode='Test01',Asset_Model_No__c = 'Test01',SFDA_Status__c = '有効',JANCODE__c = '04953170200311',Dealer_special_Object__c = true,Manual_Entry__c = false);
			Product2 prod02 = new Product2(Name='Test02',ProductCode='Test02',Asset_Model_No__c = 'Test02',SFDA_Status__c = '有効',JANCODE__c = '04953170200312',Dealer_special_Object__c = true,Manual_Entry__c = false);
			@@ -35,6 +107,7 @@
			Product2__c pro1 = new Product2__c(Name='Pro001',OT_CODE_Text__c='N3047730',Product2__c = prod01.Id);
			Product2__c pro2 = new Product2__c(Name='Pro002',OT_CODE_Text__c='N3047731',Product2__c = prod02.Id);
			insert new Product2__c[] {pro1, pro2};
			>>>>>>> LEXCommunityLiJun
			//订单

			Consumable_order__c Order1 = new Consumable_order__c();
			@@ -81,12 +154,68 @@
			// System.assertEquals(1, Controller.ConsumableorderdetailsRecords.size());
			// System.assertEquals(2, Controller.consumableInventory.size());
			Controller.ArriveGoodsConfim();
			<<<<<<< HEAD
			List<Consumable_order_details2__c> ins = [
			SELECT Id, Name
			FROM Consumable_order_details2__c
			];
			=======
			List<Consumable_order_details2__c> ins = [SELECT Id,Name FROM Consumable_order_details2__c];
			>>>>>>> LEXCommunityLiJun
			// System.assertEquals(3, ins.size());
			System.Test.stopTest();
			}
			}

			<<<<<<< HEAD
			//产品直接入库,包括01 和241
			@isTest
			static void arriveWithoutID() {
			// // TO DO: implement unit test
			List<RecordType> rectCo = [
			SELECT Id
			FROM RecordType
			WHERE IsActive = TRUE AND SobjectType = 'Account' AND Name = '販売店'
			];
			if (rectCo.size() == 0) {
			return;
			}
			// Profile prof = [select Id from Profile where Name ='901_经销商社区普通权限_2重验证(ET Email)'];
			Profile prof = [
			SELECT Id
			FROM Profile
			WHERE Name = '901_经销商社区普通权限_2重验证(ET)'
			];

			Account myAccount2 = new Account(
			name = 'Testaccount002',
			Dealer_discount__c = 20,
			RecordTypeId = rectCo[0].Id,
			AgentCode_Ext__c = '9999900'
			);
			Account myAccount1 = new Account(name = 'Testaccount001', Dealer_discount__c = 30, RecordTypeId = rectCo[0].Id);
			insert new List<account>{ myAccount1, myAccount2 };

			Contact core = new Contact(email = 'jplumber@salesforce.com', firstname = 'Joe', lastname = 'Plumber', accountid = myAccount1.id);
			insert core;
			user MyUser_Test = new User(
			ContactId = core.id,
			Alias = 'newUser',
			Email = 'newuser@testorg.com',
			EmailEncodingKey = 'UTF-8',
			LastName = 'TestUser',
			LanguageLocaleKey = 'zh_CN',
			LocaleSidKey = 'zh_CN',
			ProfileId = prof.Id,
			TimeZoneSidKey = 'Asia/Shanghai',
			UserName = 'testUser@testorg.com',
			UserPro_Type__c = 'ET'
			);
			System.runAs(new User(Id = UserInfo.getUserId())) {
			insert MyUser_Test;
			}

			=======

			//产品直接入库,包括01 和241
			@isTest
			@@ -111,10 +240,36 @@
			insert MyUser_Test;
			}

			>>>>>>> LEXCommunityLiJun
			// User MyUser_Test = [select id,Contact.accountid from User WHERE ProfileId = :prof.Id and IsActive = true and UserPro_Type__c = 'ET' limit 1 ];
			// Product2 prod01 = new Product2(Name='Test01',ProductCode='Test01',ProductCode_Ext__c = 'Test01',SFDA_Status__c = '有効',JANCODE__c = '04953170200311',Dealer_special_Object__c = true,Manual_Entry__c = false);
			// Product2 prod02 = new Product2(Name='Test02',ProductCode='N3047731',ProductCode_Ext__c = 'Test02',SFDA_Status__c = '有効',JANCODE__c = '04953170200312',Dealer_special_Object__c = true,Manual_Entry__c = false);
			// insert new Product2[] {prod01,prod02};
			<<<<<<< HEAD
			System.runAs(MyUser_Test) {
			Product2 prod01 = new Product2(
			Name = 'Test01',
			ProductCode = 'Test01',
			Asset_Model_No__c = 'Test01',
			SFDA_Status__c = '有効',
			JANCODE__c = '04953170200311',
			Dealer_special_Object__c = true,
			Manual_Entry__c = false
			);
			Product2 prod02 = new Product2(
			Name = 'Test02',
			ProductCode = 'Test02',
			Asset_Model_No__c = 'Test02',
			SFDA_Status__c = '有効',
			JANCODE__c = '04953170200312',
			Dealer_special_Object__c = true,
			Manual_Entry__c = false
			);
			insert new List<Product2>{ prod01, prod02 };
			Product2__c pro1 = new Product2__c(Name = 'Pro001', OT_CODE_Text__c = 'Test01', Product2__c = prod01.Id);
			Product2__c pro2 = new Product2__c(Name = 'Pro002', OT_CODE_Text__c = 'N3047731', Product2__c = prod02.Id);
			insert new List<Product2__c>{ pro1, pro2 };
			=======
			system.runAs(MyUser_Test){
			Product2 prod01 = new Product2(Name='Test01',ProductCode='Test01',Asset_Model_No__c = 'Test01',SFDA_Status__c = '有効',JANCODE__c = '04953170200311',Dealer_special_Object__c = true,Manual_Entry__c = false);
			Product2 prod02 = new Product2(Name='Test02',ProductCode='Test02',Asset_Model_No__c = 'Test02',SFDA_Status__c = '有効',JANCODE__c = '04953170200312',Dealer_special_Object__c = true,Manual_Entry__c = false);
			@@ -122,6 +277,7 @@
			Product2__c pro1 = new Product2__c(Name='Pro001',OT_CODE_Text__c='Test01',Product2__c = prod01.Id);
			Product2__c pro2 = new Product2__c(Name='Pro002',OT_CODE_Text__c='N3047731',Product2__c = prod02.Id);
			insert new Product2__c[] {pro1, pro2};
			>>>>>>> LEXCommunityLiJun
			PageReference page = new PageReference('/apex/ArriveGoods?ArrType=Arr');
			System.Test.setCurrentPage(page);
			ArriveGoodsController Controller = new ArriveGoodsController();
			@@ -134,20 +290,71 @@
			Controller.barcode = '01049531702003111115120017181000105ZK250BXJRF\n241N30477311115120017181000105ZK250BXJRA\n241Test021115120017181000105ZK250\n01049531702003111115120017181000105ZK250';
			Controller.SearchPro();
			Controller.ArriveGoodsConfim();
			<<<<<<< HEAD
			List<Consumable_order_details2__c> ins = [
			SELECT Id, Name
			FROM Consumable_order_details2__c
			WHERE Bar_Code__c IN ('01049531702003111115120017181000105ZK250BXJRF', '241N30477311115120017181000105ZK250BXJRA')
			];
			=======
			List<Consumable_order_details2__c> ins = [SELECT Id,Name FROM Consumable_order_details2__c WHERE Bar_Code__c in ('01049531702003111115120017181000105ZK250BXJRF','241N30477311115120017181000105ZK250BXJRA')];
			>>>>>>> LEXCommunityLiJun
			// System.assertEquals(2, ins.size());
			System.Test.stopTest();
			}
			}
			//整体到货
			@isTest
			<<<<<<< HEAD
			static void ArriveTest() {
			// // TO DO: implement unit test
			List<RecordType> rectCo = [
			SELECT Id
			FROM RecordType
			WHERE IsActive = TRUE AND SobjectType = 'Account' AND Name = '販売店'
			];
			=======
			static void ArriveTest() {
			// // TO DO: implement unit test
			List<RecordType> rectCo = [select Id from RecordType where IsActive = true and SobjectType = 'Account' and Name = '販売店'];
			>>>>>>> LEXCommunityLiJun
			if (rectCo.size() == 0) {
			return;
			}
			// Profile prof = [select Id from Profile where Name ='901_经销商社区普通权限_2重验证(ET Email)'];
			<<<<<<< HEAD
			Profile prof = [
			SELECT Id
			FROM Profile
			WHERE Name = '901_经销商社区普通权限_2重验证(ET)'
			];

			Oly_TriggerHandler.bypass('ConsumableAssetHander');
			Account myAccount2 = new Account(
			name = 'Testaccount002',
			Dealer_discount__c = 20,
			RecordTypeId = rectCo[0].Id,
			AgentCode_Ext__c = '9999900'
			);
			Account myAccount1 = new Account(name = 'Testaccount001', Dealer_discount__c = 30, RecordTypeId = rectCo[0].Id);
			insert new List<account>{ myAccount1, myAccount2 };
			Contact core = new Contact(email = 'jplumber@salesforce.com', firstname = 'Joe', lastname = 'Plumber', accountid = myAccount1.id);
			insert core;
			user MyUser_Test = new User(
			ContactId = core.id,
			Alias = 'newUser',
			Email = 'newuser@testorg.com',
			EmailEncodingKey = 'UTF-8',
			LastName = 'TestUser',
			LanguageLocaleKey = 'zh_CN',
			LocaleSidKey = 'zh_CN',
			ProfileId = prof.Id,
			TimeZoneSidKey = 'Asia/Shanghai',
			UserName = 'testUser@testorg.com',
			UserPro_Type__c = 'ET'
			);
			System.runAs(new User(Id = UserInfo.getUserId())) {
			=======
			Profile prof = [select Id from Profile where Name ='901_经销商社区普通权限_2重验证(ET)'];

			Oly_TriggerHandler.bypass('ConsumableAssetHander');
			@@ -158,6 +365,7 @@
			insert core;
			user MyUser_Test = New User(ContactId = core.id,Alias = 'newUser',Email='newuser@testorg.com',EmailEncodingKey='UTF-8', LastName='TestUser', LanguageLocaleKey='zh_CN',LocaleSidKey='zh_CN', ProfileId = prof.Id,TimeZoneSidKey='Asia/Shanghai', UserName='testUser@testorg.com',UserPro_Type__c = 'ET');
			System.runAs(new User(Id = UserInfo.getUserId())){
			>>>>>>> LEXCommunityLiJun
			insert MyUser_Test;
			}

			@@ -165,12 +373,37 @@
			// Product2 prod01 = new Product2(Name='Test01',ProductCode='Test01',Asset_Model_No__c = 'Test01',SFDA_Status__c = '有効',JANCODE__c = '04953170200311',Dealer_special_Object__c = true,Manual_Entry__c = false);
			// Product2 prod02 = new Product2(Name='Test02',ProductCode='Test02',Asset_Model_No__c = 'Test02',SFDA_Status__c = '有効',JANCODE__c = '04953170200312',Dealer_special_Object__c = true,Manual_Entry__c = false);
			// insert new Product2[] {prod01,prod02};
			<<<<<<< HEAD
			System.runAs(MyUser_Test) {
			Product2 prod01 = new Product2(
			Name = 'Test01',
			ProductCode = 'Test01',
			Asset_Model_No__c = 'Test01',
			SFDA_Status__c = '有効',
			JANCODE__c = '04953170200311',
			Dealer_special_Object__c = true,
			Manual_Entry__c = false
			);
			Product2 prod02 = new Product2(
			Name = 'Test02',
			ProductCode = 'Test02',
			Asset_Model_No__c = 'Test02',
			SFDA_Status__c = '有効',
			JANCODE__c = '04953170200312',
			Dealer_special_Object__c = true,
			Manual_Entry__c = false
			);
			insert new List<Product2>{ prod01, prod02 };
			Product2__c pro1 = new Product2__c(Name = 'Pro001', OT_CODE_Text__c = 'Test001', Product2__c = prod01.Id);
			insert new List<Product2__c>{ pro1 };
			=======
			system.runAs(MyUser_Test){
			Product2 prod01 = new Product2(Name='Test01',ProductCode='Test01',Asset_Model_No__c = 'Test01',SFDA_Status__c = '有効',JANCODE__c = '04953170200311',Dealer_special_Object__c = true,Manual_Entry__c = false);
			Product2 prod02 = new Product2(Name='Test02',ProductCode='Test02',Asset_Model_No__c = 'Test02',SFDA_Status__c = '有効',JANCODE__c = '04953170200312',Dealer_special_Object__c = true,Manual_Entry__c = false);
			insert new Product2[] {prod01,prod02};
			Product2__c pro1 = new Product2__c(Name='Pro001',OT_CODE_Text__c='Test001',Product2__c = prod01.Id);
			insert new Product2__c[] {pro1};
			>>>>>>> LEXCommunityLiJun
			// Account myAccount1 = new Account(name='Testaccount001',Dealer_discount__c =30,RecordTypeId = rectCo[0].Id);
			// insert myAccount1;
			Consumable_order__c Order2 = new Consumable_order__c();
			@@ -252,7 +485,10 @@
			Orderdet3.SerialLotNo__c = '5ZK';
			//Orderdet3.Box_Piece__c = '个';

			<<<<<<< HEAD
			=======

			>>>>>>> LEXCommunityLiJun
			//出库产品
			Consumable_order_details2__c Orderdet4 = new Consumable_order_details2__c();
			Orderdet4.Name = 'OCM_01_001005';
			@@ -261,7 +497,11 @@
			Orderdet4.Asset_Model_No__c = 'Test01';
			Orderdet4.RecordTypeId = System.Label.RT_ConOrderDetail2_Delivery;
			Orderdet4.Bar_Code__c = '01049531702003111115120017181000105ZK250BXJRD';
			<<<<<<< HEAD
			Orderdet4.Send_Date__c = Date.today();
			=======
			Orderdet4.Send_Date__c = Date.today();
			>>>>>>> LEXCommunityLiJun
			Orderdet4.Arrive_date__c = Date.today();
			Orderdet4.Box_Piece__c = '盒';
			Orderdet4.TracingCode__c = 'BXJRD';
			@@ -279,6 +519,13 @@
			Orderdet5.Consumable_Shipment_order__c = Order1.Id;
			Orderdet5.RecordTypeId = System.Label.RT_ConOrderDetail2_Delivery;
			Orderdet5.Bar_Code__c = '01049531702003111115120017181000105ZK250BXJRE';
			<<<<<<< HEAD
			Orderdet5.Arrive_date__c = Date.today();
			Orderdet5.Box_Piece__c = '盒';
			Orderdet5.TracingCode__c = 'BXJRE';
			Orderdet5.SerialLotNo__c = '5ZK';
			insert new List<Consumable_order_details2__c>{ Orderdet1, Orderdet2, Orderdet3, Orderdet4, Orderdet5 };
			=======
			Orderdet5.Arrive_date__c = Date.today();
			Orderdet5.Box_Piece__c = '盒';
			Orderdet5.TracingCode__c = 'BXJRE';
			@@ -286,6 +533,7 @@
			insert new Consumable_order_details2__c[] {Orderdet1, Orderdet2,Orderdet3,Orderdet4,Orderdet5};


			>>>>>>> LEXCommunityLiJun

			ArriveGoodsController Controller = new ArriveGoodsController();
			PageReference page = new PageReference('/apex/ArriveGoods?ArrType=Arr');
			@@ -300,20 +548,67 @@
			System.assertEquals('OCM_01_001002', controller.ConsumableorderdetailsRecords[0].esd.Name);
			// System.assertEquals(2, controller.ConsumableorderdetailsRecordserror.size());
			System.Test.stopTest();
			<<<<<<< HEAD
			=======


			>>>>>>> LEXCommunityLiJun
			}
			}

			//整体到货
			@isTest
			<<<<<<< HEAD
			static void ArriveTest1() {
			// // TO DO: implement unit test
			List<RecordType> rectCo = [
			SELECT Id
			FROM RecordType
			WHERE IsActive = TRUE AND SobjectType = 'Account' AND Name = '販売店'
			];
			=======
			static void ArriveTest1() {
			// // TO DO: implement unit test
			List<RecordType> rectCo = [select Id from RecordType where IsActive = true and SobjectType = 'Account' and Name = '販売店'];
			>>>>>>> LEXCommunityLiJun
			if (rectCo.size() == 0) {
			return;
			}
			// Profile prof = [select Id from Profile where Name ='901_经销商社区普通权限_2重验证(ET Email)'];
			<<<<<<< HEAD
			Profile prof = [
			SELECT Id
			FROM Profile
			WHERE Name = '901_经销商社区普通权限_2重验证(ET)'
			];

			Oly_TriggerHandler.bypass('ConsumableAssetHander');
			Account myAccount2 = new Account(
			name = 'Testaccount002',
			Dealer_discount__c = 20,
			RecordTypeId = rectCo[0].Id,
			AgentCode_Ext__c = '9999900'
			);
			Account myAccount1 = new Account(name = 'Testaccount001', Dealer_discount__c = 30, RecordTypeId = rectCo[0].Id);
			insert new List<account>{ myAccount1, myAccount2 };

			Contact core = new Contact(email = 'jplumber@salesforce.com', firstname = 'Joe', lastname = 'Plumber', accountid = myAccount1.id);
			insert core;
			user MyUser_Test = new User(
			ContactId = core.id,
			Alias = 'newUser',
			Email = 'newuser@testorg.com',
			EmailEncodingKey = 'UTF-8',
			LastName = 'TestUser',
			LanguageLocaleKey = 'zh_CN',
			LocaleSidKey = 'zh_CN',
			ProfileId = prof.Id,
			TimeZoneSidKey = 'Asia/Shanghai',
			UserName = 'testUser@testorg.com',
			UserPro_Type__c = 'ET'
			);
			System.runAs(new User(Id = UserInfo.getUserId())) {
			=======
			Profile prof = [select Id from Profile where Name ='901_经销商社区普通权限_2重验证(ET)'];

			Oly_TriggerHandler.bypass('ConsumableAssetHander');
			@@ -325,6 +620,7 @@
			insert core;
			user MyUser_Test = New User(ContactId = core.id,Alias = 'newUser',Email='newuser@testorg.com',EmailEncodingKey='UTF-8', LastName='TestUser', LanguageLocaleKey='zh_CN',LocaleSidKey='zh_CN', ProfileId = prof.Id,TimeZoneSidKey='Asia/Shanghai', UserName='testUser@testorg.com',UserPro_Type__c = 'ET');
			System.runAs(new User(Id = UserInfo.getUserId())){
			>>>>>>> LEXCommunityLiJun
			insert MyUser_Test;
			}

			@@ -332,6 +628,31 @@
			// Product2 prod01 = new Product2(Name='Test01',ProductCode='Test01',Asset_Model_No__c = 'Test01',SFDA_Status__c = '有効',JANCODE__c = '04953170200311',Dealer_special_Object__c = true,Manual_Entry__c = false);
			// Product2 prod02 = new Product2(Name='Test02',ProductCode='Test02',Asset_Model_No__c = 'Test02',SFDA_Status__c = '有効',JANCODE__c = '04953170200312',Dealer_special_Object__c = true,Manual_Entry__c = false);
			// insert new Product2[] {prod01,prod02};
			<<<<<<< HEAD
			System.runAs(MyUser_Test) {
			Product2 prod01 = new Product2(
			Name = 'Test01',
			ProductCode = 'Test01',
			Asset_Model_No__c = 'Test01',
			SFDA_Status__c = '有効',
			JANCODE__c = '04953170200311',
			Dealer_special_Object__c = true,
			Manual_Entry__c = false
			);
			Product2 prod02 = new Product2(
			Name = 'Test02',
			ProductCode = 'Test02',
			Asset_Model_No__c = 'Test02',
			SFDA_Status__c = '有効',
			JANCODE__c = '04953170200312',
			Dealer_special_Object__c = true,
			Manual_Entry__c = false
			);
			insert new List<Product2>{ prod01, prod02 };
			Product2__c pro1 = new Product2__c(Name = 'Pro001', OT_CODE_Text__c = 'Test001', Product2__c = prod01.Id);
			Product2__c pro2 = new Product2__c(Name = 'Pro002', OT_CODE_Text__c = 'Test002', Product2__c = prod02.Id);
			insert new List<Product2__c>{ pro1, pro2 };
			=======
			system.runAs(MyUser_Test){
			Product2 prod01 = new Product2(Name='Test01',ProductCode='Test01',Asset_Model_No__c = 'Test01',SFDA_Status__c = '有効',JANCODE__c = '04953170200311',Dealer_special_Object__c = true,Manual_Entry__c = false);
			Product2 prod02 = new Product2(Name='Test02',ProductCode='Test02',Asset_Model_No__c = 'Test02',SFDA_Status__c = '有効',JANCODE__c = '04953170200312',Dealer_special_Object__c = true,Manual_Entry__c = false);
			@@ -339,6 +660,7 @@
			Product2__c pro1 = new Product2__c(Name='Pro001',OT_CODE_Text__c='Test001',Product2__c = prod01.Id);
			Product2__c pro2 = new Product2__c(Name='Pro002',OT_CODE_Text__c='Test002',Product2__c = prod02.Id);
			insert new Product2__c[] {pro1, pro2};
			>>>>>>> LEXCommunityLiJun
			// Account myAccount1 = new Account(name='Testaccount001',Dealer_discount__c =30,RecordTypeId = rectCo[0].Id);
			// insert myAccount1;
			Consumable_order__c Order2 = new Consumable_order__c();
			@@ -418,7 +740,10 @@
			Orderdet3.TracingCode__c = 'BXJRC';
			Orderdet3.SerialLotNo__c = '5ZK';

			<<<<<<< HEAD
			=======

			>>>>>>> LEXCommunityLiJun
			//出库产品
			Consumable_order_details2__c Orderdet4 = new Consumable_order_details2__c();
			Orderdet4.Name = 'OCM_01_001005';
			@@ -427,7 +752,11 @@
			Orderdet4.Asset_Model_No__c = 'Test01';
			Orderdet4.RecordTypeId = System.Label.RT_ConOrderDetail2_Delivery;
			Orderdet4.Bar_Code__c = '01049531702003111115120017181000105ZK250BXJRD';
			<<<<<<< HEAD
			Orderdet4.Send_Date__c = Date.today();
			=======
			Orderdet4.Send_Date__c = Date.today();
			>>>>>>> LEXCommunityLiJun
			Orderdet4.TracingCode__c = 'BXJRD';
			Orderdet4.SerialLotNo__c = '5ZK';
			//Orderdet4.Box_Piece__c = '盒';
			@@ -443,6 +772,13 @@
			Orderdet5.Consumable_Shipment_order__c = Order1.Id;
			Orderdet5.RecordTypeId = System.Label.RT_ConOrderDetail2_Delivery;
			Orderdet5.Bar_Code__c = '01049531702003111115120017181000105ZK250BXJRE';
			<<<<<<< HEAD
			Orderdet5.Arrive_date__c = Date.today();
			Orderdet5.Box_Piece__c = '盒';
			Orderdet5.TracingCode__c = 'BXJRE';
			Orderdet5.SerialLotNo__c = '5ZK';
			insert new List<Consumable_order_details2__c>{ Orderdet1, Orderdet2, Orderdet3, Orderdet4, Orderdet5 };
			=======
			Orderdet5.Arrive_date__c = Date.today();
			Orderdet5.Box_Piece__c = '盒';
			Orderdet5.TracingCode__c = 'BXJRE';
			@@ -450,6 +786,7 @@
			insert new Consumable_order_details2__c[] {Orderdet1, Orderdet2,Orderdet3,Orderdet4,Orderdet5};


			>>>>>>> LEXCommunityLiJun

			ArriveGoodsController Controller = new ArriveGoodsController();
			PageReference page = new PageReference('/apex/ArriveGoods?ArrType=Arr');
			@@ -464,6 +801,191 @@
			System.assertEquals('OCM_01_001002', controller.ConsumableorderdetailsRecords[0].esd.Name);
			// System.assertEquals(1, controller.ConsumableorderdetailsRecordserror.size());
			System.Test.stopTest();
			<<<<<<< HEAD
			}
			}

			//返品
			@isTest
			static void productReturn() {
			// // TO DO: implement unit test
			List<RecordType> rectCo = [
			SELECT Id
			FROM RecordType
			WHERE IsActive = TRUE AND SobjectType = 'Account' AND Name = '販売店'
			];
			if (rectCo.size() == 0) {
			return;
			}
			// Profile prof = [select Id from Profile where Name ='901_经销商社区普通权限_2重验证(ET Email)'];
			Profile prof = [
			SELECT Id
			FROM Profile
			WHERE Name = '901_经销商社区普通权限_2重验证(ET)'
			];

			Account myAccount2 = new Account(
			name = 'Testaccount002',
			Dealer_discount__c = 20,
			RecordTypeId = rectCo[0].Id,
			AgentCode_Ext__c = '9999900'
			);
			Account myAccount1 = new Account(name = 'Testaccount001', Dealer_discount__c = 30, RecordTypeId = rectCo[0].Id);
			insert new List<account>{ myAccount1, myAccount2 };

			Contact core = new Contact(email = 'jplumber@salesforce.com', firstname = 'Joe', lastname = 'Plumber', accountid = myAccount1.id);
			insert core;
			user MyUser_Test = new User(
			ContactId = core.id,
			Alias = 'newUser',
			Email = 'newuser@testorg.com',
			EmailEncodingKey = 'UTF-8',
			LastName = 'TestUser',
			LanguageLocaleKey = 'zh_CN',
			LocaleSidKey = 'zh_CN',
			ProfileId = prof.Id,
			TimeZoneSidKey = 'Asia/Shanghai',
			UserName = 'testUser@testorg.com',
			UserPro_Type__c = 'ET'
			);
			System.runAs(new User(Id = UserInfo.getUserId())) {
			insert MyUser_Test;
			}

			// User MyUser_Test = [select id,Contact.accountid from User WHERE ProfileId = :prof.Id and IsActive = true and UserPro_Type__c = 'ET' limit 1 ];
			// Product2 prod01 = new Product2(Name='Test01',ProductCode='Test01',Asset_Model_No__c = 'Test01',SFDA_Status__c = '有効',JANCODE__c = '04953170200311',Dealer_special_Object__c = true,Manual_Entry__c = false);
			// Product2 prod02 = new Product2(Name='Test02',ProductCode='Test02',Asset_Model_No__c = 'Test02',SFDA_Status__c = '有効',JANCODE__c = '04953170200312',Dealer_special_Object__c = true,Manual_Entry__c = false);
			// insert new Product2[] {prod01,prod02};
			System.runAs(MyUser_Test) {
			Product2 prod01 = new Product2(
			Name = 'Test01',
			ProductCode = 'Test01',
			Asset_Model_No__c = 'Test01',
			SFDA_Status__c = '有効',
			JANCODE__c = '04953170200311',
			Dealer_special_Object__c = true,
			Manual_Entry__c = false
			);
			Product2 prod02 = new Product2(
			Name = 'Test02',
			ProductCode = 'Test02',
			Asset_Model_No__c = 'Test02',
			SFDA_Status__c = '有効',
			JANCODE__c = '04953170200312',
			Dealer_special_Object__c = true,
			Manual_Entry__c = false
			);
			insert new List<Product2>{ prod01, prod02 };
			Product2__c pro1 = new Product2__c(Name = 'Pro001', OT_CODE_Text__c = 'Test001', Product2__c = prod01.Id);
			Product2__c pro2 = new Product2__c(Name = 'Pro002', OT_CODE_Text__c = 'Test002', Product2__c = prod02.Id);
			insert new List<Product2__c>{ pro1, pro2 };
			//订单

			Consumable_order__c Order1 = new Consumable_order__c();
			Order1.Name = 'OCM_01_001';
			Order1.Order_status__c = '批准';
			Order1.Order_type__c = '订单';
			Order1.Dealer_Info__c = myAccount1.id;
			Order1.RecordTypeid = System.Label.RT_ConOrder_Delivery;
			Order1.Order_ProType__c = 'ET';
			//返品订单

			Consumable_order__c Order2 = new Consumable_order__c();
			Order2.Name = 'OCM_01_002';
			Order2.Order_status__c = '批准';
			Order2.Order_type__c = '返品';
			Order2.Dealer_Info__c = myAccount1.id;
			Order2.RecordTypeid = System.Label.Dealer_Returned_Label;
			insert Order1;
			insert Order2;

			//订单明细
			//fahuo
			Consumable_orderdetails__c Orderdet = new Consumable_orderdetails__c();
			Orderdet.Name = 'OCM_01_00101';
			Orderdet.Consumable_order__c = Order1.Id;
			Orderdet.RecordTypeId = System.Label.RT_ConOrderDetail1_Order;
			Orderdet.Consumable_Product__c = pro1.Id;
			Orderdet.Consumable_count__c = 4;
			insert Orderdet;

			//发货明细
			//fahuo
			Consumable_order_details2__c Orderdet1 = new Consumable_order_details2__c();
			Orderdet1.Name = 'OCM_01_001001';
			Orderdet1.Consumable_order_minor__c = Order1.Id;
			Orderdet1.Consumable_Product__c = pro1.Id;
			Orderdet1.Asset_Model_No__c = 'Pro001';
			Orderdet1.RecordTypeId = System.Label.RT_ConOrderDetail2_Delivery;
			Orderdet1.Bar_Code__c = '01049531702003111115120017181000105ZK250BXJRF';
			Orderdet1.TracingCode__c = 'BXJRF';
			//daohuo
			Consumable_order_details2__c Orderdet2 = new Consumable_order_details2__c();
			Orderdet2.Name = 'OCM_01_001002';
			Orderdet2.Consumable_order_minor__c = Order1.Id;
			Orderdet2.Consumable_Product__c = pro1.Id;
			Orderdet2.Asset_Model_No__c = 'Pro001';
			Orderdet2.Consumable_Arrived_order__c = Order1.Id;
			//Orderdet2.IsArrival__c = true;
			Orderdet2.Arrive_date__c = Date.today();
			Orderdet2.RecordTypeId = System.Label.RT_ConOrderDetail2_Delivery;
			Orderdet2.Bar_Code__c = '01049531702003111115120017181000105ZK250BXJRI';
			Orderdet2.TracingCode__c = 'BXJRF';
			//sale
			Consumable_order_details2__c Orderdet3 = new Consumable_order_details2__c();
			Orderdet3.Name = 'OCM_01_001003';
			Orderdet3.Consumable_order_minor__c = Order1.Id;
			Orderdet3.Consumable_Product__c = pro1.Id;
			Orderdet3.Asset_Model_No__c = 'Pro001';
			Orderdet3.Consumable_Arrived_order__c = Order1.Id;
			//Orderdet3.IsArrival__c = true;
			Orderdet3.Arrive_date__c = Date.today();
			Orderdet3.Used_date__c = Date.today();
			Orderdet3.Consumable_Sale_order__c = Order1.Id;
			Orderdet3.RecordTypeId = System.Label.RT_ConOrderDetail2_Delivery;
			Orderdet3.Bar_Code__c = '01049531702003111115120017181000105ZK250BXJRJ';
			Orderdet3.Box_Piece__c = '盒';
			Orderdet3.TracingCode__c = 'BXJRF';
			//出库
			Consumable_order_details2__c Orderdet4 = new Consumable_order_details2__c();
			Orderdet4.Name = 'OCM_01_001004';
			Orderdet4.Consumable_order_minor__c = Order1.Id;
			Orderdet4.Consumable_Product__c = pro1.Id;
			Orderdet4.Asset_Model_No__c = 'Pro001';
			Orderdet4.Consumable_Arrived_order__c = Order1.Id;
			//Orderdet4.IsArrival__c = true;
			Orderdet4.Arrive_date__c = Date.today();
			Orderdet4.Send_Date__c = Date.today();
			Orderdet4.Consumable_Shipment_order__c = Order1.Id;
			Orderdet4.RecordTypeId = System.Label.RT_ConOrderDetail2_Delivery;
			Orderdet4.Bar_Code__c = '01049531702003111115120017181000105ZK250BXJRN';
			Orderdet4.Box_Piece__c = '个';
			Orderdet4.TracingCode__c = 'BXJRF';
			//quxiao
			Consumable_order_details2__c Orderdet5 = new Consumable_order_details2__c();
			Orderdet5.Name = 'OCM_01_001005';
			Orderdet5.Consumable_order_minor__c = Order1.Id;
			Orderdet5.Consumable_Product__c = pro1.Id;
			Orderdet5.Asset_Model_No__c = 'Pro001';
			Orderdet5.Cancellation_Date__c = Date.today();
			Orderdet5.RecordTypeId = System.Label.RT_ConOrderDetail2_Delivery;
			Orderdet5.Bar_Code__c = '01049531702003111115120017181000105ZK250BXJRZ';
			Orderdet5.Box_Piece__c = '盒';
			Orderdet5.TracingCode__c = 'BXJRF';
			//fanpin
			Consumable_order_details2__c Orderdet6 = new Consumable_order_details2__c();
			Orderdet6.Name = 'OCM_01_001006';
			Orderdet6.Consumable_order_minor__c = Order1.Id;
			Orderdet6.Consumable_Product__c = pro1.Id;
			Orderdet6.Asset_Model_No__c = 'Pro001';
			Orderdet6.Consumable_Return_order__c = Order2.Id;
			Orderdet6.RecordTypeId = System.Label.RT_ConOrderDetail2_Delivery;
			Orderdet6.Bar_Code__c = '01049531702003111115120017181000105ZK250BXJRA';
			Orderdet6.Box_Piece__c = '个';
			Orderdet6.TracingCode__c = 'BXJRF';

			insert new List<Consumable_order_details2__c>{ Orderdet1, Orderdet2, Orderdet3, Orderdet4, Orderdet5, Orderdet6 };
			=======


			}
			@@ -612,6 +1134,7 @@
			Orderdet6.TracingCode__c = 'BXJRF';

			insert new Consumable_order_details2__c[] {Orderdet1, Orderdet2,Orderdet3,Orderdet4,Orderdet5,Orderdet6};
			>>>>>>> LEXCommunityLiJun
			PageReference page = new PageReference('/apex/ArriveGoods?ArrType=ReG');
			System.Test.setCurrentPage(page);
			ArriveGoodsController Controller = new ArriveGoodsController();
			@@ -629,26 +1152,129 @@
			//System.assertEquals('OCM_01_001002', controller.ConsumableorderdetailsRecordserror[2].esd.Name);
			//System.assertEquals('OCM_02_001001', controller.ConsumableorderdetailsRecordserror[3].esd.Name);
			Controller.GoodsReturnCheck();
			<<<<<<< HEAD
			controller.ShowGoodsofReturnList[0].esd.Return_reason__c = '多发';
			controller.ShowGoodsofReturnList[0].esd.Rrturn_count__c = 1;
			=======
			controller.ShowGoodsofReturnList[0].esd.Return_reason__c='多发';
			controller.ShowGoodsofReturnList[0].esd.Rrturn_count__c =1;
			>>>>>>> LEXCommunityLiJun
			//System.assertEquals(1, controller.ShowGoodsofReturnList.size());
			Controller.UpdateGoodsOfReturn();
			Controller.ToReturnGoodsPage();
			Controller.geterrorsize();
			System.Test.stopTest();
			<<<<<<< HEAD
			=======

			>>>>>>> LEXCommunityLiJun
			}
			}

			//返品
			@isTest
			<<<<<<< HEAD
			static void productReturn_new() {
			// // TO DO: implement unit test
			List<RecordType> rectCo = [
			SELECT Id
			FROM RecordType
			WHERE IsActive = TRUE AND SobjectType = 'Account' AND Name = '販売店'
			];
			=======
			static void productReturn_new() {
			// // TO DO: implement unit test
			List<RecordType> rectCo = [select Id from RecordType where IsActive = true and SobjectType = 'Account' and Name = '販売店'];
			>>>>>>> LEXCommunityLiJun
			if (rectCo.size() == 0) {
			return;
			}
			// Profile prof = [select Id from Profile where Name ='901_经销商社区普通权限_2重验证(ET Email)'];
			<<<<<<< HEAD
			Profile prof = [
			SELECT Id
			FROM Profile
			WHERE Name = '901_经销商社区普通权限_2重验证(ET)'
			];

			Account myAccount2 = new Account(
			name = 'Testaccount002',
			Dealer_discount__c = 20,
			RecordTypeId = rectCo[0].Id,
			AgentCode_Ext__c = '9999900'
			);
			Account myAccount1 = new Account(name = 'Testaccount001', Dealer_discount__c = 30, RecordTypeId = rectCo[0].Id);
			insert new List<account>{ myAccount1, myAccount2 };

			Contact core = new Contact(email = 'jplumber@salesforce.com', firstname = 'Joe', lastname = 'Plumber', accountid = myAccount1.id);
			insert core;
			user MyUser_Test = new User(
			ContactId = core.id,
			Alias = 'newUser',
			Email = 'newuser@testorg.com',
			EmailEncodingKey = 'UTF-8',
			LastName = 'TestUser',
			LanguageLocaleKey = 'zh_CN',
			LocaleSidKey = 'zh_CN',
			ProfileId = prof.Id,
			TimeZoneSidKey = 'Asia/Shanghai',
			UserName = 'testUser@testorg.com',
			UserPro_Type__c = 'ET'
			);
			System.runAs(new User(Id = UserInfo.getUserId())) {
			insert MyUser_Test;
			}

			// User MyUser_Test = [select id,Contact.accountid from User WHERE ProfileId = :prof.Id and IsActive = true and UserPro_Type__c = 'ET' limit 1 ];
			// Product2 prod01 = new Product2(Name='Test01',ProductCode='Test01',Asset_Model_No__c = 'Test01',SFDA_Status__c = '有効',JANCODE__c = '04953170200311',Dealer_special_Object__c = true,Manual_Entry__c = false);
			// Product2 prod02 = new Product2(Name='Test02',ProductCode='Test02',Asset_Model_No__c = 'Test02',SFDA_Status__c = '有効',JANCODE__c = '04953170200312',Dealer_special_Object__c = true,Manual_Entry__c = false);
			// insert new Product2[] {prod01,prod02};
			System.runAs(MyUser_Test) {
			Product2 prod01 = new Product2(
			Name = 'Test01',
			ProductCode = 'Test01',
			Asset_Model_No__c = 'Test01',
			SFDA_Status__c = '有効',
			JANCODE__c = '04953170200311',
			Dealer_special_Object__c = true,
			Manual_Entry__c = false
			);
			Product2 prod02 = new Product2(
			Name = 'Test02',
			ProductCode = 'Test02',
			Asset_Model_No__c = 'Test02',
			SFDA_Status__c = '有効',
			JANCODE__c = '04953170200312',
			Dealer_special_Object__c = true,
			Manual_Entry__c = false
			);
			insert new List<Product2>{ prod01, prod02 };
			Product2__c pro1 = new Product2__c(Name = 'Pro001', OT_CODE_Text__c = 'Test001', Product2__c = prod01.Id);
			Product2__c pro2 = new Product2__c(Name = 'Pro002', OT_CODE_Text__c = 'Test002', Product2__c = prod02.Id);
			insert new List<Product2__c>{ pro1, pro2 };
			//订单
			Consumable_order__c Order1 = new Consumable_order__c();
			Order1.Name = 'OCM_01_001';
			Order1.Order_status__c = '批准';
			Order1.Order_type__c = '订单';
			Order1.Dealer_Info__c = myAccount1.id;
			Order1.RecordTypeid = System.Label.RT_ConOrder_Delivery;
			Order1.Order_ProType__c = 'ET';
			insert Order1;
			//Consumable_order__c coc = [select Dealer_Info__r.name from Consumable_order__c where Id =:Order1.Id];
			//system.assertEquals('qeee',coc.Dealer_Info__r.name);

			//订单明细
			//fahuo
			Consumable_orderdetails__c Orderdet = new Consumable_orderdetails__c();
			Orderdet.Name = 'OCM_01_001001';
			Orderdet.Consumable_order__c = Order1.Id;
			Orderdet.RecordTypeId = System.Label.RT_ConOrderDetail1_Order;
			Orderdet.Consumable_Product__c = pro1.Id;
			Orderdet.Consumable_count__c = 4;
			insert Orderdet;

			=======
			Profile prof = [select Id from Profile where Name ='901_经销商社区普通权限_2重验证(ET)'];


			@@ -696,6 +1322,7 @@
			Orderdet.Consumable_count__c = 4;
			insert Orderdet;

			>>>>>>> LEXCommunityLiJun
			//发货明细
			//fahuo
			/*Consumable_order_details2__c Orderdet1 = new Consumable_order_details2__c();
			@@ -729,8 +1356,13 @@
			Orderdet3.Consumable_Arrived_order__c = Order1.Id;
			//Orderdet3.IsArrival__c = true;
			Orderdet3.Consumable_Sale_order__c = Order1.Id;
			<<<<<<< HEAD
			Orderdet3.Box_Piece__c = '盒';
			Orderdet3.Used_date__c = Date.today();
			=======
			Orderdet3.Box_Piece__c ='盒';
			Orderdet3.Used_date__c= Date.today();
			>>>>>>> LEXCommunityLiJun
			Orderdet3.Arrive_date__c = Date.today();
			Orderdet3.RecordTypeId = System.Label.RT_ConOrderDetail2_Delivery;
			Orderdet3.Bar_Code__c = '01049531702003111115120017181000105ZK250BXJRF';
			@@ -745,7 +1377,11 @@
			Orderdet4.Consumable_Arrived_order__c = Order1.Id;
			//Orderdet4.IsArrival__c = true;
			Orderdet4.Consumable_Shipment_order__c = Order1.Id;
			<<<<<<< HEAD
			Orderdet4.Box_Piece__c = '个';
			=======
			Orderdet4.Box_Piece__c ='个';
			>>>>>>> LEXCommunityLiJun
			Orderdet4.Send_Date__c = Date.today();
			Orderdet4.Arrive_date__c = Date.today();
			Orderdet4.RecordTypeId = System.Label.RT_ConOrderDetail2_Delivery;
			@@ -762,10 +1398,17 @@
			Orderdet5.Cancellation_Flag__c = true;
			Orderdet5.RecordTypeId = System.Label.RT_ConOrderDetail2_Delivery;
			Orderdet5.Bar_Code__c = '01049531702003111115120017181000105ZK250BXJRZ';
			<<<<<<< HEAD
			Orderdet5.Box_Piece__c = '个';
			Orderdet5.TracingCode__c = 'BXJRZ';
			Orderdet5.SerialLotNo__c = '5ZK';
			insert new List<Consumable_order_details2__c>{ Orderdet3, Orderdet4, Orderdet5 };
			=======
			Orderdet5.Box_Piece__c ='个';
			Orderdet5.TracingCode__c = 'BXJRZ';
			Orderdet5.SerialLotNo__c = '5ZK';
			insert new Consumable_order_details2__c[] {Orderdet3,Orderdet4,Orderdet5};
			>>>>>>> LEXCommunityLiJun

			PageReference page = new PageReference('/apex/ArriveGoods?ArrType=ReG');
			System.Test.setCurrentPage(page);
			@@ -778,12 +1421,21 @@
			Controller.SearchPro();
			// System.assertEquals(1, controller.ConsumableorderdetailsRecordserror.size());
			System.assertEquals(2, controller.ShowGoodsofReturnList.size());
			<<<<<<< HEAD
			controller.ShowGoodsofReturnList[0].esd.Return_reason__c = '多发';
			controller.ShowGoodsofReturnList[1].esd.Return_reason__c = '多发';
			controller.ShowGoodsofReturnList[0].esd.Rrturn_count__c = 1;
			Controller.UpdateGoodsOfReturn();

			list<String> list1 = new List<String>();
			=======
			controller.ShowGoodsofReturnList[0].esd.Return_reason__c='多发';
			controller.ShowGoodsofReturnList[1].esd.Return_reason__c='多发';
			controller.ShowGoodsofReturnList[0].esd.Rrturn_count__c =1;
			Controller.UpdateGoodsOfReturn();

			list<String> list1 = new list<String>();
			>>>>>>> LEXCommunityLiJun
			list1.add(Controller.barcode = '01234567898');
			Controller.inventoryEntryNoESetId(list1);

			@@ -846,19 +1498,184 @@
			list1.add(Controller.barcode = '0112345678901231106789012105625001234');
			Controller.inventoryEntryNoESetId(list1);
			System.Test.stopTest();
			<<<<<<< HEAD
			=======

			>>>>>>> LEXCommunityLiJun
			}
			}

			//直接到货
			@isTest
			<<<<<<< HEAD
			static void arrivedirect() {
			// // TO DO: implement unit test
			List<RecordType> rectCo = [
			SELECT Id
			FROM RecordType
			WHERE IsActive = TRUE AND SobjectType = 'Account' AND Name = '販売店'
			];
			=======
			static void arrivedirect() {
			// // TO DO: implement unit test
			List<RecordType> rectCo = [select Id from RecordType where IsActive = true and SobjectType = 'Account' and Name = '販売店'];
			>>>>>>> LEXCommunityLiJun
			if (rectCo.size() == 0) {
			return;
			}
			// Profile prof = [select Id from Profile where Name ='901_经销商社区普通权限_2重验证(ET Email)'];
			<<<<<<< HEAD
			Profile prof = [
			SELECT Id
			FROM Profile
			WHERE Name = '901_经销商社区普通权限_2重验证(ET)'
			];

			Account myAccount2 = new Account(
			name = 'Testaccount002',
			Dealer_discount__c = 20,
			RecordTypeId = rectCo[0].Id,
			AgentCode_Ext__c = '9999900'
			);
			Account myAccount1 = new Account(name = 'Testaccount001', Dealer_discount__c = 30, RecordTypeId = rectCo[0].Id);
			insert new List<account>{ myAccount1, myAccount2 };

			Contact core = new Contact(email = 'jplumber@salesforce.com', firstname = 'Joe', lastname = 'Plumber', accountid = myAccount1.id);
			insert core;
			user MyUser_Test = new User(
			ContactId = core.id,
			Alias = 'newUser',
			Email = 'newuser@testorg.com',
			EmailEncodingKey = 'UTF-8',
			LastName = 'TestUser',
			LanguageLocaleKey = 'zh_CN',
			LocaleSidKey = 'zh_CN',
			ProfileId = prof.Id,
			TimeZoneSidKey = 'Asia/Shanghai',
			UserName = 'testUser@testorg.com',
			UserPro_Type__c = 'ET'
			);
			System.runAs(new User(Id = UserInfo.getUserId())) {
			insert MyUser_Test;
			}

			// User MyUser_Test = [select id,Contact.accountid from User WHERE ProfileId = :prof.Id and IsActive = true and UserPro_Type__c = 'ET' limit 1 ];
			// Product2 prod01 = new Product2(Name='Test01',ProductCode='Test01',Asset_Model_No__c = 'Test01',SFDA_Status__c = '有効',JANCODE__c = '04953170200311',Dealer_special_Object__c = true,Manual_Entry__c = false);
			// Product2 prod02 = new Product2(Name='Test02',ProductCode='Test02',Asset_Model_No__c = 'Test02',SFDA_Status__c = '有効',JANCODE__c = '04953170200312',Dealer_special_Object__c = true,Manual_Entry__c = false);
			// insert new Product2[] {prod01,prod02};
			System.runAs(MyUser_Test) {
			Product2 prod01 = new Product2(
			Name = 'Test01',
			ProductCode = 'Test01',
			Asset_Model_No__c = 'Test01',
			SFDA_Status__c = '有効',
			JANCODE__c = '04953170200311',
			Dealer_special_Object__c = true,
			Manual_Entry__c = false
			);
			Product2 prod02 = new Product2(
			Name = 'Test02',
			ProductCode = 'Test02',
			Asset_Model_No__c = 'Test02',
			SFDA_Status__c = '有効',
			JANCODE__c = '04953170200312',
			Dealer_special_Object__c = true,
			Manual_Entry__c = false
			);
			insert new List<Product2>{ prod01, prod02 };
			Product2__c pro1 = new Product2__c(Name = 'Pro001', OT_CODE_Text__c = '2344', Product2__c = prod01.Id);
			Product2__c pro2 = new Product2__c(Name = 'Pro002', OT_CODE_Text__c = '82324', Product2__c = prod02.Id);
			insert new List<Product2__c>{ pro1, pro2 };
			//产品注册证
			Product_Register__c prc = new Product_Register__c(
			Name = '国械注进20162220210',
			MedPrdClass__c = '3',
			ValidFrom__c = date.newinstance(2018, 7, 22),
			ValidTo__c = date.newinstance(2028, 7, 22),
			RegisterNoClass_Old__c = '6815',
			RegisterNoClass_New__c = '6815',
			RegisterNoStatus__c = '有效'
			);
			insert prc;
			//新旧关系对照表
			//Product_Register_contrast__c prcc = new Product_Register_contrast__c(
			// Name = 'Test20181204',
			// Register_new__c = '314',
			// Register_old__c = '36815'
			// );
			//insert prcc;
			//产品-产品注册证关系 prod01
			Product_Register_Link__c prlc = new Product_Register_Link__c(Product2__c = prod01.Id, Product_Register__c = prc.Id);
			insert prlc;
			//产品-产品注册证关系 prod02
			Product_Register_Link__c prlc2 = new Product_Register_Link__c(Product2__c = prod02.Id, Product_Register__c = prc.Id);
			insert prlc2;
			//订单

			Consumable_order__c Order1 = new Consumable_order__c();
			Order1.Name = 'OCM_01_001';
			Order1.Order_status__c = '批准';
			Order1.Order_type__c = '订单';
			Order1.Dealer_Info__c = myAccount1.id;
			Order1.RecordTypeid = System.Label.RT_ConOrder_Delivery;
			insert Order1;

			//订单明细
			//fahuo
			Consumable_orderdetails__c Orderdet = new Consumable_orderdetails__c();
			Orderdet.Name = 'OCM_01_00101';
			Orderdet.Consumable_order__c = Order1.Id;
			Orderdet.RecordTypeId = System.Label.RT_ConOrderDetail1_Order;
			Orderdet.Consumable_Product__c = pro1.Id;
			Orderdet.Consumable_count__c = 4;
			insert Orderdet;

			//发货明细
			//fahuo
			Consumable_order_details2__c Orderdet1 = new Consumable_order_details2__c();
			Orderdet1.Name = 'OCM_01_001001';
			Orderdet1.Consumable_order_minor__c = Order1.Id;
			Orderdet1.Consumable_Product__c = pro1.Id;
			Orderdet1.Asset_Model_No__c = 'Test01';
			Orderdet1.RecordTypeId = System.Label.RT_ConOrderDetail2_Delivery;
			Orderdet1.Bar_Code__c = '01049531702003111115120017181000105ZK250BXJRF';
			//daohuo
			Consumable_order_details2__c Orderdet2 = new Consumable_order_details2__c();
			Orderdet2.Name = 'OCM_01_001002';
			Orderdet2.Consumable_order_minor__c = Order1.Id;
			Orderdet2.Consumable_Product__c = pro1.Id;
			Orderdet2.Asset_Model_No__c = 'Test01';
			Orderdet2.Consumable_Arrived_order__c = Order1.Id;
			//Orderdet2.IsArrival__c = true;
			Orderdet2.RecordTypeId = System.Label.RT_ConOrderDetail2_Delivery;
			Orderdet2.Bar_Code__c = '01049531702003111115120017181000105ZK250BXJRI';
			//sale
			Consumable_order_details2__c Orderdet3 = new Consumable_order_details2__c();
			Orderdet3.Name = 'OCM_01_001003';
			Orderdet3.Consumable_order_minor__c = Order1.Id;
			Orderdet3.Consumable_Product__c = pro1.Id;
			Orderdet3.Asset_Model_No__c = 'Test01';
			Orderdet3.Consumable_Arrived_order__c = Order1.Id;
			//Orderdet3.IsArrival__c = true;
			Orderdet3.Consumable_Sale_order__c = Order1.Id;
			Orderdet3.RecordTypeId = System.Label.RT_ConOrderDetail2_Delivery;
			Orderdet3.Bar_Code__c = '01049531702003111115120017181000105ZK250BXJRJ';
			//出库
			Consumable_order_details2__c Orderdet4 = new Consumable_order_details2__c();
			Orderdet4.Name = 'OCM_01_001004';
			Orderdet4.Consumable_order_minor__c = Order1.Id;
			Orderdet4.Consumable_Product__c = pro1.Id;
			Orderdet4.Asset_Model_No__c = 'Test01';
			Orderdet4.Consumable_Arrived_order__c = Order1.Id;
			//Orderdet4.IsArrival__c = true;
			Orderdet4.Consumable_Shipment_order__c = Order1.Id;
			Orderdet4.RecordTypeId = System.Label.RT_ConOrderDetail2_Delivery;
			Orderdet4.Bar_Code__c = '01049531702003111115120017181000105ZK250BXJRN';
			//List<Product2> proList = [select name,Estimation_Entry_Possibility__c from Product2 where id = :prod01.Id];
			//System.assertEquals('○', proList[0].Estimation_Entry_Possibility__c);

			insert new List<Consumable_order_details2__c>{ Orderdet1, Orderdet2, Orderdet3, Orderdet4 };
			=======
			Profile prof = [select Id from Profile where Name ='901_经销商社区普通权限_2重验证(ET)'];


			@@ -978,6 +1795,7 @@
			//System.assertEquals('○', proList[0].Estimation_Entry_Possibility__c);

			insert new Consumable_order_details2__c[] {Orderdet1, Orderdet2,Orderdet3,Orderdet4};
			>>>>>>> LEXCommunityLiJun
			PageReference page = new PageReference('/apex/ArriveGoods?Esetid=' + Order1.Id);
			System.Test.setCurrentPage(page);
			ArriveGoodsController Controller = new ArriveGoodsController();
			@@ -994,13 +1812,265 @@

			//直接到货
			@isTest
			<<<<<<< HEAD
			static void arrivedirect241() {
			// // TO DO: implement unit test
			List<RecordType> rectCo = [
			SELECT Id
			FROM RecordType
			WHERE IsActive = TRUE AND SobjectType = 'Account' AND Name = '販売店'
			];
			=======
			static void arrivedirect241() {
			// // TO DO: implement unit test
			List<RecordType> rectCo = [select Id from RecordType where IsActive = true and SobjectType = 'Account' and Name = '販売店'];
			>>>>>>> LEXCommunityLiJun
			if (rectCo.size() == 0) {
			return;
			}
			// Profile prof = [select Id from Profile where Name ='901_经销商社区普通权限_2重验证(ET Email)'];
			<<<<<<< HEAD
			Profile prof = [
			SELECT Id
			FROM Profile
			WHERE Name = '901_经销商社区普通权限_2重验证(ET)'
			];

			Account myAccount2 = new Account(
			name = 'Testaccount002',
			Dealer_discount__c = 20,
			RecordTypeId = rectCo[0].Id,
			AgentCode_Ext__c = '9999900'
			);
			Account myAccount1 = new Account(name = 'Testaccount001', Dealer_discount__c = 30, RecordTypeId = rectCo[0].Id);
			insert new List<account>{ myAccount1, myAccount2 };
			Contact core = new Contact(email = 'jplumber@salesforce.com', firstname = 'Joe', lastname = 'Plumber', accountid = myAccount1.id);
			insert core;
			user MyUser_Test = new User(
			ContactId = core.id,
			Alias = 'newUser',
			Email = 'newuser@testorg.com',
			EmailEncodingKey = 'UTF-8',
			LastName = 'TestUser',
			LanguageLocaleKey = 'zh_CN',
			LocaleSidKey = 'zh_CN',
			ProfileId = prof.Id,
			TimeZoneSidKey = 'Asia/Shanghai',
			UserName = 'testUser@testorg.com',
			UserPro_Type__c = 'ET'
			);
			System.runAs(new User(Id = UserInfo.getUserId())) {
			insert MyUser_Test;
			}

			// User MyUser_Test = [select id,Contact.accountid from User WHERE ProfileId = :prof.Id and IsActive = true and UserPro_Type__c = 'ET' limit 1 ];
			// Product2 prod01 = new Product2(Name='Test01',ProductCode='Test01',Asset_Model_No__c = 'Test01',SFDA_Status__c = '有効',JANCODE__c = '04953170200311',Dealer_special_Object__c = true,Manual_Entry__c = false);
			// Product2 prod02 = new Product2(Name='Test02',ProductCode='Test02',Asset_Model_No__c = 'Test02',SFDA_Status__c = '有効',JANCODE__c = '04953170200312',Dealer_special_Object__c = true,Manual_Entry__c = false);
			// insert new Product2[] {prod01,prod02};
			System.runAs(MyUser_Test) {
			Product2 prod01 = new Product2(
			Name = 'Test01',
			ProductCode = 'Test01',
			Asset_Model_No__c = 'Test01',
			SFDA_Status__c = '有効',
			JANCODE__c = '04953170200311',
			Dealer_special_Object__c = true,
			Manual_Entry__c = false
			);
			Product2 prod02 = new Product2(
			Name = 'Test02',
			ProductCode = 'Test02',
			Asset_Model_No__c = 'Test02',
			SFDA_Status__c = '有効',
			JANCODE__c = '04953170200312',
			Dealer_special_Object__c = true,
			Manual_Entry__c = false
			);
			insert new List<Product2>{ prod01, prod02 };
			Product2__c pro1 = new Product2__c(Name = 'Pro001', OT_CODE_Text__c = 'Test001', Product2__c = prod01.Id);
			Product2__c pro2 = new Product2__c(Name = 'Pro002', OT_CODE_Text__c = 'Test002', Product2__c = prod02.Id);
			insert new List<Product2__c>{ pro1, pro2 };
			//产品注册证
			Product_Register__c prc = new Product_Register__c(
			Name = '国械注进20162220210',
			MedPrdClass__c = '3',
			ValidFrom__c = date.newinstance(2018, 7, 22),
			ValidTo__c = date.newinstance(2028, 7, 22),
			RegisterNoClass_Old__c = '6815',
			RegisterNoClass_New__c = '6815',
			RegisterNoStatus__c = '有效'
			);
			insert prc;
			//新旧关系对照表
			//Product_Register_contrast__c prcc = new Product_Register_contrast__c(
			// Name = 'Test20181204',
			// Register_new__c = '314',
			// Register_old__c = '36815'
			// );
			//insert prcc;
			//产品-产品注册证关系 prod01
			Product_Register_Link__c prlc = new Product_Register_Link__c(Product2__c = prod01.Id, Product_Register__c = prc.Id);
			insert prlc;
			//产品-产品注册证关系 prod02
			Product_Register_Link__c prlc2 = new Product_Register_Link__c(Product2__c = prod02.Id, Product_Register__c = prc.Id);
			insert prlc2;
			//订单

			Consumable_order__c Order1 = new Consumable_order__c();
			Order1.Name = 'OCM_01_001';
			Order1.Order_status__c = '批准';
			Order1.Order_type__c = '订单';
			Order1.Dealer_Info__c = myAccount1.id;
			Order1.RecordTypeid = System.Label.RT_ConOrder_Delivery;
			insert Order1;
			Consumable_order__c Order2 = new Consumable_order__c();
			Order2.Name = 'OCM_01_002';
			Order2.Order_status__c = '批准';
			Order2.Order_type__c = '到货';
			Order2.Dealer_Info__c = myAccount1.id;
			Order2.RecordTypeid = System.Label.RT_ConOrder_Delivery;
			Order2.Deliver_date__c = Date.today();
			Order2.Order_date__c = Date.today();
			insert Order2;
			Order2 = new Consumable_order__c();
			Order2.Name = 'OCM_01_002';
			Order2.Order_status__c = '批准';
			Order2.Order_type__c = '返品';
			Order2.Dealer_Info__c = myAccount1.id;
			Order2.RecordTypeid = System.Label.RT_ConOrder_Delivery;
			Order2.Deliver_date__c = Date.today();
			Order2.Order_date__c = Date.today();
			Order2.ReturnGs_Upload_Date__c = Date.today();
			insert Order2;

			//订单明细
			//fahuo
			Consumable_orderdetails__c Orderdet = new Consumable_orderdetails__c();
			Orderdet.Name = 'OCM_01_00101';
			Orderdet.Consumable_order__c = Order1.Id;
			Orderdet.RecordTypeId = System.Label.RT_ConOrderDetail1_Order;
			Orderdet.Consumable_Product__c = pro1.Id;
			Orderdet.Consumable_count__c = 4;
			insert Orderdet;

			//发货明细
			//fahuo
			Consumable_order_details2__c Orderdet1 = new Consumable_order_details2__c();
			Orderdet1.Name = 'OCM_01_001001';
			Orderdet1.Consumable_order_minor__c = Order1.Id;
			Orderdet1.Consumable_Product__c = pro1.Id;
			Orderdet1.Asset_Model_No__c = 'Test01';
			Orderdet1.RecordTypeId = System.Label.RT_ConOrderDetail2_Delivery;
			Orderdet1.Bar_Code__c = '01049531702003111115120017181000105ZK250BXJRF';
			Orderdet1.Arrive_date__c = Date.today();
			Orderdet1.Rrturn_count__c = 1;
			Orderdet1.TracingCode__c = '20170808';
			//daohuo
			Consumable_order_details2__c Orderdet2 = new Consumable_order_details2__c();
			Orderdet2.Name = 'OCM_01_001002';
			Orderdet2.Consumable_order_minor__c = Order2.Id;
			Orderdet2.Consumable_Product__c = pro1.Id;
			Orderdet2.Asset_Model_No__c = 'Test01';
			Orderdet2.Consumable_Arrived_order__c = Order2.Id;
			//Orderdet2.IsArrival__c = true;
			Orderdet2.RecordTypeId = System.Label.RT_ConOrderDetail2_Delivery;
			Orderdet2.Bar_Code__c = '01049531702003111115120017181000105ZK250BXJRI';
			Orderdet2.Arrive_date__c = Date.today();
			Orderdet2.TracingCode__c = '20170808';

			Consumable_order_details2__c Orderdet3 = new Consumable_order_details2__c();
			Orderdet3.Name = 'OCM_01_001002';
			Orderdet3.Consumable_order_minor__c = Order2.Id;
			Orderdet3.Consumable_Product__c = pro1.Id;
			Orderdet3.Asset_Model_No__c = 'Test01';
			Orderdet3.Consumable_Arrived_order__c = Order2.Id;
			//Orderdet3.IsArrival__c = true;
			Orderdet3.RecordTypeId = System.Label.RT_ConOrderDetail2_Delivery;
			Orderdet3.Bar_Code__c = '01049531702003111115120017181000105ZK250BXJR2';
			Orderdet3.Used_date__c = Date.today();
			Orderdet3.TracingCode__c = '20170808';
			//sale
			Consumable_order_details2__c Orderdet4 = new Consumable_order_details2__c();
			Orderdet4.Name = 'OCM_01_001003';
			Orderdet4.Consumable_order_minor__c = Order2.Id;
			Orderdet4.Consumable_Product__c = pro1.Id;
			Orderdet4.Asset_Model_No__c = 'Test01';
			Orderdet4.Consumable_Arrived_order__c = Order2.Id;
			//Orderdet3.IsArrival__c = true;
			Orderdet4.Consumable_Sale_order__c = Order2.Id;
			Orderdet4.RecordTypeId = System.Label.RT_ConOrderDetail2_Delivery;
			Orderdet4.Bar_Code__c = '01049531702003111115120017181000105ZK250BXJR3';
			Orderdet4.Used_date__c = Date.today();
			Orderdet4 = new Consumable_order_details2__c();
			Orderdet4.Name = 'OCM_01_001003';
			Orderdet4.Consumable_order_minor__c = Order1.Id;
			Orderdet4.Consumable_Product__c = pro1.Id;
			Orderdet4.Asset_Model_No__c = 'Test01';
			Orderdet4.Consumable_Arrived_order__c = Order1.Id;
			//Orderdet3.IsArrival__c = true;
			Orderdet4.Consumable_Sale_order__c = Order2.Id;
			Orderdet4.RecordTypeId = System.Label.RT_ConOrderDetail2_Delivery;
			Orderdet4.Bar_Code__c = '01049531702003111115120017181000105ZK250BXJ13';
			Orderdet4.Used_date__c = Date.today();
			Orderdet4.TracingCode__c = '20170808';
			Consumable_order_details2__c Orderdet5 = new Consumable_order_details2__c();
			Orderdet5.Name = 'OCM_01_001003';
			Orderdet5.Consumable_order_minor__c = Order2.Id;
			Orderdet5.Consumable_Product__c = pro1.Id;
			Orderdet5.Asset_Model_No__c = 'Test01';
			Orderdet5.Consumable_Arrived_order__c = Order2.Id;
			//Orderdet3.IsArrival__c = true;
			Orderdet5.Consumable_Sale_order__c = Order2.Id;
			Orderdet5.RecordTypeId = System.Label.RT_ConOrderDetail2_Delivery;
			Orderdet5.Bar_Code__c = '01049531702003111115120017181000105ZK250BXJRJ';
			Orderdet5.Arrive_date__c = Date.today().addDays(1);
			Orderdet5.Send_Date__c = null;
			Orderdet5.Used_date__c = null;
			Orderdet5.Lose_Flag__c = false;
			Orderdet5.Return_date__c = null;
			Orderdet5.Cancellation_Date__c = Date.today().addDays(1);
			Orderdet5.Box_Piece__c = '盒';
			Orderdet5.TracingCode__c = '20170808';

			//出库
			Consumable_order_details2__c Orderdet6 = new Consumable_order_details2__c();
			Orderdet6.Name = 'OCM_01_001004';
			Orderdet6.Consumable_order_minor__c = Order1.Id;
			Orderdet6.Consumable_Product__c = pro1.Id;
			Orderdet6.Asset_Model_No__c = 'Test01';
			Orderdet6.Consumable_Arrived_order__c = Order1.Id;
			//Orderdet4.IsArrival__c = true;
			Orderdet6.Consumable_Shipment_order__c = Order1.Id;
			Orderdet6.RecordTypeId = System.Label.RT_ConOrderDetail2_Delivery;
			Orderdet6.Bar_Code__c = '01049531702003111115120017181000105ZK250BXJR4';
			Orderdet6.Send_Date__c = Date.today();
			Orderdet6.Return_date__c = null;
			Orderdet6.Box_Piece__c = '盒';
			Orderdet6.Rrturn_count__c = 1;
			Orderdet6.TracingCode__c = '20170808';

			// 单位为个的Barcode对应的出库单
			Consumable_order_details2__c Orderdet7 = new Consumable_order_details2__c();
			Orderdet7.Name = 'OCM_01_001004';
			Orderdet7.Consumable_order_minor__c = Order1.Id;
			Orderdet7.Consumable_Product__c = pro1.Id;
			Orderdet7.Asset_Model_No__c = 'Test01';
			Orderdet7.Consumable_Arrived_order__c = Order1.Id;
			//Orderdet4.IsArrival__c = true;
			Orderdet7.Consumable_Shipment_order__c = Order1.Id;
			Orderdet7.RecordTypeId = System.Label.RT_ConOrderDetail2_Delivery;
			Orderdet7.Bar_Code__c = '01049531702003111115120017181000105ZK250BXJR1';
			Orderdet7.Send_Date__c = Date.today();
			Orderdet7.Box_Piece__c = '个';
			Orderdet7.Used_date__c = Date.today();
			Orderdet7.Return_date__c = null;
			Orderdet7.RemoveBox_No__c = 1;
			Orderdet7.Consumable_ZS_order__c = Order1.Id;
			Orderdet7.Rrturn_count__c = 1;
			Orderdet7.TracingCode__c = '20170808';

			Orderdet7 = new Consumable_order_details2__c();
			=======
			Profile prof = [select Id from Profile where Name ='901_经销商社区普通权限_2重验证(ET)'];


			@@ -1191,11 +2261,145 @@

			// 单位为个的Barcode对应的出库单
			Consumable_order_details2__c Orderdet7 = new Consumable_order_details2__c();
			>>>>>>> LEXCommunityLiJun
			Orderdet7.Name = 'OCM_01_001004';
			Orderdet7.Consumable_order_minor__c = Order1.Id;
			Orderdet7.Consumable_Product__c = pro1.Id;
			Orderdet7.Asset_Model_No__c = 'Test01';
			Orderdet7.Consumable_Arrived_order__c = Order1.Id;
			<<<<<<< HEAD
			Orderdet7.Consumable_Shipment_order__c = Order1.Id;
			Orderdet7.RecordTypeId = System.Label.RT_ConOrderDetail2_Delivery;
			Orderdet7.Bar_Code__c = '01049531702003111115120017181000105ZK250BXJR7';
			Orderdet7.Send_Date__c = Date.today();
			Orderdet7.Box_Piece__c = '个';
			Orderdet7.Used_date__c = Date.today();
			Orderdet7.Return_date__c = null;
			Orderdet7.RemoveBox_No__c = 1;
			Orderdet7.Consumable_ZS_order__c = Order1.Id;
			Orderdet7.Rrturn_count__c = 0;
			Orderdet7.TracingCode__c = '20170808';

			Consumable_order_details2__c Orderdet8 = new Consumable_order_details2__c();
			Orderdet8.Name = 'OCM_01_001004';
			Orderdet8.Consumable_order_minor__c = Order1.Id;
			Orderdet8.Consumable_Product__c = pro1.Id;
			Orderdet8.Asset_Model_No__c = 'Test01';
			Orderdet8.Consumable_Arrived_order__c = Order1.Id;
			//Orderdet4.IsArrival__c = true;
			Orderdet8.Consumable_Shipment_order__c = Order1.Id;
			Orderdet8.RecordTypeId = System.Label.RT_ConOrderDetail2_Delivery;
			Orderdet8.Bar_Code__c = '01049531702003111115120017181000105ZK250BXJR9';
			Orderdet8.Send_Date__c = Date.today();
			Orderdet8.Box_Piece__c = '个';
			Orderdet8.Used_date__c = Date.today();
			Orderdet8.Return_date__c = null;
			Orderdet8.RemoveBox_No__c = 1;
			Orderdet8.Consumable_ZS_order__c = Order1.Id;
			Orderdet8.Rrturn_count__c = null;
			Orderdet8.RemoveBox_date__c = Date.today();
			Orderdet8.Intra_Trade_List_RMB__c = 1;
			Orderdet8.Sterilization_limit__c = Date.today();
			Orderdet8.SerialLotNo__c = '11批次';
			Orderdet8.TracingCode__c = '20170808';
			Orderdet8.Arrive_date__c = Date.today();

			Consumable_order_details2__c Orderdet9 = new Consumable_order_details2__c();
			Orderdet9.Name = 'OCM_01_001004';
			Orderdet9.Consumable_order_minor__c = Order1.Id;
			Orderdet9.Consumable_Product__c = pro1.Id;
			Orderdet9.Asset_Model_No__c = 'Test01';
			Orderdet9.Consumable_Arrived_order__c = Order1.Id;
			Orderdet9.Consumable_Shipment_order__c = Order1.Id;
			Orderdet9.RecordTypeId = System.Label.RT_ConOrderDetail2_Delivery;
			Orderdet9.Bar_Code__c = '01049531702003111115120017181000105ZK250BXJR8';
			Orderdet9.Send_Date__c = Date.today();
			Orderdet9.Box_Piece__c = '个';
			Orderdet9.Used_date__c = Date.today();
			Orderdet9.Return_date__c = null;
			Orderdet9.Consumable_ZS_order__c = Order1.Id;
			Orderdet9.Arrive_date__c = Date.today();
			Orderdet9.Rrturn_count__c = 10;
			Orderdet9.TracingCode__c = '20170808';
			Consumable_order_details2__c lose = new Consumable_order_details2__c();
			lose.Name = 'OCM_01_001004';
			lose.Consumable_order_minor__c = Order1.Id;
			lose.Consumable_Product__c = pro1.Id;
			lose.Asset_Model_No__c = 'Test01';
			lose.Consumable_Arrived_order__c = Order1.Id;
			//Orderdet4.IsArrival__c = true;
			lose.Consumable_Shipment_order__c = Order1.Id;
			lose.RecordTypeId = System.Label.RT_ConOrderDetail2_Delivery;
			lose.Bar_Code__c = '01049531702003111115120017181000105ZK250BXJR5';
			lose.Send_Date__c = null;
			lose.Arrive_date__c = null;
			lose.Used_date__c = null;
			lose.Box_Piece__c = '盒';
			lose.TracingCode__c = '20170808';
			Consumable_order_details2__c lose1 = new Consumable_order_details2__c();
			lose1.Name = 'OCM_01_001004';
			lose1.Consumable_order_minor__c = Order1.Id;
			lose1.Consumable_Product__c = pro1.Id;
			lose1.Asset_Model_No__c = 'Test01';
			lose1.Consumable_Arrived_order__c = Order1.Id;
			//Orderdet4.IsArrival__c = true;
			lose1.Consumable_Shipment_order__c = Order1.Id;
			lose1.RecordTypeId = System.Label.RT_ConOrderDetail2_Delivery;
			lose1.Bar_Code__c = '01049531702003111115120017181000105ZK250BXJR6';
			lose1.Send_Date__c = null;
			lose1.Arrive_date__c = Date.today();
			lose1.Used_date__c = null;
			lose1.Box_Piece__c = '盒';
			lose1.TracingCode__c = '20170808';
			Consumable_order_details2__c lose2 = new Consumable_order_details2__c();
			lose2.Name = 'OCM_01_001004';
			lose2.Consumable_order_minor__c = Order2.Id;
			lose2.Consumable_Product__c = pro1.Id;
			lose2.Asset_Model_No__c = 'Test01';
			lose2.Consumable_Arrived_order__c = Order2.Id;
			//Orderdet4.IsArrival__c = true;
			lose2.Consumable_Shipment_order__c = Order2.Id;
			lose2.RecordTypeId = System.Label.RT_ConOrderDetail2_Delivery;
			lose2.Bar_Code__c = '01049531702003111115120017181000105ZK250BXJR7';
			lose2.Send_Date__c = null;
			lose2.Arrive_date__c = Date.today();
			lose2.Used_date__c = null;
			lose2.Box_Piece__c = '盒';
			lose2.Intra_Trade_List_RMB__c = 1;
			lose2.Direct_Arrive_Product__c = true;
			lose2.Sterilization_limit__c = Date.today();
			lose2.SerialLotNo__c = '11批次';
			lose2.TracingCode__c = '20170808';

			//List<Product2> proList = [select name,Estimation_Entry_Possibility__c from Product2 where id = :prod01.Id];
			//System.assertEquals('○', proList[0].Estimation_Entry_Possibility__c);

			insert new List<Consumable_order_details2__c>{
			Orderdet1,
			Orderdet2,
			Orderdet3,
			Orderdet4,
			Orderdet5,
			Orderdet6,
			Orderdet7,
			Orderdet8,
			Orderdet9,
			lose,
			lose1,
			lose2
			};
			PageReference page = new PageReference('/apex/ArriveGoods?Esetid=' + Order1.Id);
			System.Test.setCurrentPage(page);
			ArriveGoodsController Controller = new ArriveGoodsController();
			//初始化测试
			System.Test.startTest();
			Controller.init();

			Controller.barcode = '01049531702003111115120017181000105ZK250BXJRF\n01049531702003111115120017181000105ZK250BXJR3\n01049531702003111115120017181000105ZK250BXJ13\n01049531702003111115120017181000105ZK250BXJRI\n01049531702003111115120017181000105ZK250BXJR2\n01049531702003111115120017181000105ZK250BXJR3\n01049531702003111115120017181000105ZK250BXJR4\n01049531702003111115120017181000105ZK250BXJR1\n01049531702003111115120017181000105ZK250BXJR7\n01049531702003111115120017181000105ZK250BXJR9\n01049531702003111115120017181000105ZK250BXJR8\n01049531702003111115120017181000105ZK250BXJR5\n01049531702003111115120017181000105ZK250BXJR6\n01049531702003111115120017181000105ZK250BXJR7\n01049531702003111115120017181000105ZK250BXAAA\n01049531702003111115120017181000105ZK250BXAAB';
			Controller.SearchPro();
			// System.assertEquals(1, controller.consumableInventory.size());

			=======
			//Orderdet4.IsArrival__c = true;
			Orderdet7.Consumable_Shipment_order__c = Order1.Id;
			Orderdet7.RecordTypeId = System.Label.RT_ConOrderDetail2_Delivery;
			@@ -1333,10 +2537,129 @@
			Controller.SearchPro();
			// System.assertEquals(1, controller.consumableInventory.size());

			>>>>>>> LEXCommunityLiJun
			System.Test.stopTest();
			}
			}

			<<<<<<< HEAD
			//返品明细2不存在的对应的到货订单明细
			@isTest
			static void productReturn_oldbarcode() {
			// // TO DO: implement unit test
			List<RecordType> rectCo = [
			SELECT Id
			FROM RecordType
			WHERE IsActive = TRUE AND SobjectType = 'Account' AND Name = '販売店'
			];
			if (rectCo.size() == 0) {
			return;
			}
			// Profile prof = [select Id from Profile where Name ='901_经销商社区普通权限_2重验证(ET Email)'];
			Profile prof = [
			SELECT Id
			FROM Profile
			WHERE Name = '901_经销商社区普通权限_2重验证(ET)'
			];

			Account myAccount2 = new Account(
			name = 'Testaccount002',
			Dealer_discount__c = 20,
			RecordTypeId = rectCo[0].Id,
			AgentCode_Ext__c = '9999900'
			);
			Account myAccount1 = new Account(name = 'Testaccount001', Dealer_discount__c = 30, RecordTypeId = rectCo[0].Id);
			insert new List<account>{ myAccount1, myAccount2 };

			Contact core = new Contact(email = 'jplumber@salesforce.com', firstname = 'Joe', lastname = 'Plumber', accountid = myAccount1.id);
			insert core;
			user MyUser_Test = new User(
			ContactId = core.id,
			Alias = 'newUser',
			Email = 'newuser@testorg.com',
			EmailEncodingKey = 'UTF-8',
			LastName = 'TestUser',
			LanguageLocaleKey = 'zh_CN',
			LocaleSidKey = 'zh_CN',
			ProfileId = prof.Id,
			TimeZoneSidKey = 'Asia/Shanghai',
			UserName = 'testUser@testorg.com',
			UserPro_Type__c = 'ET'
			);
			System.runAs(new User(Id = UserInfo.getUserId())) {
			insert MyUser_Test;
			}

			// User MyUser_Test = [select id,Contact.accountid from User WHERE ProfileId = :prof.Id and IsActive = true and UserPro_Type__c = 'ET' limit 1 ];
			// Product2 prod01 = new Product2(Name='Test01',ProductCode='Test01',Asset_Model_No__c = 'Test01',SFDA_Status__c = '有効',JANCODE__c = '04953170200311',Dealer_special_Object__c = true,Manual_Entry__c = false);
			// Product2 prod02 = new Product2(Name='Test02',ProductCode='Test02',Asset_Model_No__c = 'Test02',SFDA_Status__c = '有効',JANCODE__c = '04953170200312',Dealer_special_Object__c = true,Manual_Entry__c = false);
			// insert new Product2[] {prod01,prod02};
			System.runAs(MyUser_Test) {
			Product2 prod01 = new Product2(
			Name = 'Test01',
			ProductCode = 'Test01',
			Asset_Model_No__c = 'Test01',
			SFDA_Status__c = '有効',
			JANCODE__c = '04953170200311',
			Dealer_special_Object__c = true,
			Manual_Entry__c = false
			);
			Product2 prod02 = new Product2(
			Name = 'Test02',
			ProductCode = 'Test02',
			Asset_Model_No__c = 'Test02',
			SFDA_Status__c = '有効',
			JANCODE__c = '04953170200312',
			Dealer_special_Object__c = true,
			Manual_Entry__c = false
			);
			insert new List<Product2>{ prod01, prod02 };
			Product2__c pro1 = new Product2__c(Name = 'Pro001', OT_CODE_Text__c = 'Test001', Product2__c = prod01.Id);
			Product2__c pro2 = new Product2__c(Name = 'Pro002', OT_CODE_Text__c = 'Test002', Product2__c = prod02.Id);
			insert new List<Product2__c>{ pro1, pro2 };
			//订单

			Consumable_order__c Order1 = new Consumable_order__c();
			Order1.Name = 'OCM_01_001';
			Order1.Order_status__c = '批准';
			Order1.Order_type__c = '订单';
			Order1.Dealer_Info__c = myAccount1.id;
			Order1.RecordTypeid = System.Label.RT_ConOrder_Delivery;

			//返品订单

			Consumable_order__c Order2 = new Consumable_order__c();
			Order2.Name = 'OCM_01_002';
			Order2.Order_status__c = '批准';
			Order2.Order_type__c = '返品';
			Order2.Dealer_Info__c = myAccount1.id;
			Order2.RecordTypeid = System.Label.Dealer_Returned_Label;
			insert Order1;
			insert Order2;

			//订单明细
			//fahuo
			Consumable_orderdetails__c Orderdet = new Consumable_orderdetails__c();
			Orderdet.Name = 'OCM_01_00101';
			Orderdet.Consumable_order__c = Order1.Id;
			Orderdet.RecordTypeId = System.Label.RT_ConOrderDetail1_Order;
			Orderdet.Consumable_Product__c = pro1.Id;
			Orderdet.Consumable_count__c = 4;
			insert Orderdet;

			//发货明细
			//没出库，没销售，就是在库
			Consumable_order_details2__c Orderdet1 = new Consumable_order_details2__c();
			Orderdet1.Name = 'OCM_01_001001';
			Orderdet1.Consumable_order_minor__c = Order1.Id;
			Orderdet1.Consumable_Product__c = pro1.Id;
			Orderdet1.Asset_Model_No__c = 'Pro001';
			Orderdet1.Arrive_date__c = date.today();
			Orderdet1.RecordTypeId = System.Label.RT_ConOrderDetail2_Delivery;
			Orderdet1.Bar_Code__c = '01049531702003111115120017181000105ZK250BXJRF';
			Orderdet1.TracingCode__c = 'BXSYS';

			=======

			//返品明细2不存在的对应的到货订单明细
			@isTest
			@@ -1414,6 +2737,7 @@
			Orderdet1.Bar_Code__c = '01049531702003111115120017181000105ZK250BXJRF';
			Orderdet1.TracingCode__c = 'BXSYS';

			>>>>>>> LEXCommunityLiJun
			//daohuo
			Consumable_order_details2__c Orderdet2 = new Consumable_order_details2__c();
			Orderdet2.Name = 'OCM_01_001002';
			@@ -1459,7 +2783,11 @@
			Orderdet5.Cancellation_Date__c = Date.today();
			Orderdet5.RecordTypeId = System.Label.RT_ConOrderDetail2_Delivery;
			Orderdet5.Bar_Code__c = '01049531702003111115120017181000105ZK250BXJRZ';
			<<<<<<< HEAD
			Orderdet5.Box_Piece__c = '个';
			=======
			Orderdet5.Box_Piece__c ='个';
			>>>>>>> LEXCommunityLiJun
			Orderdet5.TracingCode__c = 'BXSYS';
			//fanpin
			Consumable_order_details2__c Orderdet6 = new Consumable_order_details2__c();
			@@ -1470,7 +2798,11 @@
			Orderdet6.Consumable_Return_order__c = Order2.Id;
			Orderdet6.RecordTypeId = System.Label.RT_ConOrderDetail2_Delivery;
			Orderdet6.Bar_Code__c = '01049531702003111115120017181000105ZK250BXJRA';
			<<<<<<< HEAD
			Orderdet6.Box_Piece__c = '个';
			=======
			Orderdet6.Box_Piece__c ='个';
			>>>>>>> LEXCommunityLiJun
			Orderdet6.TracingCode__c = 'BXSYS';

			//发货明细
			@@ -1484,7 +2816,11 @@
			Orderdet7.Bar_Code__c = '01049531702003111115120017181000105ZK250BX333';
			Orderdet7.TracingCode__c = 'BXSYS';

			<<<<<<< HEAD
			insert new List<Consumable_order_details2__c>{ Orderdet1, Orderdet2, Orderdet3, Orderdet4, Orderdet5, Orderdet6, Orderdet7 };
			=======
			insert new Consumable_order_details2__c[] {Orderdet1, Orderdet2,Orderdet3,Orderdet4,Orderdet5,Orderdet6,Orderdet7};
			>>>>>>> LEXCommunityLiJun
			PageReference page = new PageReference('/apex/ArriveGoods?ArrType=ReG');
			System.Test.setCurrentPage(page);
			ArriveGoodsController Controller = new ArriveGoodsController();
			@@ -1508,6 +2844,18 @@

			controller.getinventorysize();
			System.Test.stopTest();
			<<<<<<< HEAD
			}
			}
			@isTest
			static void barcodecheck() {
			// // TO DO: implement unit test
			List<RecordType> rectCo = [
			SELECT Id
			FROM RecordType
			WHERE IsActive = TRUE AND SobjectType = 'Account' AND Name = '販売店'
			];
			=======

			}
			}
			@@ -1515,10 +2863,44 @@
			static void barcodecheck() {
			// // TO DO: implement unit test
			List<RecordType> rectCo = [select Id from RecordType where IsActive = true and SobjectType = 'Account' and Name = '販売店'];
			>>>>>>> LEXCommunityLiJun
			if (rectCo.size() == 0) {
			return;
			}
			// Profile prof = [select Id from Profile where Name ='901_经销商社区普通权限_2重验证(ET Email)'];
			<<<<<<< HEAD
			Profile prof = [
			SELECT Id
			FROM Profile
			WHERE Name = '901_经销商社区普通权限_2重验证(ET)'
			];

			Account myAccount2 = new Account(
			name = 'Testaccount002',
			Dealer_discount__c = 20,
			RecordTypeId = rectCo[0].Id,
			AgentCode_Ext__c = '9999900'
			);
			Account myAccount1 = new Account(name = 'Testaccount001', Dealer_discount__c = 30, RecordTypeId = rectCo[0].Id);
			insert new List<account>{ myAccount1, myAccount2 };

			Contact core = new Contact(email = 'jplumber@salesforce.com', firstname = 'Joe', lastname = 'Plumber', accountid = myAccount1.id);
			insert core;
			user MyUser_Test = new User(
			ContactId = core.id,
			Alias = 'newUser',
			Email = 'newuser@testorg.com',
			EmailEncodingKey = 'UTF-8',
			LastName = 'TestUser',
			LanguageLocaleKey = 'zh_CN',
			LocaleSidKey = 'zh_CN',
			ProfileId = prof.Id,
			TimeZoneSidKey = 'Asia/Shanghai',
			UserName = 'testUser@testorg.com',
			UserPro_Type__c = 'ET'
			);
			System.runAs(new User(Id = UserInfo.getUserId())) {
			=======
			Profile prof = [select Id from Profile where Name ='901_经销商社区普通权限_2重验证(ET)'];


			@@ -1530,12 +2912,41 @@
			insert core;
			user MyUser_Test = New User(ContactId = core.id,Alias = 'newUser',Email='newuser@testorg.com',EmailEncodingKey='UTF-8', LastName='TestUser', LanguageLocaleKey='zh_CN',LocaleSidKey='zh_CN', ProfileId = prof.Id,TimeZoneSidKey='Asia/Shanghai', UserName='testUser@testorg.com',UserPro_Type__c = 'ET');
			System.runAs(new User(Id = UserInfo.getUserId())){
			>>>>>>> LEXCommunityLiJun
			insert MyUser_Test;
			}
			// User MyUser_Test = [select id,Contact.accountid from User WHERE ProfileId = :prof.Id and IsActive = true and UserPro_Type__c = 'ET' limit 1 ];
			// Product2 prod01 = new Product2(Name='Test01',ProductCode='Test01',Asset_Model_No__c = 'Test01',SFDA_Status__c = '有効',JANCODE__c = '04953170200311',Dealer_special_Object__c = true,Manual_Entry__c = false);
			// Product2 prod02 = new Product2(Name='Test02',ProductCode='Test02',Asset_Model_No__c = 'Test02',SFDA_Status__c = '有効',JANCODE__c = '04953170200312',Dealer_special_Object__c = true,Manual_Entry__c = false);
			// insert new Product2[] {prod01,prod02};
			<<<<<<< HEAD
			System.runAs(MyUser_Test) {
			Product2 prod01 = new Product2(
			Name = 'Test01',
			ProductCode = 'Test01',
			Asset_Model_No__c = 'Test01',
			SFDA_Status__c = '有効',
			JANCODE__c = '04953170200311',
			Dealer_special_Object__c = true,
			Manual_Entry__c = false
			);
			Product2 prod02 = new Product2(
			Name = 'Test02',
			ProductCode = 'Test02',
			Asset_Model_No__c = 'Test02',
			SFDA_Status__c = '有効',
			JANCODE__c = '04953170200312',
			Dealer_special_Object__c = true,
			Manual_Entry__c = false
			);
			insert new List<Product2>{ prod01, prod02 };
			Product2__c pro1 = new Product2__c(Name = 'Pro001', OT_CODE_Text__c = '2344', Product2__c = prod01.Id);
			Product2__c pro2 = new Product2__c(Name = 'Pro002', OT_CODE_Text__c = '8232', Product2__c = prod02.Id);
			insert new List<Product2__c>{ pro1, pro2 };
			ArriveGoodsController Controller = new ArriveGoodsController();
			//初始化测试
			list<String> list1 = new List<String>();
			=======
			system.runAs(MyUser_Test){
			Product2 prod01 = new Product2(Name='Test01',ProductCode='Test01',Asset_Model_No__c = 'Test01',SFDA_Status__c = '有効',JANCODE__c = '04953170200311',Dealer_special_Object__c = true,Manual_Entry__c = false);
			Product2 prod02 = new Product2(Name='Test02',ProductCode='Test02',Asset_Model_No__c = 'Test02',SFDA_Status__c = '有効',JANCODE__c = '04953170200312',Dealer_special_Object__c = true,Manual_Entry__c = false);
			@@ -1546,6 +2957,7 @@
			ArriveGoodsController Controller = new ArriveGoodsController();
			//初始化测试
			list<String> list1 = new list<String>();
			>>>>>>> LEXCommunityLiJun
			list1.clear();
			list1.add(Controller.barcode = '2413456250BBBBA');
			Controller.inventoryEntry(list1);
			@@ -1663,13 +3075,56 @@
			}
			}
			@isTest
			<<<<<<< HEAD
			static void barcodechkeck_2() {
			// // TO DO: implement unit test
			List<RecordType> rectCo = [
			SELECT Id
			FROM RecordType
			WHERE IsActive = TRUE AND SobjectType = 'Account' AND Name = '販売店'
			];
			=======
			static void barcodechkeck_2() {
			// // TO DO: implement unit test
			List<RecordType> rectCo = [select Id from RecordType where IsActive = true and SobjectType = 'Account' and Name = '販売店'];
			>>>>>>> LEXCommunityLiJun
			if (rectCo.size() == 0) {
			return;
			}
			// Profile prof = [select Id from Profile where Name ='901_经销商社区普通权限_2重验证(ET Email)'];
			<<<<<<< HEAD
			Profile prof = [
			SELECT Id
			FROM Profile
			WHERE Name = '901_经销商社区普通权限_2重验证(ET)'
			];

			Account myAccount2 = new Account(
			name = 'Testaccount002',
			Dealer_discount__c = 20,
			RecordTypeId = rectCo[0].Id,
			AgentCode_Ext__c = '9999900'
			);
			Account myAccount1 = new Account(name = 'Testaccount001', Dealer_discount__c = 30, RecordTypeId = rectCo[0].Id);
			insert new List<account>{ myAccount1, myAccount2 };

			Contact core = new Contact(email = 'jplumber@salesforce.com', firstname = 'Joe', lastname = 'Plumber', accountid = myAccount1.id);
			insert core;
			user MyUser_Test = new User(
			ContactId = core.id,
			Alias = 'newUser',
			Email = 'newuser@testorg.com',
			EmailEncodingKey = 'UTF-8',
			LastName = 'TestUser',
			LanguageLocaleKey = 'zh_CN',
			LocaleSidKey = 'zh_CN',
			ProfileId = prof.Id,
			TimeZoneSidKey = 'Asia/Shanghai',
			UserName = 'testUser@testorg.com',
			UserPro_Type__c = 'ET'
			);
			System.runAs(new User(Id = UserInfo.getUserId())) {
			=======
			Profile prof = [select Id from Profile where Name ='901_经销商社区普通权限_2重验证(ET)'];


			@@ -1681,12 +3136,48 @@
			insert core;
			user MyUser_Test = New User(ContactId = core.id,Alias = 'newUser',Email='newuser@testorg.com',EmailEncodingKey='UTF-8', LastName='TestUser', LanguageLocaleKey='zh_CN',LocaleSidKey='zh_CN', ProfileId = prof.Id,TimeZoneSidKey='Asia/Shanghai', UserName='testUser@testorg.com',UserPro_Type__c = 'ET');
			System.runAs(new User(Id = UserInfo.getUserId())){
			>>>>>>> LEXCommunityLiJun
			insert MyUser_Test;
			}
			// User MyUser_Test = [select id,Contact.accountid from User WHERE ProfileId = :prof.Id and IsActive = true and UserPro_Type__c = 'ET' limit 1 ];
			// Product2 prod01 = new Product2(Name='Test01',ProductCode='Test01',Asset_Model_No__c = 'Test01',SFDA_Status__c = '有効',JANCODE__c = '04953170200311',Dealer_special_Object__c = true,Manual_Entry__c = false);
			// Product2 prod02 = new Product2(Name='Test02',ProductCode='Test02',Asset_Model_No__c = 'Test02',SFDA_Status__c = '有効',JANCODE__c = '04953170200312',Dealer_special_Object__c = true,Manual_Entry__c = false);
			// insert new Product2[] {prod01,prod02};
			<<<<<<< HEAD
			System.runAs(MyUser_Test) {
			Product2 prod01 = new Product2(
			Name = 'Test01',
			ProductCode = 'Test01',
			Asset_Model_No__c = 'Test01',
			SFDA_Status__c = '有効',
			JANCODE__c = '04953170200311',
			Dealer_special_Object__c = true,
			Manual_Entry__c = false
			);
			Product2 prod02 = new Product2(
			Name = 'Test02',
			ProductCode = 'Test02',
			Asset_Model_No__c = 'Test02',
			SFDA_Status__c = '有効',
			JANCODE__c = '04953170200312',
			Dealer_special_Object__c = true,
			Manual_Entry__c = false
			);
			insert new List<Product2>{ prod01, prod02 };
			Product2__c pro1 = new Product2__c(Name = 'Pro001', OT_CODE_Text__c = '2344', Product2__c = prod01.Id);
			Product2__c pro2 = new Product2__c(Name = 'Pro002', OT_CODE_Text__c = '82324', Product2__c = prod02.Id);
			insert new List<Product2__c>{ pro1, pro2 };
			//产品注册证
			Product_Register__c prc = new Product_Register__c(
			Name = '国械注进20162220210',
			MedPrdClass__c = '3',
			ValidFrom__c = date.newinstance(2018, 7, 22),
			ValidTo__c = date.newinstance(2028, 7, 22),
			RegisterNoClass_Old__c = '6815',
			RegisterNoClass_New__c = '6815',
			RegisterNoStatus__c = '有效'
			);
			=======
			system.runAs(MyUser_Test){
			Product2 prod01 = new Product2(Name='Test01',ProductCode='Test01',Asset_Model_No__c = 'Test01',SFDA_Status__c = '有効',JANCODE__c = '04953170200311',Dealer_special_Object__c = true,Manual_Entry__c = false);
			Product2 prod02 = new Product2(Name='Test02',ProductCode='Test02',Asset_Model_No__c = 'Test02',SFDA_Status__c = '有効',JANCODE__c = '04953170200312',Dealer_special_Object__c = true,Manual_Entry__c = false);
			@@ -1703,6 +3194,7 @@
			RegisterNoClass_New__c = '6815',
			RegisterNoStatus__c = '有效'
			);
			>>>>>>> LEXCommunityLiJun
			insert prc;
			//新旧关系对照表
			//Product_Register_contrast__c prcc = new Product_Register_contrast__c(
			@@ -1712,6 +3204,12 @@
			// );
			//insert prcc;
			//产品-产品注册证关系 prod01
			<<<<<<< HEAD
			Product_Register_Link__c prlc = new Product_Register_Link__c(Product2__c = prod01.Id, Product_Register__c = prc.Id);
			insert prlc;
			//产品-产品注册证关系 prod02
			Product_Register_Link__c prlc2 = new Product_Register_Link__c(Product2__c = prod02.Id, Product_Register__c = prc.Id);
			=======
			Product_Register_Link__c prlc = new Product_Register_Link__c(
			Product2__c = prod01.Id,
			Product_Register__c = prc.Id
			@@ -1722,6 +3220,7 @@
			Product2__c = prod02.Id,
			Product_Register__c = prc.Id
			);
			>>>>>>> LEXCommunityLiJun
			insert prlc2;
			PageReference page = new PageReference('/apex/ArriveGoods?ArrType=ReG');
			System.Test.setCurrentPage(page);
			@@ -1729,6 +3228,15 @@
			ArriveGoodsController Controller = new ArriveGoodsController();
			//List<Product2> proList = [select name,Estimation_Entry_Possibility__c from Product2 where id = :prod01.Id];
			//System.assertEquals('○', proList[0].Estimation_Entry_Possibility__c);
			<<<<<<< HEAD
			List<Product2__c> product2InStore = [
			SELECT Id, Name, Name__c, Intra_Trade_List_RMB__c, Asset_Model_No__c, OT_CODE__c
			FROM Product2__c
			WHERE Estimation_Entry_Possibility__c = '○' AND Pro2_Dealer_Object__c = TRUE AND OT_CODE__c = 'test'
			];
			//System.assertEquals(1, product2InStore.size());
			list<String> list1 = new List<String>();
			=======
			List<Product2__c> product2InStore = [SELECT Id, Name,Name__c,Intra_Trade_List_RMB__c,Asset_Model_No__c,OT_CODE__c
			FROM Product2__c
			WHERE Estimation_Entry_Possibility__c = '○'
			@@ -1736,6 +3244,7 @@
			AND OT_CODE__c ='test' ];
			//System.assertEquals(1, product2InStore.size());
			list<String> list1 = new list<String>();
			>>>>>>> LEXCommunityLiJun
			list1.clear();
			list1.add(Controller.barcode = '2413456250BBBBA');
			Controller.inventoryEntryNoESetId(list1);
			@@ -1814,7 +3323,10 @@
			list1.add(Controller.barcode = '241test111204121778900034567890250BBBBQ');
			Controller.inventoryEntryNoESetId(list1);

			<<<<<<< HEAD
			=======

			>>>>>>> LEXCommunityLiJun
			list1.clear();
			list1.add(Controller.barcode = '0111234101204120118901231712a4001234250BBBBR');
			Controller.inventoryEntryNoESetId(list1);
			@@ -1834,19 +3346,116 @@
			list1.clear();
			list1.add(Controller.barcode = '011123410120412017120100250AAAAA');
			Controller.inventoryEntryNoESetId(list1);
			<<<<<<< HEAD
			=======

			>>>>>>> LEXCommunityLiJun
			}
			}

			//自动出库
			@isTest
			<<<<<<< HEAD
			static void addSaleOrderAuto() {
			// // TO DO: implement unit test
			List<RecordType> rectCo = [
			SELECT Id
			FROM RecordType
			WHERE IsActive = TRUE AND SobjectType = 'Account' AND Name = '販売店'
			];
			=======
			static void addSaleOrderAuto() {
			// // TO DO: implement unit test
			List<RecordType> rectCo = [select Id from RecordType where IsActive = true and SobjectType = 'Account' and Name = '販売店'];
			>>>>>>> LEXCommunityLiJun
			if (rectCo.size() == 0) {
			return;
			}
			// Profile prof = [select Id from Profile where Name ='901_经销商社区普通权限_2重验证(ET Email)'];
			<<<<<<< HEAD
			Profile prof = [
			SELECT Id
			FROM Profile
			WHERE Name = '901_经销商社区普通权限_2重验证(ET)'
			];

			Account myAccount2 = new Account(
			name = 'Testaccount002',
			Dealer_discount__c = 20,
			RecordTypeId = rectCo[0].Id,
			AgentCode_Ext__c = '9999900'
			);
			Account myAccount1 = new Account(name = 'Testaccount001', Dealer_discount__c = 30, RecordTypeId = rectCo[0].Id);
			insert new List<account>{ myAccount1, myAccount2 };

			Contact core = new Contact(email = 'jplumber@salesforce.com', firstname = 'Joe', lastname = 'Plumber', accountid = myAccount1.id);
			insert core;
			user MyUser_Test = new User(
			ContactId = core.id,
			Alias = 'newUser',
			Email = 'newuser@testorg.com',
			EmailEncodingKey = 'UTF-8',
			LastName = 'TestUser',
			LanguageLocaleKey = 'zh_CN',
			LocaleSidKey = 'zh_CN',
			ProfileId = prof.Id,
			TimeZoneSidKey = 'Asia/Shanghai',
			UserName = 'testUser@testorg.com',
			UserPro_Type__c = 'ET'
			);
			System.runAs(new User(Id = UserInfo.getUserId())) {
			insert MyUser_Test;
			}
			// User MyUser_Test = [select id,Contact.accountid from User WHERE ProfileId = :prof.Id and IsActive = true and UserPro_Type__c = 'ET' limit 1 ];
			// Product2 prod01 = new Product2(Name='Test01',ProductCode='Test01',Asset_Model_No__c = 'Test01',SFDA_Status__c = '有効',JANCODE__c = '04953170200311',Dealer_special_Object__c = true,Manual_Entry__c = false);
			// Product2 prod02 = new Product2(Name='Test02',ProductCode='Test02',Asset_Model_No__c = 'Test02',SFDA_Status__c = '有効',JANCODE__c = '04953170200312',Dealer_special_Object__c = true,Manual_Entry__c = false);
			// insert new Product2[] {prod01,prod02};
			System.runAs(MyUser_Test) {
			Product2 prod01 = new Product2(
			Name = 'Test01',
			ProductCode = 'Test01',
			Asset_Model_No__c = 'Test01',
			SFDA_Status__c = '有効',
			JANCODE__c = '04953170200311',
			Dealer_special_Object__c = true,
			Manual_Entry__c = false
			);
			Product2 prod02 = new Product2(
			Name = 'Test02',
			ProductCode = 'Test02',
			Asset_Model_No__c = 'Test02',
			SFDA_Status__c = '有効',
			JANCODE__c = '04953170200312',
			Dealer_special_Object__c = true,
			Manual_Entry__c = false
			);
			insert new List<Product2>{ prod01, prod02 };
			Product2__c pro1 = new Product2__c(Name = 'Pro001', OT_CODE_Text__c = 'Test001', Product2__c = prod01.Id);
			insert new List<Product2__c>{ pro1 };
			// Account myAccount1 = new Account(name='Testaccount001',Dealer_discount__c =30,RecordTypeId = rectCo[0].Id);
			// insert myAccount1;
			Consumable_order__c Order2 = new Consumable_order__c();
			Order2.Name = 'OCM_02_001';
			Order2.Order_status__c = '批准';
			Order2.Order_type__c = '订单';
			Order2.Dealer_Info__c = myAccount1.Id;
			Order2.RecordTypeid = System.Label.RT_ConOrder_Delivery;
			insert Order2;
			//发错库已到货
			Consumable_order_details2__c Orderdets8 = new Consumable_order_details2__c();
			Orderdets8.Name = 'OCM_01_001011';
			Orderdets8.Consumable_order_minor__c = Order2.Id;
			Orderdets8.Consumable_Product__c = pro1.Id;
			Orderdets8.Asset_Model_No__c = 'Test01';
			Orderdets8.RecordTypeId = System.Label.RT_ConOrderDetail2_Delivery;
			Orderdets8.Bar_Code__c = '01049531702003111115120017181000105ZK250BXSYS';
			Orderdets8.Box_Piece__c = '盒';
			Orderdets8.Arrive_date__c = Date.today();
			Orderdets8.TracingCode__c = 'BXSYS';
			Orderdets8.SerialLotNo__c = '5ZK';
			insert Orderdets8;

			=======
			Profile prof = [select Id from Profile where Name ='901_经销商社区普通权限_2重验证(ET)'];


			@@ -1893,6 +3502,7 @@
			Orderdets8.SerialLotNo__c = '5ZK';
			insert Orderdets8;

			>>>>>>> LEXCommunityLiJun
			ArriveGoodsController Controller = new ArriveGoodsController();
			PageReference page = new PageReference('/apex/ArriveGoods?ArrType=Arr');
			System.Test.setCurrentPage(page);
			@@ -1910,13 +3520,135 @@

			// UPDATE TCM TEST1
			@isTest
			<<<<<<< HEAD
			static void methodTest1() {
			// // TO DO: implement unit test
			List<RecordType> rectCo = [
			SELECT Id
			FROM RecordType
			WHERE IsActive = TRUE AND SobjectType = 'Account' AND Name = '販売店'
			];
			=======
			static void methodTest1() {
			// // TO DO: implement unit test
			List<RecordType> rectCo = [select Id from RecordType where IsActive = true and SobjectType = 'Account' and Name = '販売店'];
			>>>>>>> LEXCommunityLiJun
			if (rectCo.size() == 0) {
			return;
			}
			// Profile prof = [select Id from Profile where Name ='901_经销商社区普通权限_2重验证(ET Email)'];
			<<<<<<< HEAD
			Profile prof = [
			SELECT Id
			FROM Profile
			WHERE Name = '901_经销商社区普通权限_2重验证(ET)'
			];

			Account myAccount2 = new Account(
			name = 'Testaccount002',
			Dealer_discount__c = 20,
			RecordTypeId = rectCo[0].Id,
			AgentCode_Ext__c = '9999900'
			);
			Account myAccount1 = new Account(name = 'Testaccount001', Dealer_discount__c = 30, RecordTypeId = rectCo[0].Id);
			insert new List<account>{ myAccount1, myAccount2 };

			Contact core = new Contact(email = 'jplumber@salesforce.com', firstname = 'Joe', lastname = 'Plumber', accountid = myAccount1.id);
			insert core;
			user MyUser_Test = new User(
			ContactId = core.id,
			Alias = 'newUser',
			Email = 'newuser@testorg.com',
			EmailEncodingKey = 'UTF-8',
			LastName = 'TestUser',
			LanguageLocaleKey = 'zh_CN',
			LocaleSidKey = 'zh_CN',
			ProfileId = prof.Id,
			TimeZoneSidKey = 'Asia/Shanghai',
			UserName = 'testUser@testorg.com',
			UserPro_Type__c = 'ET'
			);
			System.runAs(new User(Id = UserInfo.getUserId())) {
			insert MyUser_Test;
			}
			// User MyUser_Test = [select id,Contact.accountid from User WHERE ProfileId = :prof.Id and IsActive = true and UserPro_Type__c = 'ET' limit 1 ];
			// Product2 prod01 = new Product2(Name='Test01',ProductCode='Test01',Asset_Model_No__c = 'Test01',SFDA_Status__c = '有効',JANCODE__c = '04953170200311',Dealer_special_Object__c = true,Manual_Entry__c = false);
			// Product2 prod02 = new Product2(Name='Test02',ProductCode='Test02',Asset_Model_No__c = 'Test02',SFDA_Status__c = '有効',JANCODE__c = '04953170200312',Dealer_special_Object__c = true,Manual_Entry__c = false);
			// insert new Product2[] {prod01,prod02};
			System.runAs(MyUser_Test) {
			Product2 prod01 = new Product2(
			Name = 'Test01',
			ProductCode = 'Test01',
			Asset_Model_No__c = 'Test01',
			SFDA_Status__c = '有効',
			JANCODE__c = '04953170200311',
			Dealer_special_Object__c = true,
			Manual_Entry__c = false
			);
			Product2 prod02 = new Product2(
			Name = 'Test02',
			ProductCode = 'Test02',
			Asset_Model_No__c = 'Test02',
			SFDA_Status__c = '有効',
			JANCODE__c = '04953170200312',
			Dealer_special_Object__c = true,
			Manual_Entry__c = false
			);
			insert new List<Product2>{ prod01, prod02 };
			Product2__c pro1 = new Product2__c(Name = 'Pro001', OT_CODE_Text__c = 'N3047730', Product2__c = prod01.Id);
			Product2__c pro2 = new Product2__c(Name = 'Pro002', OT_CODE_Text__c = 'N3047731', Product2__c = prod02.Id);
			insert new List<Product2__c>{ pro1, pro2 };
			//订单

			Consumable_order__c Order1 = new Consumable_order__c();
			Order1.Name = 'OCM_01_001';
			Order1.Order_status__c = '批准';
			Order1.Order_type__c = '订单';
			Order1.Dealer_Info__c = myAccount1.id;
			Order1.RecordTypeid = System.Label.RT_ConOrder_Delivery;
			Order1.Order_ProType__c = 'ET';
			insert Order1;

			//订单明细
			//fahuo
			Consumable_orderdetails__c Orderdet = new Consumable_orderdetails__c();
			Orderdet.Name = 'OCM_01_00101';
			Orderdet.Consumable_order__c = Order1.Id;
			Orderdet.RecordTypeId = System.Label.RT_ConOrderDetail1_Order;
			Orderdet.Consumable_Product__c = pro1.Id;
			Orderdet.Consumable_count__c = 4;
			insert Orderdet;

			//发货明细
			//fahuo
			Consumable_order_details2__c Orderdet1 = new Consumable_order_details2__c();
			Orderdet1.Name = 'OCM_01_001001';
			Orderdet1.Consumable_order_minor__c = Order1.Id;
			Orderdet1.Consumable_Product__c = pro1.Id;
			Orderdet1.Asset_Model_No__c = 'Test01';
			Orderdet1.RecordTypeId = System.Label.RT_ConOrderDetail2_Delivery;
			Orderdet1.Bar_Code__c = '01049531702003111115120017181000105ZK250BXJRF';
			Orderdet1.Arrive_date__c = Date.today();
			// Orderdet1.Send_Date__c=Date.today();
			// Orderdet1.Used_date__c=Date.today();
			Orderdet1.TracingCode__c = 'BXJRF';
			Orderdet1.SerialLotNo__c = '5ZK';
			insert Orderdet1;

			//fahuo
			Consumable_order_details2__c Orderdet2 = new Consumable_order_details2__c();
			Orderdet2.Name = 'OCM_01_001001';
			Orderdet2.Consumable_order_minor__c = Order1.Id;
			Orderdet2.Consumable_Product__c = pro1.Id;
			Orderdet2.Asset_Model_No__c = 'Test01';
			Orderdet2.RecordTypeId = System.Label.RT_ConOrderDetail2_Delivery;
			Orderdet2.Bar_Code__c = '01049531702003111115120017181234105ZK250BXJRF';
			Orderdet2.Arrive_date__c = Date.today();
			Orderdet2.TracingCode__c = 'BXJRF';
			Orderdet2.SerialLotNo__c = '5ZK';
			insert Orderdet2;

			=======
			Profile prof = [select Id from Profile where Name ='901_经销商社区普通权限_2重验证(ET)'];


			@@ -1991,6 +3723,7 @@
			Orderdet2.SerialLotNo__c = '5ZK';
			insert Orderdet2;

			>>>>>>> LEXCommunityLiJun
			PageReference page = new PageReference('/apex/ArriveGoods?ESetid=' + Order1.Id);
			System.Test.setCurrentPage(page);
			ArriveGoodsController Controller = new ArriveGoodsController();
			@@ -2002,12 +3735,211 @@
			// System.assertEquals(1, Controller.ConsumableorderdetailsRecords.size());
			// System.assertEquals(2, Controller.consumableInventory.size());
			Controller.ArriveGoodsConfim();
			<<<<<<< HEAD
			List<Consumable_order_details2__c> ins = [
			SELECT Id, Name
			FROM Consumable_order_details2__c
			];
			=======
			List<Consumable_order_details2__c> ins = [SELECT Id,Name FROM Consumable_order_details2__c];
			>>>>>>> LEXCommunityLiJun
			// System.assertEquals(3, ins.size());
			System.Test.stopTest();
			}
			}

			<<<<<<< HEAD
			//返品
			@isTest
			static void methodTest2() {
			// // TO DO: implement unit test
			List<RecordType> rectCo = [
			SELECT Id
			FROM RecordType
			WHERE IsActive = TRUE AND SobjectType = 'Account' AND Name = '販売店'
			];
			if (rectCo.size() == 0) {
			return;
			}
			// Profile prof = [select Id from Profile where Name ='901_经销商社区普通权限_2重验证(ET Email)'];
			Profile prof = [
			SELECT Id
			FROM Profile
			WHERE Name = '901_经销商社区普通权限_2重验证(ET)'
			];

			Account myAccount2 = new Account(
			name = 'Testaccount002',
			Dealer_discount__c = 20,
			RecordTypeId = rectCo[0].Id,
			AgentCode_Ext__c = '9999900'
			);
			Account myAccount1 = new Account(name = 'Testaccount001', Dealer_discount__c = 30, RecordTypeId = rectCo[0].Id);
			insert new List<account>{ myAccount1, myAccount2 };

			Contact core = new Contact(email = 'jplumber@salesforce.com', firstname = 'Joe', lastname = 'Plumber', accountid = myAccount1.id);
			insert core;
			user MyUser_Test = new User(
			ContactId = core.id,
			Alias = 'newUser',
			Email = 'newuser@testorg.com',
			EmailEncodingKey = 'UTF-8',
			LastName = 'TestUser',
			LanguageLocaleKey = 'zh_CN',
			LocaleSidKey = 'zh_CN',
			ProfileId = prof.Id,
			TimeZoneSidKey = 'Asia/Shanghai',
			UserName = 'testUser@testorg.com',
			UserPro_Type__c = 'ET'
			);
			System.runAs(new User(Id = UserInfo.getUserId())) {
			insert MyUser_Test;
			}
			// User MyUser_Test = [select id,Contact.accountid from User WHERE ProfileId = :prof.Id and IsActive = true and UserPro_Type__c = 'ET' limit 1 ];
			// Product2 prod01 = new Product2(Name='Test01',ProductCode='Test01',Asset_Model_No__c = 'Test01',SFDA_Status__c = '有効',JANCODE__c = '04953170200311',Dealer_special_Object__c = true,Manual_Entry__c = false);
			// Product2 prod02 = new Product2(Name='Test02',ProductCode='Test02',Asset_Model_No__c = 'Test02',SFDA_Status__c = '有効',JANCODE__c = '04953170200312',Dealer_special_Object__c = true,Manual_Entry__c = false);
			// insert new Product2[] {prod01,prod02};
			System.runAs(MyUser_Test) {
			Product2 prod01 = new Product2(
			Name = 'Test01',
			ProductCode = 'Test01',
			Asset_Model_No__c = 'Test01',
			SFDA_Status__c = '有効',
			JANCODE__c = '04953170200311',
			Dealer_special_Object__c = true,
			Manual_Entry__c = false
			);
			Product2 prod02 = new Product2(
			Name = 'Test02',
			ProductCode = 'Test02',
			Asset_Model_No__c = 'Test02',
			SFDA_Status__c = '有効',
			JANCODE__c = '04953170200312',
			Dealer_special_Object__c = true,
			Manual_Entry__c = false
			);
			insert new List<Product2>{ prod01, prod02 };
			Product2__c pro1 = new Product2__c(Name = 'Pro001', OT_CODE_Text__c = 'Test001', Product2__c = prod01.Id);
			Product2__c pro2 = new Product2__c(Name = 'Pro002', OT_CODE_Text__c = 'Test002', Product2__c = prod02.Id);
			insert new List<Product2__c>{ pro1, pro2 };
			//订单
			Consumable_order__c Order1 = new Consumable_order__c();
			Order1.Name = 'OCM_01_001';
			Order1.Order_status__c = '批准';
			Order1.Order_type__c = '订单';
			Order1.Dealer_Info__c = myAccount1.id;
			Order1.RecordTypeid = System.Label.RT_ConOrder_Delivery;
			Order1.Order_ProType__c = 'ET';
			insert Order1;
			//Consumable_order__c coc = [select Dealer_Info__r.name from Consumable_order__c where Id =:Order1.Id];
			//system.assertEquals('qeee',coc.Dealer_Info__r.name);

			//订单明细
			//fahuo
			Consumable_orderdetails__c Orderdet = new Consumable_orderdetails__c();
			Orderdet.Name = 'OCM_01_001001';
			Orderdet.Consumable_order__c = Order1.Id;
			Orderdet.RecordTypeId = System.Label.RT_ConOrderDetail1_Order;
			Orderdet.Consumable_Product__c = pro1.Id;
			Orderdet.Consumable_count__c = 4;
			insert Orderdet;

			//发货明细
			//fahuo
			Consumable_order_details2__c Orderdet1 = new Consumable_order_details2__c();
			Orderdet1.Name = 'OCM_01_001001';
			Orderdet1.Consumable_order_minor__c = Order1.Id;
			Orderdet1.Consumable_Product__c = pro1.Id;
			Orderdet1.Asset_Model_No__c = 'Pro001';
			Orderdet1.RecordTypeId = System.Label.RT_ConOrderDetail2_Delivery;
			Orderdet1.Box_Piece__c = '盒';
			Orderdet1.Bar_Code__c = '01049531702003111115120017181000105ZK250BXJRF';
			//daohuo
			Consumable_order_details2__c Orderdet2 = new Consumable_order_details2__c();
			Orderdet2.Name = 'OCM_01_001002';
			Orderdet2.Consumable_order_minor__c = Order1.Id;
			Orderdet2.Consumable_Product__c = pro1.Id;
			Orderdet2.Asset_Model_No__c = 'Pro001';
			Orderdet2.Consumable_Arrived_order__c = Order1.Id;
			//Orderdet2.IsArrival__c = true;
			Orderdet2.RecordTypeId = System.Label.RT_ConOrderDetail2_Delivery;
			Orderdet2.Box_Piece__c = '盒';
			Orderdet2.Arrive_date__c = Date.today();
			//Orderdet2.Send_Date__c = Date.today();
			//Orderdet2.Used_date__c= Date.today();
			Orderdet2.Bar_Code__c = '01049531702003111115120017181000105ZK250BXJRF';
			//sale
			Consumable_order_details2__c Orderdet3 = new Consumable_order_details2__c();
			Orderdet3.Name = 'OCM_01_001003';
			Orderdet3.Consumable_order_minor__c = Order1.Id;
			Orderdet3.Consumable_Product__c = pro1.Id;
			Orderdet3.Asset_Model_No__c = 'Pro001';
			Orderdet3.Consumable_Arrived_order__c = Order1.Id;
			//Orderdet3.IsArrival__c = true;
			Orderdet3.Consumable_Sale_order__c = Order1.Id;
			Orderdet3.Box_Piece__c = '盒';
			Orderdet3.Used_date__c = Date.today();
			Orderdet3.Arrive_date__c = Date.today();
			Orderdet3.RecordTypeId = System.Label.RT_ConOrderDetail2_Delivery;
			Orderdet3.Bar_Code__c = '01049531702003111115120017181000105ZK250BXJRF';
			Orderdet3.TracingCode__c = 'BXJRF';
			Orderdet3.SerialLotNo__c = '5ZK';
			//出库
			Consumable_order_details2__c Orderdet4 = new Consumable_order_details2__c();
			Orderdet4.Name = 'OCM_01_001004';
			Orderdet4.Consumable_order_minor__c = Order1.Id;
			Orderdet4.Consumable_Product__c = pro1.Id;
			Orderdet4.Asset_Model_No__c = 'Pro001';
			Orderdet4.Consumable_Arrived_order__c = Order1.Id;
			//Orderdet4.IsArrival__c = true;
			Orderdet4.Consumable_Shipment_order__c = Order1.Id;
			Orderdet4.Box_Piece__c = '个';
			Orderdet4.Send_Date__c = Date.today();
			Orderdet4.Arrive_date__c = Date.today();
			Orderdet4.RecordTypeId = System.Label.RT_ConOrderDetail2_Delivery;
			Orderdet4.Bar_Code__c = '01049531702003111115120017181000105ZK250BXJRN';
			Orderdet4.TracingCode__c = 'BXJRN';
			Orderdet4.SerialLotNo__c = '5ZK';
			//quxiao
			Consumable_order_details2__c Orderdet5 = new Consumable_order_details2__c();
			Orderdet5.Name = 'OCM_01_001005';
			Orderdet5.Consumable_order_minor__c = Order1.Id;
			Orderdet5.Consumable_Product__c = pro1.Id;
			Orderdet5.Asset_Model_No__c = 'Pro001';
			Orderdet5.Cancellation_Date__c = Date.today();
			Orderdet5.Cancellation_Flag__c = true;
			Orderdet5.RecordTypeId = System.Label.RT_ConOrderDetail2_Delivery;
			Orderdet5.Bar_Code__c = '01049531702003111115120017181000105ZK250BXJRZ';
			Orderdet5.Box_Piece__c = '个';
			Orderdet5.TracingCode__c = 'BXJRZ';
			Orderdet5.SerialLotNo__c = '5ZK';
			insert new List<Consumable_order_details2__c>{ Orderdet1, Orderdet3, Orderdet4, Orderdet5 };

			PageReference page = new PageReference('/apex/ArriveGoods?ArrType=ReG');
			System.Test.setCurrentPage(page);
			ArriveGoodsController Controller = new ArriveGoodsController();
			//初始化测试
			System.Test.startTest();
			Controller.init();
			//排序
			Controller.barcode = '01049531702003111115120017181000105ZK250BXJRF\n01049531702003111115120017181000105ZK250BXJRN\n01049531702003111115120017181000105ZK250BXJRZ\n01049531702003111115120017181000105ZK250BXJRR';
			Controller.SearchPro();
			System.assertEquals(1, controller.ConsumableorderdetailsRecordserror.size());
			// System.assertEquals(2, controller.ShowGoodsofReturnList.size());
			controller.ShowGoodsofReturnList[0].esd.Return_reason__c = '多发';
			// controller.ShowGoodsofReturnList[1].esd.Return_reason__c='多发';
			// controller.ShowGoodsofReturnList[0].esd.Rrturn_count__c =1;
			Controller.UpdateGoodsOfReturn();

			list<String> list1 = new List<String>();
			list1.add(Controller.barcode = '01234567898');
			Controller.inventoryEntryNoESetId(list1);

			list1.clear();
			list1.add(Controller.barcode = '012345678901234A67');
			Controller.inventoryEntryNoESetId(list1);

			=======

			//返品
			@isTest
			@@ -2159,6 +4091,7 @@
			list1.add(Controller.barcode = '012345678901234A67');
			Controller.inventoryEntryNoESetId(list1);

			>>>>>>> LEXCommunityLiJun
			list1.clear();
			list1.add(Controller.barcode = '0123456789012345117AA01');
			Controller.inventoryEntryNoESetId(list1);
			@@ -2214,19 +4147,65 @@
			list1.add(Controller.barcode = '0112345678901231106789012105625001234');
			Controller.inventoryEntryNoESetId(list1);
			System.Test.stopTest();
			<<<<<<< HEAD
			=======

			>>>>>>> LEXCommunityLiJun
			}
			}

			//整体到货
			@isTest
			<<<<<<< HEAD
			static void ArrivejancodeTest() {
			// // TO DO: implement unit test
			List<RecordType> rectCo = [
			SELECT Id
			FROM RecordType
			WHERE IsActive = TRUE AND SobjectType = 'Account' AND Name = '販売店'
			];
			=======
			static void ArrivejancodeTest() {
			// // TO DO: implement unit test
			List<RecordType> rectCo = [select Id from RecordType where IsActive = true and SobjectType = 'Account' and Name = '販売店'];
			>>>>>>> LEXCommunityLiJun
			if (rectCo.size() == 0) {
			return;
			}
			// Profile prof = [select Id from Profile where Name ='901_经销商社区普通权限_2重验证(ET Email)'];
			<<<<<<< HEAD
			Profile prof = [
			SELECT Id
			FROM Profile
			WHERE Name = '901_经销商社区普通权限_2重验证(ET)'
			];

			Oly_TriggerHandler.bypass('ConsumableAssetHander');
			Account myAccount2 = new Account(
			name = 'Testaccount002',
			Dealer_discount__c = 20,
			RecordTypeId = rectCo[0].Id,
			AgentCode_Ext__c = '9999900'
			);
			Account myAccount1 = new Account(name = 'Testaccount001', Dealer_discount__c = 30, RecordTypeId = rectCo[0].Id);
			insert new List<account>{ myAccount1, myAccount2 };
			Contact core = new Contact(email = 'jplumber@salesforce.com', firstname = 'Joe', lastname = 'Plumber', accountid = myAccount1.id);
			insert core;
			user MyUser_Test = new User(
			ContactId = core.id,
			Alias = 'newUser',
			Email = 'newuser@testorg.com',
			EmailEncodingKey = 'UTF-8',
			LastName = 'TestUser',
			LanguageLocaleKey = 'zh_CN',
			LocaleSidKey = 'zh_CN',
			ProfileId = prof.Id,
			TimeZoneSidKey = 'Asia/Shanghai',
			UserName = 'testUser@testorg.com',
			UserPro_Type__c = 'ET'
			);
			System.runAs(new User(Id = UserInfo.getUserId())) {
			=======
			Profile prof = [select Id from Profile where Name ='901_经销商社区普通权限_2重验证(ET)'];

			Oly_TriggerHandler.bypass('ConsumableAssetHander');
			@@ -2237,6 +4216,7 @@
			insert core;
			user MyUser_Test = New User(ContactId = core.id,Alias = 'newUser',Email='newuser@testorg.com',EmailEncodingKey='UTF-8', LastName='TestUser', LanguageLocaleKey='zh_CN',LocaleSidKey='zh_CN', ProfileId = prof.Id,TimeZoneSidKey='Asia/Shanghai', UserName='testUser@testorg.com',UserPro_Type__c = 'ET');
			System.runAs(new User(Id = UserInfo.getUserId())){
			>>>>>>> LEXCommunityLiJun
			insert MyUser_Test;
			}

			@@ -2244,12 +4224,37 @@
			// Product2 prod01 = new Product2(Name='Test01',ProductCode='Test01',Asset_Model_No__c = 'Test01',SFDA_Status__c = '有効',JANCODE__c = '04953170200311',Dealer_special_Object__c = true,Manual_Entry__c = false);
			// Product2 prod02 = new Product2(Name='Test02',ProductCode='Test02',Asset_Model_No__c = 'Test02',SFDA_Status__c = '有効',JANCODE__c = '04953170200312',Dealer_special_Object__c = true,Manual_Entry__c = false);
			// insert new Product2[] {prod01,prod02};
			<<<<<<< HEAD
			System.runAs(MyUser_Test) {
			Product2 prod01 = new Product2(
			Name = 'Test01',
			ProductCode = 'Test01',
			Asset_Model_No__c = 'Test01',
			SFDA_Status__c = '有効',
			JANCODE__c = '04953170200311',
			Dealer_special_Object__c = true,
			Manual_Entry__c = false
			);
			Product2 prod02 = new Product2(
			Name = 'Test02',
			ProductCode = 'Test02',
			Asset_Model_No__c = 'Test02',
			SFDA_Status__c = '有効',
			JANCODE__c = '04953170200312',
			Dealer_special_Object__c = true,
			Manual_Entry__c = false
			);
			insert new List<Product2>{ prod01, prod02 };
			Product2__c pro1 = new Product2__c(Name = 'Pro001', OT_CODE_Text__c = 'Test001', Product2__c = prod01.Id);
			insert new List<Product2__c>{ pro1 };
			=======
			system.runAs(MyUser_Test){
			Product2 prod01 = new Product2(Name='Test01',ProductCode='Test01',Asset_Model_No__c = 'Test01',SFDA_Status__c = '有効',JANCODE__c = '04953170200311',Dealer_special_Object__c = true,Manual_Entry__c = false);
			Product2 prod02 = new Product2(Name='Test02',ProductCode='Test02',Asset_Model_No__c = 'Test02',SFDA_Status__c = '有効',JANCODE__c = '04953170200312',Dealer_special_Object__c = true,Manual_Entry__c = false);
			insert new Product2[] {prod01,prod02};
			Product2__c pro1 = new Product2__c(Name='Pro001',OT_CODE_Text__c='Test001',Product2__c = prod01.Id);
			insert new Product2__c[] {pro1};
			>>>>>>> LEXCommunityLiJun
			// Account myAccount1 = new Account(name='Testaccount001',Dealer_discount__c =30,RecordTypeId = rectCo[0].Id);
			// insert myAccount1;
			Consumable_order__c Order2 = new Consumable_order__c();
			@@ -2331,7 +4336,10 @@
			Orderdet3.SerialLotNo__c = '5ZK';
			//Orderdet3.Box_Piece__c = '个';

			<<<<<<< HEAD
			=======

			>>>>>>> LEXCommunityLiJun
			//出库产品
			Consumable_order_details2__c Orderdet4 = new Consumable_order_details2__c();
			Orderdet4.Name = 'OCM_01_001005';
			@@ -2340,7 +4348,11 @@
			Orderdet4.Asset_Model_No__c = 'Test01';
			Orderdet4.RecordTypeId = System.Label.RT_ConOrderDetail2_Delivery;
			Orderdet4.Bar_Code__c = '01049531702003111115120017181000105ZK250BXJRD';
			<<<<<<< HEAD
			Orderdet4.Send_Date__c = Date.today();
			=======
			Orderdet4.Send_Date__c = Date.today();
			>>>>>>> LEXCommunityLiJun
			Orderdet4.Arrive_date__c = Date.today();
			Orderdet4.Box_Piece__c = '盒';
			Orderdet4.TracingCode__c = 'BXJRD';
			@@ -2358,6 +4370,13 @@
			Orderdet5.Consumable_Shipment_order__c = Order1.Id;
			Orderdet5.RecordTypeId = System.Label.RT_ConOrderDetail2_Delivery;
			Orderdet5.Bar_Code__c = '01049531702003111115120017181000105ZK250BXJRE';
			<<<<<<< HEAD
			Orderdet5.Arrive_date__c = Date.today();
			Orderdet5.Box_Piece__c = '盒';
			Orderdet5.TracingCode__c = 'BXJRE';
			Orderdet5.SerialLotNo__c = '5ZK';
			insert new List<Consumable_order_details2__c>{ Orderdet1, Orderdet2, Orderdet3, Orderdet4, Orderdet5 };
			=======
			Orderdet5.Arrive_date__c = Date.today();
			Orderdet5.Box_Piece__c = '盒';
			Orderdet5.TracingCode__c = 'BXJRE';
			@@ -2365,6 +4384,7 @@
			insert new Consumable_order_details2__c[] {Orderdet1, Orderdet2,Orderdet3,Orderdet4,Orderdet5};


			>>>>>>> LEXCommunityLiJun

			ArriveGoodsController Controller = new ArriveGoodsController();
			PageReference page = new PageReference('/apex/ArriveGoods?ArrType=Arr');
			@@ -2379,6 +4399,591 @@
			System.assertEquals('OCM_01_001002', controller.ConsumableorderdetailsRecords[0].esd.Name);
			// System.assertEquals(2, controller.ConsumableorderdetailsRecordserror.size());
			System.Test.stopTest();
			<<<<<<< HEAD
			}
			}

			//发错货入库
			@isTest
			static void ArriveotheragencyTest() {
			// // TO DO: implement unit test
			List<RecordType> rectCo = [
			SELECT Id
			FROM RecordType
			WHERE IsActive = TRUE AND SobjectType = 'Account' AND Name = '販売店'
			];
			if (rectCo.size() == 0) {
			return;
			}
			// Profile prof = [select Id from Profile where Name ='901_经销商社区普通权限_2重验证(ET Email)'];
			Profile prof = [
			SELECT Id
			FROM Profile
			WHERE Name = '901_经销商社区普通权限_2重验证(ET)'
			];

			Oly_TriggerHandler.bypass('ConsumableAssetHander');
			Account myAccount2 = new Account(
			name = 'Testaccount002',
			Dealer_discount__c = 20,
			RecordTypeId = rectCo[0].Id,
			AgentCode_Ext__c = '9999900'
			);
			Account myAccount1 = new Account(name = 'Testaccount001', Dealer_discount__c = 30, RecordTypeId = rectCo[0].Id);
			insert new List<account>{ myAccount1, myAccount2 };
			Contact core = new Contact(email = 'jplumber@salesforce.com', firstname = 'Joe', lastname = 'Plumber', accountid = myAccount1.id);
			insert core;
			user MyUser_Test = new User(
			ContactId = core.id,
			Alias = 'newUser',
			Email = 'newuser@testorg.com',
			EmailEncodingKey = 'UTF-8',
			LastName = 'TestUser',
			LanguageLocaleKey = 'zh_CN',
			LocaleSidKey = 'zh_CN',
			ProfileId = prof.Id,
			TimeZoneSidKey = 'Asia/Shanghai',
			UserName = 'testUser@testorg.com',
			UserPro_Type__c = 'ET'
			);
			System.runAs(new User(Id = UserInfo.getUserId())) {
			insert MyUser_Test;
			}

			// User MyUser_Test = [select id,Contact.accountid from User WHERE ProfileId = :prof.Id and IsActive = true and UserPro_Type__c = 'ET' limit 1 ];
			// Product2 prod01 = new Product2(Name='Test01',ProductCode='Test01',Asset_Model_No__c = 'Test01',SFDA_Status__c = '有効',JANCODE__c = '04953170200311',Dealer_special_Object__c = true,Manual_Entry__c = false);
			// Product2 prod02 = new Product2(Name='Test02',ProductCode='Test02',Asset_Model_No__c = 'Test02',SFDA_Status__c = '有効',JANCODE__c = '04953170200312',Dealer_special_Object__c = true,Manual_Entry__c = false);
			// insert new Product2[] {prod01,prod02};
			System.runAs(MyUser_Test) {
			Product2 prod01 = new Product2(
			Name = 'Test01',
			ProductCode = 'Test01',
			Asset_Model_No__c = 'Test01',
			SFDA_Status__c = '有効',
			JANCODE__c = '04953170200311',
			Dealer_special_Object__c = true,
			Manual_Entry__c = false
			);
			Product2 prod02 = new Product2(
			Name = 'Test02',
			ProductCode = 'Test02',
			Asset_Model_No__c = 'Test02',
			SFDA_Status__c = '有効',
			JANCODE__c = '04953170200312',
			Dealer_special_Object__c = true,
			Manual_Entry__c = false
			);
			insert new List<Product2>{ prod01, prod02 };
			Product2__c pro1 = new Product2__c(Name = 'Pro001', OT_CODE_Text__c = 'Test001', Product2__c = prod01.Id);
			insert new List<Product2__c>{ pro1 };
			Account myAccount3 = new Account(name = 'Testaccount003', Dealer_discount__c = 30, RecordTypeId = rectCo[0].Id);
			insert myAccount3;
			Consumable_order__c Order2 = new Consumable_order__c();
			Order2.Name = 'OCM_02_001';
			Order2.Order_status__c = '批准';
			Order2.Order_type__c = '订单';
			Order2.Dealer_Info__c = myAccount3.Id;
			Order2.RecordTypeid = System.Label.RT_ConOrder_Delivery;
			Order2.Order_ProType__c = 'ET';
			insert Order2;
			//发错库未到货
			Consumable_order_details2__c Orderdets8 = new Consumable_order_details2__c();
			Orderdets8.Name = 'OCM_01_001011';
			Orderdets8.Consumable_order_minor__c = Order2.Id;
			Orderdets8.Consumable_Product__c = pro1.Id;
			Orderdets8.Asset_Model_No__c = 'Test01';
			Orderdets8.RecordTypeId = System.Label.RT_ConOrderDetail2_Delivery;
			Orderdets8.Bar_Code__c = '01049531702003111115120017181000105ZK250BXSYS';
			Orderdets8.Box_Piece__c = '盒';
			Orderdets8.TracingCode__c = 'BXSYS';
			Orderdets8.SerialLotNo__c = '5ZK';
			Orderdets8.ownerid = MyUser_Test.id;
			insert Orderdets8;

			//发错库已到货
			Consumable_order_details2__c Orderdets9 = new Consumable_order_details2__c();
			Orderdets9.Name = 'OCM_01_001012';
			Orderdets9.Consumable_order_minor__c = Order2.Id;
			Orderdets9.Consumable_Product__c = pro1.Id;
			Orderdets9.Asset_Model_No__c = 'Test01';
			Orderdets9.RecordTypeId = System.Label.RT_ConOrderDetail2_Delivery;
			Orderdets9.Bar_Code__c = '01049531702003111115120017181000105ZK250BXSYQ';
			Orderdets9.Consumable_Arrived_order__c = Order2.Id;
			Orderdets9.Arrive_date__c = Date.today();
			Orderdets9.Box_Piece__c = '盒';
			Orderdets9.TracingCode__c = 'BXSYQ';
			Orderdets9.SerialLotNo__c = '5ZK';
			insert Orderdets9;

			// Consumable_order__c Order1 = new Consumable_order__c();
			// Order1.Name = 'OCM_01_001';
			// Order1.Order_status__c = '批准';
			// Order1.Order_type__c = '订单';
			// Order1.Dealer_Info__c = myAccount1.id;
			// Order1.Order_ProType__c = 'ET';
			// Order1.RecordTypeid = System.Label.RT_ConOrder_Delivery;
			// insert Order1;
			// //订单明细
			// //fahuo
			// Consumable_orderdetails__c Orderdet = new Consumable_orderdetails__c();
			// Orderdet.Name = 'OCM_01_00101';
			// Orderdet.Consumable_order__c = Order1.Id;
			// Orderdet.RecordTypeId = System.Label.RT_ConOrderDetail1_Order;
			// Orderdet.Consumable_Product__c = pro1.Id;
			// Orderdet.Consumable_count__c = 4;
			// insert Orderdet;

			// //到货正确信息
			// Consumable_order_details2__c Orderdet1 = new Consumable_order_details2__c();
			// Orderdet1.Name = 'OCM_01_001002';
			// Orderdet1.Consumable_order_minor__c = Order1.Id;
			// Orderdet1.Consumable_Product__c = pro1.Id;
			// Orderdet1.Asset_Model_No__c = 'Test01';
			// Orderdet1.RecordTypeId = System.Label.RT_ConOrderDetail2_Delivery;
			// Orderdet1.Bar_Code__c = '01049531702003111115120017181000105ZK250BXJRA';
			// Orderdet1.Box_Piece__c = '盒';
			// Orderdet1.TracingCode__c = 'BXJRA';
			// Orderdet1.SerialLotNo__c = '5ZK';
			// //没到货
			// Consumable_order_details2__c Orderdet2 = new Consumable_order_details2__c();
			// Orderdet2.Name = 'OCM_01_001003';
			// Orderdet2.Consumable_order_minor__c = Order1.Id;
			// Orderdet2.Consumable_Product__c = pro1.Id;
			// Orderdet2.Asset_Model_No__c = 'Test01';
			// Orderdet2.Consumable_Arrived_order__c = Order1.Id;
			// Orderdet2.RecordTypeId = System.Label.RT_ConOrderDetail2_Delivery;
			// Orderdet2.Bar_Code__c = '01049531702003111115120017181000105ZK250BXJRB';
			// Orderdet2.Box_Piece__c = '盒';
			// Orderdet2.TracingCode__c = 'BXJRB';
			// Orderdet2.SerialLotNo__c = '5ZK';
			// //销售产品
			// Consumable_order_details2__c Orderdet3 = new Consumable_order_details2__c();
			// Orderdet3.Name = 'OCM_01_001004';
			// Orderdet3.Consumable_order_minor__c = Order1.Id;
			// Orderdet3.Consumable_Product__c = pro1.Id;
			// Orderdet3.Asset_Model_No__c = 'Test01';
			// Orderdet3.Consumable_Arrived_order__c = Order1.Id;
			// //Orderdet3.IsArrival__c = true;
			// Orderdet3.Consumable_Sale_order__c = Order1.Id;
			// Orderdet3.RecordTypeId = System.Label.RT_ConOrderDetail2_Delivery;
			// Orderdet3.Bar_Code__c = '01049531702003111115120017181000105ZK250BXJRC';
			// Orderdet3.Used_date__c = Date.today();
			// Orderdet3.Arrive_date__c = Date.today();
			// Orderdet3.Box_Piece__c = '盒';
			// Orderdet3.TracingCode__c = 'BXJRC';
			// Orderdet3.SerialLotNo__c = '5ZK';
			// //Orderdet3.Box_Piece__c = '个';

			// //出库产品
			// Consumable_order_details2__c Orderdet4 = new Consumable_order_details2__c();
			// Orderdet4.Name = 'OCM_01_001005';
			// Orderdet4.Consumable_order_minor__c = Order1.Id;
			// Orderdet4.Consumable_Product__c = pro1.Id;
			// Orderdet4.Asset_Model_No__c = 'Test01';
			// Orderdet4.RecordTypeId = System.Label.RT_ConOrderDetail2_Delivery;
			// Orderdet4.Bar_Code__c = '01049531702003111115120017181000105ZK250BXJRD';
			// Orderdet4.Send_Date__c = Date.today();
			// Orderdet4.Arrive_date__c = Date.today();
			// Orderdet4.Box_Piece__c = '盒';
			// Orderdet4.TracingCode__c = 'BXJRD';
			// Orderdet4.SerialLotNo__c = '5ZK';
			// //Orderdet4.Box_Piece__c = '盒';
			// //Orderdet4.Return_date__c = null;

			// //已到货产品
			// Consumable_order_details2__c Orderdet5 = new Consumable_order_details2__c();
			// Orderdet5.Name = 'OCM_01_001006';
			// Orderdet5.Consumable_order_minor__c = Order1.Id;
			// Orderdet5.Consumable_Product__c = pro1.Id;
			// Orderdet5.Asset_Model_No__c = 'Test01';
			// Orderdet5.Consumable_Arrived_order__c = Order1.Id;
			// Orderdet5.Consumable_Shipment_order__c = Order1.Id;
			// Orderdet5.RecordTypeId = System.Label.RT_ConOrderDetail2_Delivery;
			// Orderdet5.Bar_Code__c = '01049531702003111115120017181000105ZK250BXJRE';
			// Orderdet5.Arrive_date__c = Date.today();
			// Orderdet5.Box_Piece__c = '盒';
			// Orderdet5.TracingCode__c = 'BXJRE';
			// Orderdet5.SerialLotNo__c = '5ZK';
			// insert new Consumable_order_details2__c[] {Orderdet1, Orderdet2,Orderdet3,Orderdet4,Orderdet5};

			ArriveGoodsController Controller = new ArriveGoodsController();
			PageReference page = new PageReference('/apex/ArriveGoods?ArrType=Arr');
			System.Test.setCurrentPage(page);
			//初始化测试
			System.Test.startTest();
			Controller.init();
			//排序
			Controller.barcode = '01049531702003111115120017181000105ZK250BXSYS\n01049531702003111115120017181000105ZK250BXSYQ';
			Controller.SearchPro();
			Controller.ArriveGoodsConfim();

			// System.assertEquals(2, controller.ConsumableorderdetailsRecordserror.size());
			System.Test.stopTest();
			}
			}

			//返品
			@isTest
			static void addInventoryDetails1() {
			// // TO DO: implement unit test
			List<RecordType> rectCo = [
			SELECT Id
			FROM RecordType
			WHERE IsActive = TRUE AND SobjectType = 'Account' AND Name = '販売店'
			];
			if (rectCo.size() == 0) {
			return;
			}
			// Profile prof = [select Id from Profile where Name ='901_经销商社区普通权限_2重验证(ET Email)'];
			Profile prof = [
			SELECT Id
			FROM Profile
			WHERE Name = '901_经销商社区普通权限_2重验证(ET)'
			];

			Account myAccount2 = new Account(
			name = 'Testaccount002',
			Dealer_discount__c = 20,
			RecordTypeId = rectCo[0].Id,
			AgentCode_Ext__c = '9999900'
			);
			Account myAccount1 = new Account(name = 'Testaccount001', Dealer_discount__c = 30, RecordTypeId = rectCo[0].Id);
			insert new List<account>{ myAccount1, myAccount2 };

			Contact core = new Contact(email = 'jplumber@salesforce.com', firstname = 'Joe', lastname = 'Plumber', accountid = myAccount1.id);
			insert core;
			user MyUser_Test = new User(
			ContactId = core.id,
			Alias = 'newUser',
			Email = 'newuser@testorg.com',
			EmailEncodingKey = 'UTF-8',
			LastName = 'TestUser',
			LanguageLocaleKey = 'zh_CN',
			LocaleSidKey = 'zh_CN',
			ProfileId = prof.Id,
			TimeZoneSidKey = 'Asia/Shanghai',
			UserName = 'testUser@testorg.com',
			UserPro_Type__c = 'ET'
			);
			System.runAs(new User(Id = UserInfo.getUserId())) {
			insert MyUser_Test;
			}

			// User MyUser_Test = [select id,Contact.accountid from User WHERE ProfileId = :prof.Id and IsActive = true and UserPro_Type__c = 'ET' limit 1 ];
			// Product2 prod01 = new Product2(Name='Test01',ProductCode='Test01',Asset_Model_No__c = 'Test01',SFDA_Status__c = '有効',JANCODE__c = '04953170200311',Dealer_special_Object__c = true,Manual_Entry__c = false);
			// Product2 prod02 = new Product2(Name='Test02',ProductCode='Test02',Asset_Model_No__c = 'Test02',SFDA_Status__c = '有効',JANCODE__c = '04953170200312',Dealer_special_Object__c = true,Manual_Entry__c = false);
			// insert new Product2[] {prod01,prod02};
			System.runAs(MyUser_Test) {
			Product2 prod01 = new Product2(
			Name = 'Test01',
			ProductCode = 'Test01',
			Asset_Model_No__c = 'Test01',
			SFDA_Status__c = '有効',
			JANCODE__c = '04953170200311',
			Dealer_special_Object__c = true,
			Manual_Entry__c = false
			);
			Product2 prod02 = new Product2(
			Name = 'Test02',
			ProductCode = 'Test02',
			Asset_Model_No__c = 'Test02',
			SFDA_Status__c = '有効',
			JANCODE__c = '04953170200312',
			Dealer_special_Object__c = true,
			Manual_Entry__c = false
			);
			insert new List<Product2>{ prod01, prod02 };
			Product2__c pro1 = new Product2__c(Name = 'Pro001', OT_CODE_Text__c = 'Test001', Product2__c = prod01.Id);
			Product2__c pro2 = new Product2__c(Name = 'Pro002', OT_CODE_Text__c = 'Test002', Product2__c = prod02.Id);
			insert new List<Product2__c>{ pro1, pro2 };
			//订单
			Oly_TriggerHandler.bypass('ConsumableAssetHander');
			Consumable_order__c Order1 = new Consumable_order__c();
			Order1.Name = 'OCM_01_001';
			Order1.Order_status__c = '批准';
			Order1.Order_type__c = '订单';
			Order1.Dealer_Info__c = myAccount1.id;
			Order1.RecordTypeid = System.Label.RT_ConOrder_Delivery;
			Order1.Order_ProType__c = 'ET';
			//返品订单

			Consumable_order__c Order2 = new Consumable_order__c();
			Order2.Name = 'OCM_01_002';
			Order2.Order_status__c = '批准';
			Order2.Order_type__c = '返品';
			Order2.Dealer_Info__c = myAccount1.id;
			Order2.RecordTypeid = System.Label.Dealer_Returned_Label;
			insert Order1;
			insert Order2;

			//订单明细
			//fahuo
			Consumable_orderdetails__c Orderdet = new Consumable_orderdetails__c();
			Orderdet.Name = 'OCM_01_00101';
			Orderdet.Consumable_order__c = Order1.Id;
			Orderdet.RecordTypeId = System.Label.RT_ConOrderDetail1_Order;
			Orderdet.Consumable_Product__c = pro1.Id;
			Orderdet.Consumable_count__c = 4;
			insert Orderdet;

			//发货明细
			//fahuo
			Consumable_order_details2__c Orderdet1 = new Consumable_order_details2__c();
			Orderdet1.Name = 'OCM_01_001001';
			Orderdet1.Consumable_order_minor__c = Order1.Id;
			Orderdet1.Consumable_Product__c = pro1.Id;
			Orderdet1.Asset_Model_No__c = 'Pro001';
			Orderdet1.RecordTypeId = System.Label.RT_ConOrderDetail2_Delivery;
			Orderdet1.Bar_Code__c = '01049531702003111115120017181000105ZK250BXJRF';
			Orderdet1.TracingCode__c = 'BXJRF';
			//daohuo
			Consumable_order_details2__c Orderdet2 = new Consumable_order_details2__c();
			Orderdet2.Name = 'OCM_01_001002';
			Orderdet2.Consumable_order_minor__c = Order1.Id;
			Orderdet2.Consumable_Product__c = pro1.Id;
			Orderdet2.Asset_Model_No__c = 'Pro001';
			Orderdet2.Consumable_Arrived_order__c = Order1.Id;
			//Orderdet2.IsArrival__c = true;
			Orderdet2.Arrive_date__c = Date.today();
			Orderdet2.RecordTypeId = System.Label.RT_ConOrderDetail2_Delivery;
			Orderdet2.Bar_Code__c = '01049531702003111115120017181000105ZK250BXJRI';
			Orderdet2.TracingCode__c = 'BXJRF';
			//sale
			Consumable_order_details2__c Orderdet3 = new Consumable_order_details2__c();
			Orderdet3.Name = 'OCM_01_001003';
			Orderdet3.Consumable_order_minor__c = Order1.Id;
			Orderdet3.Consumable_Product__c = pro1.Id;
			Orderdet3.Asset_Model_No__c = 'Pro001';
			Orderdet3.Consumable_Arrived_order__c = Order1.Id;
			//Orderdet3.IsArrival__c = true;
			Orderdet3.Arrive_date__c = Date.today();
			Orderdet3.Used_date__c = Date.today();
			Orderdet3.Consumable_Sale_order__c = Order1.Id;
			Orderdet3.RecordTypeId = System.Label.RT_ConOrderDetail2_Delivery;
			Orderdet3.Bar_Code__c = '01049531702003111115120017181000105ZK250BXJRJ';
			Orderdet3.Box_Piece__c = '盒';
			Orderdet3.TracingCode__c = 'BXJRF';
			//出库
			Consumable_order_details2__c Orderdet4 = new Consumable_order_details2__c();
			Orderdet4.Name = 'OCM_01_001004';
			Orderdet4.Consumable_order_minor__c = Order1.Id;
			Orderdet4.Consumable_Product__c = pro1.Id;
			Orderdet4.Asset_Model_No__c = 'Pro001';
			Orderdet4.Consumable_Arrived_order__c = Order1.Id;
			//Orderdet4.IsArrival__c = true;
			Orderdet4.Arrive_date__c = Date.today();
			Orderdet4.Send_Date__c = Date.today();
			Orderdet4.Consumable_Shipment_order__c = Order1.Id;
			Orderdet4.RecordTypeId = System.Label.RT_ConOrderDetail2_Delivery;
			Orderdet4.Bar_Code__c = '01049531702003111115120017181000105ZK250BXJRN';
			Orderdet4.Box_Piece__c = '个';
			Orderdet4.TracingCode__c = 'BXJRF';
			//quxiao
			Consumable_order_details2__c Orderdet5 = new Consumable_order_details2__c();
			Orderdet5.Name = 'OCM_01_001005';
			Orderdet5.Consumable_order_minor__c = Order1.Id;
			Orderdet5.Consumable_Product__c = pro1.Id;
			Orderdet5.Asset_Model_No__c = 'Pro001';
			Orderdet5.Cancellation_Date__c = Date.today();
			Orderdet5.RecordTypeId = System.Label.RT_ConOrderDetail2_Delivery;
			Orderdet5.Bar_Code__c = '01049531702003111115120017181000105ZK250BXJRZ';
			Orderdet5.Box_Piece__c = '盒';
			Orderdet5.TracingCode__c = 'BXJRF';
			//fanpin
			Consumable_order_details2__c Orderdet6 = new Consumable_order_details2__c();
			Orderdet6.Name = 'OCM_01_001006';
			Orderdet6.Consumable_order_minor__c = Order1.Id;
			Orderdet6.Consumable_Product__c = pro1.Id;
			Orderdet6.Asset_Model_No__c = 'Pro001';
			Orderdet6.Consumable_Return_order__c = Order2.Id;
			Orderdet6.RecordTypeId = System.Label.RT_ConOrderDetail2_Delivery;
			Orderdet6.Bar_Code__c = '01049531702003111115120017181000105ZK250BXJRA';
			Orderdet6.Box_Piece__c = '个';
			Orderdet6.TracingCode__c = 'BXJRF';

			// 丢失
			Consumable_order_details2__c Orderdet7 = new Consumable_order_details2__c();
			Orderdet7.Name = 'OCM_01_001002';
			Orderdet7.Consumable_order_minor__c = Order1.Id;
			Orderdet7.Consumable_Product__c = pro1.Id;
			Orderdet7.Asset_Model_No__c = 'Pro001';
			Orderdet7.Consumable_Arrived_order__c = Order1.Id;
			Orderdet7.Lose_Flag__c = true;
			Orderdet7.Arrive_date__c = Date.today();
			Orderdet7.RecordTypeId = System.Label.RT_ConOrderDetail2_Delivery;
			Orderdet7.Bar_Code__c = '01049531702003111115120017181000105ZK250BXJQT';
			Orderdet7.Box_Piece__c = '个';
			Orderdet7.TracingCode__c = 'BXJQT';

			insert new List<Consumable_order_details2__c>{ Orderdet1, Orderdet2, Orderdet3, Orderdet4, Orderdet5, Orderdet6, Orderdet7 };
			PageReference page = new PageReference('/apex/ArriveGoods?ArrType=ReG');
			System.Test.setCurrentPage(page);
			ArriveGoodsController Controller = new ArriveGoodsController();
			//初始化测试
			System.Test.startTest();
			Controller.init();
			//排序
			Controller.barcode = '01049531702003111115120017181000105ZK250BXJRN\n01049531702003111115120017181000105ZK250BXJRF\n01049531702003111115120017181000105ZK250BXJRI\n01049531702003111115120017181000105ZK250BXJRN\n01049531702003111115120017181000105ZK250BXJRZ\n01049531702003111115120017181000105ZK250BXJRA\n01049531702003111115120017181000105ZK250BXJRI\n01049531702003111115120017181000105ZK250BXJQT';
			Controller.SearchPro();
			//System.assertEquals(1, controller.ShowGoodsofReturnList.size());
			//System.assertEquals('OCM_01_001003', controller.ShowGoodsofReturnList[0].esd.Name);
			//System.assertEquals('OCM_01_001004', controller.ShowGoodsofReturnList[1].esd.Name);
			// System.assertEquals(5, controller.ConsumableorderdetailsRecordserror.size()); //tcm
			//System.assertEquals('Test01', controller.ConsumableorderdetailsRecordserror[1].Prod.Name__c);
			//System.assertEquals('OCM_01_001002', controller.ConsumableorderdetailsRecordserror[2].esd.Name);
			//System.assertEquals('OCM_02_001001', controller.ConsumableorderdetailsRecordserror[3].esd.Name);
			// Controller.GoodsReturnCheck();
			controller.ShowGoodsofReturnList[0].esd.Return_reason__c = '多发';
			controller.ShowGoodsofReturnList[0].esd.Rrturn_count__c = 1;
			//System.assertEquals(1, controller.ShowGoodsofReturnList.size());
			Controller.UpdateGoodsOfReturn();
			Controller.ToReturnGoodsPage();
			Controller.geterrorsize();
			System.Test.stopTest();
			}
			}

			@isTest
			static void makeRecordsVieweTest() {
			Integer count = 1001;
			List<ArriveGoodsController.ConsumableorderdetailsInfo> conList = new List<ArriveGoodsController.ConsumableorderdetailsInfo>();
			for (Integer i = 0; i < 1001; i++) {
			conList.add(new ArriveGoodsController.ConsumableorderdetailsInfo());
			}
			ArriveGoodsController arr = new ArriveGoodsController();
			arr.makeRecordsView(conList);
			ArriveGoodsController arr1 = new ArriveGoodsController('', '');
			}

			@isTest
			static void compareToTest() {
			ArriveGoodsController.ConsumableorderdetailsInfo c1 = new ArriveGoodsController.ConsumableorderdetailsInfo();
			ArriveGoodsController.ConsumableorderdetailsInfo c2 = new ArriveGoodsController.ConsumableorderdetailsInfo();
			c1.compareTo(c2);
			}

			@isTest
			static void searchProTest1() {
			List<RecordType> rectCo = [
			SELECT Id
			FROM RecordType
			WHERE IsActive = TRUE AND SobjectType = 'Account' AND Name = '販売店'
			];
			if (rectCo.size() == 0) {
			return;
			}
			Profile prof = [
			SELECT Id
			FROM Profile
			WHERE Name = '901_经销商社区普通权限_2重验证(ET)'
			];
			Account myAccount2 = new Account(
			name = 'Testaccount002',
			Dealer_discount__c = 20,
			RecordTypeId = rectCo[0].Id,
			AgentCode_Ext__c = '9999900'
			);
			Account myAccount1 = new Account(name = 'Testaccount001', Dealer_discount__c = 30, RecordTypeId = rectCo[0].Id);
			insert new List<account>{ myAccount1, myAccount2 };
			Contact core = new Contact(email = 'jplumber@salesforce.com', firstname = 'Joe', lastname = 'Plumber', accountid = myAccount1.id);
			insert core;
			user MyUser_Test = new User(
			ContactId = core.id,
			Alias = 'newUser',
			Email = 'newuser@testorg.com',
			EmailEncodingKey = 'UTF-8',
			LastName = 'TestUser',
			LanguageLocaleKey = 'zh_CN',
			LocaleSidKey = 'zh_CN',
			ProfileId = prof.Id,
			TimeZoneSidKey = 'Asia/Shanghai',
			UserName = 'testUser@testorg.com',
			UserPro_Type__c = 'ET'
			);
			System.runAs(new User(Id = UserInfo.getUserId())) {
			insert MyUser_Test;
			}

			System.runAs(MyUser_Test) {
			Product2 prod01 = new Product2(
			Name = 'Test01',
			ProductCode = 'Test01',
			Asset_Model_No__c = 'Test01',
			SFDA_Status__c = '有効',
			JANCODE__c = '04953170200311',
			Dealer_special_Object__c = true,
			Manual_Entry__c = false
			);
			Product2 prod02 = new Product2(
			Name = 'Test02',
			ProductCode = 'Test02',
			Asset_Model_No__c = 'Test02',
			SFDA_Status__c = '有効',
			JANCODE__c = '04953170200312',
			Dealer_special_Object__c = true,
			Manual_Entry__c = false
			);
			insert new List<Product2>{ prod01, prod02 };
			Product2__c pro1 = new Product2__c(Name = 'Pro001', OT_CODE_Text__c = 'N3047730', Product2__c = prod01.Id);
			Product2__c pro2 = new Product2__c(Name = 'Pro002', OT_CODE_Text__c = 'N3047731', Product2__c = prod02.Id);
			insert new List<Product2__c>{ pro1, pro2 };

			Consumable_order__c Order1 = new Consumable_order__c();
			Order1.Name = 'OCM_01_001';
			Order1.Order_status__c = '批准';
			Order1.Order_type__c = '订单';
			Order1.Dealer_Info__c = myAccount1.id;
			Order1.RecordTypeid = System.Label.RT_ConOrder_Delivery;
			Order1.Order_ProType__c = 'ET';
			insert Order1;
			Consumable_orderdetails__c Orderdet = new Consumable_orderdetails__c();
			Orderdet.Name = 'OCM_01_00101';
			Orderdet.Consumable_order__c = Order1.Id;
			Orderdet.RecordTypeId = System.Label.RT_ConOrderDetail1_Order;
			Orderdet.Consumable_Product__c = pro1.Id;
			Orderdet.Consumable_count__c = 4;
			insert Orderdet;
			Consumable_order_details2__c Orderdet1 = new Consumable_order_details2__c();
			Orderdet1.Name = 'OCM_01_001001';
			Orderdet1.Consumable_order_minor__c = Order1.Id;
			Orderdet1.Consumable_Product__c = pro1.Id;
			Orderdet1.Asset_Model_No__c = 'Test01';
			Orderdet1.RecordTypeId = System.Label.RT_ConOrderDetail2_Delivery;
			Orderdet1.Bar_Code__c = '01049531702003111115120017181000105ZK250BXJRF';
			Orderdet1.Cancellation_Date__c = null;
			Orderdet1.TracingCode__c = 'BXJRF';
			Orderdet1.SerialLotNo__c = '5ZK';
			insert Orderdet1;
			System.debug('Orderdet1:' + Orderdet1);
			Consumable_order_details2__c Orderdet2 = new Consumable_order_details2__c();
			Orderdet2.Name = 'OCM_01_001001';
			Orderdet2.Consumable_order_minor__c = Order1.Id;
			Orderdet2.Consumable_Product__c = pro1.Id;
			Orderdet2.Asset_Model_No__c = 'Test01';
			Orderdet2.RecordTypeId = System.Label.RT_ConOrderDetail2_Delivery;
			Orderdet2.Bar_Code__c = '01049531702003111115120017181234105ZK250BXJRF';
			Orderdet1.Cancellation_Date__c = null;
			Orderdet2.TracingCode__c = 'BXJRF';
			Orderdet2.SerialLotNo__c = '5ZK';
			insert Orderdet2;

			PageReference page = new PageReference('/apex/ArriveGoods?ArrType=Arr');
			System.Test.setCurrentPage(page);
			ArriveGoodsController Controller = new ArriveGoodsController();
			System.Test.startTest();
			Controller.init();
			Controller.barcode = '01049531702003111115120017181000105ZK250BXJRF';
			Controller.SearchPro();
			Controller.ArriveGoodsConfim();
			List<Consumable_order_details2__c> ins = [
			SELECT Id, Name
			FROM Consumable_order_details2__c
			];
			System.Test.stopTest();
			}
			}
			}
			=======


			}
			@@ -2844,4 +5449,5 @@
			System.Test.stopTest();
			}
			}
			}
			}
			>>>>>>> LEXCommunityLiJun