From c94422ed360de8e75fa62e745689cfa02d53d0ff Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期六, 04 五月 2024 11:05:07 +0800
Subject: [PATCH] 工艺路线更新
---
Tiger.Business/MES/Biz.Route.cs | 32 ++++++++++++++++
Tiger.IBusiness/MES/IRoute.cs | 1
Tiger.Api/Controllers/MES/MESController.Route.cs | 21 ++++++++++
Tiger.Model.Net/Entitys/MES/MES_ROUTE_NODE_ACT.cs | 48 ++++++++++++------------
Tiger.Model.Net/Entitys/MES/MES_ROUTE_NODE.cs | 16 ++++++--
5 files changed, 90 insertions(+), 28 deletions(-)
diff --git a/Tiger.Api/Controllers/MES/MESController.Route.cs b/Tiger.Api/Controllers/MES/MESController.Route.cs
index 5e835cd..02e4d7a 100644
--- a/Tiger.Api/Controllers/MES/MESController.Route.cs
+++ b/Tiger.Api/Controllers/MES/MESController.Route.cs
@@ -91,5 +91,26 @@
}
return Ok(response);
}
+
+ /// <summary>
+ /// 鍒犻櫎宸ヨ壓璺嚎
+ /// </summary>
+ /// <param name="action"></param>
+ /// <returns></returns>
+ [HttpPost]
+ [Route("api/[controller]/[action]")]
+ public async Task<IActionResult> DeleteRoute([FromBody] ApiAction action)
+ {
+ ApiAction response = new();
+ try
+ {
+ response = response.GetResponse(await DI.Resolve<IRoute>().DeleteRoute(action.Data?.ToString()));
+ }
+ catch (System.Exception ex)
+ {
+ response = response.GetResponse().CatchExceptionWithLog(ex);
+ }
+ return Ok(response);
+ }
}
}
diff --git a/Tiger.Business/MES/Biz.Route.cs b/Tiger.Business/MES/Biz.Route.cs
index b397e91..b79435d 100644
--- a/Tiger.Business/MES/Biz.Route.cs
+++ b/Tiger.Business/MES/Biz.Route.cs
@@ -342,6 +342,38 @@
}
return await Task.FromResult(result);
}
+
+ /// <summary>
+ /// 鍒犻櫎宸ヨ壓璺嚎
+ /// </summary>
+ /// <param name="routeId"></param>
+ /// <returns></returns>
+ public async Task<ApiAction> DeleteRoute(string routeId) {
+ var result = new ApiAction();
+ try
+ {
+ //鏌ヨ鏄惁宸茬粡鏈夊伐鍗曞湪鐢ㄦ垨鑰呮湁缁戝畾浜у搧
+
+ var db = Db;
+ var dbTran = db.UseTran(() =>
+ {
+ db.Deleteable<MES_ROUTE_NODE>(false).Where(x => x.ROT_ID == routeId).ExecuteCommand();
+ db.Deleteable<MES_ROUTE_EDGE>(false).Where(x => x.ROT_ID == routeId).ExecuteCommand();
+ db.Deleteable<MES_ROUTE_NODE_ACT>(false).Where(x => x.ROT_ID == routeId).ExecuteCommand();
+ db.Deleteable<MES_ROUTE>().Where(x => x.ID == routeId).ExecuteCommand();
+ });
+ if (!dbTran.IsSuccess)
+ {
+ result.IsSuccessed = false;
+ result.LocaleMsg = new($"鍒犻櫎宸ヨ壓璺嚎寮傚父");
+ }
+ }
+ catch (Exception ex)
+ {
+ result.CatchExceptionWithLog(ex, "鍒犻櫎宸ヨ壓璺嚎寮傚父");
+ }
+ return await Task.FromResult(result);
+ }
}
}
}
diff --git a/Tiger.IBusiness/MES/IRoute.cs b/Tiger.IBusiness/MES/IRoute.cs
index 4adad54..dfeb1b3 100644
--- a/Tiger.IBusiness/MES/IRoute.cs
+++ b/Tiger.IBusiness/MES/IRoute.cs
@@ -18,5 +18,6 @@
public Task<ApiAction> SaveRouteData(RouteData routeData);
public Task<ApiAction<List<MES_ROUTE>>> GetRoute(string routeCode);
public Task<ApiAction<RouteData>> GetRouteData(string routeCode);
+ public Task<ApiAction> DeleteRoute(string routeId);
}
}
diff --git a/Tiger.Model.Net/Entitys/MES/MES_ROUTE_NODE.cs b/Tiger.Model.Net/Entitys/MES/MES_ROUTE_NODE.cs
index 7296ac5..589ad6e 100644
--- a/Tiger.Model.Net/Entitys/MES/MES_ROUTE_NODE.cs
+++ b/Tiger.Model.Net/Entitys/MES/MES_ROUTE_NODE.cs
@@ -74,10 +74,18 @@
/// 是否允许跳站(Y/N)
/// </summary>
public string CAN_SKIP { get; set; }
- /// <summary>
- /// 设置值1
- /// </summary>
- public string OPTION_1 { get; set; }
+ /// <summary>
+ /// 是否投入站(Y/N)
+ /// </summary>
+ public string IS_INPUT { get; set; }
+ /// <summary>
+ /// 是否产出站(Y/N)
+ /// </summary>
+ public string IS_OUTPUT { get; set; }
+ /// <summary>
+ /// 设置值1
+ /// </summary>
+ public string OPTION_1 { get; set; }
/// <summary>
/// 设置值2
/// </summary>
diff --git a/Tiger.Model.Net/Entitys/MES/MES_ROUTE_NODE_ACT.cs b/Tiger.Model.Net/Entitys/MES/MES_ROUTE_NODE_ACT.cs
index c7492c9..d55da0b 100644
--- a/Tiger.Model.Net/Entitys/MES/MES_ROUTE_NODE_ACT.cs
+++ b/Tiger.Model.Net/Entitys/MES/MES_ROUTE_NODE_ACT.cs
@@ -78,30 +78,30 @@
/// 失败时执行(调用方法的全名)
/// </summary>
public string DO_IF_FAIL { get; set; }
- /// <summary>
- /// 扫码验证：条码规则
- /// </summary>
- public string RULE_CODE { get; set; }
- /// <summary>
- /// 组装上料：物料料号
- /// </summary>
- public string ITEM_CODE { get; set; }
- /// <summary>
- /// 产品测试/抽检：产品料号
- /// </summary>
- public string PROD_CODE { get; set; }
- /// <summary>
- /// 产品测试：检验项目编码
- /// </summary>
- public string TEST_CODE { get; set; }
- /// <summary>
- /// 产品抽检：抽样规则编码
- /// </summary>
- public string SAPL_CODE { get; set; }
- /// <summary>
- /// 标签打印：标签模板编码
- /// </summary>
- public string LABEL_CODE { get; set; }
+ ///// <summary>
+ ///// 扫码验证：条码规则
+ ///// </summary>
+ //public string RULE_CODE { get; set; }
+ ///// <summary>
+ ///// 组装上料：物料料号
+ ///// </summary>
+ //public string ITEM_CODE { get; set; }
+ ///// <summary>
+ ///// 产品测试/抽检：产品料号
+ ///// </summary>
+ //public string PROD_CODE { get; set; }
+ ///// <summary>
+ ///// 产品测试：检验项目编码
+ ///// </summary>
+ //public string TEST_CODE { get; set; }
+ ///// <summary>
+ ///// 产品抽检：抽样规则编码
+ ///// </summary>
+ //public string SAPL_CODE { get; set; }
+ ///// <summary>
+ ///// 标签打印：标签模板编码
+ ///// </summary>
+ //public string LABEL_CODE { get; set; }
/// <summary>
/// 设置值1
/// </summary>
--
Gitblit v1.9.3