diff --git a/PerMgr/Tnb.PerMgr.Entities/Consts/ModuleConsts.cs b/PerMgr/Tnb.PerMgr.Entities/Consts/ModuleConsts.cs index 69c95f60..d2adc2f9 100644 --- a/PerMgr/Tnb.PerMgr.Entities/Consts/ModuleConsts.cs +++ b/PerMgr/Tnb.PerMgr.Entities/Consts/ModuleConsts.cs @@ -4,5 +4,125 @@ public class ModuleConsts { public const string Tag = "PerMgr"; public const string Area = "per"; + /// + /// 任务操作-PDA异常取消 + /// + public const string MODULE_WMSEXCEPTIONCANCELPDA_ID = "26631250691605"; + /// + /// 任务操作-PDA异常重新执行 + /// + public const string MODULE_WMSEXCPTIONREEXCUTEPDA_ID = "26631184673813"; + /// + /// 任务操作-PDA异常完成 + /// + public const string MODULE_WMSEXCPTIONCOMPLETEPDA_ID = "26497241038869"; + /// + /// 任务操作-PDA投料操作 + /// + public const string MODULE_WMSFEEDINGRECORDPDA_ID = "26496913096981"; + /// + /// 任务操作-PDA绑定操作 + /// + public const string MODULE_WMSBINDINGPDA_ID = "26496560237333"; + /// + /// 任务操作-PDA载具解绑 + /// + public const string MODULE_WMSCARRYUNBINDPDA_ID = "26479624280613"; + /// + /// 任务操作-PDA载具绑定 + /// + public const string MODULE_WMSCARRYBINDPDA_ID = "26479495084837"; + /// + /// 任务操作-PDA载具移出 + /// + public const string MODULE_WMSCARRYMOOUTSTKPDA_ID = "26479437840677"; + /// + /// 任务操作-PDA载具移入 + /// + public const string MODULE_WMSMOVEINSTKPDA_ID = "26476127634469"; + /// + /// 任务操作-PDA载具更换 + /// + public const string MODULE_WMSCARRYREPLACEPDA_ID = "26475867493157"; + /// + /// 任务操作-PDA配送申请 + /// + public const string MODULE_WMSDELIVERYPDA_ID = "26475604135973"; + /// + /// 任务操作-PDA库内转移 + /// + public const string MODULE_WMSTRANSFERPDA_ID = "26475492865317"; + /// + /// 任务操作-PDA寄存捆包 + /// + public const string MODULE_WMSINBALEINPDA_ID = "26475412782629"; + /// + /// 任务操作-PDA寄存入库 + /// + public const string MODULE_WMSINBALEINSTKPDA_ID = "26474954845989"; + /// + /// 任务操作-PDA齐套入库 + /// + public const string MODULE_WMSKITTINGINSTKPDA_ID = "26474190687781"; + /// + /// 任务操作-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"; } \ No newline at end of file diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs index aeff25b8..15506c46 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs @@ -392,42 +392,56 @@ namespace Tnb.WarehouseMgr [HttpPost] public async Task TaskComplate(TaskCompleUpInput input) { - //鏇存柊浠诲姟鎵ц琛紝鍗曟嵁鐘舵佷负 瀹屾垚 - await _db.Updateable().SetColumns(it => new WmsDistaskH { status = WmsWareHouseConst.TASK_BILL_STATUS_COMPLE_ID }).Where(it => input.disTaskIds.Contains(it.id)).ExecuteCommandAsync(); - //鏇存柊棰勪换鍔＄敵璇疯〃锛屽崟鎹姸鎬佷负 宸插畬鎴 - var disTasks = await _db.Queryable().Where(it => input.disTaskIds.Contains(it.id)).ToListAsync(); - if (disTasks?.Count > 0) + try { - var preTaskIds = disTasks.Select(x => x.pretask_id).ToList(); - await _db.Updateable().SetColumns(it => new WmsPretaskH { status = WmsWareHouseConst.PRETASK_BILL_STATUS_COMPLE_ID }).Where(it => preTaskIds.Contains(it.id)).ExecuteCommandAsync(); - } - //鏇存柊杞藉叿锛岄攣瀹氱姸鎬佷负鏈攣瀹氾紝鏇存柊杞藉叿鐨勫簱浣嶅綋鍓嶄换鍔＄殑鐩爣搴撲綅 - if (disTasks?.Count > 0) - { - var multiList = disTasks.Select(it => (it.carry_id, it.endlocation_id)).ToList(); - for (int i = 0; i < multiList.Count; i++) + await _db.Ado.BeginTranAsync(); + + //鏇存柊浠诲姟鎵ц琛紝鍗曟嵁鐘舵佷负 瀹屾垚 + await _db.Updateable().SetColumns(it => new WmsDistaskH { status = WmsWareHouseConst.TASK_BILL_STATUS_COMPLE_ID }).Where(it => input.disTaskIds.Contains(it.id)).ExecuteCommandAsync(); + //鏇存柊棰勪换鍔＄敵璇疯〃锛屽崟鎹姸鎬佷负 宸插畬鎴 + var disTasks = await _db.Queryable().Where(it => input.disTaskIds.Contains(it.id)).ToListAsync(); + if (disTasks?.Count > 0) { - await _db.Updateable().SetColumns(it => new WmsCarryH { is_lock = 0, location_id = multiList[i].endlocation_id }).Where(it => it.id == multiList[i].carry_id).ExecuteCommandAsync(); + var preTaskIds = disTasks.Select(x => x.pretask_id).ToList(); + await _db.Updateable().SetColumns(it => new WmsPretaskH { status = WmsWareHouseConst.PRETASK_BILL_STATUS_COMPLE_ID }).Where(it => preTaskIds.Contains(it.id)).ExecuteCommandAsync(); } - } - //鏇存柊搴撲綅淇℃伅锛屼娇鐢ㄧ姸鎬佷负 浣跨敤锛岄攣瀹氱姸鎬佷负鏈攣瀹 - if (disTasks?.Count > 0) - { - var destLocIds = disTasks.Select(it => it.endlocation_id).ToList(); - await _db.Updateable().SetColumns(it => new BasLocation { is_use = "1", is_lock = 0 }).Where(it => destLocIds.Contains(it.id)).ExecuteCommandAsync(); - } - //鏇存柊涓氬姟涓昏〃鐨勫崟鎹姸鎬 - if (disTasks?.Count > 0) - { - foreach (var dt in disTasks) + //鏇存柊杞藉叿锛岄攣瀹氱姸鎬佷负鏈攣瀹氾紝鏇存柊杞藉叿鐨勫簱浣嶅綋鍓嶄换鍔＄殑鐩爣搴撲綅 + if (disTasks?.Count > 0) { - if (dt.is_chain == 0) + var multiList = disTasks.Select(it => (it.carry_id, it.endlocation_id)).ToList(); + for (int i = 0; i < multiList.Count; i++) + { + await _db.Updateable().SetColumns(it => new WmsCarryH { is_lock = 0, location_id = multiList[i].endlocation_id }).Where(it => it.id == multiList[i].carry_id).ExecuteCommandAsync(); + } + } + //鏇存柊搴撲綅淇℃伅锛屼娇鐢ㄧ姸鎬佷负 浣跨敤锛岄攣瀹氱姸鎬佷负鏈攣瀹 + if (disTasks?.Count > 0) + { + var destLocIds = disTasks.Select(it => it.endlocation_id).ToList(); + await _db.Updateable().SetColumns(it => new BasLocation { is_use = "1", is_lock = 0 }).Where(it => destLocIds.Contains(it.id)).ExecuteCommandAsync(); + } + //鏇存柊涓氬姟涓昏〃鐨勫崟鎹姸鎬 + if (disTasks?.Count > 0) + { + foreach (var dt in disTasks) { var upInput = new WareHouseUpInput { bizTypeId = dt.biz_type, requireId = dt.require_id }; - await base[upInput]; + if (dt.is_chain == 0) + { + await base[upInput]; + } + else if (dt.is_chain == 1 && dt.chain_type == "3") + { + await base[upInput]; + } } - } + + await _db.Ado.CommitTranAsync(); + } + catch (Exception) + { + await _db.Ado.RollbackTranAsync(); } } diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsTransfer.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsTransfer.cs new file mode 100644 index 00000000..a839ece1 --- /dev/null +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsTransfer.cs @@ -0,0 +1,153 @@ +锘縰sing 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 WmsCarryMoveInStockService : BaseWareHouseService + { + private const string BizTypeId = "26121988909861"; + private const string ModuleId = "26122102481957"; + 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 WmsCarryMoveInStockService( + 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_MOVEIN_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); + } + } + } +}