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();