From bd916670e7915ec914d71ed7daadbe8eb5fd0835 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周三, 24 4月 2024 15:31:37 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/iWare_RawMaterialWarehouse
---
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsArea/WmsAreaService.cs | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsArea/WmsAreaService.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsArea/WmsAreaService.cs
index 88546d3..811b48d 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsArea/WmsAreaService.cs
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsArea/WmsAreaService.cs
@@ -382,20 +382,18 @@
if(!string.IsNullOrEmpty(_WarehouseId))
{
- if (!long.TryParse(_WarehouseId, out long outWarehouseId)&&!string.IsNullOrEmpty(_WarehouseId))
+ System.Int64 enumWarehouseId = default(System.Int64);
+
+ if(!Enum.TryParse<System.Int64>(_WarehouseId, out enumWarehouseId)&&!string.IsNullOrEmpty(_WarehouseId))
{
- throw Oops.Oh($"绗瑊index}琛孾鎵�灞炰粨搴揮{_WarehouseId}鍊间笉姝ｇ‘锛�");
- }
- if (outWarehouseId <= 0&&!string.IsNullOrEmpty(_WarehouseId))
- {
- throw Oops.Oh($"绗瑊index}琛孾鎵�灞炰粨搴揮{_WarehouseId}鍊间笉鑳藉皬浜庣瓑浜�0锛�");
+ throw Oops.Oh($"绗瑊index}琛孾鎵�灞炰粨搴揮{_WarehouseId}鍊间笉姝ｇ‘锛�");
}
else
{
- addItem.WarehouseId = outWarehouseId;
+ addItem.WarehouseId = enumWarehouseId;
}
- }
+ }
if (string.IsNullOrEmpty(_IsBarcodeLevelControl))
{
--
Gitblit v1.9.3