From 831a469617df0394456367f397b7a6a7dca989db Mon Sep 17 00:00:00 2001 From: FanLian Date: Thu, 10 Aug 2023 10:00:59 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=87=8D=E5=86=99=E7=82=B9=E4=BD=8D?= =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=9A=84=E5=AF=BC=E5=85=A5=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E9=87=8D=E5=86=99=E5=9C=A8=E7=BA=BF?= =?UTF-8?q?=E5=BC=80=E5=8F=91=E6=8E=A5=E5=8F=A3=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LocationDefinitionService.cs | 1 - .../Tnb.WarehouseMgr/WmsCarryLedgerService.cs | 1 - .../Tnb.WarehouseMgr/WmsPointService.cs | 50 +++++++++++-------- .../VisualDevModelDataService.cs | 2 +- 4 files changed, 29 insertions(+), 25 deletions(-) diff --git a/WarehouseMgr/Tnb.WarehouseMgr/LocationDefinitionService.cs b/WarehouseMgr/Tnb.WarehouseMgr/LocationDefinitionService.cs index 7a262b68..d5d00c30 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/LocationDefinitionService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/LocationDefinitionService.cs @@ -63,7 +63,6 @@ namespace Tnb.WarehouseMgr x.is_lock = 0; x.carrystd_id = carryStdDic[x.carrystd_id].ToString() ?? throw new AppFriendlyException($"第{locs.IndexOf(x) + 1}行的载具规格有误", 500); x.create_id = _userManager.UserId; - x.create_time = DateTime.Now; x.modify_id = null; x.modify_time = null; x.is_mix = 1; diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryLedgerService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryLedgerService.cs index e02e1b26..ce70c0a6 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryLedgerService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryLedgerService.cs @@ -91,7 +91,6 @@ namespace Tnb.WarehouseMgr x.out_status = ((int)EnumOutStatus.正常).ToString(); x.is_check = 1; x.create_id = _userManager.UserId; - x.create_time = DateTime.Now; x.modify_id = null; x.modify_time = null; }); diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPointService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPointService.cs index 268e4137..99f216b0 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsPointService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPointService.cs @@ -4,6 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using JNPF.Common.Core.Manager; +using JNPF.Common.Extension; using JNPF.Common.Security; using JNPF.FriendlyException; using JNPF.VisualDev; @@ -16,11 +17,11 @@ using Tnb.WarehouseMgr.Entities; namespace Tnb.WarehouseMgr { [OverideVisualDev(ModuleConsts.MODULE_WMSPOINT_ID)] - public class WmsPointService: BaseWareHouseService + public class WmsPointService : BaseWareHouseService { private readonly ISqlSugarClient _db; private readonly IUserManager _userManager; - public WmsPointService(ISqlSugarRepository repository, IUserManager userManager) + public WmsPointService(ISqlSugarRepository repository, IUserManager userManager) { _db = repository.AsSugarClient(); _userManager = userManager; @@ -35,34 +36,39 @@ namespace Tnb.WarehouseMgr List> dics = input.list; List points = new List(); WmsPointH pt = new WmsPointH(); - List cCodes = new List(); + List aCodes = new List(); foreach (var d in dics) { - var cCode = d["carrystd_id"].ToString() ?? string.Empty; - if (cCode == string.Empty) throw new AppFriendlyException($"第{dics.IndexOf(d) + 1}行载具规格不可为空", 500); - cCodes.Add(cCode); + var pCode = d["point_code"].ToString() ?? string.Empty; + var pName = d["point_name"].ToString() ?? string.Empty; + var aCode = d["area_code"].ToString() ?? string.Empty; + var floor = d["floor"].ToString() ?? string.Empty; + if (pCode == string.Empty) throw new AppFriendlyException($"第{dics.IndexOf(d) + 1}行点位编号不可为空", 500); + if (pName == string.Empty) throw new AppFriendlyException($"第{dics.IndexOf(d) + 1}行点位名称不可为空", 500); + if (aCode == string.Empty) throw new AppFriendlyException($"第{dics.IndexOf(d) + 1}行管理区编号不可为空", 500); + if (floor == string.Empty) throw new AppFriendlyException($"第{dics.IndexOf(d) + 1}行楼层不可为空", 500); + aCodes.Add(aCode); d["create_time"] = DateTime.Now; d.Remove("modify_time"); pt = d.Adapt(); points.Add(pt); } - var carryStdDic = await _db.Queryable().Where(it => cCodes.Contains(it.carrystd_code)).ToDictionaryAsync(x => x.carrystd_code, x => x.id); - if (carryStdDic?.Count > 0) + var areas = await _db.Queryable().Where(it => aCodes.Contains(it.code)).ToDictionaryAsync(x => x.code, x => x.id); + points.ForEach(x => { - points.ForEach(x => - { - - x.id = SnowflakeIdHelper.NextId(); - x.org_id = _userManager.User.OrganizeId; - x.is_lock = 0; - - x.create_id = _userManager.UserId; - x.create_time = DateTime.Now; - x.modify_id = null; - x.modify_time = null; - - }); - } + if (!areas.Keys.Contains(x.area_code)) throw new AppFriendlyException($"第{points.IndexOf(x) + 1}行的管理区编号有误", 500); + x.id = SnowflakeIdHelper.NextId(); + x.org_id = _userManager.User.OrganizeId; + x.is_lock = 0; + x.status = 1; + x.point_x = 0; + x.point_y = 0; + x.point_z = 0; + x.area_id = areas[x.area_code].ToString() ?? throw new AppFriendlyException($"第{points.IndexOf(x) + 1}行的管理区编号编号有误", 500); + x.create_id = _userManager.UserId; + x.modify_id = null; + x.modify_time = null; + }); row = await _db.Insertable(points).ExecuteCommandAsync(); } catch (Exception ex) diff --git a/visualdev/Tnb.VisualDev/VisualDevModelDataService.cs b/visualdev/Tnb.VisualDev/VisualDevModelDataService.cs index 6ca79456..adc31b40 100644 --- a/visualdev/Tnb.VisualDev/VisualDevModelDataService.cs +++ b/visualdev/Tnb.VisualDev/VisualDevModelDataService.cs @@ -798,7 +798,7 @@ namespace JNPF.VisualDev { VisualDevImportDataOutput result = new VisualDevImportDataOutput(); var overideSvc = OverideVisualDevManager.GetOrDefault(modelId); - if (overideSvc != null && overideSvc.OverideFuncs.CreateAsync != null) + if (overideSvc != null && overideSvc.OverideFuncs.ImportDataAsync != null) { await overideSvc.OverideFuncs.ImportDataAsync(list); } From f21291380ef269124eab56baefc2084b66225091 Mon Sep 17 00:00:00 2001 From: FanLian Date: Thu, 10 Aug 2023 10:21:13 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8A=A5=E9=94=99?= =?UTF-8?q?=E6=B6=88=E6=81=AF=EF=BC=8C=E5=A2=9E=E5=8A=A0=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LocationDefinitionService.cs | 19 ++++++++++++------- .../Tnb.WarehouseMgr/WmsCarryLedgerService.cs | 19 ++++++++++--------- .../Tnb.WarehouseMgr/WmsPointService.cs | 16 ++++++++++------ .../Tnb.WarehouseMgr/WmsRouteMgrService.cs | 19 ++++++++++--------- 4 files changed, 42 insertions(+), 31 deletions(-) diff --git a/WarehouseMgr/Tnb.WarehouseMgr/LocationDefinitionService.cs b/WarehouseMgr/Tnb.WarehouseMgr/LocationDefinitionService.cs index d5d00c30..4801470e 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/LocationDefinitionService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/LocationDefinitionService.cs @@ -21,6 +21,9 @@ using NPOI.SS.Formula.Functions; namespace Tnb.WarehouseMgr { + /// + /// 库位定义业务类 + /// [OverideVisualDev(ModuleConsts.MODULE_LOCATIONDEFINITION_ID)] public class LocationDefinitionService : BaseWareHouseService { @@ -41,27 +44,29 @@ namespace Tnb.WarehouseMgr List> dics = input.list; List locs = new List(); BasLocation loc = new BasLocation(); - List cCodes = new List(); + List cStdCodes = new List(); + //遍历字典，找出需要查询数据库拿的相关字段 foreach (var d in dics) { - var cCode = d["carrystd_id"].ToString() ?? string.Empty; - if (cCode == string.Empty) throw new AppFriendlyException($"第{dics.IndexOf(d) + 1}行载具规格不可为空", 500); - cCodes.Add(cCode); + var LCode = d["location_code"].ToString() ?? string.Empty; + if (LCode == string.Empty) throw new AppFriendlyException($"第{dics.IndexOf(d) + 1}个数据起始点位编号不可为空", 500); + var cStdCode = d["carrystd_id"].ToString() ?? string.Empty; + cStdCodes.Add(cStdCode); d["create_time"] = DateTime.Now; d.Remove("modify_time"); loc = d.Adapt(); locs.Add(loc); } - var carryStdDic = await _db.Queryable().Where(it => cCodes.Contains(it.carrystd_code)).ToDictionaryAsync(x => x.carrystd_code, x => x.id); + var carryStdDic = await _db.Queryable().Where(it => cStdCodes.Contains(it.carrystd_code)).ToDictionaryAsync(x => x.carrystd_code, x => x.id); if (carryStdDic?.Count > 0) { locs.ForEach(x => { - if (!carryStdDic.Keys.Contains(x.carrystd_id)) throw new AppFriendlyException($"第{locs.IndexOf(x) + 1}行的载具规格有误", 500); + if (!carryStdDic.Keys.Contains(x.carrystd_id)) throw new AppFriendlyException($"第{locs.IndexOf(x) + 1}个数据的载具规格有误", 500); x.id = SnowflakeIdHelper.NextId(); x.org_id = _userManager.User.OrganizeId; x.is_lock = 0; - x.carrystd_id = carryStdDic[x.carrystd_id].ToString() ?? throw new AppFriendlyException($"第{locs.IndexOf(x) + 1}行的载具规格有误", 500); + x.carrystd_id = carryStdDic[x.carrystd_id].ToString() ?? throw new AppFriendlyException($"第{locs.IndexOf(x) + 1}个数据的载具规格有误", 500); x.create_id = _userManager.UserId; x.modify_id = null; x.modify_time = null; diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryLedgerService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryLedgerService.cs index ce70c0a6..ead8cf04 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryLedgerService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryLedgerService.cs @@ -62,32 +62,33 @@ namespace Tnb.WarehouseMgr List> dics = input.list; List carrys = new List(); List locCodes = new(); - List cCodes = new(); + List cStdCodes = new(); WmsCarryH carryH = new WmsCarryH(); + //遍历字典，找出需要查询数据库拿的相关字段 foreach (var d in dics) { - var cCode = d["carrystd_id"].ToString() ?? string.Empty; - if (cCode == string.Empty) throw new AppFriendlyException($"第{dics.IndexOf(d) + 1}行载具规格不可为空", 500); + var cStdCode = d["carrystd_id"].ToString() ?? string.Empty; + //if (cStdCode == string.Empty) throw new AppFriendlyException($"第{dics.IndexOf(d) + 1}个数据载具规格不可为空", 500); locCodes.Add(d["location_code"]?.ToString() ?? string.Empty); - cCodes.Add(cCode); + cStdCodes.Add(cStdCode); d["create_time"] = DateTime.Now; d.Remove("modify_time"); carryH = d.Adapt(); carrys.Add(carryH); } - var carryStdDic = await _db.Queryable().Where(it => cCodes.Contains(it.carrystd_code)).ToDictionaryAsync(x => x.carrystd_code, x => x.id); + var carryStdDic = await _db.Queryable().Where(it => cStdCodes.Contains(it.carrystd_code)).ToDictionaryAsync(x => x.carrystd_code, x => x.id); var locs = await _db.Queryable().Where(it => locCodes.Contains(it.location_code)).ToDictionaryAsync(x => x.location_code, x => x.id); carrys.ForEach(x => { - if (!carryStdDic.Keys.Contains(x.carrystd_id)) throw new AppFriendlyException($"第{carrys.IndexOf(x) + 1}行的载具规格有误", 500); - if (!locs.Keys.Contains(x.location_code)) throw new AppFriendlyException($"第{carrys.IndexOf(x) + 1}行的库位编号有误", 500); + if (!carryStdDic.Keys.Contains(x.carrystd_id)) throw new AppFriendlyException($"第{carrys.IndexOf(x) + 1}个数据的载具规格有误", 500); + if (!locs.Keys.Contains(x.location_code)) throw new AppFriendlyException($"第{carrys.IndexOf(x) + 1}个数据的库位编号有误", 500); x.id = SnowflakeIdHelper.NextId(); x.org_id = _userManager.User.OrganizeId; x.status = 1; x.is_lock = 0; - x.carrystd_id = carryStdDic[x.carrystd_id].ToString() ?? throw new AppFriendlyException($"第{carrys.IndexOf(x) + 1}行的载具规格有误", 500); + x.carrystd_id = carryStdDic[x.carrystd_id].ToString() ?? throw new AppFriendlyException($"第{carrys.IndexOf(x) + 1}个数据的载具规格有误", 500); x.carry_status = ((int)EnumCarryStatus.空闲).ToString(); - x.location_id = locs[x.location_code].ToString() ?? throw new AppFriendlyException($"第{carrys.IndexOf(x) + 1}行的库位编号有误", 500); + x.location_id = locs[x.location_code].ToString() ?? throw new AppFriendlyException($"第{carrys.IndexOf(x) + 1}个数据的库位编号有误", 500); x.out_status = ((int)EnumOutStatus.正常).ToString(); x.is_check = 1; x.create_id = _userManager.UserId; diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPointService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPointService.cs index 99f216b0..d19f7bda 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsPointService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPointService.cs @@ -16,6 +16,9 @@ using Tnb.WarehouseMgr.Entities; namespace Tnb.WarehouseMgr { + /// + /// 点位管理业务类 + /// [OverideVisualDev(ModuleConsts.MODULE_WMSPOINT_ID)] public class WmsPointService : BaseWareHouseService { @@ -37,16 +40,17 @@ namespace Tnb.WarehouseMgr List points = new List(); WmsPointH pt = new WmsPointH(); List aCodes = new List(); + //遍历字典，找出需要查询数据库拿的相关字段 foreach (var d in dics) { var pCode = d["point_code"].ToString() ?? string.Empty; var pName = d["point_name"].ToString() ?? string.Empty; var aCode = d["area_code"].ToString() ?? string.Empty; var floor = d["floor"].ToString() ?? string.Empty; - if (pCode == string.Empty) throw new AppFriendlyException($"第{dics.IndexOf(d) + 1}行点位编号不可为空", 500); - if (pName == string.Empty) throw new AppFriendlyException($"第{dics.IndexOf(d) + 1}行点位名称不可为空", 500); - if (aCode == string.Empty) throw new AppFriendlyException($"第{dics.IndexOf(d) + 1}行管理区编号不可为空", 500); - if (floor == string.Empty) throw new AppFriendlyException($"第{dics.IndexOf(d) + 1}行楼层不可为空", 500); + if (pCode == string.Empty) throw new AppFriendlyException($"第{dics.IndexOf(d) + 1}个数据点位编号不可为空", 500); + if (pName == string.Empty) throw new AppFriendlyException($"第{dics.IndexOf(d) + 1}个数据点位名称不可为空", 500); + //if (aCode == string.Empty) throw new AppFriendlyException($"第{dics.IndexOf(d) + 1}个数据管理区编号不可为空", 500); + if (floor == string.Empty) throw new AppFriendlyException($"第{dics.IndexOf(d) + 1}个数据楼层不可为空", 500); aCodes.Add(aCode); d["create_time"] = DateTime.Now; d.Remove("modify_time"); @@ -56,7 +60,7 @@ namespace Tnb.WarehouseMgr var areas = await _db.Queryable().Where(it => aCodes.Contains(it.code)).ToDictionaryAsync(x => x.code, x => x.id); points.ForEach(x => { - if (!areas.Keys.Contains(x.area_code)) throw new AppFriendlyException($"第{points.IndexOf(x) + 1}行的管理区编号有误", 500); + if (!areas.Keys.Contains(x.area_code)) throw new AppFriendlyException($"第{points.IndexOf(x) + 1}个数据的管理区编号有误", 500); x.id = SnowflakeIdHelper.NextId(); x.org_id = _userManager.User.OrganizeId; x.is_lock = 0; @@ -64,7 +68,7 @@ namespace Tnb.WarehouseMgr x.point_x = 0; x.point_y = 0; x.point_z = 0; - x.area_id = areas[x.area_code].ToString() ?? throw new AppFriendlyException($"第{points.IndexOf(x) + 1}行的管理区编号编号有误", 500); + x.area_id = areas[x.area_code].ToString() ?? throw new AppFriendlyException($"第{points.IndexOf(x) + 1}个数据的管理区编号编号有误", 500); x.create_id = _userManager.UserId; x.modify_id = null; x.modify_time = null; diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsRouteMgrService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsRouteMgrService.cs index a6cb1af8..f76686fa 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsRouteMgrService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsRouteMgrService.cs @@ -76,18 +76,19 @@ namespace Tnb.WarehouseMgr List pointCodes = new List(); List locCodes = new(); WmsRoad road = new WmsRoad(); + //遍历字典，找出需要查询数据库拿的相关字段 foreach (var d in dics) { var sCode = d["startpoint_code"].ToString() ?? string.Empty; var eCode = d["endpoint_code"].ToString() ?? string.Empty; var dis = d["distance"].ToString() ?? string.Empty; if(sCode == eCode) throw new AppFriendlyException("起始点位不能等于终止点位", 500); - if (sCode.IsEmpty()) - throw new AppFriendlyException($"第{dics.IndexOf(d) + 1}行起始点位编号不可为空", 500); - if (eCode.IsEmpty()) - throw new AppFriendlyException($"第{dics.IndexOf(d) + 1}行终止点位编号不可为空", 500); + //if (sCode.IsEmpty()) + // throw new AppFriendlyException($"第{dics.IndexOf(d) + 1}个数据数据起始点位编号不可为空", 500); + //if (eCode.IsEmpty()) + // throw new AppFriendlyException($"第{dics.IndexOf(d) + 1}个数据终止点位编号不可为空", 500); if (dis.IsEmpty()) - throw new AppFriendlyException($"第{dics.IndexOf(d) + 1}行距离不可为空", 500); + throw new AppFriendlyException($"第{dics.IndexOf(d) + 1}个数据距离不可为空", 500); pointCodes.Add(sCode); pointCodes.Add(eCode); d["create_time"] = DateTime.Now; @@ -100,12 +101,12 @@ namespace Tnb.WarehouseMgr { roads.ForEach(x => { - if (!points.Keys.Contains(x.startpoint_code) ) throw new AppFriendlyException($"第{roads.IndexOf(x) + 1}行的起始点位编号有误", 500); - if (!points.Keys.Contains(x.endpoint_code)) throw new AppFriendlyException($"第{roads.IndexOf(x) + 1}行的终止点位编号有误", 500); + if (!points.Keys.Contains(x.startpoint_code) ) throw new AppFriendlyException($"第{roads.IndexOf(x) + 1}个数据的起始点位编号有误", 500); + if (!points.Keys.Contains(x.endpoint_code)) throw new AppFriendlyException($"第{roads.IndexOf(x) + 1}个数据的终止点位编号有误", 500); x.id = SnowflakeIdHelper.NextId(); x.org_id = _userManager.User.OrganizeId; - x.startpoint_id = points[x.startpoint_code].ToString() ?? throw new AppFriendlyException($"第{roads.IndexOf(x) + 1}行的起始点位编号有误", 500); - x.endpoint_id = points[x.endpoint_code].ToString() ?? throw new AppFriendlyException($"第{roads.IndexOf(x) + 1}行的终止点位编号有误", 500); + x.startpoint_id = points[x.startpoint_code].ToString() ?? throw new AppFriendlyException($"第{roads.IndexOf(x) + 1}个数据的起始点位编号有误", 500); + x.endpoint_id = points[x.endpoint_code].ToString() ?? throw new AppFriendlyException($"第{roads.IndexOf(x) + 1}个数据的终止点位编号有误", 500); x.road_code = $"{x.startpoint_code}-{x.endpoint_code}"; x.status = 1; x.create_id = _userManager.UserId;