~shaocx/iWare_RawMaterialWarehouse.git

			@@ -229,7 +229,6 @@
			var _FactoryName = "";//名称
			var _FactoryAddress = "";//地址
			var _IsDisabled = "";//是否禁用
			var _Id = "";//Id主键
			#endregion


			@@ -238,7 +237,6 @@
			_FactoryName = row["名称"]?.ToString() ;
			_FactoryAddress = row["地址"]?.ToString() ;
			_IsDisabled = row["是否禁用"]?.ToString() ;
			_Id = row["Id主键"]?.ToString() ;
			#endregion


			@@ -280,22 +278,7 @@
			}
			}

			if(!string.IsNullOrEmpty(_Id))
			{
			if (!long.TryParse(_Id, out long outId)&&!string.IsNullOrEmpty(_Id))
			{
			throw Oops.Oh($"第{index}行[Id主键]{_Id}值不正确！");
			}
			if (outId <= 0&&!string.IsNullOrEmpty(_Id))
			{
			throw Oops.Oh($"第{index}行[Id主键]{_Id}值不能小于等于0！");
			}
			else
			{
			addItem.Id = outId;
			}

			}

			#endregion


			@@ -333,9 +316,9 @@
			/// <returns></returns>
			private async Task CheckExisit( WmsFactory input,bool isEdit=false)
			{




			string errorMsg = string.Empty;
			bool isExist = false;
			if (!isEdit)//新增
			{
			@@ -343,7 +326,24 @@
			isExist = await _wmsFactoryRep.AnyAsync(u =>
			u.FactoryCode.Equals(input.FactoryCode)
			,false);
			}

			errorMsg = $"系统中,编号[{input.FactoryCode}]已存在";
			if (isExist)
			{
			throw Oops.Oh(errorMsg);
			}

			//数据是否存在重复
			isExist = await _wmsFactoryRep.AnyAsync(u =>
			u.FactoryName.Equals(input.FactoryName)
			, false);

			errorMsg = $"系统中,名称[{input.FactoryName}]已存在";
			if (isExist)
			{
			throw Oops.Oh(errorMsg);
			}
			}
			else//编辑
			{

			@@ -354,12 +354,29 @@
			u.Id != input.Id
			&&u.FactoryCode.Equals(input.FactoryCode)
			,false);
			}

			errorMsg = $"系统中,编号[{input.FactoryCode}]已存在";
			if (isExist)
			{
			throw Oops.Oh(errorMsg);
			}

			isExist = await _wmsFactoryRep.AnyAsync(u =>
			u.Id != input.Id
			&& u.FactoryName.Equals(input.FactoryName)
			, false);

			errorMsg = $"系统中,名称[{input.FactoryName}]已存在";
			if (isExist)
			{
			throw Oops.Oh(errorMsg);
			}

			}



			if (isExist) throw Oops.Oh(ErrorCode.E0001);
			}
			}

			/// <summary>
			/// 根据联合主键验证数据是否已存在-导入时验证
			@@ -383,16 +400,30 @@
			}).FirstOrDefault();
			if (existExcelItem != null)
			{
			var wmsFactory = existExcelItem.Adapt<WmsFactory>();
			var item= existExcelItem.Adapt<WmsFactory>();
			throw Oops.Oh($"导入的表格中,编号[{item.FactoryCode}]已存在");
			}


			//数据是否重复
			var existExcelItem2 = inputs.GroupBy(g => new {
			g.FactoryName
			})
			.Where(g => g.Count() > 1)
			.Select(s => new {
			s.Key.FactoryName
			}).FirstOrDefault();
			if (existExcelItem2 != null)
			{
			var item = existExcelItem2.Adapt<WmsFactory>();
			throw Oops.Oh($"导入的表格中,名称[{item.FactoryName}]已存在");
			}



			//根据联合主键验证数据库中是否已存在相同数据
			var existDBItem = await _wmsFactoryRep.DetachedEntities.FirstOrDefaultAsync(w=>


			//根据联合主键验证数据库中是否已存在相同数据
			var existDBItem = await _wmsFactoryRep.DetachedEntities.FirstOrDefaultAsync(w=>
			inputs.Select(s=>""
			+s.FactoryCode
			)
			@@ -401,10 +432,22 @@
			));
			if (existDBItem != null)
			{
			var wmsFactory = existExcelItem.Adapt<WmsFactory>();
			var item= existExcelItem.Adapt<WmsFactory>();
			var item= existDBItem.Adapt<WmsFactory>();
			throw Oops.Oh($"系统中,编号[{item.FactoryCode}]已存在");
			}

			var existDBItem2 = await _wmsFactoryRep.DetachedEntities.FirstOrDefaultAsync(w =>
			inputs.Select(s => ""
			+ s.FactoryName
			)
			.Contains(""
			+ w.FactoryName
			));
			if (existDBItem2 != null)
			{
			var item = existDBItem2.Adapt<WmsFactory>();
			throw Oops.Oh($"系统中,名称[{item.FactoryName}]已存在");
			}
			}

			#endregion