From baad883a45b5434117a7769354701c6aa607a5a9 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期日, 01 九月 2024 01:45:32 +0800
Subject: [PATCH] 工步增加工步名称和工步当前消息 优化了一些已知问题
---
Tiger.Api/Controllers/MES/MESController.Route.cs | 185 ++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 179 insertions(+), 6 deletions(-)
diff --git a/Tiger.Api/Controllers/MES/MESController.Route.cs b/Tiger.Api/Controllers/MES/MESController.Route.cs
index 0207069..f1030aa 100644
--- a/Tiger.Api/Controllers/MES/MESController.Route.cs
+++ b/Tiger.Api/Controllers/MES/MESController.Route.cs
@@ -139,14 +139,130 @@
}
/// <summary>
+ /// 鍒犻櫎浜у搧缁戝畾鐨勫伐鑹鸿矾绾�
+ /// </summary>
+ /// <param name="action"></param>
+ /// <returns></returns>
+ [HttpPost]
+ [Route("api/[controller]/[action]")]
+ public async Task<IActionResult> DeleteProdRoute([FromBody] ApiAction<DelProdRotInput> action)
+ {
+ ApiAction response = new();
+ try
+ {
+ response = response.GetResponse(await DI.Resolve<IRoute>().DeleteProdRoute(action.Data));
+ }
+ catch (System.Exception ex)
+ {
+ response = response.GetResponse().CatchExceptionWithLog(ex);
+ }
+ return Ok(response);
+ }
+
+ /// <summary>
+ /// 淇濆瓨宸ュ崟宸ヨ壓鑺傜偣宀椾綅璧勬簮
+ /// </summary>
+ /// <param name="action"></param>
+ /// <returns></returns>
+ [HttpPost]
+ [Route("api/[controller]/[action]")]
+ public async Task<IActionResult> SaveWoRouteNodePost([FromBody] ApiAction<List<MES_WO_NODE_POST>> action)
+ {
+ ApiAction response = new();
+ try
+ {
+ response = response.GetResponse(await DI.Resolve<IRoute>().SaveWoRouteNodePost(action.Data));
+ }
+ catch (System.Exception ex)
+ {
+ response = response.GetResponse().CatchExceptionWithLog(ex);
+ }
+ return Ok(response);
+ }
+
+ /// <summary>
+ /// 淇濆瓨宸ュ崟宸ヨ壓璺嚎鍥惧舰鏁版嵁
+ /// </summary>
+ /// <param name="action"></param>
+ /// <returns></returns>
+ [HttpPost]
+ [Route("api/[controller]/[action]")]
+ public async Task<IActionResult> SaveWoRouteData([FromBody] ApiAction<WoRouteData> action)
+ {
+ ApiAction response = new();
+ try
+ {
+ response = response.GetResponse(await DI.Resolve<IRoute>().SaveWoRouteData(action.Data));
+ }
+ catch (System.Exception ex)
+ {
+ response = response.GetResponse().CatchExceptionWithLog(ex);
+ }
+ return Ok(response);
+ }
+
+ /// <summary>
+ /// 鑾峰彇宸ュ崟宸ヨ壓璺嚎鍥惧舰鏁版嵁
+ /// </summary>
+ /// <param name="action"></param>
+ /// <returns></returns>
+ [HttpPost]
+ [Route("api/[controller]/[action]")]
+ public async Task<IActionResult> GetWoRouteData([FromBody] ApiAction action)
+ {
+ ApiAction response = new();
+ try
+ {
+ response = response.GetResponse(await DI.Resolve<IRoute>().GetWoRouteData(action.Data?.ToString()));
+ }
+ catch (System.Exception ex)
+ {
+ response = response.GetResponse().CatchExceptionWithLog(ex);
+ }
+ return Ok(response);
+ }
+
+ /// <summary>
+ /// 鍒犻櫎宸ュ崟缁戝畾鐨勫伐鑹鸿矾绾�
+ /// </summary>
+ /// <param name="action"></param>
+ /// <returns></returns>
+ [HttpPost]
+ [Route("api/[controller]/[action]")]
+ public async Task<IActionResult> DeleteWoRoute([FromBody] ApiAction<DelWoRotInput> action)
+ {
+ ApiAction response = new();
+ try
+ {
+ response = response.GetResponse(await DI.Resolve<IRoute>().DeleteWoRoute(action.Data));
+ }
+ catch (System.Exception ex)
+ {
+ response = response.GetResponse().CatchExceptionWithLog(ex);
+ }
+ return Ok(response);
+ }
+
+ /// <summary>
/// 鑾峰彇宸ヨ壓璺嚎鏍戝舰缁撴瀯
/// </summary>
- /// <param name="param"></param>
+ /// <param name="prodCode"></param>
+ /// <param name="orgCode"></param>
/// <returns></returns>
[HttpGet]
[Route("api/[controller]/[action]")]
- public async Task<IActionResult> GetRoutePTreeAsync(string param) {
- var data = Biz.Db.Ado.UseStoredProcedure().SqlQuery<V_MES_ROUTE_PTREE>("SP_MES_GET_ROUTE_PTREE", new SugarParameter("@PROD_CODE", param));//杩斿洖List
+ public async Task<IActionResult> GetRoutePTreeAsync(string prodCode, string orgCode) {
+ SugarParameter[] pars = Biz.Db.Ado.GetParameters(new { PROD_CODE = prodCode,ORG_CODE = orgCode });
+ var data = Biz.Db.Ado.UseStoredProcedure().SqlQuery<V_MES_ROUTE_PTREE>("SP_MES_GET_ROUTE_PTREE", pars);//杩斿洖List
+ return Ok(data);
+ }
+
+ [HttpGet]
+ [Route("api/[controller]/[action]")]
+ public async Task<IActionResult> GetWoPTreeAsync(string wo)
+ {
+ SugarParameter[] pars = Biz.Db.Ado.GetParameters(new { WO = wo });
+ var data = Biz.Db.Ado.UseStoredProcedure().SqlQuery<V_MES_WO_PTREE>("SP_MES_GET_WO_PTREE", pars);//杩斿洖List
return Ok(data);
}
@@ -167,8 +283,9 @@
pars[2].Direction = System.Data.ParameterDirection.Output;
pars[3].Direction = System.Data.ParameterDirection.Output;
Biz.Db.Ado.UseStoredProcedure().ExecuteCommand("SP_MES_ROUTE2PROD", pars);
- response.Data = pars[3].Value;
- response.Message = pars[4].Value.ToString();
+ response.Data = pars[2].Value;
+ response.IsSuccessed = pars[2].Value.ToInt32() == 0 ? true : false;
+ response.LocaleMsg = new(pars[3].Value.ToString());
}
catch (System.Exception ex)
{
@@ -196,7 +313,63 @@
pars[4].Direction = System.Data.ParameterDirection.Output;
Biz.Db.Ado.UseStoredProcedure().ExecuteCommand("SP_MES_ROUTE2CUST", pars);
response.Data = pars[3].Value;
- response.Message = pars[4].Value.ToString();
+ response.IsSuccessed = pars[3].Value.ToInt32() == 0? true: false;
+ response.LocaleMsg = new(pars[4].Value.ToString());
+ }
+ catch (System.Exception ex)
+ {
+ response = response.GetResponse().CatchExceptionWithLog(ex);
+ }
+ return Ok(response);
+ }
+
+ /// <summary>
+ /// 娣诲姞宸ュ崟宸ヨ壓璺嚎
+ /// </summary>
+ /// <param name="rotId"></param>
+ /// <param name="wo"></param>
+ /// <returns></returns>
+ [HttpGet]
+ [Route("api/[controller]/[action]")]
+ public async Task<IActionResult> SP_MES_PROD2WO(string rotId, string wo)
+ {
+ ApiAction response = new();
+ try
+ {
+ SugarParameter[] pars = Biz.Db.Ado.GetParameters(new { ROT_ID = rotId, WO = wo, ERR_CODE = 0, ERR_MSG = "" });
+ pars[2].Direction = System.Data.ParameterDirection.Output;
+ pars[3].Direction = System.Data.ParameterDirection.Output;
+ Biz.Db.Ado.UseStoredProcedure().ExecuteCommand("SP_MES_PROD2WO", pars);
+ response.Data = pars[2].Value;
+ response.IsSuccessed = pars[2].Value.ToInt32() == 0 ? true : false;
+ response.LocaleMsg = new(pars[3].Value.ToString());
+ }
+ catch (System.Exception ex)
+ {
+ response = response.GetResponse().CatchExceptionWithLog(ex);
+ }
+ return Ok(response);
+ }
+
+ /// <summary>
+ /// 娣诲姞宸ュ崟鐨勫鎴风殑宸ヨ壓璺嚎
+ /// </summary>
+ /// <param name="wo"></param>
+ /// <returns></returns>
+ [HttpGet]
+ [Route("api/[controller]/[action]")]
+ public async Task<IActionResult> SP_MES_WO2CUST(string wo)
+ {
+ ApiAction response = new();
+ try
+ {
+ SugarParameter[] pars = Biz.Db.Ado.GetParameters(new { WO = wo, ERR_CODE = 0, ERR_MSG = "" });
+ pars[1].Direction = System.Data.ParameterDirection.Output;
+ pars[2].Direction = System.Data.ParameterDirection.Output;
+ Biz.Db.Ado.UseStoredProcedure().ExecuteCommand("SP_MES_WO2CUST", pars);
+ response.Data = pars[1].Value;
+ response.IsSuccessed = pars[1].Value.ToInt32() == 0 ? true : false;
+ response.LocaleMsg = new(pars[2].Value.ToString());
}
catch (System.Exception ex)
{
--
Gitblit v1.9.3