diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryQueryService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryQueryService.cs
index b91fdf3c..fefe2f4a 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryQueryService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryQueryService.cs
@@ -31,28 +31,27 @@ namespace Tnb.WarehouseMgr
///
///
///
- [HttpPost,NonUnify]
-
+ [HttpPost]
+
public async Task MESCarryQuery(MESCarryQueryInput input)
{
if (input.IsNull()) throw new ArgumentNullException("input");
var data = new List();
try
{
- var carrys = await _db.Queryable()
- .InnerJoin((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()
+ .InnerJoin((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>();
- data = carrys.Adapt>();
-
}
- catch (Exception ex)
+ catch (Exception)
{
await _db.Ado.RollbackTranAsync();
- return await ToApiResult(JNPF.Common.Enums.HttpStatusCode.InternalServerError, ex.Message);
}
- return ToApiResult(data);
+ return data;
}
///
/// 载具查询返回接口
@@ -60,7 +59,7 @@ namespace Tnb.WarehouseMgr
///
///
[HttpPost]
- [NonUnify]
+ //[NonUnify]
public async Task 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;
}
}
}
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsCollocationSchemeSevice.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsCollocationSchemeSevice.cs
index 4aa97494..1a15b5d0 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsCollocationSchemeSevice.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsCollocationSchemeSevice.cs
@@ -88,7 +88,7 @@ namespace Tnb.WarehouseMgr
///
///
[HttpPost]
- [NonUnify]
+ //[NonUnify]
public async Task MESCollocationSchemeQuery(MESCollocationSchemeQueryInput input)
{
if (input.IsNull()) throw new ArgumentNullException("input");
@@ -104,11 +104,10 @@ namespace Tnb.WarehouseMgr
.Mapper(it => it.CollocationSchemeDs = it.list?.Adapt>())
.ToListAsync();
}
- catch (Exception ex)
+ catch (Exception)
{
- return await ToApiResult(JNPF.Common.Enums.HttpStatusCode.InternalServerError, ex.Message);
}
- return await ToApiResult(data);
+ return data;
}
}
}
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsEmptyInstockService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsEmptyInstockService.cs
index 820e6316..670d0a15 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsEmptyInstockService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsEmptyInstockService.cs
@@ -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
///
///
[HttpPost]
- [NonUnify]
+ //[NonUnify]
public async Task 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)
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsOutStockService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsOutStockService.cs
index df13798d..2a0e3835 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsOutStockService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsOutStockService.cs
@@ -305,7 +305,7 @@ namespace Tnb.WarehouseMgr
///
///
[HttpPost]
- [NonUnify]
+ //[NonUnify]
public async Task MESCreateOutstock(MESCreateOutstockInput input)
{
try
diff --git a/message/Tnb.Message/Service/WechatOpenService.cs b/message/Tnb.Message/Service/WechatOpenService.cs
index 740a8322..dc3ef1a6 100644
--- a/message/Tnb.Message/Service/WechatOpenService.cs
+++ b/message/Tnb.Message/Service/WechatOpenService.cs
@@ -69,7 +69,7 @@ public class WechatOpenService : IDynamicApiController, ITransient
[HttpPost("token")]
[AllowAnonymous]
[IgnoreLog]
- [NonUnify]
+ //[NonUnify]
public async Task Create([FromQuery] string signature, [FromQuery] string timestamp, [FromQuery] string nonce, [FromQuery] string openid)
{
var input = await GetWechatMPEvent();