From 40900adeb84a469c9a3e3fae334c96ab6bdc25e8 Mon Sep 17 00:00:00 2001 From: alex Date: Tue, 20 Jun 2023 16:26:25 +0800 Subject: [PATCH 1/9] 1 --- .../WmsCarryReplaceService.cs | 175 ------------------ .../Tnb.WarehouseMgr/WmsCarryService.cs | 2 +- .../Tnb.WarehouseMgr/WmsPDAFeedingService.cs | 2 +- 3 files changed, 2 insertions(+), 177 deletions(-) delete mode 100644 WarehouseMgr/Tnb.WarehouseMgr/WmsCarryReplaceService.cs diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryReplaceService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryReplaceService.cs deleted file mode 100644 index bd3368d2..00000000 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryReplaceService.cs +++ /dev/null @@ -1,175 +0,0 @@ -using JNPF.Common.Contracts; -using JNPF.Common.Core.Manager; -using JNPF.Common.Dtos.VisualDev; -using JNPF.Common.Enums; -using JNPF.Common.Security; -using JNPF.DependencyInjection; -using JNPF.DynamicApiController; -using JNPF.FriendlyException; -using JNPF.Logging; -using JNPF.Systems.Interfaces.System; -using JNPF.VisualDev; -using Mapster; -using Microsoft.AspNetCore.Mvc; -using SqlSugar; -using Tnb.Common.Utils; -using Tnb.WarehouseMgr.Entities; -using Tnb.WarehouseMgr.Entities.Consts; -using Tnb.WarehouseMgr.Entities.Dto; -using Tnb.WarehouseMgr.Entities.Enums; -using Tnb.WarehouseMgr.Interfaces; - -namespace Tnb.WarehouseMgr -{ - /// - /// 载具服务 - /// - [OverideVisualDev(ModuleId)] - public class WmsCarryReplaceService : BaseWareHouseService, IWmsCarryService - { - private const string ModuleId = "26188532491557"; - private readonly ISqlSugarClient _db; - private readonly IUserManager _userManager; - private readonly IBillRullService _billRullService; - public OverideVisualDevFunc OverideFuncs { get; } = new OverideVisualDevFunc(); - public WmsCarryReplaceService(ISqlSugarRepository repository, IUserManager userManager, IBillRullService billRullService) - { - _db = repository.AsSugarClient(); - _userManager = userManager; - _billRullService = billRullService; - OverideFuncs.CreateAsync = CarryReplace; - } - - /// - /// 更换载具 - /// - /// - /// 输入参数: - ///
{ - ///
old_carry_id:老载具id - ///
new_carry_id：新载具ID - ///
} - /// - /// - /// - [HttpPost] - public async Task CarryReplace(VisualDevModelDataCrInput input) - { - var isOk = false; - try - { - await _db.Ado.BeginTranAsync(); - var oldCarryId = input.data.ContainsKey("carry_id") ? input.data["carry_id"]?.ToString() : ""; - var newCarryId = input.data.ContainsKey("newcarry_id") ? input.data["newcarry_id"]?.ToString() : ""; - var oldCarry = await _db.Queryable().FirstAsync(it => it.id == oldCarryId); - var newCarry = await _db.Queryable().FirstAsync(it => it.id == newCarryId); - if (oldCarry != null && newCarry != null) - { - ExChangeCarryInput carryInput = new() { old_carry_id = oldCarry.id, new_carry_id = newCarry.id }; - isOk = await _updateSubCarry(carryInput); - isOk = await _updateSubCarry(carryInput); - isOk = await _updateSubCarry(carryInput); - - newCarry.status = oldCarry.status; - newCarry.carry_status = oldCarry.carry_status; - newCarry.location_id = oldCarry.location_id; - newCarry.location_code = oldCarry.location_code; - newCarry.is_lock = oldCarry.is_lock; - newCarry.out_status = oldCarry.out_status; - newCarry.is_check = oldCarry.is_check; - newCarry.bale_num = oldCarry.bale_num; - newCarry.collocation_scheme_id = oldCarry.collocation_scheme_id; - newCarry.collocation_scheme_code = oldCarry.collocation_scheme_code; - newCarry.source_id = oldCarry.source_id; - newCarry.source_code = oldCarry.source_code; - newCarry.create_id = _userManager.UserId; - newCarry.create_time = DateTime.Now; - var row = await _db.Updateable(newCarry).ExecuteCommandAsync(); - WmsCarryReplaceH wmsCarryReplaceH = oldCarry.Adapt(); - wmsCarryReplaceH.id = SnowflakeIdHelper.NextId(); - wmsCarryReplaceH.org_id = oldCarry.org_id; - wmsCarryReplaceH.bill_code = await _billRullService.GetBillNumber(WmsCarryConst.WMS_CARRY_REPLACE_ENCODE); - wmsCarryReplaceH.carry_id = oldCarry.id; - wmsCarryReplaceH.carry_code = oldCarry.carry_code; - wmsCarryReplaceH.newcarry_id = newCarry.id; - wmsCarryReplaceH.newcarry_code = newCarry.carry_code; - row = await _db.Insertable(wmsCarryReplaceH).ExecuteCommandAsync(); - row = await UpdateNullCarry(oldCarry); - isOk = (row > 0); - if (!isOk) throw Oops.Oh(ErrorCode.COM1001); - } - else - { - if (oldCarry == null) - { - throw new AppFriendlyException("没有可用的旧载具", 500); - } - if (newCarry == null) - { - throw new AppFriendlyException("没有可用的新载具", 500); - } - - } - await _db.Ado.CommitTranAsync(); - } - catch (Exception ex) - { - Log.Error("载具更换失败", ex); - await _db.Ado.RollbackTranAsync(); - throw; - } - return isOk; - } - - public async Task UpdateNullCarry(WmsCarryH carryObj) - { - var row = -1; - try - { - carryObj.status = 0; - carryObj.carry_status = "0"; - carryObj.location_id = null; - carryObj.location_code = null; - carryObj.out_status = "0"; - carryObj.is_check = 0; - carryObj.status = 1; - carryObj.bale_num = null; - carryObj.collocation_scheme_id = null; - carryObj.collocation_scheme_code = null; - carryObj.source_id = null; - carryObj.source_code = null; - row = await _db.Updateable(carryObj).ExecuteCommandAsync(); - } - catch (Exception ex) - { - - } - return row; - } - - private async Task _updateSubCarry(ExChangeCarryInput input) where T : BaseEntity, IWmsCarryEntity, new() - { - var row = -1; - var items = await _db.Queryable().Where(it => it.carry_id == input.old_carry_id).ToListAsync(); - if (items?.Count > 0) - { - List newItems = DeepCopyHelper.DeepCopyList(items); - if (newItems?.Count > 0) - { - newItems.ForEach(x => - { - x.id = SnowflakeIdHelper.NextId(); - x.carry_id = input.new_carry_id; - - }); - row = await _db.Insertable(newItems).ExecuteCommandAsync(); - } - if (row > 0) - { - row = await _db.Deleteable(items).ExecuteCommandAsync(); - } - } - return (row > 0); - } - } -} \ No newline at end of file diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryService.cs index 7e065bb3..6f62ca3e 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryService.cs @@ -27,7 +27,7 @@ namespace Tnb.WarehouseMgr [OverideVisualDev(ModuleId)] public class WmsCarryService : BaseWareHouseService, IWmsCarryService { - private const string ModuleId = "26188532491557"; + private const string ModuleId = "26188532491557";//26188532491557 private readonly ISqlSugarClient _db; private readonly IUserManager _userManager; private readonly IBillRullService _billRullService; diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAFeedingService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAFeedingService.cs index eb6ecc23..c5d7d070 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAFeedingService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAFeedingService.cs @@ -25,7 +25,7 @@ namespace Tnb.WarehouseMgr /// /// 载具服务 /// - [OverideVisualDev(ModuleId)] + //[OverideVisualDev(ModuleId)] public class WmsPDAFeedingService : BaseWareHouseService, IWmsCarryService, IWmsFeedingService { private const string ModuleId = "26188532491557"; From d20bb1d0f525547d920a3961838a4edb8bc080f8 Mon Sep 17 00:00:00 2001 From: FanLian Date: Tue, 20 Jun 2023 16:33:35 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E6=9B=B4=E6=8D=A2moduleID?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Tnb.WarehouseMgr.Entities/Consts/ModuleConsts.cs | 7 +++++++ WarehouseMgr/Tnb.WarehouseMgr/WmsCarryUnbindService.cs | 2 +- WarehouseMgr/Tnb.WarehouseMgr/WmsPDAFeedingService.cs | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/ModuleConsts.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/ModuleConsts.cs index f19023ae..3bb1aef3 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/ModuleConsts.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/ModuleConsts.cs @@ -94,6 +94,13 @@ public class ModuleConsts /// public const string MODULE_WMSINSTOCK_ID = "26191326300453"; /// + /// 模块标识-载具解绑 + public const string MODULE_WMSCARRYUNBIND_ID = "26479624280613"; + /// + /// 模块标识-载具绑定 + /// + public const string MODULE_WMSCARRYBIND_ID = "26479495084837"; + /// /// 模块标识-载具更换 /// public const string MODULE_WMSCARRYREPLACE_ID = "26188532491557"; diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryUnbindService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryUnbindService.cs index 5ad45372..74bd890b 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryUnbindService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryUnbindService.cs @@ -29,7 +29,7 @@ namespace Tnb.WarehouseMgr /// /// 载具解绑 /// - [OverideVisualDev(ModuleConsts.MODULE_WMSCARRYREPLACE_ID)] + [OverideVisualDev(ModuleConsts.MODULE_WMSCARRYUNBIND_ID)] public class WmsCarryUnbindService : BaseWareHouseService { private readonly ISqlSugarClient _db; diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAFeedingService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAFeedingService.cs index c5d7d070..308843c9 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAFeedingService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAFeedingService.cs @@ -28,7 +28,7 @@ namespace Tnb.WarehouseMgr //[OverideVisualDev(ModuleId)] public class WmsPDAFeedingService : BaseWareHouseService, IWmsCarryService, IWmsFeedingService { - private const string ModuleId = "26188532491557"; + private const string ModuleId = "26496913096981"; private readonly ISqlSugarClient _db; private readonly IUserManager _userManager; private readonly IBillRullService _billRullService; From cb1465cac8d329541c377839214c431173e1c1e1 Mon Sep 17 00:00:00 2001 From: FanLian Date: Tue, 20 Jun 2023 16:33:50 +0800 Subject: [PATCH 3/9] 1 --- WarehouseMgr/Tnb.WarehouseMgr/WmsCarryBindService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryBindService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryBindService.cs index b208f687..f853b92c 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryBindService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryBindService.cs @@ -29,7 +29,7 @@ namespace Tnb.WarehouseMgr /// /// 载具绑定 /// - [OverideVisualDev(ModuleConsts.MODULE_WMSCARRYREPLACE_ID)] + [OverideVisualDev(ModuleConsts.MODULE_WMSCARRYBIND_ID)] public class WmsCarryBindService : BaseWareHouseService { private readonly ISqlSugarClient _db; From 88eacad38ad2b7f3e84e2d7540612965910aae3f Mon Sep 17 00:00:00 2001 From: alex Date: Tue, 20 Jun 2023 16:59:27 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E8=BD=BD=E5=85=B7=E6=9B=B4=E6=8D=A2?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=A4=B1=E6=95=88=E9=97=AE=E9=A2=98=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Consts/ModuleConsts.cs | 121 ------------------ .../Consts/ModuleConsts.cs | 2 +- .../Tnb.WarehouseMgr/Tnb.WarehouseMgr.csproj | 8 ++ .../Tnb.WarehouseMgr/WmsBindService.cs | 3 +- .../Tnb.WarehouseMgr/WmsCarryService.cs | 7 +- .../WmsPDACarryReplaceService.cs | 2 - .../Tnb.WarehouseMgr/WmsPDAFeedingService.cs | 1 - 7 files changed, 12 insertions(+), 132 deletions(-) diff --git a/PerMgr/Tnb.PerMgr.Entities/Consts/ModuleConsts.cs b/PerMgr/Tnb.PerMgr.Entities/Consts/ModuleConsts.cs index d2adc2f9..bbe62db9 100644 --- a/PerMgr/Tnb.PerMgr.Entities/Consts/ModuleConsts.cs +++ b/PerMgr/Tnb.PerMgr.Entities/Consts/ModuleConsts.cs @@ -4,125 +4,4 @@ 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.Entities/Consts/ModuleConsts.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/ModuleConsts.cs index 3bb1aef3..1a1a144f 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/ModuleConsts.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/ModuleConsts.cs @@ -103,7 +103,7 @@ public class ModuleConsts /// /// 模块标识-载具更换 /// - public const string MODULE_WMSCARRYREPLACE_ID = "26188532491557"; + public const string MODULE_WMSCARRYREPLACE_ID = "26188532491557";//26188532491557 /// /// 模块标识-齐套分拣 /// diff --git a/WarehouseMgr/Tnb.WarehouseMgr/Tnb.WarehouseMgr.csproj b/WarehouseMgr/Tnb.WarehouseMgr/Tnb.WarehouseMgr.csproj index b70c9cce..47e61861 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/Tnb.WarehouseMgr.csproj +++ b/WarehouseMgr/Tnb.WarehouseMgr/Tnb.WarehouseMgr.csproj @@ -8,6 +8,14 @@ True + + + + + + + + diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsBindService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsBindService.cs index abd254eb..abfb50a2 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsBindService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsBindService.cs @@ -31,7 +31,6 @@ namespace Tnb.WarehouseMgr private readonly ISqlSugarClient _db; private readonly IUserManager _userManager; private readonly IBillRullService _billRullService; - public OverideVisualDevFunc OverideFuncs { get; } = new OverideVisualDevFunc(); public WmsBindService(ISqlSugarRepository repository, IUserManager userManager, IBillRullService billRullService) { _db = repository.AsSugarClient(); @@ -52,7 +51,7 @@ namespace Tnb.WarehouseMgr /// /// /// - public async Task WmsBind(VisualDevModelDataCrInput input) + private async Task WmsBind(VisualDevModelDataCrInput input) { var isOk = false; try diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryService.cs index 6f62ca3e..6223716d 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryService.cs @@ -24,14 +24,12 @@ namespace Tnb.WarehouseMgr /// /// 载具服务 /// - [OverideVisualDev(ModuleId)] + [OverideVisualDev(ModuleConsts.MODULE_WMSCARRYREPLACE_ID)] public class WmsCarryService : BaseWareHouseService, IWmsCarryService { - private const string ModuleId = "26188532491557";//26188532491557 private readonly ISqlSugarClient _db; private readonly IUserManager _userManager; private readonly IBillRullService _billRullService; - public OverideVisualDevFunc OverideFuncs { get; } = new OverideVisualDevFunc(); public WmsCarryService(ISqlSugarRepository repository, IUserManager userManager, IBillRullService billRullService) { _db = repository.AsSugarClient(); @@ -52,8 +50,7 @@ namespace Tnb.WarehouseMgr /// /// /// - [HttpPost] - public async Task ExchangeCarry(VisualDevModelDataCrInput input) + private async Task ExchangeCarry(VisualDevModelDataCrInput input) { var isOk = false; try diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryReplaceService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryReplaceService.cs index 1a3c8042..f1808cc5 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryReplaceService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryReplaceService.cs @@ -28,11 +28,9 @@ namespace Tnb.WarehouseMgr [OverideVisualDev(ModuleConsts.MODULE_WMSCARRYREPLACEPDA_ID)] public class WmsPDACarryReplaceService : BaseWareHouseService, IWmsCarryService, IPdaStroage { - //private const string ModuleId = "26188532491557"; private readonly ISqlSugarClient _db; private readonly IUserManager _userManager; private readonly IBillRullService _billRullService; - public OverideVisualDevFunc OverideFuncs { get; } = new OverideVisualDevFunc(); public WmsPDACarryReplaceService(ISqlSugarRepository repository, IUserManager userManager, IBillRullService billRullService) { _db = repository.AsSugarClient(); diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAFeedingService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAFeedingService.cs index 308843c9..0d61614c 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAFeedingService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAFeedingService.cs @@ -34,7 +34,6 @@ namespace Tnb.WarehouseMgr private readonly IBillRullService _billRullService; private readonly WmsCarryService _wmsCarryService; private static Dictionary dicMaterial = new Dictionary(); - public OverideVisualDevFunc OverideFuncs { get; } = new OverideVisualDevFunc(); public WmsPDAFeedingService(ISqlSugarRepository repository, IUserManager userManager, IBillRullService billRullService,WmsCarryService wmsCarryService) { _db = repository.AsSugarClient(); From f8fbee4b076a5394cff5946077fb6223ae786d75 Mon Sep 17 00:00:00 2001 From: alex Date: Tue, 20 Jun 2023 16:59:40 +0800 Subject: [PATCH 5/9] 1 --- WarehouseMgr/Tnb.WarehouseMgr/Tnb.WarehouseMgr.csproj | 8 -------- .../Tnb.WarehouseMgr/WmsPDACarryReplaceService.cs | 4 ++-- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/WarehouseMgr/Tnb.WarehouseMgr/Tnb.WarehouseMgr.csproj b/WarehouseMgr/Tnb.WarehouseMgr/Tnb.WarehouseMgr.csproj index 47e61861..b70c9cce 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/Tnb.WarehouseMgr.csproj +++ b/WarehouseMgr/Tnb.WarehouseMgr/Tnb.WarehouseMgr.csproj @@ -8,14 +8,6 @@ True - - - - - - - - diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryReplaceService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryReplaceService.cs index f1808cc5..b7ae0e01 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryReplaceService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryReplaceService.cs @@ -51,8 +51,8 @@ namespace Tnb.WarehouseMgr /// /// /// - [HttpPost] - public async Task PDACarryReplace(VisualDevModelDataCrInput input) + + private async Task PDACarryReplace(VisualDevModelDataCrInput input) { var isOk = false; try From 38cfe56f107f724fb74e7b7580ea308ddf9b4567 Mon Sep 17 00:00:00 2001 From: alex Date: Tue, 20 Jun 2023 17:27:02 +0800 Subject: [PATCH 6/9] 1 --- WarehouseMgr/Tnb.WarehouseMgr/WmsPDAFeedingService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAFeedingService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAFeedingService.cs index 0d61614c..1c57c58e 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAFeedingService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAFeedingService.cs @@ -25,7 +25,7 @@ namespace Tnb.WarehouseMgr /// /// 载具服务 /// - //[OverideVisualDev(ModuleId)] + [OverideVisualDev(ModuleId)] public class WmsPDAFeedingService : BaseWareHouseService, IWmsCarryService, IWmsFeedingService { private const string ModuleId = "26496913096981"; From ee2d6f7c6fd7258e49ca9ecde41386589d4aeaec Mon Sep 17 00:00:00 2001 From: FanLian Date: Tue, 20 Jun 2023 17:29:27 +0800 Subject: [PATCH 7/9] 1 --- WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/ModuleConsts.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/ModuleConsts.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/ModuleConsts.cs index 1a1a144f..82585ecd 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/ModuleConsts.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/ModuleConsts.cs @@ -95,11 +95,11 @@ public class ModuleConsts public const string MODULE_WMSINSTOCK_ID = "26191326300453"; /// /// 模块标识-载具解绑 - public const string MODULE_WMSCARRYUNBIND_ID = "26479624280613"; + public const string MODULE_WMSCARRYUNBIND_ID = "26106270092325"; /// /// 模块标识-载具绑定 /// - public const string MODULE_WMSCARRYBIND_ID = "26479495084837"; + public const string MODULE_WMSCARRYBIND_ID = "26105163614501"; /// /// 模块标识-载具更换 /// From 0968abf3f0be2198e3d6902eb79920db35aa2830 Mon Sep 17 00:00:00 2001 From: FanLian Date: Tue, 20 Jun 2023 17:34:40 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E5=A2=9E=E5=8A=A0PDA=E8=BD=BD=E5=85=B7?= =?UTF-8?q?=E7=BB=91=E5=AE=9A=E5=92=8C=E8=A7=A3=E7=BB=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WmsPDACarryBindService.cs | 132 ++++++++++++++++++ .../WmsPDACarryUnbindService .cs | 108 ++++++++++++++ 2 files changed, 240 insertions(+) create mode 100644 WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryBindService.cs create mode 100644 WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryUnbindService .cs diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryBindService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryBindService.cs new file mode 100644 index 00000000..983dbb47 --- /dev/null +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryBindService.cs @@ -0,0 +1,132 @@ +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 NPOI.SS.Formula; +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_WMSCARRYBINDPDA_ID)] + public class WmsPDACarryBindService : BaseWareHouseService + { + private readonly ISqlSugarClient _db; + private readonly IRunService _runService; + private readonly IVisualDevService _visualDevService; + private readonly IUserManager _userManager; + private readonly IBillRullService _billRullService; + public WmsPDACarryBindService( + ISqlSugarRepository repository, + IRunService runService, + IVisualDevService visualDevService, + IUserManager userManager, + IBillRullService billRullService) + { + _db = repository.AsSugarClient(); + _runService = runService; + _visualDevService = visualDevService; + _userManager = userManager; + _billRullService = billRullService; + OverideFuncs.CreateAsync = PDACarryBind; + } + + private async Task PDACarryBind(VisualDevModelDataCrInput input) + { + var isOk = false; + try + { + await _db.Ado.BeginTranAsync(); + + VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleConsts.MODULE_WMSCARRYMOOUTSTK_ID, true); + await _runService.Create(templateEntity, input); + + if (input == null) throw new ArgumentNullException(nameof(input)); + var carryId = input.data.ContainsKey("carry_id") ? input.data["carry_id"]?.ToString() : ""; + var subCarryId = input.data.ContainsKey("newcarry_id") ? input.data["newcarry_id"]?.ToString() : ""; + var carry = await _db.Queryable().SingleAsync(it => it.id == carryId); + var subCarry = await _db.Queryable().SingleAsync(it => it.id == subCarryId); + WmsCarrybindH wmsCarrybindH = carry.Adapt(); + if (carry != null && subCarry != null) + { + wmsCarrybindH.id = SnowflakeIdHelper.NextId(); + wmsCarrybindH.org_id = carry.org_id; + wmsCarrybindH.carry_id = carry.id; + wmsCarrybindH.membercarry_id = subCarry.id; + wmsCarrybindH.membercarry_code = subCarry.carry_code; + wmsCarrybindH.loc = input.data[nameof(WmsCarrybindH.loc)].ParseToInt(1); + wmsCarrybindH.create_id = _userManager.UserId; + wmsCarrybindH.create_time = DateTime.Now; + var row = await _db.Insertable(wmsCarrybindH).ExecuteCommandAsync(); + carry.carry_status = "1"; + row = await _db.Updateable(carry).ExecuteCommandAsync(); + subCarry.carry_status = "1"; + row = await _db.Updateable(subCarry).ExecuteCommandAsync(); + var items = await _db.Queryable().Where(it => it.carry_id == subCarryId).ToListAsync(); + for (int i = 0; i < items.Count; i++) + { + WmsCarrybindCode wmsCarrybindCode = new(); + wmsCarrybindCode.id = SnowflakeIdHelper.NextId(); + wmsCarrybindCode.org_id = subCarry.id; + wmsCarrybindCode.carrybind_id = wmsCarrybindH.id; + wmsCarrybindCode.material_id = items[i].material_id; + wmsCarrybindCode.material_code = items[i].material_code; + wmsCarrybindCode.barcode = items[i].barcode; + wmsCarrybindCode.code_batch = items[i].code_batch; + wmsCarrybindCode.codeqty = items[i].codeqty; + wmsCarrybindCode.membercarry_id = subCarry.id; + wmsCarrybindCode.membercarry_code = subCarry.carry_code; + wmsCarrybindCode.unit_id = items[i].unit_id; + wmsCarrybindCode.unit_code = items[i].unit_code; + wmsCarrybindCode.create_id = _userManager.UserId; + wmsCarrybindCode.create_time = DateTime.Now; + row = await _db.Insertable(wmsCarrybindCode).ExecuteCommandAsync(); + } + isOk = (row > 0); + if (!isOk) throw Oops.Oh(ErrorCode.COM1001); + } + else + { + if (carry == null || subCarry == null) + { + throw new AppFriendlyException("没有可用的主载具", 500); + } + } + 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 WmsCarryReplaceH { status = input.bizTypeId }).Where(it => it.id == input.requireId).ExecuteCommandHasChangeAsync(); + if (!isOk) throw Oops.Oh(ErrorCode.COM1001); + }*/ + } +} diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryUnbindService .cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryUnbindService .cs new file mode 100644 index 00000000..d1128ff6 --- /dev/null +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryUnbindService .cs @@ -0,0 +1,108 @@ +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 NPOI.SS.Formula; +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_WMSCARRYUNBINDPDA_ID)] + public class WmsPDACarryUnbindService : BaseWareHouseService + { + private readonly ISqlSugarClient _db; + private readonly IRunService _runService; + private readonly IVisualDevService _visualDevService; + private readonly IUserManager _userManager; + private readonly IWareHouseService _wareHouseService; + public WmsPDACarryUnbindService( + ISqlSugarRepository repository, + IRunService runService, + IVisualDevService visualDevService, + IWareHouseService wareHouseService, + IUserManager userManager) + { + _db = repository.AsSugarClient(); + _runService = runService; + _visualDevService = visualDevService; + _userManager = userManager; + _wareHouseService = wareHouseService; + OverideFuncs.CreateAsync = PDACarryUnbind; + } + private async Task PDACarryUnbind(VisualDevModelDataCrInput input) + { + var isOk = false; + try + { + await _db.Ado.BeginTranAsync(); + + VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(ModuleConsts.MODULE_WMSCARRYMOOUTSTK_ID, true); + await _runService.Create(templateEntity, input); + + if (input == null) throw new ArgumentNullException(nameof(input)); + var carryId = input.data.ContainsKey("carry_id") ? input.data["carry_id"]?.ToString() : ""; + var subCarryId = input.data.ContainsKey("newcarry_id") ? input.data["newcarry_id"]?.ToString() : ""; + var carry = await _db.Queryable().FirstAsync(it => it.id == carryId); + var subCarry = await _db.Queryable().FirstAsync(it => it.id == subCarryId); + //WmsCarryunbindH wmsCarryUnbindH = carry.Adapt(); + if (carry != null && subCarry != null) + { + var row = await _db.Deleteable().Where(it => it.carry_id == subCarry.id).ExecuteCommandAsync(); + carry.carry_status = "0"; + row = await _db.Updateable(carry).ExecuteCommandAsync(); + subCarry.carry_status = "0"; + row = await _db.Updateable(subCarry).ExecuteCommandAsync(); + isOk = (row > 0); + if (!isOk) throw Oops.Oh(ErrorCode.COM1001); + } + else + { + if (carry == null) + { + throw new AppFriendlyException("没有可用的主载具", 500); + } + if (subCarry == null) + { + throw new AppFriendlyException("没有可用的子载具", 500); + } + } + + 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 WmsCarryReplaceH { status = input.bizTypeId }).Where(it => it.id == input.requireId).ExecuteCommandHasChangeAsync(); + if (!isOk) throw Oops.Oh(ErrorCode.COM1001); + }*/ + } +} From ead7fd138581482ec872b12b5c00f17582a673dd Mon Sep 17 00:00:00 2001 From: zhoukeda <1315948824@qq.com> Date: Tue, 20 Jun 2023 17:35:18 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E5=AD=90=E5=B7=A5?= =?UTF-8?q?=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Entity/BasMaterial.cs | 5 +++ .../IBasMaterialService.cs | 13 ++++++++ BasicData/Tnb.BasicData/BasMaterialService.cs | 32 +++++++++++++++++++ 3 files changed, 50 insertions(+) diff --git a/BasicData/Tnb.BasicData.Entities/Entity/BasMaterial.cs b/BasicData/Tnb.BasicData.Entities/Entity/BasMaterial.cs index 633cc417..b9147f91 100644 --- a/BasicData/Tnb.BasicData.Entities/Entity/BasMaterial.cs +++ b/BasicData/Tnb.BasicData.Entities/Entity/BasMaterial.cs @@ -248,5 +248,10 @@ public partial class BasMaterial : BaseEntity /// 是否包含入库数 /// public int? is_contain_into_num { get; set; } + + /// + /// 是否创建子工单 + /// + public string? is_create_sub_work_order { get; set; } } diff --git a/BasicData/Tnb.BasicData.Interfaces/IBasMaterialService.cs b/BasicData/Tnb.BasicData.Interfaces/IBasMaterialService.cs index c27b3596..53f530fd 100644 --- a/BasicData/Tnb.BasicData.Interfaces/IBasMaterialService.cs +++ b/BasicData/Tnb.BasicData.Interfaces/IBasMaterialService.cs @@ -4,6 +4,19 @@ namespace Tnb.BasicData.Interfaces { public interface IBasMaterialService { + /// + /// 获取本物料清单及其所有子集物料信息 + /// + /// + /// public Task GetMaterialSelectInfo(MaterialSelectQueryInput queryInput); + + + /// + /// 获取可创建子工单的物料 + /// + /// + /// + public Task GetCanCreateSubWorkOrderMaterial(MaterialSelectQueryInput queryInput); } } \ No newline at end of file diff --git a/BasicData/Tnb.BasicData/BasMaterialService.cs b/BasicData/Tnb.BasicData/BasMaterialService.cs index 16716cc5..f5ba3c65 100644 --- a/BasicData/Tnb.BasicData/BasMaterialService.cs +++ b/BasicData/Tnb.BasicData/BasMaterialService.cs @@ -128,6 +128,38 @@ namespace Tnb.BasicData } } + [HttpPost] + public async Task GetCanCreateSubWorkOrderMaterial(MaterialSelectQueryInput queryInput) + { + var db = _repository.AsSugarClient(); + if (!string.IsNullOrEmpty(queryInput.ebom_id)) + { + List ids = await GetAllChildrenMaterialId(queryInput.ebom_id,0); + var result = await db.Queryable() + .LeftJoin((a, b) => b.EnCode == DictConst.MeasurementUnit && b.DeleteMark == null) + .LeftJoin((a, b, c) => c.DictionaryTypeId == b.Id && a.unit_id == c.EnCode) + .WhereIF(!string.IsNullOrEmpty(queryInput.material_info), (a, b, c) => a.code.Contains(queryInput.material_info) || a.name.Contains(queryInput.material_info)) + .WhereIF(!string.IsNullOrEmpty(queryInput.ebom_id), (a, b, c) => ids.Contains(a.id)) + .Where((a,b,c)=>a.is_create_sub_work_order=="1") + .Select((a, b, c) => new MaterialSelectOutput() + { + id = a.id, + code = a.code, + name = a.name, + descrip = a.descrip, + unit_id = a.unit_id, + unit_name = c.FullName, + }).ToPagedListAsync(queryInput.currentPage, queryInput.pageSize); + + return PageResult.SqlSugarPageResult(result); + + } + else + { + return PageResult.SqlSugarPageResult(new SqlSugarPagedList()); + } + } + /// /// 获取物料清单下所子集物料id ///