From 966f1394b31670aba13698e893f8e6af83e28bde Mon Sep 17 00:00:00 2001
From: payne <bzrlw2012@163.com>
Date: 周五, 26 4月 2024 10:20:57 +0800
Subject: [PATCH] 1
---
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsArea/WmsAreaService.cs | 27 ++++++++++++++++++---------
1 files changed, 18 insertions(+), 9 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..12c9b9d 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
@@ -26,6 +26,8 @@
private readonly IRepository<SysDictType, MasterDbContextLocator> _sysDictTypeRep;
private readonly IRepository<SysDictData, MasterDbContextLocator> _sysDictDataRep;
private readonly ISysExcelTemplateService _sysExcelTemplateService;
+ private readonly IRepository<WmsWarehouse, MasterDbContextLocator> _wmsWarehouseRep;
+
private readonly static object _lock = new();
public WmsAreaService(
@@ -33,12 +35,14 @@
,IRepository<SysDictType, MasterDbContextLocator> sysDictTypeRep
,IRepository<SysDictData, MasterDbContextLocator> sysDictDataRep
,ISysExcelTemplateService sysExcelTemplateService
+ ,IRepository<WmsWarehouse, MasterDbContextLocator> wmsWarehouseRep
)
{
_wmsAreaRep = wmsAreaRep;
_sysDictTypeRep = sysDictTypeRep;
_sysDictDataRep = sysDictDataRep;
_sysExcelTemplateService = sysExcelTemplateService;
+ _wmsWarehouseRep = wmsWarehouseRep;
}
/// <summary>
@@ -163,7 +167,14 @@
var wmsArea = input.Adapt<WmsArea>();
//楠岃瘉
await CheckExisit(wmsArea);
-
+ //鎵�灞炰粨搴�
+ var Info = _wmsWarehouseRep.Where(x => x.Id == input.WarehouseId).FirstOrDefault();
+ if (Info == null)
+ {
+ throw Oops.Oh(errorMessage: @$"鎵�灞炰粨搴撲笉瀛樺湪锛�");
+ }
+ wmsArea.WarehouseName = Info.Name;
+ wmsArea.WarehouseCode = Info.Code;
wmsArea.CreatedUserId = wmsArea.UpdatedUserId = SysHelper.GetUserId();
wmsArea.CreatedUserName = wmsArea.UpdatedUserName = SysHelper.GetUserName();
wmsArea.CreatedTime = wmsArea.UpdatedTime = SysHelper.GetNowTime();
@@ -382,20 +393,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