From 9b49da3312241a0af84823d35b7763e64d320b19 Mon Sep 17 00:00:00 2001
From: payne <bzrlw2012@163.com>
Date: 周五, 26 4月 2024 10:01:18 +0800
Subject: [PATCH] 调整查询条件
---
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsPlace/WmsPlaceService.cs | 80 ++++++++++++++++-----------------------
1 files changed, 33 insertions(+), 47 deletions(-)
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsPlace/WmsPlaceService.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsPlace/WmsPlaceService.cs
index ea3153d..1239e93 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsPlace/WmsPlaceService.cs
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsPlace/WmsPlaceService.cs
@@ -27,18 +27,20 @@
private readonly IRepository<SysDictData, MasterDbContextLocator> _sysDictDataRep;
private readonly ISysExcelTemplateService _sysExcelTemplateService;
private readonly static object _lock = new();
-
+ private readonly IRepository<WmsArea, MasterDbContextLocator> _wmsAreaRep;
public WmsPlaceService(
IRepository<WmsPlace,MasterDbContextLocator> wmsPlaceRep
,IRepository<SysDictType, MasterDbContextLocator> sysDictTypeRep
,IRepository<SysDictData, MasterDbContextLocator> sysDictDataRep
,ISysExcelTemplateService sysExcelTemplateService
+ , IRepository<WmsArea, MasterDbContextLocator> wmsAreaRep
)
{
_wmsPlaceRep = wmsPlaceRep;
_sysDictTypeRep = sysDictTypeRep;
_sysDictDataRep = sysDictDataRep;
_sysExcelTemplateService = sysExcelTemplateService;
+ _wmsAreaRep = wmsAreaRep;
}
/// <summary>
@@ -197,7 +199,19 @@
public async Task Add(AddWmsPlaceInput input)
{
var wmsPlace = input.Adapt<WmsPlace>();
- //楠岃瘉
+ var area = (await _wmsAreaRep.DetachedEntities.FirstOrDefaultAsync(u => u.Id == input.AreaId&&u.IsDeleted==false)).Adapt<WmsAreaOutput>();
+ if (area == null)
+ {
+ throw Oops.Oh($"搴撳尯涓嶅瓨鍦�");
+ }
+ if (area.IsDisabled==true)
+ {
+ throw Oops.Oh($"搴撳尯宸茬鐢�");
+ }
+ wmsPlace.AreaName= area.AreaName;
+ wmsPlace.AreaCode= area.AreaCode;
+ wmsPlace.PlaceTypeName = wmsPlace.PlaceType.ToString();
+ //楠岃瘉
await CheckExisit(wmsPlace);
wmsPlace.CreatedUserId = wmsPlace.UpdatedUserId = SysHelper.GetUserId();
@@ -231,6 +245,19 @@
if (!isExist) throw Oops.Oh(ErrorCode.D1002);
var wmsPlace = input.Adapt<WmsPlace>();
+
+ var area = (await _wmsAreaRep.DetachedEntities.FirstOrDefaultAsync(u => u.Id == input.AreaId && u.IsDeleted == false)).Adapt<WmsAreaOutput>();
+ if (area == null)
+ {
+ throw Oops.Oh($"搴撳尯涓嶅瓨鍦�");
+ }
+ if (area.IsDisabled == true)
+ {
+ throw Oops.Oh($"搴撳尯宸茬鐢�");
+ }
+ wmsPlace.AreaName = area.AreaName;
+ wmsPlace.AreaCode = area.AreaCode;
+ wmsPlace.PlaceTypeName = wmsPlace.PlaceType.ToString();
//楠岃瘉
await CheckExisit(wmsPlace,true);
@@ -329,7 +356,6 @@
var _OutSequence = "";//鍑哄簱椤哄簭
var _IsVirtually = "";//鏄惁铏氭嫙
var _IsDisabled = "";//鏄惁绂佺敤
- var _Id = "";//Id涓婚敭
#endregion
@@ -338,20 +364,12 @@
_PlaceName = row["搴撲綅鍚嶇О"]?.ToString() ;
_PlaceAlias = row["搴撲綅鍒悕"]?.ToString() ;
_PlaceType = row["搴撲綅绫诲瀷"]?.ToString() ;
- _PlaceTypeName = row["搴撲綅绫诲瀷鍚嶇О"]?.ToString() ;
_PlaceStatus = row["搴撲綅灞炴��"]?.ToString() ;
- _IsSrmPlace = row["鏄惁鍫嗗灈鏈哄簱浣�"]?.ToString() ;
- _SrmPlaceNo = row["鍫嗗灈鏈哄簱浣嶅彿"]?.ToString() ;
- _IsRgvPlace = row["鏄惁RGV搴撲綅"]?.ToString() ;
- _RgvPlaceNo = row["RGV搴撲綅鍙�"]?.ToString() ;
- _IsAgvPlace = row["鏄惁AGV搴撲綅"]?.ToString() ;
- _AgvPlaceNo = row["AGV搴撲綅鍙�"]?.ToString() ;
- _IsTransPlace = row["鏄惁杈撻�佺嚎搴撲綅"]?.ToString() ;
- _TransPlaceNo = row["杈撻�佺嚎搴撲綅鍙�"]?.ToString() ;
+
_IsActivateWCS = row["鏄惁婵�娲讳笌浠诲姟璋冨害"]?.ToString() ;
_Environment = row["搴撳瓨鐜"]?.ToString() ;
_AreaCode = row["搴撳尯缂栧彿"]?.ToString() ;
- _AreaId = row["鎵�鍦ㄥ簱鍖�"]?.ToString() ;
+ //_AreaId = row["鎵�鍦ㄥ簱鍖�"]?.ToString() ;
_AreaName = row["搴撳尯鍚嶇О"]?.ToString() ;
_VerificationCode = row["妫�楠岀爜"]?.ToString() ;
_RowNo = row["鎺�"]?.ToString() ;
@@ -369,7 +387,6 @@
_OutSequence = row["鍑哄簱椤哄簭"]?.ToString() ;
_IsVirtually = row["鏄惁铏氭嫙"]?.ToString() ;
_IsDisabled = row["鏄惁绂佺敤"]?.ToString() ;
- _Id = row["Id涓婚敭"]?.ToString() ;
#endregion
@@ -476,22 +493,7 @@
throw Oops.Oh($"绗瑊index}琛孾鎵�鍦ㄥ簱鍖篯{_AreaId}涓嶈兘涓虹┖锛�");
}
- if(!string.IsNullOrEmpty(_AreaId))
- {
- if (!long.TryParse(_AreaId, out long outAreaId)&&!string.IsNullOrEmpty(_AreaId))
- {
- throw Oops.Oh($"绗瑊index}琛孾鎵�鍦ㄥ簱鍖篯{_AreaId}鍊间笉姝ｇ‘锛�");
- }
- if (outAreaId <= 0&&!string.IsNullOrEmpty(_AreaId))
- {
- throw Oops.Oh($"绗瑊index}琛孾鎵�鍦ㄥ簱鍖篯{_AreaId}鍊间笉鑳藉皬浜庣瓑浜�0锛�");
- }
- else
- {
- addItem.AreaId = outAreaId;
- }
-
- }
+
if(!string.IsNullOrEmpty(_AreaName))
{
addItem.AreaName = (string)_AreaName;
@@ -697,23 +699,7 @@
addItem.IsDisabled = outIsDisabled;
}
}
-
- 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
--
Gitblit v1.9.3