wenkai.chen/tnb.server
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

载具更换接口失效问题调整

Browse Source
This commit is contained in:
alex
2023-06-20 16:59:27 +08:00
parent cb1465cac8
commit 88eacad38a
7 changed files with 12 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

121
PerMgr/Tnb.PerMgr.Entities/Consts/ModuleConsts.cs
View File

@@ -4,125 +4,4 @@ public class ModuleConsts
{
public const string Tag = "PerMgr";
public const string Area = "per";
/// <summary>
/// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-PDA<44>쳣ȡ<ECB3A3><C8A1>
/// </summary>
public const string MODULE_WMSEXCEPTIONCANCELPDA_ID = "26631250691605";
/// <summary>
/// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-PDA<44>쳣<EFBFBD><ECB3A3><EFBFBD><EFBFBD>ִ<EFBFBD><D6B4>
/// </summary>
public const string MODULE_WMSEXCPTIONREEXCUTEPDA_ID = "26631184673813";
/// <summary>
/// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-PDA<44>쳣<EFBFBD><ECB3A3><EFBFBD><EFBFBD>
/// </summary>
public const string MODULE_WMSEXCPTIONCOMPLETEPDA_ID = "26497241038869";
/// <summary>
/// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-PDAͶ<41>ϲ<EFBFBD><CFB2><EFBFBD>
/// </summary>
public const string MODULE_WMSFEEDINGRECORDPDA_ID = "26496913096981";
/// <summary>
/// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-PDA<44>󶨲<EFBFBD><F3B6A8B2><EFBFBD>
/// </summary>
public const string MODULE_WMSBINDINGPDA_ID = "26496560237333";
/// <summary>
/// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-PDA<44>ؾ߽<D8BE><DFBD><EFBFBD>
/// </summary>
public const string MODULE_WMSCARRYUNBINDPDA_ID = "26479624280613";
/// <summary>
/// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-PDA<44>ؾ߰<D8BE><DFB0><EFBFBD>
/// </summary>
public const string MODULE_WMSCARRYBINDPDA_ID = "26479495084837";
/// <summary>
/// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-PDA<44>ؾ<EFBFBD><D8BE>Ƴ<EFBFBD>
/// </summary>
public const string MODULE_WMSCARRYMOOUTSTKPDA_ID = "26479437840677";
/// <summary>
/// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-PDA<44>ؾ<EFBFBD><D8BE><EFBFBD><EFBFBD><EFBFBD>
/// </summary>
public const string MODULE_WMSMOVEINSTKPDA_ID = "26476127634469";
/// <summary>
/// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-PDA<44>ؾ߸<D8BE><DFB8><EFBFBD>
/// </summary>
public const string MODULE_WMSCARRYREPLACEPDA_ID = "26475867493157";
/// <summary>
/// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-PDA<44><41><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
/// </summary>
public const string MODULE_WMSDELIVERYPDA_ID = "26475604135973";
/// <summary>
/// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-PDA<44><41><EFBFBD><EFBFBD>ת<EFBFBD><D7AA>
/// </summary>
public const string MODULE_WMSTRANSFERPDA_ID = "26475492865317";
/// <summary>
/// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-PDA<44>Ĵ<EFBFBD><C4B4><EFBFBD><EFBFBD><EFBFBD>
/// </summary>
public const string MODULE_WMSINBALEINPDA_ID = "26475412782629";
/// <summary>
/// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-PDA<44>Ĵ<EFBFBD><C4B4><EFBFBD><EFBFBD><EFBFBD>
/// </summary>
public const string MODULE_WMSINBALEINSTKPDA_ID = "26474954845989";
/// <summary>
/// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-PDA<44><41><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
/// </summary>
public const string MODULE_WMSKITTINGINSTKPDA_ID = "26474190687781";
/// <summary>
/// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-PDAһ<41><D2BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
/// </summary>
public const string MODULE_WMSINSTOCKPDA_ID = "26458832529445";
/// <summary>
/// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-<2D>Ĵ<EFBFBD><C4B4><EFBFBD><EFBFBD><EFBFBD>
/// </summary>
public const string MODULE_WMSOUTBALE_ID = "26192638001445";
/// <summary>
/// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-<2D>Ĵ<EFBFBD><C4B4><EFBFBD><EFBFBD><EFBFBD>
/// </summary>
public const string MODULE_WMSINBALE_ID = "26192480520485";
/// <summary>
/// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-<2D><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
/// </summary>
public const string MODULE_WMSOUTSTOCK_ID = "26191983650597";
/// <summary>
/// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-<2D><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
/// </summary>
public const string MODULE_WMSINSTOCK_ID = "26191326300453";
/// <summary>
/// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-<2D>ؾ߸<D8BE><DFB8><EFBFBD>
/// </summary>
public const string MODULE_WMSCARRYREPLACE_ID = "26188532491557";
/// <summary>
/// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-<2D><><EFBFBD>׷ּ<D7B7>
/// </summary>
public const string MODULE_WMSSETSORTING_ID = "26172520979237";
/// <summary>
/// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-<2D><><EFBFBD>׳<EFBFBD><D7B3><EFBFBD>
/// </summary>
public const string MODULE_WMSKITTINGOUTSTK_ID = "26169701736741";
/// <summary>
/// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-<2D><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
/// </summary>
public const string MODULE_WMSKITTINGINSTK_ID = "26166785871909";
/// <summary>
/// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-<2D><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
/// </summary>
public const string MODULE_WMSDELIVERY_ID = "26126388337189";
/// <summary>
/// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-<2D><><EFBFBD><EFBFBD>ת<EFBFBD><D7AA>
/// </summary>
public const string MODULE_WMSTRANSFER_ID = "26125750270757";
/// <summary>
/// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-<2D>ؾ<EFBFBD><D8BE>Ƴ<EFBFBD>
/// </summary>
public const string MODULE_WMSCARRYMOOUTSTK_ID = "26123262586661";
/// <summary>
/// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-<2D><><EFBFBD>ؾ߳<D8BE><DFB3><EFBFBD>
/// </summary>
public const string MODULE_WMSEPTYOUTSTK_ID = "26122798979365";
/// <summary>
/// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-<2D>ؾ<EFBFBD><D8BE><EFBFBD><EFBFBD><EFBFBD>
/// </summary>
public const string MODULE_CARRYMOVEINSTOCK_ID = "26122102481957";
/// <summary>
/// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-<2D><><EFBFBD>ؾ<EFBFBD><D8BE><EFBFBD><EFBFBD><EFBFBD>
/// </summary>
public const string MODULE_WMSEMPTYINSTOCK_ID = "26120915344165";
}

