From 40de162dfa4b631efc0ed0e6b89d54ac1236e95b Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期三, 01 五月 2024 00:26:49 +0800
Subject: [PATCH] 工艺路线更新
---
Tiger.Business/MES/Biz.Route.cs | 61 ++++++++++++++++++++++++++++--
Tiger.IBusiness/MES/IRoute.cs | 1
Tiger.Model.Net/Entitys/MES/MES_ROUTE.cs | 1
Tiger.Model.Net/Entitys/MES/MES_ROUTE_NODE_ACT.cs | 2
Tiger.Model.Net/Entitys/MES/MES_ROUTE_NODE.cs | 12 ++++--
5 files changed, 67 insertions(+), 10 deletions(-)
diff --git a/Tiger.Business/MES/Biz.Route.cs b/Tiger.Business/MES/Biz.Route.cs
index 9a5f25b..77ab922 100644
--- a/Tiger.Business/MES/Biz.Route.cs
+++ b/Tiger.Business/MES/Biz.Route.cs
@@ -195,6 +195,38 @@
}
/// <summary>
+ /// 淇濆瓨琛屼负
+ /// </summary>
+ /// <param name="routeAct"></param>
+ /// <returns></returns>
+ public async Task<ApiAction> SaveActs(List<MES_ROUTE_NODE_ACT> routeAct)
+ {
+ var result = new ApiAction();
+ try
+ {
+ var db = Db;
+ var dbTran = db.UseTran(() =>
+ {
+ var y = db.Storageable(routeAct)
+ .WhereColumns(t => new { t.ID, t.GHOST_ROW })
+ .ToStorage();
+ y.AsInsertable.ExecuteCommand();
+ y.AsUpdateable.ExecuteCommand();
+ });
+ if (!dbTran.IsSuccess)
+ {
+ result.IsSuccessed = false;
+ result.Message = $"淇濆瓨琛屼负鏁版嵁寮傚父";
+ }
+ }
+ catch (Exception ex)
+ {
+ result.CatchExceptionWithLog(ex, "淇濆瓨琛屼负鏁版嵁寮傚父");
+ }
+ return await Task.FromResult(result);
+ }
+
+ /// <summary>
/// 淇濆瓨
/// </summary>
/// <param name="router"></param>
@@ -236,11 +268,6 @@
var result = new ApiAction();
try
{
- var actionNode = await SaveNodes(routeData.nodes);
- if (!actionNode.IsSuccessed) { return actionNode; }
- var actionEdge = await SaveEdges(routeData.edges);
- if (!actionEdge.IsSuccessed) { return actionEdge; }
-
var db = Db;
var dbTran = db.UseTran(() =>
{
@@ -252,6 +279,30 @@
y.AsInsertable.ExecuteCommand();
y.AsUpdateable.IgnoreColumns(x => x.ID).ExecuteCommand();
}
+ if (routeData.nodes != null)
+ {
+ var y = db.Storageable(routeData.nodes)
+ .WhereColumns(t => new { t.ID, t.GHOST_ROW })
+ .ToStorage();
+ y.AsInsertable.ExecuteCommand();
+ y.AsUpdateable.ExecuteCommand();
+ }
+ if (routeData.edges != null)
+ {
+ var y = db.Storageable(routeData.edges)
+ .WhereColumns(t => new { t.ID, t.GHOST_ROW })
+ .ToStorage();
+ y.AsInsertable.ExecuteCommand();
+ y.AsUpdateable.ExecuteCommand();
+ }
+ if (routeData.acts != null)
+ {
+ var y = db.Storageable(routeData.acts)
+ .WhereColumns(t => new { t.ID, t.GHOST_ROW })
+ .ToStorage();
+ y.AsInsertable.ExecuteCommand();
+ y.AsUpdateable.ExecuteCommand();
+ }
});
if (!dbTran.IsSuccess)
{
diff --git a/Tiger.IBusiness/MES/IRoute.cs b/Tiger.IBusiness/MES/IRoute.cs
index 8a57e28..4adad54 100644
--- a/Tiger.IBusiness/MES/IRoute.cs
+++ b/Tiger.IBusiness/MES/IRoute.cs
@@ -14,6 +14,7 @@
public Task<ApiAction> SaveRoute(MES_ROUTE route);
public Task<ApiAction> SaveNodes(List<MES_ROUTE_NODE> routeNode);
public Task<ApiAction> SaveEdges(List<MES_ROUTE_EDGE> routeEdge);
+ public Task<ApiAction> SaveActs(List<MES_ROUTE_NODE_ACT> routeAct);
public Task<ApiAction> SaveRouteData(RouteData routeData);
public Task<ApiAction<List<MES_ROUTE>>> GetRoute(string routeCode);
public Task<ApiAction<RouteData>> GetRouteData(string routeCode);
diff --git a/Tiger.Model.Net/Entitys/MES/MES_ROUTE.cs b/Tiger.Model.Net/Entitys/MES/MES_ROUTE.cs
index 4cc05f0..4031f2b 100644
--- a/Tiger.Model.Net/Entitys/MES/MES_ROUTE.cs
+++ b/Tiger.Model.Net/Entitys/MES/MES_ROUTE.cs
@@ -99,5 +99,6 @@
public MES_ROUTE route { get; set; }
public List<MES_ROUTE_NODE> nodes { get; set; }
public List<MES_ROUTE_EDGE> edges { get; set; }
+ public List<MES_ROUTE_NODE_ACT> acts { get; set; }
}
}
\ No newline at end of file
diff --git a/Tiger.Model.Net/Entitys/MES/MES_ROUTE_NODE.cs b/Tiger.Model.Net/Entitys/MES/MES_ROUTE_NODE.cs
index 4cea1d0..7296ac5 100644
--- a/Tiger.Model.Net/Entitys/MES/MES_ROUTE_NODE.cs
+++ b/Tiger.Model.Net/Entitys/MES/MES_ROUTE_NODE.cs
@@ -62,10 +62,14 @@
/// 是否启用(Y/N)
/// </summary>
public string IS_ACTIVE { get; set; }
- /// <summary>
- /// 是否计算直通率(Y/N)
- /// </summary>
- public string IS_CALC_FPY { get; set; }
+ /// <summary>
+ /// 是否第一个节点(Y/N)
+ /// </summary>
+ public string IS_FIRST_NODE { get; set; }
+ /// <summary>
+ /// 是否计算直通率(Y/N)
+ /// </summary>
+ public string IS_CALC_FPY { get; set; }
/// <summary>
/// 是否允许跳站(Y/N)
/// </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 9c0d1dd..b039a79 100644
--- a/Tiger.Model.Net/Entitys/MES/MES_ROUTE_NODE_ACT.cs
+++ b/Tiger.Model.Net/Entitys/MES/MES_ROUTE_NODE_ACT.cs
@@ -37,7 +37,7 @@
/// <summary>
/// 工序编码
/// </summary>
- public string OPER_CODE { get; set; }
+ //public string OPER_CODE { get; set; }
/// <summary>
/// 行为类型(0Normal默认行为|1Scan扫码验证|2Assy组装上料|3Test产品测试|4Audit产品抽检|5Print标签打印)
/// </summary>
--
Gitblit v1.9.3