From b57a0b5d5f2712417d5777e01f8615f670d22584 Mon Sep 17 00:00:00 2001
From: payne <bzrlw2012@163.com>
Date: 周四, 25 4月 2024 11:21:33 +0800
Subject: [PATCH] 控制规则明细调整
---
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsControlRuleDetail/WmsControlRuleDetailService.cs | 146 ++++++++++++------------------------------------
1 files changed, 36 insertions(+), 110 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..5f4405c 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
@@ -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)
@@ -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)
@@ -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();
@@ -240,7 +244,7 @@
UpdatedUserName = SysHelper.GetUserName()
};
#region 瀹氫箟鍙橀噺
- var _ControlRuleId = "";//鎺у埗灞炴�ц鍒橧D
+ var _RuleName = "";//鎺у埗灞炴�ц鍒欏悕绉�
var _MaxImumqty = "";//鏈�楂樺簱瀛�
var _MinImumqty = "";//鏈�浣庡簱瀛�
var _SafeImumqty = "";//瀹夊叏搴撳瓨
@@ -249,12 +253,11 @@
var _IsNotChek = "";//鏄惁鍏嶆
var _ShelfLifeDays = "";//淇濊川鏈熷ぉ鏁�
var _IsDisabled = "";//鏄惁绂佺敤
- var _Id = "";//Id涓婚敭
#endregion
#region 鍙栧��
- _ControlRuleId = row["鎺у埗灞炴�ц鍒橧D"]?.ToString() ;
+ _RuleName = row["鎺у埗灞炴�ц鍒欏悕绉�"]?.ToString() ;
_MaxImumqty = row["鏈�楂樺簱瀛�"]?.ToString() ;
_MinImumqty = row["鏈�浣庡簱瀛�"]?.ToString() ;
_SafeImumqty = row["瀹夊叏搴撳瓨"]?.ToString() ;
@@ -263,39 +266,21 @@
_IsNotChek = row["鏄惁鍏嶆"]?.ToString() ;
_ShelfLifeDays = row["淇濊川鏈熷ぉ鏁�"]?.ToString() ;
_IsDisabled = row["鏄惁绂佺敤"]?.ToString() ;
- _Id = row["Id涓婚敭"]?.ToString() ;
- #endregion
-
-
- #region 楠岃瘉
-
- if (string.IsNullOrEmpty(_ControlRuleId))
+
+ #endregion
+
+
+ #region 楠岃瘉
+
+ if (string.IsNullOrEmpty(_RuleName))
{
- throw Oops.Oh($"绗瑊index}琛孾鎺у埗灞炴�ц鍒橧D]{_ControlRuleId}涓嶈兘涓虹┖锛�");
+ throw Oops.Oh($"绗瑊index}琛孾鎺у埗灞炴�ц鍒欏悕绉癩{_RuleName}涓嶈兘涓虹┖锛�");
}
- if(!string.IsNullOrEmpty(_ControlRuleId))
+ if(!string.IsNullOrEmpty(_RuleName))
{
- 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}涓嶈兘涓虹┖锛�");
- }
-
+ addItem.RuleName = (string)_RuleName;
+ }
if(!string.IsNullOrEmpty(_MaxImumqty))
{
if (!decimal.TryParse(_MaxImumqty, out decimal outMaxImumqty)&&!string.IsNullOrEmpty(_MaxImumqty))
@@ -312,12 +297,6 @@
}
}
-
- if (string.IsNullOrEmpty(_MinImumqty))
- {
- throw Oops.Oh($"绗瑊index}琛孾鏈�浣庡簱瀛榏{_MinImumqty}涓嶈兘涓虹┖锛�");
- }
-
if(!string.IsNullOrEmpty(_MinImumqty))
{
if (!decimal.TryParse(_MinImumqty, out decimal outMinImumqty)&&!string.IsNullOrEmpty(_MinImumqty))
@@ -334,12 +313,6 @@
}
}
-
- if (string.IsNullOrEmpty(_SafeImumqty))
- {
- throw Oops.Oh($"绗瑊index}琛孾瀹夊叏搴撳瓨]{_SafeImumqty}涓嶈兘涓虹┖锛�");
- }
-
if(!string.IsNullOrEmpty(_SafeImumqty))
{
if (!decimal.TryParse(_SafeImumqty, out decimal outSafeImumqty)&&!string.IsNullOrEmpty(_SafeImumqty))
@@ -356,12 +329,6 @@
}
}
-
- if (string.IsNullOrEmpty(_MinStorageAge))
- {
- throw Oops.Oh($"绗瑊index}琛孾鏈�灏忓簱榫刔{_MinStorageAge}涓嶈兘涓虹┖锛�");
- }
-
if(!string.IsNullOrEmpty(_MinStorageAge))
{
if (!decimal.TryParse(_MinStorageAge, out decimal outMinStorageAge)&&!string.IsNullOrEmpty(_MinStorageAge))
@@ -378,12 +345,6 @@
}
}
-
- if (string.IsNullOrEmpty(_MaxStorageAge))
- {
- throw Oops.Oh($"绗瑊index}琛孾鏈�澶у簱榫刔{_MaxStorageAge}涓嶈兘涓虹┖锛�");
- }
-
if(!string.IsNullOrEmpty(_MaxStorageAge))
{
if (!decimal.TryParse(_MaxStorageAge, out decimal outMaxStorageAge)&&!string.IsNullOrEmpty(_MaxStorageAge))
@@ -400,12 +361,6 @@
}
}
-
- if (string.IsNullOrEmpty(_IsNotChek))
- {
- throw Oops.Oh($"绗瑊index}琛孾鏄惁鍏嶆]{_IsNotChek}涓嶈兘涓虹┖锛�");
- }
-
if(!string.IsNullOrEmpty(_IsNotChek))
{
if(!_IsNotChek.Equals("鏄�") && !_IsNotChek.Equals("鍚�"))
@@ -417,13 +372,7 @@
bool outIsNotChek = _IsNotChek.Equals("鏄�") ? true : false;
addItem.IsNotChek = outIsNotChek;
}
- }
-
-
- if (string.IsNullOrEmpty(_ShelfLifeDays))
- {
- throw Oops.Oh($"绗瑊index}琛孾淇濊川鏈熷ぉ鏁癩{_ShelfLifeDays}涓嶈兘涓虹┖锛�");
- }
+ }
if(!string.IsNullOrEmpty(_ShelfLifeDays))
{
@@ -441,12 +390,6 @@
}
}
-
- if (string.IsNullOrEmpty(_IsDisabled))
- {
- throw Oops.Oh($"绗瑊index}琛孾鏄惁绂佺敤]{_IsDisabled}涓嶈兘涓虹┖锛�");
- }
-
if(!string.IsNullOrEmpty(_IsDisabled))
{
if(!_IsDisabled.Equals("鏄�") && !_IsDisabled.Equals("鍚�"))
@@ -459,27 +402,12 @@
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
-
-
+
+ #endregion
+
+
+ addItem.RuleCode = Yitter.IdGenerator.YitIdHelper.NextId().ToString();//TODO 瑕佽皟鐢ㄧ敓鎴� 缂栧彿鐨勬柟娉� 鍏堢敤闆姳ID
details.Add(addItem);
}
//楠岄噸
@@ -521,7 +449,7 @@
{
//鏁版嵁鏄惁瀛樺湪閲嶅
isExist = await _wmsControlRuleDetailRep.AnyAsync(u =>
- u.ControlRuleId.Equals(input.ControlRuleId)
+ u.RuleName.Equals(input.RuleName)
,false);
}
else//缂栬緫
@@ -532,7 +460,7 @@
//褰撳墠缂栬緫鏁版嵁浠ュ鏄惁瀛樺湪閲嶅
isExist = await _wmsControlRuleDetailRep.AnyAsync(u =>
u.Id != input.Id
- &&u.ControlRuleId.Equals(input.ControlRuleId)
+ &&u.RuleName.Equals(input.RuleName)
,false);
}
@@ -555,17 +483,16 @@
}
//鏁版嵁鏄惁閲嶅
var existExcelItem = inputs.GroupBy(g => new {
- g.ControlRuleId
+ g.RuleName
})
.Where(g => g.Count() > 1)
.Select(s => new {
- s.Key.ControlRuleId
+ s.Key.RuleName
}).FirstOrDefault();
if (existExcelItem != null)
{
- var wmsControlRuleDetail = existExcelItem.Adapt<WmsControlRuleDetail>();
var item= existExcelItem.Adapt<WmsControlRuleDetail>();
- throw Oops.Oh($"瀵煎叆鐨勮〃鏍间腑,鎺у埗灞炴�ц鍒橧D[{item.ControlRuleId}]宸插瓨鍦�");
+ throw Oops.Oh($"瀵煎叆鐨勮〃鏍间腑,鎺у埗灞炴�ц鍒欏悕绉癧{item.RuleName}]宸插瓨鍦�");
}
@@ -574,16 +501,15 @@
//鏍规嵁鑱斿悎涓婚敭楠岃瘉鏁版嵁搴撲腑鏄惁宸插瓨鍦ㄧ浉鍚屾暟鎹�
var existDBItem = await _wmsControlRuleDetailRep.DetachedEntities.FirstOrDefaultAsync(w=>
inputs.Select(s=>""
- +s.ControlRuleId
+ +s.RuleName
)
.Contains(""
- +w.ControlRuleId
+ +w.RuleName
));
if (existDBItem != null)
{
- var wmsControlRuleDetail = existExcelItem.Adapt<WmsControlRuleDetail>();
- var item= existExcelItem.Adapt<WmsControlRuleDetail>();
- throw Oops.Oh($"绯荤粺涓�,鎺у埗灞炴�ц鍒橧D[{item.ControlRuleId}]宸插瓨鍦�");
+ var item= existDBItem.Adapt<WmsControlRuleDetail>();
+ throw Oops.Oh($"绯荤粺涓�,鎺у埗灞炴�ц鍒欏悕绉癧{item.RuleName}]宸插瓨鍦�");
}
}
--
Gitblit v1.9.3