2
WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/ModuleConsts.cs
View File

@@ -103,7 +103,7 @@ public class ModuleConsts
/// <summary>
/// 模块标识-载具更换
/// </summary>
public const string MODULE_WMSCARRYREPLACE_ID = "26188532491557";
public const string MODULE_WMSCARRYREPLACE_ID = "26188532491557";//26188532491557
/// <summary>
/// 模块标识-齐套分拣
/// </summary>

8
WarehouseMgr/Tnb.WarehouseMgr/Tnb.WarehouseMgr.csproj
View File

@@ -8,6 +8,14 @@
<GenerateDocumentationFile>True</GenerateDocumentationFile>
</PropertyGroup>
<ItemGroup>
<Compile Remove="WmsBindService.cs" />
<Compile Remove="WmsCarryBindService.cs" />
<Compile Remove="WmsCarryUnbindService.cs" />
<Compile Remove="WmsPDACarryReplaceService.cs" />
<Compile Remove="WmsPDAFeedingService.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\BasicData\Tnb.BasicData.Interfaces\Tnb.BasicData.Interfaces.csproj" />
<ProjectReference Include="..\..\visualdev\Tnb.VisualDev.Engine\Tnb.VisualDev.Engine.csproj" />

3
WarehouseMgr/Tnb.WarehouseMgr/WmsBindService.cs
View File

@@ -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<WmsCarryH> repository, IUserManager userManager, IBillRullService billRullService)
{
_db = repository.AsSugarClient();
@@ -52,7 +51,7 @@ namespace Tnb.WarehouseMgr
/// </param>
/// <returns></returns>
/// <exception cref="ArgumentNullException"></exception>
public async Task<dynamic> WmsBind(VisualDevModelDataCrInput input)
private async Task<dynamic> WmsBind(VisualDevModelDataCrInput input)
{
var isOk = false;
try

7
WarehouseMgr/Tnb.WarehouseMgr/WmsCarryService.cs
View File

@@ -24,14 +24,12 @@ namespace Tnb.WarehouseMgr
/// <summary>
/// 载具服务
/// </summary>
[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<WmsCarryH> repository, IUserManager userManager, IBillRullService billRullService)
{
_db = repository.AsSugarClient();
@@ -52,8 +50,7 @@ namespace Tnb.WarehouseMgr
/// </param>
/// <returns></returns>
/// <exception cref="ArgumentNullException"></exception>
[HttpPost]
public async Task<dynamic> ExchangeCarry(VisualDevModelDataCrInput input)
private async Task<dynamic> ExchangeCarry(VisualDevModelDataCrInput input)
{
var isOk = false;
try

2
WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryReplaceService.cs
View File

@@ -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<WmsCarryH> repository, IUserManager userManager, IBillRullService billRullService)
{
_db = repository.AsSugarClient();

1
WarehouseMgr/Tnb.WarehouseMgr/WmsPDAFeedingService.cs
View File

@@ -34,7 +34,6 @@ namespace Tnb.WarehouseMgr
private readonly IBillRullService _billRullService;
private readonly WmsCarryService _wmsCarryService;
private static Dictionary<string, object> dicMaterial = new Dictionary<string, object>();
public OverideVisualDevFunc OverideFuncs { get; } = new OverideVisualDevFunc();
public WmsPDAFeedingService(ISqlSugarRepository<WmsCarryH> repository, IUserManager userManager, IBillRullService billRullService,WmsCarryService wmsCarryService)
{
_db = repository.AsSugarClient();