From 51f38f6fd09633b20d2af827c5a5b3ec810c5dd3 Mon Sep 17 00:00:00 2001
From: payne <bzrlw2012@163.com>
Date: 周三, 24 4月 2024 14:24:48 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/iWare_RawMaterialWarehouse
---
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsPlace/WmsPlaceService.cs | 47 +++++++++++++++++------------------------------
1 files changed, 17 insertions(+), 30 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 5d775ee..250bf5c 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
@@ -55,7 +55,6 @@
.Where(!string.IsNullOrEmpty(input.PlaceAlias), u => u.PlaceAlias == input.PlaceAlias)
.Where(input.PlaceType != null, u => u.PlaceType == input.PlaceType)
.Where(!string.IsNullOrEmpty(input.PlaceTypeName), u => u.PlaceTypeName == input.PlaceTypeName)
- .Where(!string.IsNullOrEmpty(input.StockUnit), u => u.StockUnit == input.StockUnit)
.Where(input.PlaceStatus != null, u => u.PlaceStatus == input.PlaceStatus)
.Where(input.IsSrmPlace != null, u => u.IsSrmPlace == input.IsSrmPlace)
.Where(!string.IsNullOrEmpty(input.SrmPlaceNo), u => u.SrmPlaceNo == input.SrmPlaceNo)
@@ -88,8 +87,6 @@
.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(!string.IsNullOrEmpty(input.CreatedUserName), u => u.CreatedUserName == input.CreatedUserName)
- .Where(!string.IsNullOrEmpty(input.UpdatedUserName), u => u.UpdatedUserName == input.UpdatedUserName)
.OrderBy(PageInputOrder.OrderBuilder<WmsPlaceSearch>(input))
.ProjectToType<WmsPlaceOutput>()
.ToADPagedListAsync(input.PageNo, input.PageSize);
@@ -109,7 +106,6 @@
var pPlaceAlias = input.PlaceAlias?.Trim() ?? "";
var pPlaceType = input.PlaceType;
var pPlaceTypeName = input.PlaceTypeName?.Trim() ?? "";
- var pStockUnit = input.StockUnit?.Trim() ?? "";
var pPlaceStatus = input.PlaceStatus;
var pIsSrmPlace = input.IsSrmPlace;
var pSrmPlaceNo = input.SrmPlaceNo?.Trim() ?? "";
@@ -142,15 +138,12 @@
var pIsDisabled = input.IsDisabled;
var pCreatedTime = input.CreatedTime;
var pUpdatedTime = input.UpdatedTime;
- var pCreatedUserName = input.CreatedUserName?.Trim() ?? "";
- var pUpdatedUserName = input.UpdatedUserName?.Trim() ?? "";
var wmsPlaces = await _wmsPlaceRep.DetachedEntities
.Where(!string.IsNullOrEmpty(pPlaceCode), u => u.PlaceCode == pPlaceCode)
.Where(!string.IsNullOrEmpty(pPlaceName), u => u.PlaceName == pPlaceName)
.Where(!string.IsNullOrEmpty(pPlaceAlias), u => u.PlaceAlias == pPlaceAlias)
.Where(pPlaceType != null, u => u.PlaceType == pPlaceType)
.Where(!string.IsNullOrEmpty(pPlaceTypeName), u => u.PlaceTypeName == pPlaceTypeName)
- .Where(!string.IsNullOrEmpty(pStockUnit), u => u.StockUnit == pStockUnit)
.Where(pPlaceStatus != null, u => u.PlaceStatus == pPlaceStatus)
.Where(pIsSrmPlace != null, u => u.IsSrmPlace == pIsSrmPlace)
.Where(!string.IsNullOrEmpty(pSrmPlaceNo), u => u.SrmPlaceNo == pSrmPlaceNo)
@@ -183,8 +176,6 @@
.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(!string.IsNullOrEmpty(pCreatedUserName), u => u.CreatedUserName == pCreatedUserName)
- .Where(!string.IsNullOrEmpty(pUpdatedUserName), u => u.UpdatedUserName == pUpdatedUserName)
.OrderBy(PageInputOrder.OrderNonPageBuilder(input))
.ProjectToType<WmsPlaceOutput>()
.ToListAsync();
@@ -326,7 +317,6 @@
var _PlaceAlias = "";//搴撲綅鍒悕
var _PlaceType = "";//搴撲綅绫诲瀷
var _PlaceTypeName = "";//搴撲綅绫诲瀷鍚嶇О
- var _StockUnit = "";//瀛樻斁鍗曚綅
var _PlaceStatus = "";//搴撲綅灞炴��
var _IsSrmPlace = "";//鏄惁鍫嗗灈鏈哄簱浣�
var _SrmPlaceNo = "";//鍫嗗灈鏈哄簱浣嶅彿
@@ -367,7 +357,6 @@
_PlaceAlias = row["搴撲綅鍒悕"]?.ToString() ;
_PlaceType = row["搴撲綅绫诲瀷"]?.ToString() ;
_PlaceTypeName = row["搴撲綅绫诲瀷鍚嶇О"]?.ToString() ;
- _StockUnit = row["瀛樻斁鍗曚綅"]?.ToString() ;
_PlaceStatus = row["搴撲綅灞炴��"]?.ToString() ;
_IsSrmPlace = row["鏄惁鍫嗗灈鏈哄簱浣�"]?.ToString() ;
_SrmPlaceNo = row["鍫嗗灈鏈哄簱浣嶅彿"]?.ToString() ;
@@ -435,44 +424,42 @@
if(!string.IsNullOrEmpty(_PlaceType))
{
- if (!int.TryParse(_PlaceType, out int outPlaceType)&&!string.IsNullOrEmpty(_PlaceType))
+ Admin.NET.Core.PlaceTypeEnum enumPlaceType = default(Admin.NET.Core.PlaceTypeEnum);
+
+ if(!Enum.TryParse<Admin.NET.Core.PlaceTypeEnum>(_PlaceType, out enumPlaceType)&&!string.IsNullOrEmpty(_PlaceType))
{
- throw Oops.Oh($"绗瑊index}琛孾搴撲綅绫诲瀷]{_PlaceType}鍊间笉姝ｇ‘锛�");
- }
- if (outPlaceType <= 0&&!string.IsNullOrEmpty(_PlaceType))
- {
- throw Oops.Oh($"绗瑊index}琛孾搴撲綅绫诲瀷]{_PlaceType}鍊间笉鑳藉皬浜庣瓑浜�0锛�");
+ throw Oops.Oh($"绗瑊index}琛孾搴撲綅绫诲瀷]{_PlaceType}鍊间笉姝ｇ‘锛�");
}
else
{
- addItem.PlaceType = outPlaceType;
+ addItem.PlaceType = enumPlaceType;
}
- }
+ }
if(!string.IsNullOrEmpty(_PlaceTypeName))
{
addItem.PlaceTypeName = (string)_PlaceTypeName;
}
- if(!string.IsNullOrEmpty(_StockUnit))
+
+ if (string.IsNullOrEmpty(_PlaceStatus))
{
- addItem.StockUnit = (string)_StockUnit;
- }
+ throw Oops.Oh($"绗瑊index}琛孾搴撲綅灞炴�{_PlaceStatus}涓嶈兘涓虹┖锛�");
+ }
+
if(!string.IsNullOrEmpty(_PlaceStatus))
{
- if (!int.TryParse(_PlaceStatus, out int outPlaceStatus)&&!string.IsNullOrEmpty(_PlaceStatus))
+ Admin.NET.Core.PlaceStatusEnum enumPlaceStatus = default(Admin.NET.Core.PlaceStatusEnum);
+
+ if(!Enum.TryParse<Admin.NET.Core.PlaceStatusEnum>(_PlaceStatus, out enumPlaceStatus)&&!string.IsNullOrEmpty(_PlaceStatus))
{
- throw Oops.Oh($"绗瑊index}琛孾搴撲綅灞炴�{_PlaceStatus}鍊间笉姝ｇ‘锛�");
- }
- if (outPlaceStatus <= 0&&!string.IsNullOrEmpty(_PlaceStatus))
- {
- throw Oops.Oh($"绗瑊index}琛孾搴撲綅灞炴�{_PlaceStatus}鍊间笉鑳藉皬浜庣瓑浜�0锛�");
+ throw Oops.Oh($"绗瑊index}琛孾搴撲綅灞炴�{_PlaceStatus}鍊间笉姝ｇ‘锛�");
}
else
{
- addItem.PlaceStatus = outPlaceStatus;
+ addItem.PlaceStatus = enumPlaceStatus;
}
- }
+ }
if(!string.IsNullOrEmpty(_IsSrmPlace))
{
if(!_IsSrmPlace.Equals("鏄�") && !_IsSrmPlace.Equals("鍚�"))
--
Gitblit v1.9.3