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

Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev

Browse Source
This commit is contained in:
FanLian
2023-07-13 15:30:47 +08:00
parent 38f72bd4d0 30c67925e1
commit 1f806bf9fb
6 changed files with 30 additions and 28 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> /// </summary>
/// <param name="input"></param> /// <param name="input"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost,NonUnify] [HttpPost]
public async Task<dynamic> MESCarryQuery(MESCarryQueryInput input) public async Task<dynamic> MESCarryQuery(MESCarryQueryInput input)
{ {
if (input.IsNull()) throw new ArgumentNullException("input"); if (input.IsNull()) throw new ArgumentNullException("input");
var data = new List<CarryQueryOutput>(); var data = new List<CarryQueryOutput>();
try try
{ {
var carrys = await _db.Queryable<WmsCarryH>() var carrys = await _db.Queryable<WmsCarryH>()
.InnerJoin<WmsCollocationSchemeH>((a, b) => a.collocation_scheme_id == b.id) .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)) .Where((a, b) => a.carry_code.Contains(input.carry_code) || b.bill_name.Contains(input.collocation_scheme_name))
.ToListAsync(); .ToListAsync();
data = carrys.Adapt<List<CarryQueryOutput>>();
data = carrys.Adapt<List<CarryQueryOutput>>();
} }
catch (Exception ex) catch (Exception)
{ {
await _db.Ado.RollbackTranAsync(); await _db.Ado.RollbackTranAsync();
return await ToApiResult(JNPF.Common.Enums.HttpStatusCode.InternalServerError, ex.Message);
} }
return ToApiResult(data); return data;
} }
/// <summary> /// <summary>
/// 载具查询返回接口 /// 载具查询返回接口
@@ -60,7 +59,7 @@ namespace Tnb.WarehouseMgr
/// <param name="input"></param> /// <param name="input"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
[NonUnify] //[NonUnify]
public async Task<dynamic> MESCarryQueryResult(MESCarryQueryResultInput input) public async Task<dynamic> MESCarryQueryResult(MESCarryQueryResultInput input)
{ {
if (input.IsNull()) throw new ArgumentNullException("input"); if (input.IsNull()) throw new ArgumentNullException("input");
@@ -76,9 +75,10 @@ namespace Tnb.WarehouseMgr
catch (Exception ex) catch (Exception ex)
{ {
await _db.Ado.RollbackTranAsync(); 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> /// <param name="input"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
[NonUnify] //[NonUnify]
public async Task<dynamic> MESCollocationSchemeQuery(MESCollocationSchemeQueryInput input) public async Task<dynamic> MESCollocationSchemeQuery(MESCollocationSchemeQueryInput input)
{ {
if (input.IsNull()) throw new ArgumentNullException("input"); if (input.IsNull()) throw new ArgumentNullException("input");
@@ -104,11 +104,10 @@ namespace Tnb.WarehouseMgr
.Mapper(it => it.CollocationSchemeDs = it.list?.Adapt<List<CollocationSchemeDOutput>>()) .Mapper(it => it.CollocationSchemeDs = it.list?.Adapt<List<CollocationSchemeDOutput>>())
.ToListAsync(); .ToListAsync();
} }
catch (Exception ex) catch (Exception)
{ {
return await ToApiResult(JNPF.Common.Enums.HttpStatusCode.InternalServerError, ex.Message);
} }
return await ToApiResult(data); return data;
} }
} }
} }

11
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(); await _db.Ado.CommitTranAsync();
@@ -175,6 +175,7 @@ namespace Tnb.WarehouseMgr
[HttpPost] [HttpPost]
public async Task<dynamic> MesEmptyCarryInStock(MESEmptyCarryInStockInput input) public async Task<dynamic> MesEmptyCarryInStock(MESEmptyCarryInStockInput input)
{ {
var isSuccessful = false;
if (input.IsNull()) throw new ArgumentNullException("input"); if (input.IsNull()) throw new ArgumentNullException("input");
try try
{ {
@@ -206,15 +207,15 @@ namespace Tnb.WarehouseMgr
data = dic data = dic
}; };
await WmsEmptyIn(visualDevModelDataCrInput); await WmsEmptyIn(visualDevModelDataCrInput);
isSuccessful = true;
} }
} }
catch (Exception ex) catch (Exception ex)
{ {
await _db.Ado.RollbackTranAsync(); 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) public async override Task ModifyAsync(WareHouseUpInput input)

8
WarehouseMgr/Tnb.WarehouseMgr/WmsInStockService.cs
View File

@@ -257,9 +257,9 @@ namespace Tnb.WarehouseMgr
/// <param name="input"></param> /// <param name="input"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
[NonUnify]
public async Task<dynamic> MESCreateInstock(MESCreateInstockInput input) public async Task<dynamic> MESCreateInstock(MESCreateInstockInput input)
{ {
var isSuccessFul = false;
try try
{ {
await _db.Ado.BeginTranAsync(); await _db.Ado.BeginTranAsync();
@@ -445,6 +445,7 @@ namespace Tnb.WarehouseMgr
await _db.Updateable<WmsInstockD>().SetColumns(it => new WmsInstockD { line_status = WmsWareHouseConst.BILLSTATUS_ON_ID }).Where(it => instockCOdes.Select(x => x.bill_d_id).Contains(it.id)).ExecuteCommandAsync(); await _db.Updateable<WmsInstockD>().SetColumns(it => new WmsInstockD { line_status = WmsWareHouseConst.BILLSTATUS_ON_ID }).Where(it => instockCOdes.Select(x => x.bill_d_id).Contains(it.id)).ExecuteCommandAsync();
await _db.Updateable<WmsInstockH>().SetColumns(it => new WmsInstockH { status = WmsWareHouseConst.BILLSTATUS_ON_ID }).Where(it => it.id == instock!.id).ExecuteCommandAsync(); await _db.Updateable<WmsInstockH>().SetColumns(it => new WmsInstockH { status = WmsWareHouseConst.BILLSTATUS_ON_ID }).Where(it => it.id == instock!.id).ExecuteCommandAsync();
} }
isSuccessFul = true;
} }
} }
} }
@@ -453,11 +454,12 @@ namespace Tnb.WarehouseMgr
} }
catch (Exception ex) catch (Exception ex)
{ {
isSuccessFul = false;
JNPF.Logging.Log.Error(ex.Message); JNPF.Logging.Log.Error(ex.Message);
await _db.Ado.RollbackTranAsync(); 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 await ToApiResult(); return isSuccessFul;
} }
} }
} }

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

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

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

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