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 1/4] =?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); } } From 06aeced8af54da9b85074ac009eca745c3640f1f Mon Sep 17 00:00:00 2001 From: alex Date: Thu, 15 Jun 2023 16:21:11 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=89=AB=E7=A0=81=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Consts/WmsWareHouseConst.cs | 4 + .../Dto/Inputs/BarCodePrintInput.cs | 19 ++++ .../Dto/Inputs/SacnBarCodeInStockInput.cs | 19 ++++ .../Entity/WmsTempCode.cs | 107 ++++++++++++++++++ .../Tnb.WarehouseMgr/WmsInStockService.cs | 67 ++++++++++- 5 files changed, 214 insertions(+), 2 deletions(-) create mode 100644 WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/BarCodePrintInput.cs create mode 100644 WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/SacnBarCodeInStockInput.cs create mode 100644 WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsTempCode.cs diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/WmsWareHouseConst.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/WmsWareHouseConst.cs index c6fa8973..218d355b 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/WmsWareHouseConst.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/WmsWareHouseConst.cs @@ -124,6 +124,10 @@ namespace Tnb.WarehouseMgr.Entities.Consts /// 预任务生成业务类型-配送申请 /// public const string BIZTYPE_WMSDELIVERY_ID = "26585291847957"; + /// + /// 条码打印状态-已完成 + /// + public const string BARCODE_PRINT_STATUS_COMPLETE_ID = "26191372853541"; } diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/BarCodePrintInput.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/BarCodePrintInput.cs new file mode 100644 index 00000000..bae70e4a --- /dev/null +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/BarCodePrintInput.cs @@ -0,0 +1,19 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Tnb.WarehouseMgr.Entities.Dto.Inputs +{ + /// + /// 条码打印输入参数 + /// + public class BarCodePrintInput + { + /// + /// 入库申请单Id列表 + /// + public List BillIds { get; set; } + } +} diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/SacnBarCodeInStockInput.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/SacnBarCodeInStockInput.cs new file mode 100644 index 00000000..f27031ce --- /dev/null +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/SacnBarCodeInStockInput.cs @@ -0,0 +1,19 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Tnb.WarehouseMgr.Entities.Dto.Inputs +{ + /// + /// 扫码入库输入参数 + /// + public class SacnBarCodeInStockInput + { + /// + /// 入库单ID + /// + public string bill_id { get; set; } + } +} diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsTempCode.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsTempCode.cs new file mode 100644 index 00000000..edc9cfd4 --- /dev/null +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsTempCode.cs @@ -0,0 +1,107 @@ +using JNPF.Common.Contracts; +using JNPF.Common.Security; +using SqlSugar; + +namespace Tnb.WarehouseMgr.Entities; + +/// +/// 条码临时表 +/// +[SugarTable("wms_temp_code")] +public partial class WmsTempCode : BaseEntity +{ + public WmsTempCode() + { + id = SnowflakeIdHelper.NextId(); + } + /// + /// 所属组织 + /// + public string? org_id { get; set; } + + /// + /// 物料ID + /// + public string? material_id { get; set; } + + /// + /// 物料编号 + /// + public string? material_code { get; set; } + + /// + /// 条码编号 + /// + public string? barcode { get; set; } + + /// + /// 批次 + /// + public string? code_batch { get; set; } + + /// + /// 条码数量 + /// + public int? codeqty { get; set; } + + /// + /// 单位ID + /// + public string? unit_id { get; set; } + + /// + /// 是否锁定 + /// + public int? is_lock { get; set; } + + /// + /// 是否结束 + /// + public string? is_end { get; set; } + + /// + /// 需求单据ID + /// + public string? require_id { get; set; } + + /// + /// 需求单据代码 + /// + public string? require_code { get; set; } + + /// + /// 备注 + /// + public string? remark { get; set; } + + /// + /// 扩展 + /// + public string? extras { get; set; } + + /// + /// 创建用户 + /// + public string? create_id { get; set; } + + /// + /// 创建时间 + /// + public DateTime? create_time { get; set; } + + /// + /// 修改用户 + /// + public string? modify_id { get; set; } + + /// + /// 修改时间 + /// + public DateTime? modify_time { get; set; } + + /// + /// 时间戳 + /// + public DateTime? time_stamp { get; set; } + +} diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsInStockService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsInStockService.cs index 530b0994..4b3db4c6 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsInStockService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsInStockService.cs @@ -3,11 +3,15 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using JNPF.Common.Core.Manager; using JNPF.Systems.Interfaces.System; using Microsoft.AspNetCore.Mvc; +using Minio.DataModel; using SqlSugar; +using Tnb.BasicData.Entities; using Tnb.WarehouseMgr.Entities; using Tnb.WarehouseMgr.Entities.Consts; +using Tnb.WarehouseMgr.Entities.Dto.Inputs; using Tnb.WarehouseMgr.Interfaces; namespace Tnb.WarehouseMgr @@ -19,10 +23,12 @@ namespace Tnb.WarehouseMgr { private readonly ISqlSugarClient _db; private readonly IDictionaryDataService _dictionaryDataService; - public WmsInStockService(ISqlSugarRepository repository, IDictionaryDataService dictionaryDataService) + private readonly IUserManager _userManager; + public WmsInStockService(ISqlSugarRepository repository, IDictionaryDataService dictionaryDataService, IUserManager userManager) { _db = repository.AsSugarClient(); _dictionaryDataService = dictionaryDataService; + _userManager = userManager; } /// /// 根据入库申请单ID获取申请单明细信息 @@ -41,9 +47,66 @@ namespace Tnb.WarehouseMgr /// /// 条码打印 /// + /// + ///
{ + ///
BillIds：入库申请单Id列表 + ///
} + /// + /// + /// + /// + [HttpPost] + public async Task BarCodePrint(BarCodePrintInput input) + { + if (input == null) throw new ArgumentNullException("input"); + if (input.BillIds == null || input.BillIds.Count == 0) throw new ArgumentException($"parameter {nameof(input.BillIds)} not be null or zero"); + try + { + await _db.Ado.BeginTranAsync(); + + var inStockDetails = await _db.Queryable().Where(it => input.BillIds.Contains(it.bill_id)).ToListAsync(); + if (inStockDetails?.Count > 0) + { + List wmsTempCodes = new(); + for (int i = 0; i < inStockDetails.Count; i++) + { + WmsTempCode barCode = new(); + barCode.org_id = inStockDetails[i].org_id; + barCode.material_id = inStockDetails[i].material_id; + barCode.material_code = inStockDetails[i].material_code; + var code = $"{inStockDetails[i].material_code}{inStockDetails[i].code_batch}{(i + 1).ToString().PadLeft(4, '0')}"; + barCode.barcode = code; + barCode.code_batch = inStockDetails[i].code_batch; + barCode.codeqty = (int?)(await _db.Queryable().FirstAsync(it => it.id == inStockDetails[i].material_id))?.minpacking; + barCode.unit_id = inStockDetails[i].unit_id; + barCode.is_lock = 0; + barCode.is_end = "0"; + barCode.require_id = input.BillIds[i]; + barCode.require_code = (await _db.Queryable().SingleAsync(it => it.id == input.BillIds[i])).bill_code; + barCode.create_id = _userManager.UserId; + barCode.create_time = DateTime.Now; + wmsTempCodes.Add(barCode); + } + var row = await _db.Insertable(wmsTempCodes).ExecuteCommandAsync(); + if (row > 0) + { + await _db.Updateable().SetColumns(it => new WmsInstockH { print_status = WmsWareHouseConst.BARCODE_PRINT_STATUS_COMPLETE_ID }).Where(it => input.BillIds.Contains(it.id)).ExecuteCommandAsync(); + } + } + + await _db.Ado.CommitTranAsync(); + } + catch (Exception) + { + await _db.Ado.RollbackTranAsync(); + } + } + /// + /// 扫码入库 + /// /// [HttpPost] - public async Task BarCodePrint() + public async Task SacnBarCodeInStock() { } From 155193c4c0a5894fd82a0a39e2f818d8748ba0a7 Mon Sep 17 00:00:00 2001 From: hlb <894797954@qq.com> Date: Thu, 15 Jun 2023 16:26:25 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=93=E5=86=85?= =?UTF-8?q?=E8=BD=AC=E7=A7=BB=E5=92=8C=E9=85=8D=E9=80=81=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{PdaWmsDeliveryService.cs => WmsPDADeliveryService.cs} | 0 .../{PdaWmsTransferService.cs => WmsPDATransferService.cs} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename WarehouseMgr/Tnb.WarehouseMgr/{PdaWmsDeliveryService.cs => WmsPDADeliveryService.cs} (100%) rename WarehouseMgr/Tnb.WarehouseMgr/{PdaWmsTransferService.cs => WmsPDATransferService.cs} (100%) diff --git a/WarehouseMgr/Tnb.WarehouseMgr/PdaWmsDeliveryService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDADeliveryService.cs similarity index 100% rename from WarehouseMgr/Tnb.WarehouseMgr/PdaWmsDeliveryService.cs rename to WarehouseMgr/Tnb.WarehouseMgr/WmsPDADeliveryService.cs diff --git a/WarehouseMgr/Tnb.WarehouseMgr/PdaWmsTransferService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDATransferService.cs similarity index 100% rename from WarehouseMgr/Tnb.WarehouseMgr/PdaWmsTransferService.cs rename to WarehouseMgr/Tnb.WarehouseMgr/WmsPDATransferService.cs From d849a23b896d8ae2acd6163796a31586e238b99a Mon Sep 17 00:00:00 2001 From: hlb <894797954@qq.com> Date: Thu, 15 Jun 2023 16:27:23 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=93=E5=86=85?= =?UTF-8?q?=E8=BD=AC=E7=A7=BB=E5=92=8C=E9=85=8D=E9=80=81=E7=9A=84=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WarehouseMgr/Tnb.WarehouseMgr/WmsPDADeliveryService.cs | 4 ++-- WarehouseMgr/Tnb.WarehouseMgr/WmsPDATransferService.cs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDADeliveryService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDADeliveryService.cs index e09709c2..7fb08b96 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDADeliveryService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDADeliveryService.cs @@ -34,7 +34,7 @@ namespace Tnb.WarehouseMgr [Route("api/[area]/[controller]/[action]")] [OverideVisualDev(ModuleConsts.MODULE_WMSDELIVERYPDA_ID)] [ServiceModule(BizTypeId)] - public class PdaWmsDeliveryService : IOverideVisualDevService, IWmsDeliveryService, IDynamicApiController, ITransient + public class WmsPDADeliveryService : IOverideVisualDevService, IWmsDeliveryService, IDynamicApiController, ITransient { private const string BizTypeId = "26125644258853"; private readonly ISqlSugarClient _db; @@ -45,7 +45,7 @@ namespace Tnb.WarehouseMgr private readonly IBillRullService _billRullService; private readonly IUserManager _userManager; public OverideVisualDevFunc OverideFuncs { get; } = new OverideVisualDevFunc(); - public PdaWmsDeliveryService( + public WmsPDADeliveryService( ISqlSugarRepository repository, IRunService runService, IVisualDevService visualDevService, diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDATransferService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDATransferService.cs index 49bdd59d..1b71e1a0 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDATransferService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDATransferService.cs @@ -31,7 +31,7 @@ namespace Tnb.WarehouseMgr /// [OverideVisualDev(ModuleConsts.MODULE_WMSTRANSFER_ID)] [ServiceModule(BizTypeId)] - public class PdaWmsTransferService : BaseWareHouseService + public class WmsPDATransferService : BaseWareHouseService { private const string BizTypeId = "26585291847957"; private readonly ISqlSugarClient _db; @@ -40,7 +40,7 @@ namespace Tnb.WarehouseMgr private readonly IWareHouseService _wareHouseService; private readonly IBillRullService _billRullService; private readonly IUserManager _userManager; - public PdaWmsTransferService( + public WmsPDATransferService( ISqlSugarRepository repository, IRunService runService, IVisualDevService visualDevService,