From bff3d9b141088487aa04159b3f6a5a26dd8d5dc6 Mon Sep 17 00:00:00 2001
From: payne <bzrlw2012@163.com>
Date: 周五, 26 4月 2024 10:17:13 +0800
Subject: [PATCH] 1
---
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsControlRuleDetail/WmsControlRuleDetailService.cs | 602 ++++++++++++++++++++++++------------------------------
1 files changed, 265 insertions(+), 337 deletions(-)
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsControlRuleDetail/WmsControlRuleDetailService.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsControlRuleDetail/WmsControlRuleDetailService.cs
index 43c03b9..9037c71 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsControlRuleDetail/WmsControlRuleDetailService.cs
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsControlRuleDetail/WmsControlRuleDetailService.cs
@@ -22,23 +22,23 @@
[Route("api")]
public class WmsControlRuleDetailService : IWmsControlRuleDetailService, IDynamicApiController, ITransient
{
- private readonly IRepository<WmsControlRuleDetail,MasterDbContextLocator> _wmsControlRuleDetailRep;
+ private readonly IRepository<WmsControlRuleDetail, MasterDbContextLocator> _wmsControlRuleDetailRep;
private readonly IRepository<SysDictType, MasterDbContextLocator> _sysDictTypeRep;
private readonly IRepository<SysDictData, MasterDbContextLocator> _sysDictDataRep;
private readonly ISysExcelTemplateService _sysExcelTemplateService;
private readonly static object _lock = new();
public WmsControlRuleDetailService(
- IRepository<WmsControlRuleDetail,MasterDbContextLocator> wmsControlRuleDetailRep
- ,IRepository<SysDictType, MasterDbContextLocator> sysDictTypeRep
- ,IRepository<SysDictData, MasterDbContextLocator> sysDictDataRep
- ,ISysExcelTemplateService sysExcelTemplateService
+ IRepository<WmsControlRuleDetail, MasterDbContextLocator> wmsControlRuleDetailRep
+ , IRepository<SysDictType, MasterDbContextLocator> sysDictTypeRep
+ , IRepository<SysDictData, MasterDbContextLocator> sysDictDataRep
+ , ISysExcelTemplateService sysExcelTemplateService
)
{
_wmsControlRuleDetailRep = wmsControlRuleDetailRep;
- _sysDictTypeRep = sysDictTypeRep;
- _sysDictDataRep = sysDictDataRep;
- _sysExcelTemplateService = sysExcelTemplateService;
+ _sysDictTypeRep = sysDictTypeRep;
+ _sysDictDataRep = sysDictDataRep;
+ _sysExcelTemplateService = sysExcelTemplateService;
}
/// <summary>
@@ -50,7 +50,8 @@
public async Task<PageResult<WmsControlRuleDetailOutput>> Page([FromQuery] WmsControlRuleDetailSearch input)
{
var wmsControlRuleDetails = await _wmsControlRuleDetailRep.DetachedEntities
- .Where(input.ControlRuleId != null, u => u.ControlRuleId == input.ControlRuleId)
+ .Where(!string.IsNullOrEmpty(input.RuleCode), u => u.RuleCode == input.RuleCode)
+ .Where(!string.IsNullOrEmpty(input.RuleName), u => u.RuleName == input.RuleName)
.Where(input.MaxImumqty != null, u => u.MaxImumqty == input.MaxImumqty)
.Where(input.MinImumqty != null, u => u.MinImumqty == input.MinImumqty)
.Where(input.SafeImumqty != null, u => u.SafeImumqty == input.SafeImumqty)
@@ -59,8 +60,8 @@
.Where(input.IsNotChek != null, u => u.IsNotChek == input.IsNotChek)
.Where(input.ShelfLifeDays != null, u => u.ShelfLifeDays == input.ShelfLifeDays)
.Where(input.IsDisabled != null, u => u.IsDisabled == input.IsDisabled)
- .Where(input.CreatedTime!=null, u => u.CreatedTime>= Convert.ToDateTime(input.CreatedTime[0]) && u.CreatedTime<= Convert.ToDateTime(input.CreatedTime[1]))
- .Where(input.UpdatedTime!=null, u => u.UpdatedTime>= Convert.ToDateTime(input.UpdatedTime[0]) && u.UpdatedTime<= Convert.ToDateTime(input.UpdatedTime[1]))
+ .Where(input.CreatedTime != null, u => u.CreatedTime >= Convert.ToDateTime(input.CreatedTime[0]) && u.CreatedTime <= Convert.ToDateTime(input.CreatedTime[1]))
+ .Where(input.UpdatedTime != null, u => u.UpdatedTime >= Convert.ToDateTime(input.UpdatedTime[0]) && u.UpdatedTime <= Convert.ToDateTime(input.UpdatedTime[1]))
.Where(!string.IsNullOrEmpty(input.CreatedUserName), u => u.CreatedUserName == input.CreatedUserName)
.Where(!string.IsNullOrEmpty(input.UpdatedUserName), u => u.UpdatedUserName == input.UpdatedUserName)
.OrderBy(PageInputOrder.OrderBuilder<WmsControlRuleDetailSearch>(input))
@@ -77,7 +78,8 @@
[HttpGet("WmsControlRuleDetail/listNonPage")]
public async Task<List<WmsControlRuleDetailOutput>> ListNonPageAsync([FromQuery] WmsControlRuleDetailSearchNonPage input)
{
- var pControlRuleId = input.ControlRuleId;
+ var pRuleCode = input.RuleCode?.Trim() ?? "";
+ var pRuleName = input.RuleName?.Trim() ?? "";
var pMaxImumqty = input.MaxImumqty;
var pMinImumqty = input.MinImumqty;
var pSafeImumqty = input.SafeImumqty;
@@ -91,7 +93,8 @@
var pCreatedUserName = input.CreatedUserName?.Trim() ?? "";
var pUpdatedUserName = input.UpdatedUserName?.Trim() ?? "";
var wmsControlRuleDetails = await _wmsControlRuleDetailRep.DetachedEntities
- .Where(pControlRuleId != null, u => u.ControlRuleId == pControlRuleId)
+ .Where(!string.IsNullOrEmpty(pRuleCode), u => u.RuleCode == pRuleCode)
+ .Where(!string.IsNullOrEmpty(pRuleName), u => u.RuleName == pRuleName)
.Where(pMaxImumqty != null, u => u.MaxImumqty == pMaxImumqty)
.Where(pMinImumqty != null, u => u.MinImumqty == pMinImumqty)
.Where(pSafeImumqty != null, u => u.SafeImumqty == pSafeImumqty)
@@ -100,8 +103,8 @@
.Where(pIsNotChek != null, u => u.IsNotChek == pIsNotChek)
.Where(pShelfLifeDays != null, u => u.ShelfLifeDays == pShelfLifeDays)
.Where(pIsDisabled != null, u => u.IsDisabled == pIsDisabled)
- .Where(input.CreatedTime!=null, u => u.CreatedTime>= Convert.ToDateTime(input.CreatedTime[0]) && u.CreatedTime<= Convert.ToDateTime(input.CreatedTime[1]))
- .Where(input.UpdatedTime!=null, u => u.UpdatedTime>= Convert.ToDateTime(input.UpdatedTime[0]) && u.UpdatedTime<= Convert.ToDateTime(input.UpdatedTime[1]))
+ .Where(input.CreatedTime != null, u => u.CreatedTime >= Convert.ToDateTime(input.CreatedTime[0]) && u.CreatedTime <= Convert.ToDateTime(input.CreatedTime[1]))
+ .Where(input.UpdatedTime != null, u => u.UpdatedTime >= Convert.ToDateTime(input.UpdatedTime[0]) && u.UpdatedTime <= Convert.ToDateTime(input.UpdatedTime[1]))
.Where(!string.IsNullOrEmpty(pCreatedUserName), u => u.CreatedUserName == pCreatedUserName)
.Where(!string.IsNullOrEmpty(pUpdatedUserName), u => u.UpdatedUserName == pUpdatedUserName)
.OrderBy(PageInputOrder.OrderNonPageBuilder(input))
@@ -110,7 +113,7 @@
return wmsControlRuleDetails;
}
- /// <summary>
+ /// <summary>
/// 鑾峰彇鎺у埗灞炴�ц鍒欐槑缁�
/// </summary>
/// <param name="input"></param>
@@ -130,7 +133,7 @@
public async Task<List<WmsControlRuleDetailOutput>> List([FromQuery] WmsControlRuleDetailInput input)
{
return await _wmsControlRuleDetailRep.DetachedEntities.ProjectToType<WmsControlRuleDetailOutput>().ToListAsync();
- }
+ }
#region 澧炪�佸垹銆佹敼
@@ -143,7 +146,8 @@
public async Task Add(AddWmsControlRuleDetailInput input)
{
var wmsControlRuleDetail = input.Adapt<WmsControlRuleDetail>();
- //楠岃瘉
+ wmsControlRuleDetail.RuleCode = Yitter.IdGenerator.YitIdHelper.NextId().ToString();//TODO 瑕佽皟鐢ㄧ敓鎴� 缂栧彿鐨勬柟娉� 鍏堢敤闆姳ID
+ //楠岃瘉
await CheckExisit(wmsControlRuleDetail);
wmsControlRuleDetail.CreatedUserId = wmsControlRuleDetail.UpdatedUserId = SysHelper.GetUserId();
@@ -162,7 +166,7 @@
{
var wmsControlRuleDetail = await _wmsControlRuleDetailRep.FirstOrDefaultAsync(u => u.Id == input.Id);
await _wmsControlRuleDetailRep.DeleteAsync(wmsControlRuleDetail);
-
+
}
/// <summary>
@@ -178,12 +182,12 @@
var wmsControlRuleDetail = input.Adapt<WmsControlRuleDetail>();
//楠岃瘉
- await CheckExisit(wmsControlRuleDetail,true);
+ await CheckExisit(wmsControlRuleDetail, true);
wmsControlRuleDetail.UpdatedUserId = SysHelper.GetUserId();
wmsControlRuleDetail.UpdatedUserName = SysHelper.GetUserName();
wmsControlRuleDetail.UpdatedTime = SysHelper.GetNowTime();
- await _wmsControlRuleDetailRep.UpdateAsync(wmsControlRuleDetail,ignoreNullValues:true);
+ await _wmsControlRuleDetailRep.UpdateAsync(wmsControlRuleDetail, ignoreNullValues: true);
}
#endregion
@@ -197,17 +201,17 @@
/// <returns>瀵煎叆鐨勮褰曟暟</returns>
[HttpPost("WmsControlRuleDetail/importExcel")]
public async Task<int> ImportExcelAsync(IFormFile file)
- {
+ {
int _HeadStartLine = 2;//绗�1琛屾槸璇存槑,绗�2琛屾槸鍒楀悕
int _DataStartLine = 3;//绗�3琛屽紑濮嬫槸鏁版嵁
DataTable importDataTable = ExcelUtil.ImportExcelToDataTable(file, _HeadStartLine, _DataStartLine);
- var addList =await CommonImport(importDataTable, _DataStartLine);
+ var addList = await CommonImport(importDataTable, _DataStartLine);
lock (_lock)
{
_wmsControlRuleDetailRep.InsertAsync(addList);
-
+
}
await Task.CompletedTask;
return addList.Count;
@@ -228,263 +232,187 @@
{
index++;
- //瀵煎叆妯＄増瀹氬埗鍖栦唬鐮侊紙鏇挎崲妯＄増浣跨敤锛�
-
- var addItem = new WmsControlRuleDetail()
- {
- CreatedTime = SysHelper.GetNowTime(),
- CreatedUserId = SysHelper.GetUserId(),
- CreatedUserName = SysHelper.GetUserName(),
- UpdatedTime = SysHelper.GetNowTime(),
- UpdatedUserId = SysHelper.GetUserId(),
- UpdatedUserName = SysHelper.GetUserName()
- };
- #region 瀹氫箟鍙橀噺
- var _ControlRuleId = "";//鎺у埗灞炴�ц鍒橧D
- var _MaxImumqty = "";//鏈�楂樺簱瀛�
- var _MinImumqty = "";//鏈�浣庡簱瀛�
- var _SafeImumqty = "";//瀹夊叏搴撳瓨
- var _MinStorageAge = "";//鏈�灏忓簱榫�
- var _MaxStorageAge = "";//鏈�澶у簱榫�
- var _IsNotChek = "";//鏄惁鍏嶆
- var _ShelfLifeDays = "";//淇濊川鏈熷ぉ鏁�
- var _IsDisabled = "";//鏄惁绂佺敤
- var _Id = "";//Id涓婚敭
- #endregion
-
-
- #region 鍙栧��
- _ControlRuleId = row["鎺у埗灞炴�ц鍒橧D"]?.ToString() ;
- _MaxImumqty = row["鏈�楂樺簱瀛�"]?.ToString() ;
- _MinImumqty = row["鏈�浣庡簱瀛�"]?.ToString() ;
- _SafeImumqty = row["瀹夊叏搴撳瓨"]?.ToString() ;
- _MinStorageAge = row["鏈�灏忓簱榫�"]?.ToString() ;
- _MaxStorageAge = row["鏈�澶у簱榫�"]?.ToString() ;
- _IsNotChek = row["鏄惁鍏嶆"]?.ToString() ;
- _ShelfLifeDays = row["淇濊川鏈熷ぉ鏁�"]?.ToString() ;
- _IsDisabled = row["鏄惁绂佺敤"]?.ToString() ;
- _Id = row["Id涓婚敭"]?.ToString() ;
- #endregion
-
-
- #region 楠岃瘉
-
- if (string.IsNullOrEmpty(_ControlRuleId))
- {
- throw Oops.Oh($"绗瑊index}琛孾鎺у埗灞炴�ц鍒橧D]{_ControlRuleId}涓嶈兘涓虹┖锛�");
- }
-
- if(!string.IsNullOrEmpty(_ControlRuleId))
- {
- if (!long.TryParse(_ControlRuleId, out long outControlRuleId)&&!string.IsNullOrEmpty(_ControlRuleId))
- {
- throw Oops.Oh($"绗瑊index}琛孾鎺у埗灞炴�ц鍒橧D]{_ControlRuleId}鍊间笉姝ｇ‘锛�");
- }
- if (outControlRuleId <= 0&&!string.IsNullOrEmpty(_ControlRuleId))
- {
- throw Oops.Oh($"绗瑊index}琛孾鎺у埗灞炴�ц鍒橧D]{_ControlRuleId}鍊间笉鑳藉皬浜庣瓑浜�0锛�");
- }
- else
- {
- addItem.ControlRuleId = outControlRuleId;
- }
-
- }
-
- if (string.IsNullOrEmpty(_MaxImumqty))
- {
- throw Oops.Oh($"绗瑊index}琛孾鏈�楂樺簱瀛榏{_MaxImumqty}涓嶈兘涓虹┖锛�");
- }
-
- if(!string.IsNullOrEmpty(_MaxImumqty))
- {
- if (!decimal.TryParse(_MaxImumqty, out decimal outMaxImumqty)&&!string.IsNullOrEmpty(_MaxImumqty))
- {
- throw Oops.Oh($"绗瑊index}琛孾鏈�楂樺簱瀛榏{_MaxImumqty}鍊间笉姝ｇ‘锛�");
- }
- if (outMaxImumqty <= 0&&!string.IsNullOrEmpty(_MaxImumqty))
- {
- throw Oops.Oh($"绗瑊index}琛孾鏈�楂樺簱瀛榏{_MaxImumqty}鍊间笉鑳藉皬浜庣瓑浜�0锛�");
- }
- else
- {
- addItem.MaxImumqty = outMaxImumqty;
- }
-
- }
-
- if (string.IsNullOrEmpty(_MinImumqty))
- {
- throw Oops.Oh($"绗瑊index}琛孾鏈�浣庡簱瀛榏{_MinImumqty}涓嶈兘涓虹┖锛�");
- }
-
- if(!string.IsNullOrEmpty(_MinImumqty))
- {
- if (!decimal.TryParse(_MinImumqty, out decimal outMinImumqty)&&!string.IsNullOrEmpty(_MinImumqty))
- {
- throw Oops.Oh($"绗瑊index}琛孾鏈�浣庡簱瀛榏{_MinImumqty}鍊间笉姝ｇ‘锛�");
- }
- if (outMinImumqty <= 0&&!string.IsNullOrEmpty(_MinImumqty))
- {
- throw Oops.Oh($"绗瑊index}琛孾鏈�浣庡簱瀛榏{_MinImumqty}鍊间笉鑳藉皬浜庣瓑浜�0锛�");
- }
- else
- {
- addItem.MinImumqty = outMinImumqty;
- }
-
- }
-
- if (string.IsNullOrEmpty(_SafeImumqty))
- {
- throw Oops.Oh($"绗瑊index}琛孾瀹夊叏搴撳瓨]{_SafeImumqty}涓嶈兘涓虹┖锛�");
- }
-
- if(!string.IsNullOrEmpty(_SafeImumqty))
- {
- if (!decimal.TryParse(_SafeImumqty, out decimal outSafeImumqty)&&!string.IsNullOrEmpty(_SafeImumqty))
- {
- throw Oops.Oh($"绗瑊index}琛孾瀹夊叏搴撳瓨]{_SafeImumqty}鍊间笉姝ｇ‘锛�");
- }
- if (outSafeImumqty <= 0&&!string.IsNullOrEmpty(_SafeImumqty))
- {
- throw Oops.Oh($"绗瑊index}琛孾瀹夊叏搴撳瓨]{_SafeImumqty}鍊间笉鑳藉皬浜庣瓑浜�0锛�");
- }
- else
- {
- addItem.SafeImumqty = outSafeImumqty;
- }
-
- }
-
- if (string.IsNullOrEmpty(_MinStorageAge))
- {
- throw Oops.Oh($"绗瑊index}琛孾鏈�灏忓簱榫刔{_MinStorageAge}涓嶈兘涓虹┖锛�");
- }
-
- if(!string.IsNullOrEmpty(_MinStorageAge))
- {
- if (!decimal.TryParse(_MinStorageAge, out decimal outMinStorageAge)&&!string.IsNullOrEmpty(_MinStorageAge))
- {
- throw Oops.Oh($"绗瑊index}琛孾鏈�灏忓簱榫刔{_MinStorageAge}鍊间笉姝ｇ‘锛�");
- }
- if (outMinStorageAge <= 0&&!string.IsNullOrEmpty(_MinStorageAge))
- {
- throw Oops.Oh($"绗瑊index}琛孾鏈�灏忓簱榫刔{_MinStorageAge}鍊间笉鑳藉皬浜庣瓑浜�0锛�");
- }
- else
- {
- addItem.MinStorageAge = outMinStorageAge;
- }
-
- }
-
- if (string.IsNullOrEmpty(_MaxStorageAge))
- {
- throw Oops.Oh($"绗瑊index}琛孾鏈�澶у簱榫刔{_MaxStorageAge}涓嶈兘涓虹┖锛�");
- }
-
- if(!string.IsNullOrEmpty(_MaxStorageAge))
- {
- if (!decimal.TryParse(_MaxStorageAge, out decimal outMaxStorageAge)&&!string.IsNullOrEmpty(_MaxStorageAge))
- {
- throw Oops.Oh($"绗瑊index}琛孾鏈�澶у簱榫刔{_MaxStorageAge}鍊间笉姝ｇ‘锛�");
- }
- if (outMaxStorageAge <= 0&&!string.IsNullOrEmpty(_MaxStorageAge))
- {
- throw Oops.Oh($"绗瑊index}琛孾鏈�澶у簱榫刔{_MaxStorageAge}鍊间笉鑳藉皬浜庣瓑浜�0锛�");
- }
- else
- {
- addItem.MaxStorageAge = outMaxStorageAge;
- }
-
- }
-
- if (string.IsNullOrEmpty(_IsNotChek))
- {
- throw Oops.Oh($"绗瑊index}琛孾鏄惁鍏嶆]{_IsNotChek}涓嶈兘涓虹┖锛�");
- }
-
- if(!string.IsNullOrEmpty(_IsNotChek))
- {
- if(!_IsNotChek.Equals("鏄�") && !_IsNotChek.Equals("鍚�"))
- {
- throw Oops.Oh($"绗瑊index}琛孾鏄惁鍏嶆]{_IsNotChek}鍊间笉姝ｇ‘锛�");
- }
- else
- {
- bool outIsNotChek = _IsNotChek.Equals("鏄�") ? true : false;
- addItem.IsNotChek = outIsNotChek;
- }
- }
-
-
- if (string.IsNullOrEmpty(_ShelfLifeDays))
- {
- throw Oops.Oh($"绗瑊index}琛孾淇濊川鏈熷ぉ鏁癩{_ShelfLifeDays}涓嶈兘涓虹┖锛�");
- }
-
- if(!string.IsNullOrEmpty(_ShelfLifeDays))
- {
- if (!decimal.TryParse(_ShelfLifeDays, out decimal outShelfLifeDays)&&!string.IsNullOrEmpty(_ShelfLifeDays))
- {
- throw Oops.Oh($"绗瑊index}琛孾淇濊川鏈熷ぉ鏁癩{_ShelfLifeDays}鍊间笉姝ｇ‘锛�");
- }
- if (outShelfLifeDays <= 0&&!string.IsNullOrEmpty(_ShelfLifeDays))
- {
- throw Oops.Oh($"绗瑊index}琛孾淇濊川鏈熷ぉ鏁癩{_ShelfLifeDays}鍊间笉鑳藉皬浜庣瓑浜�0锛�");
- }
- else
- {
- addItem.ShelfLifeDays = outShelfLifeDays;
- }
-
- }
-
- if (string.IsNullOrEmpty(_IsDisabled))
- {
- throw Oops.Oh($"绗瑊index}琛孾鏄惁绂佺敤]{_IsDisabled}涓嶈兘涓虹┖锛�");
- }
-
- if(!string.IsNullOrEmpty(_IsDisabled))
- {
- if(!_IsDisabled.Equals("鏄�") && !_IsDisabled.Equals("鍚�"))
- {
- throw Oops.Oh($"绗瑊index}琛孾鏄惁绂佺敤]{_IsDisabled}鍊间笉姝ｇ‘锛�");
- }
- else
- {
- bool outIsDisabled = _IsDisabled.Equals("鏄�") ? true : false;
- 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
-
+ //瀵煎叆妯＄増瀹氬埗鍖栦唬鐮侊紙鏇挎崲妯＄増浣跨敤锛�
-
+ var addItem = new WmsControlRuleDetail()
+ {
+ CreatedTime = SysHelper.GetNowTime(),
+ CreatedUserId = SysHelper.GetUserId(),
+ CreatedUserName = SysHelper.GetUserName(),
+ UpdatedTime = SysHelper.GetNowTime(),
+ UpdatedUserId = SysHelper.GetUserId(),
+ UpdatedUserName = SysHelper.GetUserName()
+ };
+ #region 瀹氫箟鍙橀噺
+ var _RuleName = "";//鎺у埗灞炴�ц鍒欏悕绉�
+ var _MaxImumqty = "";//鏈�楂樺簱瀛�
+ var _MinImumqty = "";//鏈�浣庡簱瀛�
+ var _SafeImumqty = "";//瀹夊叏搴撳瓨
+ var _MinStorageAge = "";//鏈�灏忓簱榫�
+ var _MaxStorageAge = "";//鏈�澶у簱榫�
+ var _IsNotChek = "";//鏄惁鍏嶆
+ var _ShelfLifeDays = "";//淇濊川鏈熷ぉ鏁�
+ var _IsDisabled = "";//鏄惁绂佺敤
+ #endregion
+
+
+ #region 鍙栧��
+ _RuleName = row["鎺у埗灞炴�ц鍒欏悕绉�"]?.ToString();
+ _MaxImumqty = row["鏈�楂樺簱瀛�"]?.ToString();
+ _MinImumqty = row["鏈�浣庡簱瀛�"]?.ToString();
+ _SafeImumqty = row["瀹夊叏搴撳瓨"]?.ToString();
+ _MinStorageAge = row["鏈�灏忓簱榫�"]?.ToString();
+ _MaxStorageAge = row["鏈�澶у簱榫�"]?.ToString();
+ _IsNotChek = row["鏄惁鍏嶆"]?.ToString();
+ _ShelfLifeDays = row["淇濊川鏈熷ぉ鏁�"]?.ToString();
+ _IsDisabled = row["鏄惁绂佺敤"]?.ToString();
+
+ #endregion
+
+
+ #region 楠岃瘉
+
+ if (string.IsNullOrEmpty(_RuleName))
+ {
+ throw Oops.Oh($"绗瑊index}琛孾鎺у埗灞炴�ц鍒欏悕绉癩{_RuleName}涓嶈兘涓虹┖锛�");
+ }
+
+ if (!string.IsNullOrEmpty(_RuleName))
+ {
+ addItem.RuleName = (string)_RuleName;
+ }
+ if (!string.IsNullOrEmpty(_MaxImumqty))
+ {
+ if (!decimal.TryParse(_MaxImumqty, out decimal outMaxImumqty) && !string.IsNullOrEmpty(_MaxImumqty))
+ {
+ throw Oops.Oh($"绗瑊index}琛孾鏈�楂樺簱瀛榏{_MaxImumqty}鍊间笉姝ｇ‘锛�");
+ }
+ if (outMaxImumqty <= 0 && !string.IsNullOrEmpty(_MaxImumqty))
+ {
+ throw Oops.Oh($"绗瑊index}琛孾鏈�楂樺簱瀛榏{_MaxImumqty}鍊间笉鑳藉皬浜庣瓑浜�0锛�");
+ }
+ else
+ {
+ addItem.MaxImumqty = outMaxImumqty;
+ }
+
+ }
+ if (!string.IsNullOrEmpty(_MinImumqty))
+ {
+ if (!decimal.TryParse(_MinImumqty, out decimal outMinImumqty) && !string.IsNullOrEmpty(_MinImumqty))
+ {
+ throw Oops.Oh($"绗瑊index}琛孾鏈�浣庡簱瀛榏{_MinImumqty}鍊间笉姝ｇ‘锛�");
+ }
+ if (outMinImumqty <= 0 && !string.IsNullOrEmpty(_MinImumqty))
+ {
+ throw Oops.Oh($"绗瑊index}琛孾鏈�浣庡簱瀛榏{_MinImumqty}鍊间笉鑳藉皬浜庣瓑浜�0锛�");
+ }
+ else
+ {
+ addItem.MinImumqty = outMinImumqty;
+ }
+
+ }
+ if (!string.IsNullOrEmpty(_SafeImumqty))
+ {
+ if (!decimal.TryParse(_SafeImumqty, out decimal outSafeImumqty) && !string.IsNullOrEmpty(_SafeImumqty))
+ {
+ throw Oops.Oh($"绗瑊index}琛孾瀹夊叏搴撳瓨]{_SafeImumqty}鍊间笉姝ｇ‘锛�");
+ }
+ if (outSafeImumqty <= 0 && !string.IsNullOrEmpty(_SafeImumqty))
+ {
+ throw Oops.Oh($"绗瑊index}琛孾瀹夊叏搴撳瓨]{_SafeImumqty}鍊间笉鑳藉皬浜庣瓑浜�0锛�");
+ }
+ else
+ {
+ addItem.SafeImumqty = outSafeImumqty;
+ }
+
+ }
+ if (!string.IsNullOrEmpty(_MinStorageAge))
+ {
+ if (!decimal.TryParse(_MinStorageAge, out decimal outMinStorageAge) && !string.IsNullOrEmpty(_MinStorageAge))
+ {
+ throw Oops.Oh($"绗瑊index}琛孾鏈�灏忓簱榫刔{_MinStorageAge}鍊间笉姝ｇ‘锛�");
+ }
+ if (outMinStorageAge <= 0 && !string.IsNullOrEmpty(_MinStorageAge))
+ {
+ throw Oops.Oh($"绗瑊index}琛孾鏈�灏忓簱榫刔{_MinStorageAge}鍊间笉鑳藉皬浜庣瓑浜�0锛�");
+ }
+ else
+ {
+ addItem.MinStorageAge = outMinStorageAge;
+ }
+
+ }
+ if (!string.IsNullOrEmpty(_MaxStorageAge))
+ {
+ if (!decimal.TryParse(_MaxStorageAge, out decimal outMaxStorageAge) && !string.IsNullOrEmpty(_MaxStorageAge))
+ {
+ throw Oops.Oh($"绗瑊index}琛孾鏈�澶у簱榫刔{_MaxStorageAge}鍊间笉姝ｇ‘锛�");
+ }
+ if (outMaxStorageAge <= 0 && !string.IsNullOrEmpty(_MaxStorageAge))
+ {
+ throw Oops.Oh($"绗瑊index}琛孾鏈�澶у簱榫刔{_MaxStorageAge}鍊间笉鑳藉皬浜庣瓑浜�0锛�");
+ }
+ else
+ {
+ addItem.MaxStorageAge = outMaxStorageAge;
+ }
+
+ }
+ if (!string.IsNullOrEmpty(_IsNotChek))
+ {
+ if (!_IsNotChek.Equals("鏄�") && !_IsNotChek.Equals("鍚�"))
+ {
+ throw Oops.Oh($"绗瑊index}琛孾鏄惁鍏嶆]{_IsNotChek}鍊间笉姝ｇ‘锛�");
+ }
+ else
+ {
+ bool outIsNotChek = _IsNotChek.Equals("鏄�") ? true : false;
+ addItem.IsNotChek = outIsNotChek;
+ }
+ }
+
+ if (!string.IsNullOrEmpty(_ShelfLifeDays))
+ {
+ if (!decimal.TryParse(_ShelfLifeDays, out decimal outShelfLifeDays) && !string.IsNullOrEmpty(_ShelfLifeDays))
+ {
+ throw Oops.Oh($"绗瑊index}琛孾淇濊川鏈熷ぉ鏁癩{_ShelfLifeDays}鍊间笉姝ｇ‘锛�");
+ }
+ if (outShelfLifeDays <= 0 && !string.IsNullOrEmpty(_ShelfLifeDays))
+ {
+ throw Oops.Oh($"绗瑊index}琛孾淇濊川鏈熷ぉ鏁癩{_ShelfLifeDays}鍊间笉鑳藉皬浜庣瓑浜�0锛�");
+ }
+ else
+ {
+ addItem.ShelfLifeDays = outShelfLifeDays;
+ }
+
+ }
+ if (!string.IsNullOrEmpty(_IsDisabled))
+ {
+ if (!_IsDisabled.Equals("鏄�") && !_IsDisabled.Equals("鍚�"))
+ {
+ throw Oops.Oh($"绗瑊index}琛孾鏄惁绂佺敤]{_IsDisabled}鍊间笉姝ｇ‘锛�");
+ }
+ else
+ {
+ bool outIsDisabled = _IsDisabled.Equals("鏄�") ? true : false;
+ addItem.IsDisabled = outIsDisabled;
+ }
+ }
+
+
+ #endregion
+
+
+ addItem.RuleCode = Yitter.IdGenerator.YitIdHelper.NextId().ToString();//TODO 瑕佽皟鐢ㄧ敓鎴� 缂栧彿鐨勬柟娉� 鍏堢敤闆姳ID
details.Add(addItem);
}
- //楠岄噸
- await CheckExisitForImport(details);
-
+ //楠岄噸
+ await CheckExisitForImport(details);
+
return details;
}
@@ -511,80 +439,80 @@
/// <param name="input"></param>
/// <param name="isEdit"></param>
/// <returns></returns>
- private async Task CheckExisit( WmsControlRuleDetail input,bool isEdit=false)
+ private async Task CheckExisit(WmsControlRuleDetail input, bool isEdit = false)
{
-
-
- bool isExist = false;
- if (!isEdit)//鏂板
- {
- //鏁版嵁鏄惁瀛樺湪閲嶅
- isExist = await _wmsControlRuleDetailRep.AnyAsync(u =>
- u.ControlRuleId.Equals(input.ControlRuleId)
- ,false);
- }
- else//缂栬緫
- {
-
-
- //褰撳墠缂栬緫鏁版嵁浠ュ鏄惁瀛樺湪閲嶅
- isExist = await _wmsControlRuleDetailRep.AnyAsync(u =>
- u.Id != input.Id
- &&u.ControlRuleId.Equals(input.ControlRuleId)
- ,false);
- }
-
-
+
+ bool isExist = false;
+ if (!isEdit)//鏂板
+ {
+ //鏁版嵁鏄惁瀛樺湪閲嶅
+ isExist = await _wmsControlRuleDetailRep.AnyAsync(u =>
+ u.RuleName.Equals(input.RuleName)
+ , false);
+ }
+ else//缂栬緫
+ {
+
+
+
+ //褰撳墠缂栬緫鏁版嵁浠ュ鏄惁瀛樺湪閲嶅
+ isExist = await _wmsControlRuleDetailRep.AnyAsync(u =>
+ u.Id != input.Id
+ && u.RuleName.Equals(input.RuleName)
+ , false);
+ }
+
+
if (isExist) throw Oops.Oh(ErrorCode.E0001);
- }
-
+ }
+
/// <summary>
/// 鏍规嵁鑱斿悎涓婚敭楠岃瘉鏁版嵁鏄惁宸插瓨鍦�-瀵煎叆鏃堕獙璇�
/// </summary>
/// <param name="inputs"></param>
/// <returns></returns>
private async Task CheckExisitForImport(List<WmsControlRuleDetail> inputs)
- {
+ {
//鏍规嵁鑱斿悎涓婚敭楠岃瘉琛ㄦ牸涓腑鏄惁宸插瓨鍦ㄧ浉鍚屾暟鎹�
- if (inputs?.Count <= 0)
- {
- throw Oops.Oh($"瀵煎叆鏁版嵁涓嶈兘涓虹┖");
- }
- //鏁版嵁鏄惁閲嶅
- var existExcelItem = inputs.GroupBy(g => new {
- g.ControlRuleId
- })
- .Where(g => g.Count() > 1)
- .Select(s => new {
- s.Key.ControlRuleId
- }).FirstOrDefault();
- if (existExcelItem != null)
- {
- var wmsControlRuleDetail = existExcelItem.Adapt<WmsControlRuleDetail>();
- var item= existExcelItem.Adapt<WmsControlRuleDetail>();
- throw Oops.Oh($"瀵煎叆鐨勮〃鏍间腑,鎺у埗灞炴�ц鍒橧D[{item.ControlRuleId}]宸插瓨鍦�");
- }
-
+ if (inputs?.Count <= 0)
+ {
+ throw Oops.Oh($"瀵煎叆鏁版嵁涓嶈兘涓虹┖");
+ }
+ //鏁版嵁鏄惁閲嶅
+ var existExcelItem = inputs.GroupBy(g => new
+ {
+ g.RuleName
+ })
+ .Where(g => g.Count() > 1)
+ .Select(s => new
+ {
+ s.Key.RuleName
+ }).FirstOrDefault();
+ if (existExcelItem != null)
+ {
+ var item = existExcelItem.Adapt<WmsControlRuleDetail>();
+ throw Oops.Oh($"瀵煎叆鐨勮〃鏍间腑,鎺у埗灞炴�ц鍒欏悕绉癧{item.RuleName}]宸插瓨鍦�");
+ }
- //鏍规嵁鑱斿悎涓婚敭楠岃瘉鏁版嵁搴撲腑鏄惁宸插瓨鍦ㄧ浉鍚屾暟鎹�
- var existDBItem = await _wmsControlRuleDetailRep.DetachedEntities.FirstOrDefaultAsync(w=>
- inputs.Select(s=>""
- +s.ControlRuleId
- )
- .Contains(""
- +w.ControlRuleId
- ));
- if (existDBItem != null)
- {
- var wmsControlRuleDetail = existExcelItem.Adapt<WmsControlRuleDetail>();
- var item= existExcelItem.Adapt<WmsControlRuleDetail>();
- throw Oops.Oh($"绯荤粺涓�,鎺у埗灞炴�ц鍒橧D[{item.ControlRuleId}]宸插瓨鍦�");
- }
+
+ //鏍规嵁鑱斿悎涓婚敭楠岃瘉鏁版嵁搴撲腑鏄惁宸插瓨鍦ㄧ浉鍚屾暟鎹�
+ var existDBItem = await _wmsControlRuleDetailRep.DetachedEntities.FirstOrDefaultAsync(w =>
+ inputs.Select(s => ""
+ + s.RuleName
+ )
+ .Contains(""
+ + w.RuleName
+ ));
+ if (existDBItem != null)
+ {
+ var item = existDBItem.Adapt<WmsControlRuleDetail>();
+ throw Oops.Oh($"绯荤粺涓�,鎺у埗灞炴�ц鍒欏悕绉癧{item.RuleName}]宸插瓨鍦�");
+ }
}
#endregion
--
Gitblit v1.9.3