From 5b62f7a470a51ab02b8eb3799d4dd89da49db077 Mon Sep 17 00:00:00 2001 From: hlb <894797954@qq.com> Date: Thu, 15 Jun 2023 15:02:11 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BA=93=E5=86=85?= =?UTF-8?q?=E8=BD=AC=E7=A7=BB=E4=B8=9A=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WarehouseMgr/Tnb.WarehouseMgr/WmsTransfer.cs | 153 ------------------ .../Tnb.WarehouseMgr/WmsTransferService.cs | 149 +++++++++++++++++ 2 files changed, 149 insertions(+), 153 deletions(-) delete mode 100644 WarehouseMgr/Tnb.WarehouseMgr/WmsTransfer.cs create mode 100644 WarehouseMgr/Tnb.WarehouseMgr/WmsTransferService.cs diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsTransfer.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsTransfer.cs deleted file mode 100644 index 6629a4c7..00000000 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsTransfer.cs +++ /dev/null @@ -1,153 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using JNPF.Common.Core.Manager; -using JNPF.Common.Dtos.VisualDev; -using JNPF.Common.Enums; -using JNPF.Common.Extension; -using JNPF.Common.Security; -using JNPF.FriendlyException; -using JNPF.Systems.Interfaces.System; -using JNPF.VisualDev; -using JNPF.VisualDev.Entitys; -using JNPF.VisualDev.Interfaces; -using Mapster; -using Microsoft.AspNetCore.Mvc; -using SqlSugar; -using Tnb.BasicData.Entities; -using Tnb.WarehouseMgr.Entities; -using Tnb.WarehouseMgr.Entities.Attributes; -using Tnb.WarehouseMgr.Entities.Consts; -using Tnb.WarehouseMgr.Entities.Dto; -using Tnb.WarehouseMgr.Interfaces; -namespace Tnb.WarehouseMgr -{ - internal class WmsTransfer - { - /// - /// 库内转移 - /// - [OverideVisualDev(ModuleId)] - [ServiceModule(BizTypeId)] - public class WmsTransferService : BaseWareHouseService - { - private const string BizTypeId = "26125644258853"; - private const string ModuleId = "26125750270757"; - private readonly ISqlSugarClient _db; - private readonly IRunService _runService; - private readonly IVisualDevService _visualDevService; - private readonly IWareHouseService _wareHouseService; - private readonly IBillRullService _billRullService; - private readonly IUserManager _userManager; - public WmsTransferService( - ISqlSugarRepository repository, - IRunService runService, - IVisualDevService visualDevService, - IWareHouseService wareHouseService, - IUserManager userManager, - IBillRullService billRullService) - { - _db = repository.AsSugarClient(); - _runService = runService; - _visualDevService = visualDevService; - _wareHouseService = wareHouseService; - _userManager = userManager; - _billRullService = billRullService; - OverideFuncs.CreateAsync = CarryTransfer; - } - - private async Task CarryTransfer(VisualDevModelDataCrInput input) - { - - try - { - await _db.Ado.BeginTranAsync(); - - VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleId, true); - await _runService.Create(templateEntity, input); - //入库取终点 - var inStockStrategyInput = new InStockStrategyQuery { warehouse_id = input.data[nameof(InStockStrategyQuery.warehouse_id)].ToString(), Size = 1 }; - var endLocations = await _wareHouseService.InStockStrategy(inStockStrategyInput); - WmsPointH sPoint = null; - WmsPointH ePoint = null; - if (input.data.ContainsKey(nameof(WmsPointH.location_id))) - { - sPoint = await _db.Queryable().FirstAsync(it => it.location_id == input.data[nameof(WmsPointH.location_id)].ToString()); - } - if (endLocations?.Count > 0) - { - ePoint = await _db.Queryable().FirstAsync(it => it.location_id == endLocations[0].id); - } - - if (sPoint != null && ePoint != null) - { - var points = await _wareHouseService.PathAlgorithms(sPoint.id, ePoint.id); - //根据获取的路径点生成预任务,生成顺序必须预路径算法返回的起终点的顺序一致（预任务顺序） - if (points?.Count > 0) - { - if (points.Count <= 2) throw new AppFriendlyException("该路径不存在", 500); - var preTasks = points.Where(it => !it.location_id.IsNullOrEmpty()).GroupBy(g => g.area_code).Select(it => - { - var sPoint = it.FirstOrDefault(); - var ePoint = it.LastOrDefault(); - - WmsPretaskH preTask = new(); - preTask.org_id = _userManager.User.OrganizeId; - preTask.startlocation_id = sPoint?.location_id; - preTask.startlocation_code = sPoint?.location_code; - preTask.endlocation_id = ePoint?.location_id; - preTask.endlocation_code = ePoint?.location_code; - preTask.start_floor = sPoint?.floor.ToString(); - preTask.end_floor = ePoint?.floor.ToString(); - preTask.bill_code = _billRullService.GetBillNumber(WmsWareHouseConst.WMS_PRETASK_H_ENCODE).GetAwaiter().GetResult(); - preTask.status = WmsWareHouseConst.PRETASK_BILL_STATUS_DXF_ID; - preTask.biz_type = WmsWareHouseConst.BIZTYPE_WMSTRANSFER_ID; - preTask.task_type = WmsWareHouseConst.WMS_PRETASK_TRANSFER_TYPE_ID; - preTask.carry_id = input.data[nameof(preTask.carry_id)]?.ToString()!; - preTask.carry_code = input.data[nameof(preTask.carry_code)]?.ToString()!; - preTask.area_id = sPoint?.area_id; - preTask.area_code = it.Key; - preTask.require_id = input.data["ReturnIdentity"].ToString(); - preTask.require_code = input.data[nameof(preTask.bill_code)]?.ToString()!; - preTask.create_id = _userManager.UserId; - preTask.create_time = DateTime.Now; - return preTask; - }).ToList(); - var isOk = await _wareHouseService.GenPreTask(preTasks); - if (isOk) - { - var preTaskUpInput = new GenPreTaskUpInput(); - preTaskUpInput.PreTaskId = input.data["ReturnIdentity"].ToString(); - preTaskUpInput.CarryId = input.data[nameof(WmsCarryD.carry_id)]?.ToString()!; - preTaskUpInput.CarryStartLocationId = points.FirstOrDefault().location_id; - preTaskUpInput.CarryStartLocationCode = points.FirstOrDefault().location_code; - preTaskUpInput.LocationIds = points.Select(x => x.location_id).ToList(); - preTaskUpInput.PreTaskRecords = preTasks.Adapt>(); - preTaskUpInput.PreTaskRecords.ForEach(x => x.id = SnowflakeIdHelper.NextId()); - await _wareHouseService.GenTaskHandleAfter(preTaskUpInput); - } - } - - } - - await _db.Ado.CommitTranAsync(); - } - catch (Exception ex) - { - await _db.Ado.RollbackTranAsync(); - throw; - } - return Task.FromResult(true); - } - - public override async Task ModifyAsync(WareHouseUpInput input) - { - if (input == null) throw new ArgumentNullException(nameof(input)); - var isOk = await _db.Updateable().SetColumns(it => new WmsMoveInstock { status = input.bizTypeId }).Where(it => it.id == input.requireId).ExecuteCommandHasChangeAsync(); - if (!isOk) throw Oops.Oh(ErrorCode.COM1001); - } - } - } -} diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsTransferService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsTransferService.cs new file mode 100644 index 00000000..e071ba34 --- /dev/null +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsTransferService.cs @@ -0,0 +1,149 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using JNPF.Common.Core.Manager; +using JNPF.Common.Dtos.VisualDev; +using JNPF.Common.Enums; +using JNPF.Common.Extension; +using JNPF.Common.Security; +using JNPF.FriendlyException; +using JNPF.Systems.Interfaces.System; +using JNPF.VisualDev; +using JNPF.VisualDev.Entitys; +using JNPF.VisualDev.Interfaces; +using Mapster; +using Microsoft.AspNetCore.Mvc; +using Microsoft.CodeAnalysis; +using SqlSugar; +using Tnb.BasicData.Entities; +using Tnb.WarehouseMgr.Entities; +using Tnb.WarehouseMgr.Entities.Attributes; +using Tnb.WarehouseMgr.Entities.Consts; +using Tnb.WarehouseMgr.Entities.Dto; +using Tnb.WarehouseMgr.Interfaces; +namespace Tnb.WarehouseMgr +{ + + /// + /// 库内转移 + /// + [OverideVisualDev(ModuleConsts.MODULE_WMSTRANSFER_ID)] + [ServiceModule(BizTypeId)] + public class WmsTransferService : BaseWareHouseService + { + private const string BizTypeId = "26125644258853"; + private readonly ISqlSugarClient _db; + private readonly IRunService _runService; + private readonly IVisualDevService _visualDevService; + private readonly IWareHouseService _wareHouseService; + private readonly IBillRullService _billRullService; + private readonly IUserManager _userManager; + public WmsTransferService( + ISqlSugarRepository repository, + IRunService runService, + IVisualDevService visualDevService, + IWareHouseService wareHouseService, + IUserManager userManager, + IBillRullService billRullService) + { + _db = repository.AsSugarClient(); + _runService = runService; + _visualDevService = visualDevService; + _wareHouseService = wareHouseService; + _userManager = userManager; + _billRullService = billRullService; + OverideFuncs.CreateAsync = CarryTransfer; + } + + private async Task CarryTransfer(VisualDevModelDataCrInput input) + { + + try + { + await _db.Ado.BeginTranAsync(); + + VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleConsts.MODULE_WMSTRANSFER_ID, true); + await _runService.Create(templateEntity, input); + WmsPointH sPoint = null; + WmsPointH ePoint = null; + if (input.data.ContainsKey(nameof(WmsTransfer.startlocation_id))) + { + sPoint = await _db.Queryable().FirstAsync(it => it.location_id == input.data[nameof(WmsTransfer.startlocation_id)].ToString()); + } + if (input.data.ContainsKey(nameof(WmsTransfer.endlocation_id))) + { + ePoint = await _db.Queryable().FirstAsync(it => it.location_id == input.data[nameof(WmsTransfer.endlocation_id)].ToString()); + } + + if (sPoint != null && ePoint != null) + { + var points = await _wareHouseService.PathAlgorithms(sPoint.id, ePoint.id); + //根据获取的路径点生成预任务,生成顺序必须预路径算法返回的起终点的顺序一致（预任务顺序） + if (points?.Count > 0) + { + if (points.Count <= 2) throw new AppFriendlyException("该路径不存在", 500); + var preTasks = points.Where(it => !it.location_id.IsNullOrEmpty()).GroupBy(g => g.area_code).Select(it => + { + var sPoint = it.FirstOrDefault(); + var ePoint = it.LastOrDefault(); + + WmsPretaskH preTask = new(); + preTask.org_id = _userManager.User.OrganizeId; + preTask.startlocation_id = sPoint?.location_id; + preTask.startlocation_code = sPoint?.location_code; + preTask.endlocation_id = ePoint?.location_id; + preTask.endlocation_code = ePoint?.location_code; + preTask.start_floor = sPoint?.floor.ToString(); + preTask.end_floor = ePoint?.floor.ToString(); + preTask.bill_code = _billRullService.GetBillNumber(WmsWareHouseConst.WMS_PRETASK_H_ENCODE).GetAwaiter().GetResult(); + preTask.status = WmsWareHouseConst.PRETASK_BILL_STATUS_DXF_ID; + preTask.biz_type = WmsWareHouseConst.BIZTYPE_WMSTRANSFER_ID; + preTask.task_type = WmsWareHouseConst.WMS_PRETASK_TRANSFER_TYPE_ID; + preTask.carry_id = input.data[nameof(preTask.carry_id)]?.ToString()!; + preTask.carry_code = input.data[nameof(preTask.carry_code)]?.ToString()!; + preTask.area_id = sPoint?.area_id; + preTask.area_code = it.Key; + preTask.require_id = input.data["ReturnIdentity"].ToString(); + preTask.require_code = input.data[nameof(preTask.bill_code)]?.ToString()!; + preTask.create_id = _userManager.UserId; + preTask.create_time = DateTime.Now; + return preTask; + }).ToList(); + var isOk = await _wareHouseService.GenPreTask(preTasks); + if (isOk) + { + var preTaskUpInput = new GenPreTaskUpInput(); + preTaskUpInput.PreTaskId = input.data["ReturnIdentity"].ToString(); + preTaskUpInput.CarryId = input.data[nameof(WmsCarryD.carry_id)]?.ToString()!; + preTaskUpInput.CarryStartLocationId = points.FirstOrDefault().location_id; + preTaskUpInput.CarryStartLocationCode = points.FirstOrDefault().location_code; + preTaskUpInput.LocationIds = points.Select(x => x.location_id).ToList(); + preTaskUpInput.PreTaskRecords = preTasks.Adapt>(); + preTaskUpInput.PreTaskRecords.ForEach(x => x.id = SnowflakeIdHelper.NextId()); + await _wareHouseService.GenTaskHandleAfter(preTaskUpInput); + } + } + + } + + await _db.Ado.CommitTranAsync(); + } + catch (Exception ex) + { + await _db.Ado.RollbackTranAsync(); + throw; + } + return Task.FromResult(true); + } + + public override async Task ModifyAsync(WareHouseUpInput input) + { + if (input == null) throw new ArgumentNullException(nameof(input)); + var isOk = await _db.Updateable().SetColumns(it => new WmsMoveInstock { status = input.bizTypeId }).Where(it => it.id == input.requireId).ExecuteCommandHasChangeAsync(); + if (!isOk) throw Oops.Oh(ErrorCode.COM1001); + } + } + +} From 123a92c0b965001cd0ed8e0f4fbe34a4f6d7353f Mon Sep 17 00:00:00 2001 From: hlb <894797954@qq.com> Date: Thu, 15 Jun 2023 15:39:53 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E9=85=8D=E9=80=81=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=EF=BC=8C=E5=A2=9E=E5=8A=A0=E9=A2=84=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E7=94=B3=E8=AF=B7=E4=B8=9A=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Tnb.WarehouseMgr/WmsDeliveryService.cs | 80 ++++++++++++++++++- .../Tnb.WarehouseMgr/WmsTransferService.cs | 10 ++- 2 files changed, 84 insertions(+), 6 deletions(-) diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsDeliveryService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsDeliveryService.cs index 30d87152..8545386c 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsDeliveryService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsDeliveryService.cs @@ -4,11 +4,13 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using Aspose.Cells.Drawing; +using JNPF.Common.Core.Manager; using JNPF.Common.Dtos.VisualDev; using JNPF.Common.Extension; using JNPF.DependencyInjection; using JNPF.DynamicApiController; using JNPF.FriendlyException; +using JNPF.Systems.Interfaces.System; using JNPF.VisualDev; using JNPF.VisualDev.Entitys; using JNPF.VisualDev.Interfaces; @@ -17,6 +19,9 @@ using SqlSugar; using Tnb.BasicData.Entities; using Tnb.BasicData.Interfaces; using Tnb.WarehouseMgr.Entities; +using Tnb.WarehouseMgr.Entities.Attributes; +using Tnb.WarehouseMgr.Entities.Consts; +using Tnb.WarehouseMgr.Entities.Dto; using Tnb.WarehouseMgr.Entities.Enums; using Tnb.WarehouseMgr.Interfaces; @@ -27,13 +32,18 @@ namespace Tnb.WarehouseMgr /// [ApiDescriptionSettings(Tag = ModuleConsts.Tag, Area = ModuleConsts.Area, Order = 700)] [Route("api/[area]/[controller]/[action]")] + [OverideVisualDev(ModuleConsts.MODULE_WMSDELIVERY_ID)] + [ServiceModule(BizTypeId)] public class WmsDeliveryService : IOverideVisualDevService, IWmsDeliveryService, IDynamicApiController, ITransient { - private const string ModuleId = "26126388337189"; + private const string BizTypeId = "26125644258853"; private readonly ISqlSugarClient _db; private readonly IRunService _runService; private readonly IVisualDevService _visualDevService; private readonly IBasLocationService _basLocationService; + private readonly IWareHouseService _wareHouseService; + private readonly IBillRullService _billRullService; + private readonly IUserManager _userManager; public OverideVisualDevFunc OverideFuncs { get; } = new OverideVisualDevFunc(); public WmsDeliveryService( ISqlSugarRepository repository, @@ -89,8 +99,74 @@ namespace Tnb.WarehouseMgr var isStoreLoc = locs.Where(x => !x.IsNullOrEmpty()).Select(x => x.is_type.ParseToInt()).Any(x => x == (int)EnumLocationType.存储库位); if (isStoreLoc) throw new AppFriendlyException("起始库位不能为存储库位", 500); } - VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleId, true); + VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleConsts.MODULE_WMSDELIVERY_ID, true); await _runService.Create(templateEntity, input); + + // 计算路径，插入预任务申请 + WmsPointH sPoint = null; + WmsPointH ePoint = null; + if (input.data.ContainsKey(nameof(WmsDelivery.startlocation_id))) + { + sPoint = await _db.Queryable().FirstAsync(it => it.location_id == input.data[nameof(WmsTransfer.startlocation_id)].ToString()); + } + if (input.data.ContainsKey(nameof(WmsTransfer.endlocation_id))) + { + ePoint = await _db.Queryable().FirstAsync(it => it.location_id == input.data[nameof(WmsTransfer.endlocation_id)].ToString()); + } + + if (sPoint != null && ePoint != null) + { + var points = await _wareHouseService.PathAlgorithms(sPoint.id, ePoint.id); + //根据获取的路径点生成预任务,生成顺序必须预路径算法返回的起终点的顺序一致（预任务顺序） + if (points?.Count > 0) + { + if (points.Count <= 2) throw new AppFriendlyException("该路径不存在", 500); + var preTasks = points.Where(it => !it.location_id.IsNullOrEmpty()).GroupBy(g => g.area_code).Select(it => + { + var sPoint = it.FirstOrDefault(); + var ePoint = it.LastOrDefault(); + + WmsPretaskH preTask = new(); + preTask.org_id = _userManager.User.OrganizeId; + preTask.startlocation_id = sPoint?.location_id; + preTask.startlocation_code = sPoint?.location_code; + preTask.endlocation_id = ePoint?.location_id; + preTask.endlocation_code = ePoint?.location_code; + preTask.start_floor = sPoint?.floor.ToString(); + preTask.end_floor = ePoint?.floor.ToString(); + preTask.bill_code = _billRullService.GetBillNumber(WmsWareHouseConst.WMS_PRETASK_H_ENCODE).GetAwaiter().GetResult(); + preTask.status = WmsWareHouseConst.PRETASK_BILL_STATUS_DXF_ID; + preTask.biz_type = WmsWareHouseConst.BIZTYPE_WMSTRANSFER_ID; + preTask.task_type = WmsWareHouseConst.WMS_PRETASK_TRANSFER_TYPE_ID; + preTask.carry_id = input.data[nameof(preTask.carry_id)]?.ToString()!; + preTask.carry_code = input.data[nameof(preTask.carry_code)]?.ToString()!; + preTask.area_id = sPoint?.area_id; + preTask.area_code = it.Key; + preTask.require_id = input.data["ReturnIdentity"].ToString(); + preTask.require_code = input.data[nameof(preTask.bill_code)]?.ToString()!; + preTask.create_id = _userManager.UserId; + preTask.create_time = DateTime.Now; + return preTask; + }).ToList(); + var isOk = await _wareHouseService.GenPreTask(preTasks); + if (isOk) + { + //不需要插入操作表 + /* var preTaskUpInput = new GenPreTaskUpInput(); + preTaskUpInput.PreTaskId = input.data["ReturnIdentity"].ToString(); + preTaskUpInput.CarryId = input.data[nameof(WmsCarryD.carry_id)]?.ToString()!; + preTaskUpInput.CarryStartLocationId = points.FirstOrDefault().location_id; + preTaskUpInput.CarryStartLocationCode = points.FirstOrDefault().location_code; + preTaskUpInput.LocationIds = points.Select(x => x.location_id).ToList(); + preTaskUpInput.PreTaskRecords = preTasks.Adapt>(); + preTaskUpInput.PreTaskRecords.ForEach(x => x.id = SnowflakeIdHelper.NextId()); + await _wareHouseService.GenTaskHandleAfter(preTaskUpInput);*/ + } + } + + } + + await _db.Ado.CommitTranAsync(); } catch (Exception) { diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsTransferService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsTransferService.cs index e071ba34..bcd69b27 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsTransferService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsTransferService.cs @@ -33,7 +33,7 @@ namespace Tnb.WarehouseMgr [ServiceModule(BizTypeId)] public class WmsTransferService : BaseWareHouseService { - private const string BizTypeId = "26125644258853"; + private const string BizTypeId = "26585291847957"; private readonly ISqlSugarClient _db; private readonly IRunService _runService; private readonly IVisualDevService _visualDevService; @@ -66,6 +66,7 @@ namespace Tnb.WarehouseMgr VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleConsts.MODULE_WMSTRANSFER_ID, true); await _runService.Create(templateEntity, input); + // 计算路径，插入预任务申请 WmsPointH sPoint = null; WmsPointH ePoint = null; if (input.data.ContainsKey(nameof(WmsTransfer.startlocation_id))) @@ -99,7 +100,7 @@ namespace Tnb.WarehouseMgr preTask.end_floor = ePoint?.floor.ToString(); preTask.bill_code = _billRullService.GetBillNumber(WmsWareHouseConst.WMS_PRETASK_H_ENCODE).GetAwaiter().GetResult(); preTask.status = WmsWareHouseConst.PRETASK_BILL_STATUS_DXF_ID; - preTask.biz_type = WmsWareHouseConst.BIZTYPE_WMSTRANSFER_ID; + preTask.biz_type = WmsWareHouseConst.BIZTYPE_WMSDELIVERY_ID; preTask.task_type = WmsWareHouseConst.WMS_PRETASK_TRANSFER_TYPE_ID; preTask.carry_id = input.data[nameof(preTask.carry_id)]?.ToString()!; preTask.carry_code = input.data[nameof(preTask.carry_code)]?.ToString()!; @@ -114,7 +115,8 @@ namespace Tnb.WarehouseMgr var isOk = await _wareHouseService.GenPreTask(preTasks); if (isOk) { - var preTaskUpInput = new GenPreTaskUpInput(); + //不需要插入操作表 + /* var preTaskUpInput = new GenPreTaskUpInput(); preTaskUpInput.PreTaskId = input.data["ReturnIdentity"].ToString(); preTaskUpInput.CarryId = input.data[nameof(WmsCarryD.carry_id)]?.ToString()!; preTaskUpInput.CarryStartLocationId = points.FirstOrDefault().location_id; @@ -122,7 +124,7 @@ namespace Tnb.WarehouseMgr preTaskUpInput.LocationIds = points.Select(x => x.location_id).ToList(); preTaskUpInput.PreTaskRecords = preTasks.Adapt>(); preTaskUpInput.PreTaskRecords.ForEach(x => x.id = SnowflakeIdHelper.NextId()); - await _wareHouseService.GenTaskHandleAfter(preTaskUpInput); + await _wareHouseService.GenTaskHandleAfter(preTaskUpInput);*/ } } From 39884a950387a1e2316a2d4dcc2d78e5b0b4d49e Mon Sep 17 00:00:00 2001 From: FanLian Date: Thu, 15 Jun 2023 15:43:59 +0800 Subject: [PATCH 3/7] 1 --- .../Tnb.WarehouseMgr/WareHouseService.cs | 5 +- .../WmsCarryMoveOutStockService.cs | 8 +- .../WmsEmptyOutStockService.cs | 144 ------------------ 3 files changed, 6 insertions(+), 151 deletions(-) delete mode 100644 WarehouseMgr/Tnb.WarehouseMgr/WmsEmptyOutStockService.cs diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs index 6510ff98..62fb1363 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs @@ -212,10 +212,9 @@ namespace Tnb.WarehouseMgr /// /// [HttpGet] - public async Task> OutStockStrategy([FromQuery] OutStockStrategyQuery input) + public async Task OutStockStrategy() { - var items = await _db.Queryable().Where(it => it.id == input.carry_id ).ToListAsync(); - return items.Take(input.Size).ToList(); + return Task.FromResult(true); } /// /// 生成任务执行 diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryMoveOutStockService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryMoveOutStockService.cs index eee01c09..7f8adba1 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryMoveOutStockService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryMoveOutStockService.cs @@ -67,17 +67,17 @@ namespace Tnb.WarehouseMgr VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleId, true); await _runService.Create(templateEntity, input); //入库取终点 - var OutStockStrategyInput = new OutStockStrategyQuery { carry_id = input.data[nameof(OutStockStrategyQuery.carry_id)].ToString(), Size = 1 }; - var carrys = await _wareHouseService.OutStockStrategy(OutStockStrategyInput); + //var OutStockStrategyInput = new OutStockStrategyQuery { carry_id = input.data[nameof(OutStockStrategyQuery.carry_id)].ToString(), Size = 1 }; + var carry = await _db.Queryable().FirstAsync(it => it.id == input.data[nameof(WmsMoveOutstock.carry_id)].ToString()); WmsPointH sPoint = null; WmsPointH ePoint = null; if (input.data.ContainsKey(nameof(WmsPointH.location_id))) { ePoint = await _db.Queryable().FirstAsync(it => it.location_id == input.data[nameof(WmsPointH.location_id)].ToString()); } - if (carrys?.Count > 0) + if (carry != null) { - sPoint = await _db.Queryable().FirstAsync(it => it.location_id == carrys[0].location_id); + sPoint = await _db.Queryable().FirstAsync(it => it.location_id == carry.location_id); } if (sPoint != null && ePoint != null) diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsEmptyOutStockService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsEmptyOutStockService.cs deleted file mode 100644 index 4885c0b2..00000000 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsEmptyOutStockService.cs +++ /dev/null @@ -1,144 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using JNPF.Common.Core.Manager; -using JNPF.Common.Dtos.VisualDev; -using JNPF.Common.Enums; -using JNPF.Common.Extension; -using JNPF.Common.Security; -using JNPF.FriendlyException; -using JNPF.Systems.Interfaces.System; -using JNPF.VisualDev; -using JNPF.VisualDev.Entitys; -using JNPF.VisualDev.Interfaces; -using Mapster; -using Microsoft.AspNetCore.Mvc; -using SqlSugar; -using Tnb.BasicData.Entities; -using Tnb.WarehouseMgr.Entities; -using Tnb.WarehouseMgr.Entities.Attributes; -using Tnb.WarehouseMgr.Entities.Consts; -using Tnb.WarehouseMgr.Entities.Dto; -using Tnb.WarehouseMgr.Interfaces; - -namespace Tnb.WarehouseMgr -{ - /// - /// 载具移入 - /// - [OverideVisualDev(ModuleId)] - [ServiceModule(BizTypeId)] - public class WmsEmptyMoveOutStockService : BaseWareHouseService - { - private const string ModuleId = "26122798979365"; - private const string BizTypeId = "26122798979365"; - private readonly ISqlSugarClient _db; - private readonly IRunService _runService; - private readonly IVisualDevService _visualDevService; - private readonly IWareHouseService _wareHouseService; - private readonly IBillRullService _billRullService; - private readonly IUserManager _userManager; - public WmsEmptyMoveOutStockService( - ISqlSugarRepository repository, - IRunService runService, - IVisualDevService visualDevService, - IWareHouseService wareHouseService, - IUserManager userManager, - IBillRullService billRullService) - { - _db = repository.AsSugarClient(); - _runService = runService; - _visualDevService = visualDevService; - _wareHouseService = wareHouseService; - _userManager = userManager; - _billRullService = billRullService; - OverideFuncs.CreateAsync = CarryMoveIn; - } - - private async Task CarryMoveIn(VisualDevModelDataCrInput input) - { - - try - { - await _db.Ado.BeginTranAsync(); - - VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleId, true); - await _runService.Create(templateEntity, input); - //入库取终点 - var OutStockStrategyInput = new OutStockStrategyQuery { carry_id = input.data[nameof(OutStockStrategyQuery.carry_id)].ToString(), Size = 1 }; - var carrys = await _wareHouseService.OutStockStrategy(OutStockStrategyInput); - WmsPointH sPoint = null; - WmsPointH ePoint = null; - if (input.data.ContainsKey(nameof(WmsPointH.location_id))) - { - ePoint = await _db.Queryable().FirstAsync(it => it.location_id == input.data[nameof(WmsPointH.location_id)].ToString()); - } - if (carrys?.Count > 0) - { - sPoint = await _db.Queryable().FirstAsync(it => it.location_id == carrys[0].location_id); - } - - if (sPoint != null && ePoint != null) - { - var points = await _wareHouseService.PathAlgorithms(sPoint.id, ePoint.id); - //根据获取的路径点生成预任务,生成顺序必须预路径算法返回的起终点的顺序一致（预任务顺序） - if (points?.Count > 0) - { - if (points.Count <= 2) throw new AppFriendlyException("该路径不存在", 500); - var preTasks = points.Where(it => !it.location_id.IsNullOrEmpty()).GroupBy(g => g.area_code).Select(it => - { - var sPoint = it.FirstOrDefault(); - var ePoint = it.LastOrDefault(); - - WmsPretaskH preTask = new(); - preTask.org_id = _userManager.User.OrganizeId; - preTask.startlocation_id = sPoint?.location_id; - preTask.startlocation_code = sPoint?.location_code; - preTask.endlocation_id = ePoint?.location_id; - preTask.endlocation_code = ePoint?.location_code; - preTask.start_floor = sPoint?.floor.ToString(); - preTask.end_floor = ePoint?.floor.ToString(); - preTask.bill_code = _billRullService.GetBillNumber(WmsWareHouseConst.WMS_PRETASK_H_ENCODE).GetAwaiter().GetResult(); - preTask.status = WmsWareHouseConst.PRETASK_BILL_STATUS_DXF_ID; - preTask.biz_type = WmsWareHouseConst.BIZTYPE_EMPTYOUT_ID; - //preTask.task_type = WmsWareHouseConst.WMS_PRETASK_OUTSTOCK_TYPE_ID; - preTask.carry_id = input.data[nameof(preTask.carry_id)]?.ToString()!; - preTask.carry_code = input.data[nameof(preTask.carry_code)]?.ToString()!; - preTask.area_id = sPoint?.area_id; - preTask.area_code = it.Key; - preTask.require_id = input.data["ReturnIdentity"].ToString(); - preTask.require_code = input.data[nameof(preTask.bill_code)]?.ToString()!; - preTask.create_id = _userManager.UserId; - preTask.create_time = DateTime.Now; - return preTask; - }).ToList(); - var isOk = await _wareHouseService.GenPreTask(preTasks); - if (isOk) - { - var preTaskUpInput = new GenPreTaskUpInput(); - preTaskUpInput.PreTaskId = input.data["ReturnIdentity"].ToString(); - preTaskUpInput.CarryId = input.data[nameof(WmsCarryD.carry_id)]?.ToString()!; - preTaskUpInput.CarryStartLocationId = points.FirstOrDefault().location_id; - preTaskUpInput.CarryStartLocationCode = points.FirstOrDefault().location_code; - preTaskUpInput.LocationIds = points.Select(x => x.location_id).ToList(); - preTaskUpInput.PreTaskRecords = preTasks.Adapt>(); - preTaskUpInput.PreTaskRecords.ForEach(x => x.id = SnowflakeIdHelper.NextId()); - await _wareHouseService.GenTaskHandleAfter(preTaskUpInput); - } - } - - } - - await _db.Ado.CommitTranAsync(); - } - catch (Exception ex) - { - await _db.Ado.RollbackTranAsync(); - throw; - } - return Task.FromResult(true); - } - } -} From 767d796e52331224f466146e275fdf6b24e83678 Mon Sep 17 00:00:00 2001 From: FanLian Date: Thu, 15 Jun 2023 15:47:17 +0800 Subject: [PATCH 4/7] 1 --- WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs index a6a294be..7e673d2e 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs @@ -214,8 +214,7 @@ namespace Tnb.WarehouseMgr [HttpGet] public async Task OutStockStrategy() { - var items = await _db.Queryable().Where(it => it.id == input.carry_id ).ToListAsync(); - return items.Take(input.Size).ToList(); + return Task.FromResult(true); } /// /// 生成任务执行 From e1c205fd4149f6441db228f6297bd1ab2c80cd1b Mon Sep 17 00:00:00 2001 From: FanLian Date: Thu, 15 Jun 2023 15:49:23 +0800 Subject: [PATCH 5/7] 1 --- WarehouseMgr/Tnb.WarehouseMgr.Interfaces/IWareHouseService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Interfaces/IWareHouseService.cs b/WarehouseMgr/Tnb.WarehouseMgr.Interfaces/IWareHouseService.cs index 99e3794b..ca5fb036 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Interfaces/IWareHouseService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Interfaces/IWareHouseService.cs @@ -1 +1 @@ -using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Mvc;
using Tnb.BasicData.Entities;
using Tnb.WarehouseMgr.Entities;
using Tnb.WarehouseMgr.Entities.Dto;

namespace Tnb.WarehouseMgr.Interfaces
{
 /// 
 /// 库房业务(出入库)接口
 /// 
 public interface IWareHouseService
 {
 /// 
 /// 入库策略
 /// 
 /// 
 /// 
 Task> InStockStrategy([FromQuery] InStockStrategyQuery input);
 /// 
 /// 出库策略
 /// 
 /// 
 /// 
 Task> OutStockStrategy([FromQuery] OutStockStrategyQuery input);
 /// 
 /// 路径算法
 /// 
 /// 
 /// 
 /// 
 Task> PathAlgorithms(string pStartId, string pEndId);
 /// 
 /// 生成预任务
 /// 
 /// 
 /// 
 Task GenPreTask(List preTasks);
 /// 
 /// 生成预任务成功后操作
 /// 
 /// 
 /// 
 Task GenTaskHandleAfter(GenPreTaskUpInput input);
 }
}
 \ No newline at end of file +using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Mvc;
using Tnb.BasicData.Entities;
using Tnb.WarehouseMgr.Entities;
using Tnb.WarehouseMgr.Entities.Dto;

namespace Tnb.WarehouseMgr.Interfaces
{
 /// 
 /// 库房业务(出入库)接口
 /// 
 public interface IWareHouseService
 {
 /// 
 /// 入库策略
 /// 
 /// 
 /// 
 Task> InStockStrategy([FromQuery] InStockStrategyQuery input);
 /// 
 /// 出库策略
 /// 
 /// 
 /// 
 //Task> OutStockStrategy([FromQuery] OutStockStrategyQuery input);
 /// 
 /// 路径算法
 /// 
 /// 
 /// 
 /// 
 Task> PathAlgorithms(string pStartId, string pEndId);
 /// 
 /// 生成预任务
 /// 
 /// 
 /// 
 Task GenPreTask(List preTasks);
 /// 
 /// 生成预任务成功后操作
 /// 
 /// 
 /// 
 Task GenTaskHandleAfter(GenPreTaskUpInput input);
 }
}
 \ No newline at end of file From 573bfbc9c06766ce1e7f327a9938684b30bd48ee Mon Sep 17 00:00:00 2001 From: FanLian Date: Thu, 15 Jun 2023 16:14:35 +0800 Subject: [PATCH 6/7] 1 --- .../WmsCarryMoveInStockService.cs | 5 +- .../WmsCarryMoveOutStockService.cs | 149 +---------------- .../WmsPDACarryMoveInStockService.cs | 153 ++++++++++++++++++ .../WmsPDAEmptyInstockService.cs | 151 +++++++++++++++++ 4 files changed, 312 insertions(+), 146 deletions(-) create mode 100644 WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryMoveInStockService.cs create mode 100644 WarehouseMgr/Tnb.WarehouseMgr/WmsPDAEmptyInstockService.cs diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryMoveInStockService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryMoveInStockService.cs index 62af80c3..a0dcb925 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryMoveInStockService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryMoveInStockService.cs @@ -28,12 +28,11 @@ namespace Tnb.WarehouseMgr /// /// 载具移入 /// - [OverideVisualDev(ModuleId)] + [OverideVisualDev(ModuleConsts.MODULE_CARRYMOVEINSTOCK_ID)] [ServiceModule(BizTypeId)] public class WmsCarryMoveInStockService : BaseWareHouseService { private const string BizTypeId = "26121988909861"; - private const string ModuleId = "26122102481957"; private readonly ISqlSugarClient _db; private readonly IRunService _runService; private readonly IVisualDevService _visualDevService; @@ -66,7 +65,7 @@ namespace Tnb.WarehouseMgr { await _db.Ado.BeginTranAsync(); - VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleId, true); + VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleConsts.MODULE_CARRYMOVEINSTOCK_ID, true); await _runService.Create(templateEntity, input); //入库取终点 //出库起点 var inStockStrategyInput = new InStockStrategyQuery { warehouse_id = input.data[nameof(InStockStrategyQuery.warehouse_id)].ToString(), Size = 1 }; diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryMoveOutStockService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryMoveOutStockService.cs index 7f8adba1..8c24fbf0 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryMoveOutStockService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryMoveOutStockService.cs @@ -1,144 +1,7 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using JNPF.Common.Core.Manager; -using JNPF.Common.Dtos.VisualDev; -using JNPF.Common.Enums; -using JNPF.Common.Extension; -using JNPF.Common.Security; -using JNPF.FriendlyException; -using JNPF.Systems.Interfaces.System; -using JNPF.VisualDev; -using JNPF.VisualDev.Entitys; -using JNPF.VisualDev.Interfaces; -using Mapster; -using Microsoft.AspNetCore.Mvc; -using SqlSugar; -using Tnb.BasicData.Entities; -using Tnb.WarehouseMgr.Entities; -using Tnb.WarehouseMgr.Entities.Attributes; -using Tnb.WarehouseMgr.Entities.Consts; -using Tnb.WarehouseMgr.Entities.Dto; -using Tnb.WarehouseMgr.Interfaces; - -namespace Tnb.WarehouseMgr -{ - /// - /// 载具移入 - /// - [OverideVisualDev(ModuleId)] - [ServiceModule(BizTypeId)] - public class WmsCarryMoveOutStockService : BaseWareHouseService - { - private const string ModuleId = "26123262586661"; - private const string BizTypeId = "26122271183141"; - private readonly ISqlSugarClient _db; - private readonly IRunService _runService; - private readonly IVisualDevService _visualDevService; - private readonly IWareHouseService _wareHouseService; - private readonly IBillRullService _billRullService; - private readonly IUserManager _userManager; - public WmsCarryMoveOutStockService( - ISqlSugarRepository repository, - IRunService runService, - IVisualDevService visualDevService, - IWareHouseService wareHouseService, - IUserManager userManager, - IBillRullService billRullService) +using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using JNPF.Common.Core.Manager;
using JNPF.Common.Dtos.VisualDev;
using JNPF.Common.Enums;
using JNPF.Common.Extension;
using JNPF.Common.Security;
using JNPF.FriendlyException;
using JNPF.Systems.Interfaces.System;
using JNPF.VisualDev;
using JNPF.VisualDev.Entitys;
using JNPF.VisualDev.Interfaces;
using Mapster;
using Microsoft.AspNetCore.Mvc;
using SqlSugar;
using Tnb.BasicData.Entities;
using Tnb.WarehouseMgr.Entities;
using Tnb.WarehouseMgr.Entities.Attributes;
using Tnb.WarehouseMgr.Entities.Consts;
using Tnb.WarehouseMgr.Entities.Dto;
using Tnb.WarehouseMgr.Interfaces;

namespace Tnb.WarehouseMgr
{
 /// 
 /// 载具移入
 /// 
 [OverideVisualDev(ModuleId)]
 [ServiceModule(BizTypeId)]
 public class WmsCarryMoveOutStockService : BaseWareHouseService
 {
 private const string ModuleId = "26123262586661";
 private const string BizTypeId = "26122271183141";
 private readonly ISqlSugarClient _db;
 private readonly IRunService _runService;
 private readonly IVisualDevService _visualDevService;
 private readonly IWareHouseService _wareHouseService;
 private readonly IBillRullService _billRullService;
 private readonly IUserManager _userManager;
 public WmsCarryMoveOutStockService(
 ISqlSugarRepository repository,
 IRunService runService,
 IVisualDevService visualDevService,
 IWareHouseService wareHouseService,
 IUserManager userManager,
 IBillRullService billRullService)
 {
 _db = repository.AsSugarClient();
 _runService = runService;
 _visualDevService = visualDevService;
 _wareHouseService = wareHouseService;
 _userManager = userManager;
 _billRullService = billRullService;
 OverideFuncs.CreateAsync = CarryMoveIn;
 }

 private async Task CarryMoveIn(VisualDevModelDataCrInput input)
 {

 try
 {
 await _db.Ado.BeginTranAsync();

 VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleId, true);
 await _runService.Create(templateEntity, input);
 //入库取终点
 //var OutStockStrategyInput = new OutStockStrategyQuery { carry_id = input.data[nameof(OutStockStrategyQuery.carry_id)].ToString(), Size = 1 };
 var carry = await _db.Queryable().FirstAsync(it => it.id == input.data[nameof(WmsMoveOutstock.carry_id)].ToString());
 WmsPointH sPoint = null;
 WmsPointH ePoint = null;
 if (input.data.ContainsKey(nameof(WmsPointH.location_id)))
 {
 ePoint = await _db.Queryable().FirstAsync(it => it.location_id == input.data[nameof(WmsPointH.location_id)].ToString());
 }
 if (carry != null)
 {
 sPoint = await _db.Queryable().FirstAsync(it => it.location_id == carry.location_id);
 }

 if (sPoint != null && ePoint != null)
 {
 var points = await _wareHouseService.PathAlgorithms(sPoint.id, ePoint.id);
 //根据获取的路径点生成预任务,生成顺序必须预路径算法返回的起终点的顺序一致（预任务顺序）
 if (points?.Count > 0)
 {
 if (points.Count <= 2) throw new AppFriendlyException("该路径不存在", 500);
 var preTasks = points.Where(it => !it.location_id.IsNullOrEmpty()).GroupBy(g => g.area_code).Select(it =>
 {
 var sPoint = it.FirstOrDefault();
 var ePoint = it.LastOrDefault();

 WmsPretaskH preTask = new();
 preTask.org_id = _userManager.User.OrganizeId;
 preTask.startlocation_id = sPoint?.location_id;
 preTask.startlocation_code = sPoint?.location_code;
 preTask.endlocation_id = ePoint?.location_id;
 preTask.endlocation_code = ePoint?.location_code;
 preTask.start_floor = sPoint?.floor.ToString();
 preTask.end_floor = ePoint?.floor.ToString();
 preTask.bill_code = _billRullService.GetBillNumber(WmsWareHouseConst.WMS_PRETASK_H_ENCODE).GetAwaiter().GetResult();
 preTask.status = WmsWareHouseConst.PRETASK_BILL_STATUS_DXF_ID;
 preTask.biz_type = WmsWareHouseConst.BIZTYPE_WMSMOOUTSTK_ID;
 preTask.task_type = WmsWareHouseConst.WMS_PRETASK_OUTSTOCK_TYPE_ID;
 preTask.carry_id = input.data[nameof(preTask.carry_id)]?.ToString()!;
 preTask.carry_code = input.data[nameof(preTask.carry_code)]?.ToString()!;
 preTask.area_id = sPoint?.area_id;
 preTask.area_code = it.Key;
 preTask.require_id = input.data["ReturnIdentity"].ToString();
 preTask.require_code = input.data[nameof(preTask.bill_code)]?.ToString()!;
 preTask.create_id = _userManager.UserId;
 preTask.create_time = DateTime.Now;
 return preTask;
 }).ToList();
 var isOk = await _wareHouseService.GenPreTask(preTasks);
 if (isOk)
 {
 var preTaskUpInput = new GenPreTaskUpInput();
 preTaskUpInput.PreTaskId = input.data["ReturnIdentity"].ToString();
 preTaskUpInput.CarryId = input.data[nameof(WmsCarryD.carry_id)]?.ToString()!;
 preTaskUpInput.CarryStartLocationId = points.FirstOrDefault().location_id;
 preTaskUpInput.CarryStartLocationCode = points.FirstOrDefault().location_code;
 preTaskUpInput.LocationIds = points.Select(x => x.location_id).ToList();
 preTaskUpInput.PreTaskRecords = preTasks.Adapt>();
 preTaskUpInput.PreTaskRecords.ForEach(x => x.id = SnowflakeIdHelper.NextId());
 await _wareHouseService.GenTaskHandleAfter(preTaskUpInput);
 }
 }

 }

 await _db.Ado.CommitTranAsync();
 }
 catch (Exception ex)
 {
 await _db.Ado.RollbackTranAsync();
 throw;
 }
 return Task.FromResult(true);
 } + public override async Task ModifyAsync(WareHouseUpInput input) { - _db = repository.AsSugarClient(); - _runService = runService; - _visualDevService = visualDevService; - _wareHouseService = wareHouseService; - _userManager = userManager; - _billRullService = billRullService; - OverideFuncs.CreateAsync = CarryMoveIn; - } - - private async Task CarryMoveIn(VisualDevModelDataCrInput input) - { - - try - { - await _db.Ado.BeginTranAsync(); - - VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleId, true); - await _runService.Create(templateEntity, input); - //入库取终点 - //var OutStockStrategyInput = new OutStockStrategyQuery { carry_id = input.data[nameof(OutStockStrategyQuery.carry_id)].ToString(), Size = 1 }; - var carry = await _db.Queryable().FirstAsync(it => it.id == input.data[nameof(WmsMoveOutstock.carry_id)].ToString()); - WmsPointH sPoint = null; - WmsPointH ePoint = null; - if (input.data.ContainsKey(nameof(WmsPointH.location_id))) - { - ePoint = await _db.Queryable().FirstAsync(it => it.location_id == input.data[nameof(WmsPointH.location_id)].ToString()); - } - if (carry != null) - { - sPoint = await _db.Queryable().FirstAsync(it => it.location_id == carry.location_id); - } - - if (sPoint != null && ePoint != null) - { - var points = await _wareHouseService.PathAlgorithms(sPoint.id, ePoint.id); - //根据获取的路径点生成预任务,生成顺序必须预路径算法返回的起终点的顺序一致（预任务顺序） - if (points?.Count > 0) - { - if (points.Count <= 2) throw new AppFriendlyException("该路径不存在", 500); - var preTasks = points.Where(it => !it.location_id.IsNullOrEmpty()).GroupBy(g => g.area_code).Select(it => - { - var sPoint = it.FirstOrDefault(); - var ePoint = it.LastOrDefault(); - - WmsPretaskH preTask = new(); - preTask.org_id = _userManager.User.OrganizeId; - preTask.startlocation_id = sPoint?.location_id; - preTask.startlocation_code = sPoint?.location_code; - preTask.endlocation_id = ePoint?.location_id; - preTask.endlocation_code = ePoint?.location_code; - preTask.start_floor = sPoint?.floor.ToString(); - preTask.end_floor = ePoint?.floor.ToString(); - preTask.bill_code = _billRullService.GetBillNumber(WmsWareHouseConst.WMS_PRETASK_H_ENCODE).GetAwaiter().GetResult(); - preTask.status = WmsWareHouseConst.PRETASK_BILL_STATUS_DXF_ID; - preTask.biz_type = WmsWareHouseConst.BIZTYPE_WMSMOOUTSTK_ID; - preTask.task_type = WmsWareHouseConst.WMS_PRETASK_OUTSTOCK_TYPE_ID; - preTask.carry_id = input.data[nameof(preTask.carry_id)]?.ToString()!; - preTask.carry_code = input.data[nameof(preTask.carry_code)]?.ToString()!; - preTask.area_id = sPoint?.area_id; - preTask.area_code = it.Key; - preTask.require_id = input.data["ReturnIdentity"].ToString(); - preTask.require_code = input.data[nameof(preTask.bill_code)]?.ToString()!; - preTask.create_id = _userManager.UserId; - preTask.create_time = DateTime.Now; - return preTask; - }).ToList(); - var isOk = await _wareHouseService.GenPreTask(preTasks); - if (isOk) - { - var preTaskUpInput = new GenPreTaskUpInput(); - preTaskUpInput.PreTaskId = input.data["ReturnIdentity"].ToString(); - preTaskUpInput.CarryId = input.data[nameof(WmsCarryD.carry_id)]?.ToString()!; - preTaskUpInput.CarryStartLocationId = points.FirstOrDefault().location_id; - preTaskUpInput.CarryStartLocationCode = points.FirstOrDefault().location_code; - preTaskUpInput.LocationIds = points.Select(x => x.location_id).ToList(); - preTaskUpInput.PreTaskRecords = preTasks.Adapt>(); - preTaskUpInput.PreTaskRecords.ForEach(x => x.id = SnowflakeIdHelper.NextId()); - await _wareHouseService.GenTaskHandleAfter(preTaskUpInput); - } - } - - } - - await _db.Ado.CommitTranAsync(); - } - catch (Exception ex) - { - await _db.Ado.RollbackTranAsync(); - throw; - } - return Task.FromResult(true); - } - } -} + if (input == null) throw new ArgumentNullException(nameof(input)); + var isOk = await _db.Updateable().SetColumns(it => new WmsMoveOutstock { status = input.bizTypeId }).Where(it => it.id == input.requireId).ExecuteCommandHasChangeAsync(); + if (!isOk) throw Oops.Oh(ErrorCode.COM1001); + }
 } 
}
 \ No newline at end of file diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryMoveInStockService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryMoveInStockService.cs new file mode 100644 index 00000000..da54a0a9 --- /dev/null +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryMoveInStockService.cs @@ -0,0 +1,153 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using JNPF.Common.Core.Manager; +using JNPF.Common.Dtos.VisualDev; +using JNPF.Common.Enums; +using JNPF.Common.Extension; +using JNPF.Common.Security; +using JNPF.FriendlyException; +using JNPF.Systems.Interfaces.System; +using JNPF.VisualDev; +using JNPF.VisualDev.Entitys; +using JNPF.VisualDev.Interfaces; +using Mapster; +using Microsoft.AspNetCore.Mvc; +using SqlSugar; +using Tnb.BasicData.Entities; +using Tnb.WarehouseMgr.Entities; +using Tnb.WarehouseMgr.Entities.Attributes; +using Tnb.WarehouseMgr.Entities.Consts; +using Tnb.WarehouseMgr.Entities.Dto; +using Tnb.WarehouseMgr.Interfaces; + +namespace Tnb.WarehouseMgr +{ + /// + /// 载具移入 + /// + [OverideVisualDev(ModuleId)] + [ServiceModule(BizTypeId)] + public class WmsPDACarryMoveInStockService : BaseWareHouseService + { + private const string BizTypeId = "26121988909861"; + private const string ModuleId = "26476127634469"; + private readonly ISqlSugarClient _db; + private readonly IRunService _runService; + private readonly IVisualDevService _visualDevService; + private readonly IWareHouseService _wareHouseService; + private readonly IBillRullService _billRullService; + private readonly IUserManager _userManager; + + + public WmsPDACarryMoveInStockService( + ISqlSugarRepository repository, + IRunService runService, + IVisualDevService visualDevService, + IWareHouseService wareHouseService, + IUserManager userManager, + IBillRullService billRullService) + { + _db = repository.AsSugarClient(); + _runService = runService; + _visualDevService = visualDevService; + _wareHouseService = wareHouseService; + _userManager = userManager; + _billRullService = billRullService; + OverideFuncs.CreateAsync = CarryMoveIn; + } + + private async Task CarryMoveIn(VisualDevModelDataCrInput input) + { + + try + { + await _db.Ado.BeginTranAsync(); + + VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleId, true); + await _runService.Create(templateEntity, input); + //入库取终点 //出库起点 + var inStockStrategyInput = new InStockStrategyQuery { warehouse_id = input.data[nameof(InStockStrategyQuery.warehouse_id)].ToString(), Size = 1 }; + var endLocations = await _wareHouseService.InStockStrategy(inStockStrategyInput); + WmsPointH sPoint = null; + WmsPointH ePoint = null; + if (input.data.ContainsKey(nameof(WmsPointH.location_id))) + { + sPoint = await _db.Queryable().FirstAsync(it => it.location_id == input.data[nameof(WmsPointH.location_id)].ToString()); + } + if (endLocations?.Count > 0) + { + ePoint = await _db.Queryable().FirstAsync(it => it.location_id == endLocations[0].id); + } + + if (sPoint != null && ePoint != null) + { + var points = await _wareHouseService.PathAlgorithms(sPoint.id, ePoint.id); + //根据获取的路径点生成预任务,生成顺序必须预路径算法返回的起终点的顺序一致（预任务顺序） + if (points?.Count > 0) + { + if (points.Count <= 2) throw new AppFriendlyException("该路径不存在", 500); + var preTasks = points.Where(it => !it.location_id.IsNullOrEmpty()).GroupBy(g => g.area_code).Select(it => + { + var sPoint = it.FirstOrDefault(); + var ePoint = it.LastOrDefault(); + + WmsPretaskH preTask = new(); + preTask.org_id = _userManager.User.OrganizeId; + preTask.startlocation_id = sPoint?.location_id; + preTask.startlocation_code = sPoint?.location_code; + preTask.endlocation_id = ePoint?.location_id; + preTask.endlocation_code = ePoint?.location_code; + preTask.start_floor = sPoint?.floor.ToString(); + preTask.end_floor = ePoint?.floor.ToString(); + preTask.bill_code = _billRullService.GetBillNumber(WmsWareHouseConst.WMS_PRETASK_H_ENCODE).GetAwaiter().GetResult(); + preTask.status = WmsWareHouseConst.PRETASK_BILL_STATUS_DXF_ID; + preTask.biz_type = WmsWareHouseConst.BIZTYPE_CARRYMOVEINSTOCK_ID; + preTask.task_type = WmsWareHouseConst.WMS_PRETASK_INSTOCK_TYPE_ID; + preTask.carry_id = input.data[nameof(preTask.carry_id)]?.ToString()!; + preTask.carry_code = input.data[nameof(preTask.carry_code)]?.ToString()!; + preTask.area_id = sPoint?.area_id; + preTask.area_code = it.Key; + preTask.require_id = input.data["ReturnIdentity"].ToString(); + preTask.require_code = input.data[nameof(preTask.bill_code)]?.ToString()!; + preTask.create_id = _userManager.UserId; + preTask.create_time = DateTime.Now; + return preTask; + }).ToList(); + var isOk = await _wareHouseService.GenPreTask(preTasks); + if (isOk) + { + var preTaskUpInput = new GenPreTaskUpInput(); + preTaskUpInput.PreTaskId = input.data["ReturnIdentity"].ToString(); + preTaskUpInput.CarryId = input.data[nameof(WmsCarryD.carry_id)]?.ToString()!; + preTaskUpInput.CarryStartLocationId = points.FirstOrDefault().location_id; + preTaskUpInput.CarryStartLocationCode = points.FirstOrDefault().location_code; + preTaskUpInput.LocationIds = points.Select(x => x.location_id).ToList(); + preTaskUpInput.PreTaskRecords = preTasks.Adapt>(); + preTaskUpInput.PreTaskRecords.ForEach(x => x.id = SnowflakeIdHelper.NextId()); + await _wareHouseService.GenTaskHandleAfter(preTaskUpInput); + } + } + + } + + await _db.Ado.CommitTranAsync(); + } + catch (Exception ex) + { + await _db.Ado.RollbackTranAsync(); + throw; + } + return Task.FromResult(true); + } + + //public override async Task ModifyAsync(WareHouseUpInput input) + //{ + // if (input == null) throw new ArgumentNullException(nameof(input)); + // var isOk = await _db.Updateable().SetColumns(it => new WmsMoveInstock { status = input.bizTypeId }).Where(it => it.id == input.requireId).ExecuteCommandHasChangeAsync(); + // if (!isOk) throw Oops.Oh(ErrorCode.COM1001); + //} + } +} diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAEmptyInstockService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAEmptyInstockService.cs new file mode 100644 index 00000000..94e9a9bb --- /dev/null +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAEmptyInstockService.cs @@ -0,0 +1,151 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using JNPF.Common.Core.Manager; +using JNPF.Common.Dtos.VisualDev; +using JNPF.Common.Enums; +using JNPF.Common.Extension; +using JNPF.Common.Security; +using JNPF.FriendlyException; +using JNPF.Systems.Interfaces.System; +using JNPF.VisualDev; +using JNPF.VisualDev.Entitys; +using JNPF.VisualDev.Interfaces; +using Mapster; +using Microsoft.AspNetCore.Mvc; +using SqlSugar; +using Tnb.BasicData.Entities; +using Tnb.WarehouseMgr.Entities; +using Tnb.WarehouseMgr.Entities.Attributes; +using Tnb.WarehouseMgr.Entities.Consts; +using Tnb.WarehouseMgr.Entities.Dto; +using Tnb.WarehouseMgr.Interfaces; + +namespace Tnb.WarehouseMgr + +{ + /// + /// 空载具入库 + /// + [OverideVisualDev(ModuleConsts.MODULE_WMSEMPTYINSTOCK_ID)] + [ServiceModule(BizTypeId)] + + public class WmsPDAEmptyInstockService : BaseWareHouseService + { + private const string BizTypeId = "26121986416677"; + private readonly ISqlSugarClient _db; + private readonly IRunService _runService; + private readonly IVisualDevService _visualDevService; + private readonly IWareHouseService _wareHouseService; + private readonly IBillRullService _billRullService; + private readonly IUserManager _userManager; + public WmsPDAEmptyInstockService( + ISqlSugarRepository repository, + IRunService runService, + IVisualDevService visualDevService, + IWareHouseService wareHouseService, + IUserManager userManager, + IBillRullService billRullService) + { + _db = repository.AsSugarClient(); + _runService = runService; + _visualDevService = visualDevService; + _wareHouseService = wareHouseService; + _userManager = userManager; + _billRullService = billRullService; + OverideFuncs.CreateAsync = WmsEmptyIn; + } + + private async Task WmsEmptyIn(VisualDevModelDataCrInput input) + { + + try + { + await _db.Ado.BeginTranAsync(); + + VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleConsts.MODULE_WMSEMPTYINSTOCK_ID, true); + await _runService.Create(templateEntity, input); + //入库取终点 + var inStockStrategyInput = new InStockStrategyQuery { warehouse_id = input.data[nameof(InStockStrategyQuery.warehouse_id)].ToString(), Size = 1 }; + var endLocations = await _wareHouseService.InStockStrategy(inStockStrategyInput); + WmsPointH sPoint = null; + WmsPointH ePoint = null; + if (input.data.ContainsKey(nameof(WmsPointH.location_id))) + { + sPoint = await _db.Queryable().FirstAsync(it => it.location_id == input.data[nameof(WmsPointH.location_id)].ToString()); + } + if (endLocations?.Count > 0) + { + ePoint = await _db.Queryable().FirstAsync(it => it.location_id == endLocations[0].id); + } + + if (sPoint != null && ePoint != null) + { + var points = await _wareHouseService.PathAlgorithms(sPoint.id, ePoint.id); + //根据获取的路径点生成预任务,生成顺序必须预路径算法返回的起终点的顺序一致（预任务顺序） + if (points?.Count > 0) + { + if (points.Count <= 2) throw new AppFriendlyException("该路径不存在", 500); + var preTasks = points.Where(it => !it.location_id.IsNullOrEmpty()).GroupBy(g => g.area_code).Select(it => + { + var sPoint = it.FirstOrDefault(); + var ePoint = it.LastOrDefault(); + + WmsPretaskH preTask = new(); + preTask.org_id = _userManager.User.OrganizeId; + preTask.startlocation_id = sPoint?.location_id; + preTask.startlocation_code = sPoint?.location_code; + preTask.endlocation_id = ePoint?.location_id; + preTask.endlocation_code = ePoint?.location_code; + preTask.start_floor = sPoint?.floor.ToString(); + preTask.end_floor = ePoint?.floor.ToString(); + preTask.bill_code = _billRullService.GetBillNumber(WmsWareHouseConst.WMS_PRETASK_H_ENCODE).GetAwaiter().GetResult(); + preTask.status = WmsWareHouseConst.PRETASK_BILL_STATUS_DXF_ID; + preTask.biz_type = WmsWareHouseConst.BIZTYPE_WMSEMPTYINSTOCK_ID; + preTask.carry_id = input.data[nameof(preTask.carry_id)]?.ToString()!; + preTask.carry_code = input.data[nameof(preTask.carry_code)]?.ToString()!; + preTask.area_id = sPoint?.area_id; + preTask.area_code = it.Key; + preTask.require_id = input.data["ReturnIdentity"].ToString(); + preTask.require_code = input.data[nameof(preTask.bill_code)]?.ToString()!; + preTask.create_id = _userManager.UserId; + preTask.create_time = DateTime.Now; + return preTask; + }).ToList(); + var isOk = await _wareHouseService.GenPreTask(preTasks); + if (isOk) + { + var preTaskUpInput = new GenPreTaskUpInput(); + preTaskUpInput.PreTaskId = input.data["ReturnIdentity"].ToString(); + preTaskUpInput.CarryId = input.data[nameof(WmsCarryD.carry_id)]?.ToString()!; + preTaskUpInput.CarryStartLocationId = points.FirstOrDefault().location_id; + preTaskUpInput.CarryStartLocationCode = points.FirstOrDefault().location_code; + preTaskUpInput.LocationIds = points.Select(x => x.id).ToList(); + preTaskUpInput.PreTaskRecords = preTasks.Adapt>(); + preTaskUpInput.PreTaskRecords.ForEach(x => x.id = SnowflakeIdHelper.NextId()); + await _wareHouseService.GenTaskHandleAfter(preTaskUpInput); + } + } + + } + + await _db.Ado.CommitTranAsync(); + } + catch (Exception ex) + { + await _db.Ado.RollbackTranAsync(); + throw; + } + return Task.FromResult(true); + } + + //public async Task ModifyAsync(WareHouseUpInput input) + //{ + // if (input == null) throw new ArgumentNullException(nameof(input)); + // var isOk = await _db.Updateable().SetColumns(it => new WmsEmptyInstock { status = input.bizTypeId }).Where(it => it.id == input.requireId).ExecuteCommandHasChangeAsync(); + // if (!isOk) throw Oops.Oh(ErrorCode.COM1001); + //} + } +} From 06e9472fafc2317e7240282fb768f7ed9262ba6c Mon Sep 17 00:00:00 2001 From: hlb <894797954@qq.com> Date: Thu, 15 Jun 2023 16:19:48 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E5=A2=9E=E5=8A=A0PDA=20=E5=BA=93=E5=86=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Consts/ModuleConsts.cs | 60 +++--- .../Tnb.WarehouseMgr/PdaWmsDeliveryService.cs | 178 ++++++++++++++++++ .../Tnb.WarehouseMgr/PdaWmsTransferService.cs | 151 +++++++++++++++ .../Tnb.WarehouseMgr/WmsDeliveryService.cs | 11 +- .../Tnb.WarehouseMgr/WmsTransferService.cs | 6 +- 5 files changed, 371 insertions(+), 35 deletions(-) create mode 100644 WarehouseMgr/Tnb.WarehouseMgr/PdaWmsDeliveryService.cs create mode 100644 WarehouseMgr/Tnb.WarehouseMgr/PdaWmsTransferService.cs diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/ModuleConsts.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/ModuleConsts.cs index 69d95c77..f6c5ca72 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/ModuleConsts.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/ModuleConsts.cs @@ -5,123 +5,123 @@ public class ModuleConsts public const string Tag = "WarehouseMgr"; public const string Area = "wms"; /// - /// 任务操作-PDA异常取消 + /// 模块标识-PDA异常取消 /// public const string MODULE_WMSEXCEPTIONCANCELPDA_ID = "26631250691605"; /// - /// 任务操作-PDA异常重新执行 + /// 模块标识-PDA异常重新执行 /// public const string MODULE_WMSEXCPTIONREEXCUTEPDA_ID = "26631184673813"; /// - /// 任务操作-PDA异常完成 + /// 模块标识-PDA异常完成 /// public const string MODULE_WMSEXCPTIONCOMPLETEPDA_ID = "26497241038869"; /// - /// 任务操作-PDA投料操作 + /// 模块标识-PDA投料操作 /// public const string MODULE_WMSFEEDINGRECORDPDA_ID = "26496913096981"; /// - /// 任务操作-PDA绑定操作 + /// 模块标识-PDA绑定操作 /// public const string MODULE_WMSBINDINGPDA_ID = "26496560237333"; /// - /// 任务操作-PDA载具解绑 + /// 模块标识-PDA载具解绑 /// public const string MODULE_WMSCARRYUNBINDPDA_ID = "26479624280613"; /// - /// 任务操作-PDA载具绑定 + /// 模块标识-PDA载具绑定 /// public const string MODULE_WMSCARRYBINDPDA_ID = "26479495084837"; /// - /// 任务操作-PDA载具移出 + /// 模块标识-PDA载具移出 /// public const string MODULE_WMSCARRYMOOUTSTKPDA_ID = "26479437840677"; /// - /// 任务操作-PDA载具移入 + /// 模块标识-PDA载具移入 /// public const string MODULE_WMSMOVEINSTKPDA_ID = "26476127634469"; /// - /// 任务操作-PDA载具更换 + /// 模块标识-PDA载具更换 /// public const string MODULE_WMSCARRYREPLACEPDA_ID = "26475867493157"; /// - /// 任务操作-PDA配送申请 + /// 模块标识-PDA配送申请 /// public const string MODULE_WMSDELIVERYPDA_ID = "26475604135973"; /// - /// 任务操作-PDA库内转移 + /// 模块标识-PDA库内转移 /// public const string MODULE_WMSTRANSFERPDA_ID = "26475492865317"; /// - /// 任务操作-PDA寄存捆包 + /// 模块标识-PDA寄存捆包 /// public const string MODULE_WMSINBALEINPDA_ID = "26475412782629"; /// - /// 任务操作-PDA寄存入库 + /// 模块标识-PDA寄存入库 /// public const string MODULE_WMSINBALEINSTKPDA_ID = "26474954845989"; /// - /// 任务操作-PDA齐套入库 + /// 模块标识-PDA齐套入库 /// public const string MODULE_WMSKITTINGINSTKPDA_ID = "26474190687781"; /// - /// 任务操作-PDA一般入库 + /// 模块标识-PDA一般入库 /// public const string MODULE_WMSINSTOCKPDA_ID = "26458832529445"; /// - /// 任务操作-寄存出库 + /// 模块标识-寄存出库 /// public const string MODULE_WMSOUTBALE_ID = "26192638001445"; /// - /// 任务操作-寄存捆包 + /// 模块标识-寄存捆包 /// public const string MODULE_WMSINBALE_ID = "26192480520485"; /// - /// 任务操作-出库申请 + /// 模块标识-出库申请 /// public const string MODULE_WMSOUTSTOCK_ID = "26191983650597"; /// - /// 任务操作-入库申请 + /// 模块标识-入库申请 /// public const string MODULE_WMSINSTOCK_ID = "26191326300453"; /// - /// 任务操作-载具更换 + /// 模块标识-载具更换 /// public const string MODULE_WMSCARRYREPLACE_ID = "26188532491557"; /// - /// 任务操作-齐套分拣 + /// 模块标识-齐套分拣 /// public const string MODULE_WMSSETSORTING_ID = "26172520979237"; /// - /// 任务操作-齐套出库 + /// 模块标识-齐套出库 /// public const string MODULE_WMSKITTINGOUTSTK_ID = "26169701736741"; /// - /// 任务操作-齐套入库 + /// 模块标识-齐套入库 /// public const string MODULE_WMSKITTINGINSTK_ID = "26166785871909"; /// - /// 任务操作-配送申请 + /// 模块标识-配送申请 /// public const string MODULE_WMSDELIVERY_ID = "26126388337189"; /// - /// 任务操作-库内转移 + /// 模块标识-库内转移 /// public const string MODULE_WMSTRANSFER_ID = "26125750270757"; /// - /// 任务操作-载具移出 + /// 模块标识-载具移出 /// public const string MODULE_WMSCARRYMOOUTSTK_ID = "26123262586661"; /// - /// 任务操作-空载具出库 + /// 模块标识-空载具出库 /// public const string MODULE_WMSEPTYOUTSTK_ID = "26122798979365"; /// - /// 任务操作-载具移入 + /// 模块标识-载具移入 /// public const string MODULE_CARRYMOVEINSTOCK_ID = "26122102481957"; /// - /// 任务操作-空载具入库 + /// 模块标识-空载具入库 /// public const string MODULE_WMSEMPTYINSTOCK_ID = "26120915344165"; diff --git a/WarehouseMgr/Tnb.WarehouseMgr/PdaWmsDeliveryService.cs b/WarehouseMgr/Tnb.WarehouseMgr/PdaWmsDeliveryService.cs new file mode 100644 index 00000000..e09709c2 --- /dev/null +++ b/WarehouseMgr/Tnb.WarehouseMgr/PdaWmsDeliveryService.cs @@ -0,0 +1,178 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Aspose.Cells.Drawing; +using JNPF.Common.Core.Manager; +using JNPF.Common.Dtos.VisualDev; +using JNPF.Common.Extension; +using JNPF.DependencyInjection; +using JNPF.DynamicApiController; +using JNPF.FriendlyException; +using JNPF.Systems.Interfaces.System; +using JNPF.VisualDev; +using JNPF.VisualDev.Entitys; +using JNPF.VisualDev.Interfaces; +using Microsoft.AspNetCore.Mvc; +using SqlSugar; +using Tnb.BasicData.Entities; +using Tnb.BasicData.Interfaces; +using Tnb.WarehouseMgr.Entities; +using Tnb.WarehouseMgr.Entities.Attributes; +using Tnb.WarehouseMgr.Entities.Consts; +using Tnb.WarehouseMgr.Entities.Dto; +using Tnb.WarehouseMgr.Entities.Enums; +using Tnb.WarehouseMgr.Interfaces; + +namespace Tnb.WarehouseMgr +{ + /// + /// 配送申请服务 + /// + [ApiDescriptionSettings(Tag = ModuleConsts.Tag, Area = ModuleConsts.Area, Order = 700)] + [Route("api/[area]/[controller]/[action]")] + [OverideVisualDev(ModuleConsts.MODULE_WMSDELIVERYPDA_ID)] + [ServiceModule(BizTypeId)] + public class PdaWmsDeliveryService : IOverideVisualDevService, IWmsDeliveryService, IDynamicApiController, ITransient + { + private const string BizTypeId = "26125644258853"; + private readonly ISqlSugarClient _db; + private readonly IRunService _runService; + private readonly IVisualDevService _visualDevService; + private readonly IBasLocationService _basLocationService; + private readonly IWareHouseService _wareHouseService; + private readonly IBillRullService _billRullService; + private readonly IUserManager _userManager; + public OverideVisualDevFunc OverideFuncs { get; } = new OverideVisualDevFunc(); + public PdaWmsDeliveryService( + ISqlSugarRepository repository, + IRunService runService, + IVisualDevService visualDevService, + IBasLocationService basLocationService + ) + { + _db = repository.AsSugarClient(); + _runService = runService; + _visualDevService = visualDevService; + _basLocationService = basLocationService; + //OverideFuncs.CreateAsync = Create; + } + /// + /// 根据载具编号获取起始库位点 + /// + /// + /// + [HttpGet] + public async Task GetUnStoreLocationListByCarryId([FromRoute] string carryId) + { + var items = await _db.Queryable().LeftJoin((a, b) => a.location_id == b.id) + .Where(a => a.id == carryId) + .Select((a, b) => new + { + carry_code = a.carry_code, + location_code = b.location_code, + }) + .ToListAsync(); + return items; + } + + private async Task Create(VisualDevModelDataCrInput input) + { + try + { + //startlocation_id + //endlocation_id + string startLocationId = "", endLocationId = ""; + if (input.data.ContainsKey(nameof(WmsDelivery.startlocation_id))) + { + startLocationId = input.data[nameof(WmsDelivery.startlocation_id)]?.ToString()!; + } + if (input.data.ContainsKey(nameof(WmsDelivery.endlocation_id))) + { + endLocationId = input.data[nameof(WmsDelivery.endlocation_id)]?.ToString()!; + } + var locIds = new[] { startLocationId, endLocationId }; + var locs = await _basLocationService.GetLocationInfobyIds(locIds); + if (locs?.Count > 0) + { + var isStoreLoc = locs.Where(x => !x.IsNullOrEmpty()).Select(x => x.is_type.ParseToInt()).Any(x => x == (int)EnumLocationType.存储库位); + if (isStoreLoc) throw new AppFriendlyException("起始库位不能为存储库位", 500); + } + VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleConsts.MODULE_WMSDELIVERYPDA_ID, true); + await _runService.Create(templateEntity, input); + + // 计算路径，插入预任务申请 + WmsPointH sPoint = null; + WmsPointH ePoint = null; + if (input.data.ContainsKey(nameof(WmsDelivery.startlocation_id))) + { + sPoint = await _db.Queryable().FirstAsync(it => it.location_id == input.data[nameof(WmsTransfer.startlocation_id)].ToString()); + } + if (input.data.ContainsKey(nameof(WmsTransfer.endlocation_id))) + { + ePoint = await _db.Queryable().FirstAsync(it => it.location_id == input.data[nameof(WmsTransfer.endlocation_id)].ToString()); + } + + if (sPoint != null && ePoint != null) + { + var points = await _wareHouseService.PathAlgorithms(sPoint.id, ePoint.id); + //根据获取的路径点生成预任务,生成顺序必须预路径算法返回的起终点的顺序一致（预任务顺序） + if (points?.Count > 0) + { + if (points.Count <= 2) throw new AppFriendlyException("该路径不存在", 500); + var preTasks = points.Where(it => !it.location_id.IsNullOrEmpty()).GroupBy(g => g.area_code).Select(it => + { + var sPoint = it.FirstOrDefault(); + var ePoint = it.LastOrDefault(); + + WmsPretaskH preTask = new(); + preTask.org_id = _userManager.User.OrganizeId; + preTask.startlocation_id = sPoint?.location_id; + preTask.startlocation_code = sPoint?.location_code; + preTask.endlocation_id = ePoint?.location_id; + preTask.endlocation_code = ePoint?.location_code; + preTask.start_floor = sPoint?.floor.ToString(); + preTask.end_floor = ePoint?.floor.ToString(); + preTask.bill_code = _billRullService.GetBillNumber(WmsWareHouseConst.WMS_PRETASK_H_ENCODE).GetAwaiter().GetResult(); + preTask.status = WmsWareHouseConst.PRETASK_BILL_STATUS_DXF_ID; + preTask.biz_type = WmsWareHouseConst.BIZTYPE_WMSDELIVERY_ID; + preTask.task_type = WmsWareHouseConst.WMS_PRETASK_TRANSFER_TYPE_ID; + preTask.carry_id = input.data[nameof(preTask.carry_id)]?.ToString()!; + preTask.carry_code = input.data[nameof(preTask.carry_code)]?.ToString()!; + preTask.area_id = sPoint?.area_id; + preTask.area_code = it.Key; + preTask.require_id = input.data["ReturnIdentity"].ToString(); + preTask.require_code = input.data[nameof(preTask.bill_code)]?.ToString()!; + preTask.create_id = _userManager.UserId; + preTask.create_time = DateTime.Now; + return preTask; + }).ToList(); + var isOk = await _wareHouseService.GenPreTask(preTasks); + if (isOk) + { + //不需要插入操作表 + /* var preTaskUpInput = new GenPreTaskUpInput(); + preTaskUpInput.PreTaskId = input.data["ReturnIdentity"].ToString(); + preTaskUpInput.CarryId = input.data[nameof(WmsCarryD.carry_id)]?.ToString()!; + preTaskUpInput.CarryStartLocationId = points.FirstOrDefault().location_id; + preTaskUpInput.CarryStartLocationCode = points.FirstOrDefault().location_code; + preTaskUpInput.LocationIds = points.Select(x => x.location_id).ToList(); + preTaskUpInput.PreTaskRecords = preTasks.Adapt>(); + preTaskUpInput.PreTaskRecords.ForEach(x => x.id = SnowflakeIdHelper.NextId()); + await _wareHouseService.GenTaskHandleAfter(preTaskUpInput);*/ + } + } + + } + + await _db.Ado.CommitTranAsync(); + } + catch (Exception) + { + return await Task.FromResult(false); + } + return await Task.FromResult(true); + } + } +} diff --git a/WarehouseMgr/Tnb.WarehouseMgr/PdaWmsTransferService.cs b/WarehouseMgr/Tnb.WarehouseMgr/PdaWmsTransferService.cs new file mode 100644 index 00000000..49bdd59d --- /dev/null +++ b/WarehouseMgr/Tnb.WarehouseMgr/PdaWmsTransferService.cs @@ -0,0 +1,151 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using JNPF.Common.Core.Manager; +using JNPF.Common.Dtos.VisualDev; +using JNPF.Common.Enums; +using JNPF.Common.Extension; +using JNPF.Common.Security; +using JNPF.FriendlyException; +using JNPF.Systems.Interfaces.System; +using JNPF.VisualDev; +using JNPF.VisualDev.Entitys; +using JNPF.VisualDev.Interfaces; +using Mapster; +using Microsoft.AspNetCore.Mvc; +using Microsoft.CodeAnalysis; +using SqlSugar; +using Tnb.BasicData.Entities; +using Tnb.WarehouseMgr.Entities; +using Tnb.WarehouseMgr.Entities.Attributes; +using Tnb.WarehouseMgr.Entities.Consts; +using Tnb.WarehouseMgr.Entities.Dto; +using Tnb.WarehouseMgr.Interfaces; +namespace Tnb.WarehouseMgr +{ + + /// + /// 库内转移 + /// + [OverideVisualDev(ModuleConsts.MODULE_WMSTRANSFER_ID)] + [ServiceModule(BizTypeId)] + public class PdaWmsTransferService : BaseWareHouseService + { + private const string BizTypeId = "26585291847957"; + private readonly ISqlSugarClient _db; + private readonly IRunService _runService; + private readonly IVisualDevService _visualDevService; + private readonly IWareHouseService _wareHouseService; + private readonly IBillRullService _billRullService; + private readonly IUserManager _userManager; + public PdaWmsTransferService( + ISqlSugarRepository repository, + IRunService runService, + IVisualDevService visualDevService, + IWareHouseService wareHouseService, + IUserManager userManager, + IBillRullService billRullService) + { + _db = repository.AsSugarClient(); + _runService = runService; + _visualDevService = visualDevService; + _wareHouseService = wareHouseService; + _userManager = userManager; + _billRullService = billRullService; + OverideFuncs.CreateAsync = CarryTransfer; + } + + private async Task CarryTransfer(VisualDevModelDataCrInput input) + { + + try + { + await _db.Ado.BeginTranAsync(); + + VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleConsts.MODULE_WMSTRANSFER_ID, true); + await _runService.Create(templateEntity, input); + // 计算路径，插入预任务申请 + WmsPointH sPoint = null; + WmsPointH ePoint = null; + if (input.data.ContainsKey(nameof(WmsTransfer.startlocation_id))) + { + sPoint = await _db.Queryable().FirstAsync(it => it.location_id == input.data[nameof(WmsTransfer.startlocation_id)].ToString()); + } + if (input.data.ContainsKey(nameof(WmsTransfer.endlocation_id))) + { + ePoint = await _db.Queryable().FirstAsync(it => it.location_id == input.data[nameof(WmsTransfer.endlocation_id)].ToString()); + } + + if (sPoint != null && ePoint != null) + { + var points = await _wareHouseService.PathAlgorithms(sPoint.id, ePoint.id); + //根据获取的路径点生成预任务,生成顺序必须预路径算法返回的起终点的顺序一致（预任务顺序） + if (points?.Count > 0) + { + if (points.Count <= 2) throw new AppFriendlyException("该路径不存在", 500); + var preTasks = points.Where(it => !it.location_id.IsNullOrEmpty()).GroupBy(g => g.area_code).Select(it => + { + var sPoint = it.FirstOrDefault(); + var ePoint = it.LastOrDefault(); + + WmsPretaskH preTask = new(); + preTask.org_id = _userManager.User.OrganizeId; + preTask.startlocation_id = sPoint?.location_id; + preTask.startlocation_code = sPoint?.location_code; + preTask.endlocation_id = ePoint?.location_id; + preTask.endlocation_code = ePoint?.location_code; + preTask.start_floor = sPoint?.floor.ToString(); + preTask.end_floor = ePoint?.floor.ToString(); + preTask.bill_code = _billRullService.GetBillNumber(WmsWareHouseConst.WMS_PRETASK_H_ENCODE).GetAwaiter().GetResult(); + preTask.status = WmsWareHouseConst.PRETASK_BILL_STATUS_DXF_ID; + preTask.biz_type = WmsWareHouseConst.BIZTYPE_WMSDELIVERY_ID; + preTask.task_type = WmsWareHouseConst.WMS_PRETASK_TRANSFER_TYPE_ID; + preTask.carry_id = input.data[nameof(preTask.carry_id)]?.ToString()!; + preTask.carry_code = input.data[nameof(preTask.carry_code)]?.ToString()!; + preTask.area_id = sPoint?.area_id; + preTask.area_code = it.Key; + preTask.require_id = input.data["ReturnIdentity"].ToString(); + preTask.require_code = input.data[nameof(preTask.bill_code)]?.ToString()!; + preTask.create_id = _userManager.UserId; + preTask.create_time = DateTime.Now; + return preTask; + }).ToList(); + var isOk = await _wareHouseService.GenPreTask(preTasks); + if (isOk) + { + //不需要插入操作表 + /* var preTaskUpInput = new GenPreTaskUpInput(); + preTaskUpInput.PreTaskId = input.data["ReturnIdentity"].ToString(); + preTaskUpInput.CarryId = input.data[nameof(WmsCarryD.carry_id)]?.ToString()!; + preTaskUpInput.CarryStartLocationId = points.FirstOrDefault().location_id; + preTaskUpInput.CarryStartLocationCode = points.FirstOrDefault().location_code; + preTaskUpInput.LocationIds = points.Select(x => x.location_id).ToList(); + preTaskUpInput.PreTaskRecords = preTasks.Adapt>(); + preTaskUpInput.PreTaskRecords.ForEach(x => x.id = SnowflakeIdHelper.NextId()); + await _wareHouseService.GenTaskHandleAfter(preTaskUpInput);*/ + } + } + + } + + await _db.Ado.CommitTranAsync(); + } + catch (Exception ex) + { + await _db.Ado.RollbackTranAsync(); + throw; + } + return Task.FromResult(true); + } + + public override async Task ModifyAsync(WareHouseUpInput input) + { + if (input == null) throw new ArgumentNullException(nameof(input)); + var isOk = await _db.Updateable().SetColumns(it => new WmsMoveInstock { status = input.bizTypeId }).Where(it => it.id == input.requireId).ExecuteCommandHasChangeAsync(); + if (!isOk) throw Oops.Oh(ErrorCode.COM1001); + } + } + +} diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsDeliveryService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsDeliveryService.cs index 8545386c..82fff8ec 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsDeliveryService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsDeliveryService.cs @@ -6,6 +6,7 @@ using System.Threading.Tasks; using Aspose.Cells.Drawing; using JNPF.Common.Core.Manager; using JNPF.Common.Dtos.VisualDev; +using JNPF.Common.Enums; using JNPF.Common.Extension; using JNPF.DependencyInjection; using JNPF.DynamicApiController; @@ -34,7 +35,7 @@ namespace Tnb.WarehouseMgr [Route("api/[area]/[controller]/[action]")] [OverideVisualDev(ModuleConsts.MODULE_WMSDELIVERY_ID)] [ServiceModule(BizTypeId)] - public class WmsDeliveryService : IOverideVisualDevService, IWmsDeliveryService, IDynamicApiController, ITransient + public class WmsDeliveryService : BaseWareHouseService,IOverideVisualDevService, IWmsDeliveryService, IDynamicApiController, ITransient { private const string BizTypeId = "26125644258853"; private readonly ISqlSugarClient _db; @@ -136,7 +137,7 @@ namespace Tnb.WarehouseMgr preTask.end_floor = ePoint?.floor.ToString(); preTask.bill_code = _billRullService.GetBillNumber(WmsWareHouseConst.WMS_PRETASK_H_ENCODE).GetAwaiter().GetResult(); preTask.status = WmsWareHouseConst.PRETASK_BILL_STATUS_DXF_ID; - preTask.biz_type = WmsWareHouseConst.BIZTYPE_WMSTRANSFER_ID; + preTask.biz_type = WmsWareHouseConst.BIZTYPE_WMSDELIVERY_ID; preTask.task_type = WmsWareHouseConst.WMS_PRETASK_TRANSFER_TYPE_ID; preTask.carry_id = input.data[nameof(preTask.carry_id)]?.ToString()!; preTask.carry_code = input.data[nameof(preTask.carry_code)]?.ToString()!; @@ -174,5 +175,11 @@ namespace Tnb.WarehouseMgr } return await Task.FromResult(true); } + public override async Task ModifyAsync(WareHouseUpInput input) + { + if (input == null) throw new ArgumentNullException(nameof(input)); + var isOk = await _db.Updateable().SetColumns(it => new WmsDelivery { status = input.bizTypeId }).Where(it => it.id == input.requireId).ExecuteCommandHasChangeAsync(); + if (!isOk) throw Oops.Oh(ErrorCode.COM1001); + } } } diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsTransferService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsTransferService.cs index bcd69b27..772127de 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsTransferService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsTransferService.cs @@ -29,7 +29,7 @@ namespace Tnb.WarehouseMgr /// /// 库内转移 /// - [OverideVisualDev(ModuleConsts.MODULE_WMSTRANSFER_ID)] + [OverideVisualDev(ModuleConsts.MODULE_WMSTRANSFERPDA_ID)] [ServiceModule(BizTypeId)] public class WmsTransferService : BaseWareHouseService { @@ -64,7 +64,7 @@ namespace Tnb.WarehouseMgr { await _db.Ado.BeginTranAsync(); - VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleConsts.MODULE_WMSTRANSFER_ID, true); + VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleConsts.MODULE_WMSTRANSFERPDA_ID, true); await _runService.Create(templateEntity, input); // 计算路径，插入预任务申请 WmsPointH sPoint = null; @@ -143,7 +143,7 @@ namespace Tnb.WarehouseMgr public override async Task ModifyAsync(WareHouseUpInput input) { if (input == null) throw new ArgumentNullException(nameof(input)); - var isOk = await _db.Updateable().SetColumns(it => new WmsMoveInstock { status = input.bizTypeId }).Where(it => it.id == input.requireId).ExecuteCommandHasChangeAsync(); + var isOk = await _db.Updateable().SetColumns(it => new WmsTransfer { status = input.bizTypeId }).Where(it => it.id == input.requireId).ExecuteCommandHasChangeAsync(); if (!isOk) throw Oops.Oh(ErrorCode.COM1001); } }