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

删除NonUnify

Browse Source
This commit is contained in:
alex
2023-07-13 15:26:27 +08:00
parent b64a4af91e
commit 64cebe8017
5 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
WarehouseMgr/Tnb.WarehouseMgr/WmsCarryQueryService.cs
View File

@@ -31,28 +31,27 @@ namespace Tnb.WarehouseMgr
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
[HttpPost,NonUnify]
[HttpPost]
public async Task<dynamic> MESCarryQuery(MESCarryQueryInput input)
{
if (input.IsNull()) throw new ArgumentNullException("input");
var data = new List<CarryQueryOutput>();
try
{
var carrys = await _db.Queryable<WmsCarryH>()
.InnerJoin<WmsCollocationSchemeH>((a, b) => a.collocation_scheme_id == b.id)
.Where((a, b) => a.carry_code.Contains(input.carry_code) || b.bill_name.Contains(input.collocation_scheme_name))
.ToListAsync();
var carrys = await _db.Queryable<WmsCarryH>()
.InnerJoin<WmsCollocationSchemeH>((a, b) => a.collocation_scheme_id == b.id)
.Where((a, b) => a.carry_code.Contains(input.carry_code) || b.bill_name.Contains(input.collocation_scheme_name))
.ToListAsync();
data = carrys.Adapt<List<CarryQueryOutput>>();
data = carrys.Adapt<List<CarryQueryOutput>>();
}
catch (Exception ex)
catch (Exception)
{
await _db.Ado.RollbackTranAsync();
return await ToApiResult(JNPF.Common.Enums.HttpStatusCode.InternalServerError, ex.Message);
}
return ToApiResult(data);
return data;
}
/// <summary>
/// 载具查询返回接口
@@ -60,7 +59,7 @@ namespace Tnb.WarehouseMgr
/// <param name="input"></param>
/// <returns></returns>
[HttpPost]
[NonUnify]
//[NonUnify]
public async Task<dynamic> MESCarryQueryResult(MESCarryQueryResultInput input)
{
if (input.IsNull()) throw new ArgumentNullException("input");
@@ -76,9 +75,10 @@ namespace Tnb.WarehouseMgr
catch (Exception ex)
{
await _db.Ado.RollbackTranAsync();
return await ToApiResult(JNPF.Common.Enums.HttpStatusCode.InternalServerError, ex.Message);
//return await ToApiResult(JNPF.Common.Enums.HttpStatusCode.InternalServerError, ex.Message);
}
return ToApiResult(JNPF.Common.Enums.HttpStatusCode.OK, data);
//return ToApiResult(JNPF.Common.Enums.HttpStatusCode.OK, data);
return data;
}
}
}

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

@@ -88,7 +88,7 @@ namespace Tnb.WarehouseMgr
/// <param name="input"></param>
/// <returns></returns>
[HttpPost]
[NonUnify]
//[NonUnify]
public async Task<dynamic> MESCollocationSchemeQuery(MESCollocationSchemeQueryInput input)
{
if (input.IsNull()) throw new ArgumentNullException("input");
@@ -104,11 +104,10 @@ namespace Tnb.WarehouseMgr
.Mapper(it => it.CollocationSchemeDs = it.list?.Adapt<List<CollocationSchemeDOutput>>())
.ToListAsync();
}
catch (Exception ex)
catch (Exception)
{
return await ToApiResult(JNPF.Common.Enums.HttpStatusCode.InternalServerError, ex.Message);
}
return await ToApiResult(data);
return data;
}
}
}

13
WarehouseMgr/Tnb.WarehouseMgr/WmsEmptyInstockService.cs
View File

@@ -153,9 +153,9 @@ namespace Tnb.WarehouseMgr
}
}
else
else
{
throw new AppFriendlyException("起始库位不可用或无可用的目标库位",500);
throw new AppFriendlyException("起始库位不可用或无可用的目标库位", 500);
}
await _db.Ado.CommitTranAsync();
@@ -173,9 +173,10 @@ namespace Tnb.WarehouseMgr
/// <param name="input"></param>
/// <returns></returns>
[HttpPost]
[NonUnify]
//[NonUnify]
public async Task<dynamic> MesEmptyCarryInStock(MESEmptyCarryInStockInput input)
{
var isSuccessful = false;
if (input.IsNull()) throw new ArgumentNullException("input");
try
{
@@ -207,15 +208,15 @@ namespace Tnb.WarehouseMgr
data = dic
};
await WmsEmptyIn(visualDevModelDataCrInput);
isSuccessful = true;
}
}
catch (Exception ex)
{
await _db.Ado.RollbackTranAsync();
return await ToApiResult(JNPF.Common.Enums.HttpStatusCode.InternalServerError, ex.Message);
//return await ToApiResult(JNPF.Common.Enums.HttpStatusCode.InternalServerError, ex.Message);
}
return ToApiResult();
return isSuccessful;
}
public async override Task ModifyAsync(WareHouseUpInput input)

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

@@ -305,7 +305,7 @@ namespace Tnb.WarehouseMgr
/// <param name="input"></param>
/// <returns></returns>
[HttpPost]
[NonUnify]
//[NonUnify]
public async Task<dynamic> MESCreateOutstock(MESCreateOutstockInput input)
{
try

2
message/Tnb.Message/Service/WechatOpenService.cs
View File

@@ -69,7 +69,7 @@ public class WechatOpenService : IDynamicApiController, ITransient
[HttpPost("token")]
[AllowAnonymous]
[IgnoreLog]
[NonUnify]
//[NonUnify]
public async Task<dynamic> Create([FromQuery] string signature, [FromQuery] string timestamp, [FromQuery] string nonce, [FromQuery] string openid)
{
var input = await GetWechatMPEvent();