From 831a469617df0394456367f397b7a6a7dca989db Mon Sep 17 00:00:00 2001 From: FanLian Date: Thu, 10 Aug 2023 10:00:59 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E5=86=99=E7=82=B9=E4=BD=8D=E4=B8=9A?= =?UTF-8?q?=E5=8A=A1=E7=9A=84=E5=AF=BC=E5=85=A5=E6=A8=A1=E5=9D=97=EF=BC=8C?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=87=8D=E5=86=99=E5=9C=A8=E7=BA=BF=E5=BC=80?= =?UTF-8?q?=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); }