From 49559e6c17a08ce6a0978979b2a1a0c13c298eb3 Mon Sep 17 00:00:00 2001 From: hlb <894797954@qq.com> Date: Wed, 14 Jun 2023 17:35:00 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=A9=BA=E8=BD=BD?= =?UTF-8?q?=E5=85=B7=E5=85=A5=E5=BA=93=E4=B8=9A=E5=8A=A1=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Consts/WmsWareHouseConst.cs | 4 + .../WmsEmptyInstockService.cs | 141 ++++++++++++++++++ 2 files changed, 145 insertions(+) create mode 100644 WarehouseMgr/Tnb.WarehouseMgr/WmsEmptyInstockService.cs diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/WmsWareHouseConst.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/WmsWareHouseConst.cs index 79c77dab..7ab9cd4c 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/WmsWareHouseConst.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/WmsWareHouseConst.cs @@ -29,5 +29,9 @@ namespace Tnb.WarehouseMgr.Entities.Consts /// 单据状态-作业中 /// public const string BILLSTATUS_ON_ID = "25065143245845"; + /// + /// 预任务生成业务类型-空载具移入ID + /// + public const string BIZTYPE_EMPTYIN_ID = "26121986416677"; } } diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsEmptyInstockService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsEmptyInstockService.cs new file mode 100644 index 00000000..7d5ee9db --- /dev/null +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsEmptyInstockService.cs @@ -0,0 +1,141 @@ +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.Consts; +using Tnb.WarehouseMgr.Entities.Dto; +using Tnb.WarehouseMgr.Interfaces; + +namespace Tnb.WarehouseMgr + +{ + /// + /// 空载具入库 + /// + [OverideVisualDev(ModuleId)] + public class WmsEmptyInstockService : BaseWareHouseService + { + private const string ModuleId = "26120915344165"; + 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 WmsEmptyInstockService( + 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(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_EMPTYIN_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); + } + } +} From 1730632c28876f6863e2a65f3362497ac37bd67a Mon Sep 17 00:00:00 2001 From: hlb <894797954@qq.com> Date: Wed, 14 Jun 2023 17:37:38 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=A9=BA=E8=BD=BD=E5=85=B7=E4=B8=9A?= =?UTF-8?q?=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Tnb.WarehouseMgr.Entities/Consts/WmsWareHouseConst.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/WmsWareHouseConst.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/WmsWareHouseConst.cs index ae6fb528..4cb48cb3 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/WmsWareHouseConst.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/WmsWareHouseConst.cs @@ -46,5 +46,9 @@ namespace Tnb.WarehouseMgr.Entities.Consts /// 预任务类型-入库TypeId /// public const string WMS_PRETASK_INSTOCK_TYPE_ID = "26126748597797"; + /// + /// 预任务生成业务类型-载具移入Id + /// + public const string BIZTYPE_EMPTYIN_ID = "26120915344165"; } }