From 4417ac9e48587bdfcc0bdee5e84dca7627a6e4a4 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期四, 17 十月 2024 21:18:00 +0800
Subject: [PATCH] 工艺路线删除优化
---
Tiger.Business/MES/Biz.Route.cs | 765 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 745 insertions(+), 20 deletions(-)
diff --git a/Tiger.Business/MES/Biz.Route.cs b/Tiger.Business/MES/Biz.Route.cs
index 9a5f25b..ec90c54 100644
--- a/Tiger.Business/MES/Biz.Route.cs
+++ b/Tiger.Business/MES/Biz.Route.cs
@@ -10,8 +10,10 @@
using System.Linq;
using Newtonsoft.Json;
using Tiger.IBusiness;
-using static Tiger.Business.Biz;
using Microsoft.AspNetCore.Http;
+using Tiger.Model.Entitys.WMS.DTOS;
+using static Tiger.Model.BIZ_MES_WO;
+using Tiger.Model.Entitys.MES.Position;
namespace Tiger.Business
{
@@ -56,14 +58,26 @@
RouteData rotData = new RouteData();
try
{
+ if (string.IsNullOrEmpty(routerId))
+ {
+ res.IsSuccessed = false;
+ res.LocaleMsg = new($"浼犲叆鐨勫伐鑹鸿矾绾縄D涓虹┖锛屼笉鑳芥煡鎵惧伐鑹鸿矾绾匡紒");
+ return res;
+ }
//宸ヨ壓璺嚎
var route = await Db.Queryable<MES_ROUTE>()
- .WhereIF(!string.IsNullOrEmpty(routerId), x => x.ROT_CODE.Equals(routerId))
+ .WhereIF(!string.IsNullOrEmpty(routerId), x => x.ID.Equals(routerId) || x.ROT_CODE == routerId)
.OrderBy(x => x.CREATE_TIME).FirstAsync();
rotData.route = route;
+ if (route == null)
+ {
+ res.IsSuccessed = false;
+ res.LocaleMsg = new($"涓嶈兘鏌ユ壘鍒板伐鑹鸿矾绾匡紒");
+ return res;
+ }
//鑺傜偣
var nodes = await Db.Queryable<MES_ROUTE_NODE>()
- .WhereIF(!string.IsNullOrEmpty(routerId), x => x.ROT_ID.Equals(routerId))
+ .WhereIF(!string.IsNullOrEmpty(route.ID), x => x.ROT_ID.Equals(route.ID))
.ToListAsync();
foreach (var node in nodes)
{
@@ -84,9 +98,31 @@
}
rotData.nodes = nodes;
+ var acts = await Db.Queryable<MES_ROUTE_NODE_ACT>()
+ .WhereIF(!string.IsNullOrEmpty(route.ID), x => x.ROT_ID.Equals(route.ID))
+ .ToListAsync();
+ foreach (var act in acts)
+ {
+ act.node = new()
+ {
+ id = act.ID,
+ type = act.GPH_TYPE,
+ x = act.GPH_X,
+ y = act.GPH_Y,
+ properties = act.GPH_PROP,
+ text = new()
+ {
+ x = act.GPH_X,
+ y = act.GPH_Y,
+ value = act.GPH_TEXT
+ }
+ };
+ }
+ rotData.acts = acts;
+
//杈�
var edges = await Db.Queryable<MES_ROUTE_EDGE>()
- .WhereIF(!string.IsNullOrEmpty(routerId), x => x.ROT_ID.Equals(routerId))
+ .WhereIF(!string.IsNullOrEmpty(route.ID), x => x.ROT_ID.Equals(route.ID))
.ToListAsync();
foreach (var edge in edges)
{
@@ -152,7 +188,7 @@
if (!dbTran.IsSuccess)
{
result.IsSuccessed = false;
- result.Message = $"淇濆瓨杈规暟鎹紓甯�";
+ result.LocaleMsg = new($"淇濆瓨杈规暟鎹紓甯�");
}
}
catch (Exception ex)
@@ -184,7 +220,7 @@
if (!dbTran.IsSuccess)
{
result.IsSuccessed = false;
- result.Message = $"淇濆瓨鑺傜偣鏁版嵁寮傚父";
+ result.LocaleMsg = new($"淇濆瓨鑺傜偣鏁版嵁寮傚父");
}
}
catch (Exception ex)
@@ -195,11 +231,11 @@
}
/// <summary>
- /// 淇濆瓨
+ /// 淇濆瓨琛屼负
/// </summary>
- /// <param name="router"></param>
+ /// <param name="routeAct"></param>
/// <returns></returns>
- public async Task<ApiAction> SaveRoute(MES_ROUTE router)
+ public async Task<ApiAction> SaveActs(List<MES_ROUTE_NODE_ACT> routeAct)
{
var result = new ApiAction();
try
@@ -207,11 +243,56 @@
var db = Db;
var dbTran = db.UseTran(() =>
{
- var y = db.Storageable(router)
- .WhereColumns(t => new { t.ROT_CODE, t.GHOST_ROW })
+ var y = db.Storageable(routeAct)
+ .WhereColumns(t => new { t.ID, t.GHOST_ROW })
.ToStorage();
y.AsInsertable.ExecuteCommand();
- y.AsUpdateable.IgnoreColumns(x => x.ID).ExecuteCommand();
+ y.AsUpdateable.ExecuteCommand();
+ });
+ if (!dbTran.IsSuccess)
+ {
+ result.IsSuccessed = false;
+ result.LocaleMsg = new($"淇濆瓨琛屼负鏁版嵁寮傚父");
+ }
+ }
+ catch (Exception ex)
+ {
+ result.CatchExceptionWithLog(ex, "淇濆瓨琛屼负鏁版嵁寮傚父");
+ }
+ return await Task.FromResult(result);
+ }
+
+ /// <summary>
+ /// 淇濆瓨
+ /// </summary>
+ /// <param name="route"></param>
+ /// <returns></returns>
+ public async Task<ApiAction> SaveRoute(MES_ROUTE route)
+ {
+ var result = new ApiAction();
+ try
+ {
+ var _route = Db.Queryable<MES_ROUTE>().Where(x => x.ROT_CODE == route.ROT_CODE).First();
+ //if (_route != null && Db.Queryable<MES_ROUTE_NODE>().Where(x => x.ROT_ID == _route.ID).Any())
+ //{
+ // result.IsSuccessed = false;
+ // result.LocaleMsg = new($"宸ヨ壓璺嚎宸茬粡鏈夎璁¤褰曪紝涓嶈兘淇濆瓨锛�");
+ // return result;
+ //}
+ if (_route != null && Db.Queryable<MES_PROD_OPER>().Where(x => x.ROT_ID == _route.ID).Any())
+ {
+ result.IsSuccessed = false;
+ result.LocaleMsg = new($"宸ヨ壓璺嚎宸茬粡鏈夌粦瀹氳褰曪紝涓嶈兘淇濆瓨锛�");
+ return result;
+ }
+ var db = Db;
+ var dbTran = db.UseTran(() =>
+ {
+ var y = db.Storageable(route)
+ //.WhereColumns(t => new { t.ROT_CODE, t.GHOST_ROW })
+ .ToStorage();
+ y.AsInsertable.ExecuteCommand();
+ y.AsUpdateable.ExecuteCommand();
});
if (!dbTran.IsSuccess)
{
@@ -236,11 +317,63 @@
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 nodeIds = routeData.nodes.Select(x => x.ID).ToList();
+ var actIds = routeData.acts.Select(x => x.ID).ToList();
+ //濡傛灉宸ュ簭鑺傜偣ID娌″湪浜у搧宸ュ簭閲屽氨鏂板
+ List<MES_PROD_OPER> operList = new List<MES_PROD_OPER>();
+ foreach (var node in routeData.nodes)
+ {
+ if (!Db.Queryable<MES_PROD_OPER>().Any(q => q.NODE_ID == node.ID && q.ROT_ID == routeData.route.ID))
+ {
+ operList.Add(new()
+ {
+ PROD_CODE = routeData.route.PROD_CODE,
+ CUST_CODE = routeData.route.CUST_CODE,
+ NODE_ID = node.ID,
+ NODE_NAME = node.NODE_NAME,
+ ROT_ID = node.ROT_ID,
+ OPER_CODE = node.OPER_CODE,
+ IS_ACTIVE = "Y",
+ CAN_SKIP = "N",
+ IS_CALC_FPY = "N",
+ ALLOW_DFT_IN = "N",
+ IS_INPUT = "N",
+ IS_OUTPUT = "N",
+ AUTH_ORG = node.AUTH_ORG,
+ AUTH_PROD = node.AUTH_PROD,
+ AUTH_WH = node.AUTH_WH,
+ });
+ }
+ }
+ //濡傛灉琛屼负鑺傜偣ID娌″湪浜у搧琛屼负閲屽氨鏂板
+ List<MES_PROD_ACTION> actList = new List<MES_PROD_ACTION>();
+ foreach (var act in routeData.acts)
+ {
+ if (!Db.Queryable<MES_PROD_ACTION>().Any(q => q.ACT_ID == act.ID && q.ROT_ID == routeData.route.ID))
+ {
+ actList.Add(new()
+ {
+ PROD_CODE = routeData.route.PROD_CODE,
+ CUST_CODE = routeData.route.CUST_CODE,
+ NODE_ID = act.NODE_ID,
+ ACT_ID = act.ID,
+ ACT_TYPE = act.ACT_TYPE,
+ ROT_ID = act.ROT_ID,
+ ACT_CODE = act.ACT_CODE,
+ RULE_CODE = "",
+ ITEM_CODE = "",
+ TEST_CODE = "",
+ SAPL_CODE = "",
+ LABEL_CODE = "",
+ PKG_CODE = "",
+ IS_ACTIVE = "Y",
+ SETUP_FINISH = "N",
+ AUTH_ORG = act.AUTH_ORG,
+ AUTH_PROD = act.AUTH_PROD,
+ AUTH_WH = act.AUTH_WH,
+ });
+ }
+ }
var db = Db;
var dbTran = db.UseTran(() =>
{
@@ -252,11 +385,42 @@
y.AsInsertable.ExecuteCommand();
y.AsUpdateable.IgnoreColumns(x => x.ID).ExecuteCommand();
}
+ if (!routeData.route.PROD_CODE.IsNullOrEmpty())
+ {
+ db.Deleteable<MES_PROD_OPER>().Where(x => x.ROT_ID == routeData.route.ID && x.PROD_CODE == routeData.route.PROD_CODE && !SqlFunc.ContainsArray(nodeIds, x.NODE_ID)).ExecuteCommand();
+ db.Deleteable<MES_PROD_ACTION>().Where(x => x.ROT_ID == routeData.route.ID && x.PROD_CODE == routeData.route.PROD_CODE && !SqlFunc.ContainsArray(actIds, x.ACT_ID)).ExecuteCommand();
+ }
+ db.Deleteable<MES_ROUTE_NODE>(false).Where(x => x.ROT_ID == routeData.route.ID).ExecuteCommand();
+ db.Deleteable<MES_ROUTE_EDGE>(false).Where(x => x.ROT_ID == routeData.route.ID).ExecuteCommand();
+ db.Deleteable<MES_ROUTE_NODE_ACT>(false).Where(x => x.ROT_ID == routeData.route.ID).ExecuteCommand();
+ if (routeData.nodes != null)
+ {
+ db.Insertable(routeData.nodes).ExecuteCommand();
+ }
+ if (routeData.edges != null)
+ {
+ db.Insertable(routeData.edges).ExecuteCommand();
+ }
+ if (routeData.acts != null)
+ {
+ db.Insertable(routeData.acts).ExecuteCommand();
+ }
+ if (!routeData.route.PROD_CODE.IsNullOrEmpty())
+ {
+ if (operList.Count > 0)
+ {
+ db.Insertable(operList).ExecuteCommand();
+ }
+ if (actList.Count > 0)
+ {
+ db.Insertable(actList).ExecuteCommand();
+ }
+ }
});
if (!dbTran.IsSuccess)
{
result.IsSuccessed = false;
- result.Message = $"淇濆瓨宸ヨ壓璺嚎鍥惧舰鏁版嵁寮傚父";
+ result.LocaleMsg = new($"淇濆瓨宸ヨ壓璺嚎鍥惧舰鏁版嵁寮傚父");
}
}
catch (Exception ex)
@@ -265,6 +429,567 @@
}
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);
+ }
+
+ /// <summary>
+ /// 淇濆瓨鑺傜偣宀椾綅璧勬簮
+ /// </summary>
+ /// <param name="nodePost"></param>
+ /// <returns></returns>
+ public async Task<ApiAction> SaveRouteNodePost(List<MES_ROUTE_NODE_POST> nodePost)
+ {
+ var result = new ApiAction();
+ try
+ {
+ var db = Db;
+ var dbTran = db.UseTran(() =>
+ {
+ var y = db.Storageable(nodePost)
+ .ToStorage();
+ y.AsInsertable.ExecuteCommand();
+ y.AsUpdateable.ExecuteCommand();
+ });
+ if (!dbTran.IsSuccess)
+ {
+ result.IsSuccessed = false;
+ result.LocaleMsg = new($"淇濆瓨鑺傜偣宀椾綅璧勬簮鏁版嵁寮傚父");
+ }
+ }
+ catch (Exception ex)
+ {
+ result.CatchExceptionWithLog(ex, "淇濆瓨鑺傜偣宀椾綅璧勬簮鏁版嵁寮傚父");
+ }
+ return await Task.FromResult(result);
+ }
+
+ /// <summary>
+ /// 鍒犻櫎浜у搧缁戝畾鐨勫伐鑹鸿矾绾�
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ /// <exception cref="NotImplementedException"></exception>
+ public async Task<ApiAction> DeleteProdRoute(DelProdRotInput input)
+ {
+ var result = new ApiAction();
+ try
+ {
+ var expable = Expressionable.Create<MES_PROD_ACTION>();
+ var expableOper = Expressionable.Create<MES_PROD_OPER>();
+ if (!string.IsNullOrEmpty(input.rotId))
+ {
+ expable.And(x => x.ROT_ID == input.rotId);
+ expableOper.And(x => x.ROT_ID == input.rotId);
+ }
+ else if (!string.IsNullOrEmpty(input.rotCode))
+ {
+ var item = await Db.Queryable<MES_ROUTE>().Where(x => x.ROT_CODE == input.rotCode).FirstAsync();
+ if (item != null)
+ {
+ expable.And(x => x.ROT_ID == item.ID);
+ expableOper.And(x => x.ROT_ID == item.ID);
+ }
+ }
+ string _custCode = input.custCode ?? "";
+ expable.And(x => x.PROD_CODE == input.prodCode && (x.CUST_CODE == _custCode));
+ expableOper.And(x => x.PROD_CODE == input.prodCode && x.CUST_CODE == _custCode);
+
+ var exp = expable.ToExpression();
+ var expOper = expableOper.ToExpression();
+ var db = Db;
+ var dbTran = db.UseTran(() =>
+ {
+ db.Deleteable<MES_PROD_ACTION>().Where(exp).ExecuteCommand();
+ db.Deleteable<MES_PROD_OPER>().Where(expOper).ExecuteCommand();
+ });
+ if (!dbTran.IsSuccess)
+ {
+ result.IsSuccessed = false;
+ result.LocaleMsg = new($"鍒犻櫎宸ヨ壓璺嚎寮傚父");
+ }
+ }
+ catch (Exception ex)
+ {
+ result.CatchExceptionWithLog(ex, "鍒犻櫎宸ヨ壓璺嚎寮傚父");
+ }
+ return result;
+ }
+
+ /// <summary>
+ /// 鍒犻櫎宸ュ崟缁戝畾鐨勫伐鑹鸿矾绾�
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ /// <exception cref="NotImplementedException"></exception>
+ public async Task<ApiAction> DeleteWoRoute(DelWoRotInput input)
+ {
+ var result = new ApiAction();
+ try
+ {
+ var bizMesWo = await Db.Queryable<BIZ_MES_WO>().Where(x => x.ORDER_NO == input.wo).FirstAsync();
+ if (bizMesWo != null && bizMesWo.STATUS > (int)STATUSs.Imported && bizMesWo.STATUS < (int)STATUSs.Closed)
+ {
+ result.IsSuccessed = false;
+ result.LocaleMsg = new($"宸ュ崟鐘舵�佷负[{EnumHelper.GetDesc(EnumHelper.GetEnum<STATUSs>(bizMesWo.STATUS))}]锛屼笉鑳藉垹闄ゅ伐鑹鸿矾绾�");
+ return result;
+ }
+ var expableNode = Expressionable.Create<MES_WO_NODE>();
+ var expableEdge = Expressionable.Create<MES_WO_EDGE>();
+ var expableAct = Expressionable.Create<MES_WO_NODE_ACT>();
+ var expable = Expressionable.Create<MES_WO_ACTION>();
+ var expableOper = Expressionable.Create<MES_WO_OPER>();
+ var _rotId = input.rotId;
+ if (!string.IsNullOrEmpty(input.rotId))
+ {
+ expable.And(x => x.ROT_ID == input.rotId);
+ expableOper.And(x => x.ROT_ID == input.rotId);
+ expableNode.And(x => x.ROT_ID == input.rotId);
+ expableEdge.And(x => x.ROT_ID == input.rotId);
+ expableAct.And(x => x.ROT_ID == input.rotId);
+ }
+ else if (!string.IsNullOrEmpty(input.rotCode))
+ {
+ var item = await Db.Queryable<MES_ROUTE>().Where(x => x.ROT_CODE == input.rotCode).FirstAsync();
+ if (item != null)
+ {
+ _rotId = item.ID;
+ expable.And(x => x.ROT_ID == item.ID);
+ expableOper.And(x => x.ROT_ID == item.ID);
+ expableNode.And(x => x.ROT_ID == item.ID);
+ expableEdge.And(x => x.ROT_ID == item.ID);
+ expableAct.And(x => x.ROT_ID == item.ID);
+ }
+ }
+ //濡傛灉闄や簡鍒犻櫎鐨勫綋鍓嶅伐鑹鸿矾绾夸笉瀛樺湪鍏朵粬缁戝畾鐨勫伐鑹鸿矾绾匡紝鍒欐洿鏂扮姸鎬�
+ if (bizMesWo != null && !Db.Queryable<MES_WO_NODE>().Where(x => x.WORK_ORDER == input.wo && x.ROT_ID != _rotId).Any())
+ {
+ bizMesWo.ROUTE_STATUS = (int)ROUTE_STATUSs.WaitSet;
+ bizMesWo.STATUS = (int)STATUSs.Init;
+ bizMesWo.ROUTE_CODE = "";
+ }
+ if (!string.IsNullOrEmpty(input.wo))
+ {
+ expable.And(x => x.WORK_ORDER == input.wo);
+ expableOper.And(x => x.WORK_ORDER == input.wo);
+ expableNode.And(x => x.WORK_ORDER == input.wo);
+ expableEdge.And(x => x.WORK_ORDER == input.wo);
+ expableAct.And(x => x.WORK_ORDER == input.wo);
+ }
+ var exp = expable.ToExpression();
+ var expOper = expableOper.ToExpression();
+ var expNode = expableNode.ToExpression();
+ var expEdge = expableEdge.ToExpression();
+ var expAct = expableAct.ToExpression();
+ var db = Db;
+ var dbTran = db.UseTran(() =>
+ {
+ db.Deleteable<MES_WO_ACTION>().Where(exp).ExecuteCommand();
+ db.Deleteable<MES_WO_OPER>().Where(expOper).ExecuteCommand();
+ db.Deleteable<MES_WO_NODE>().Where(expNode).ExecuteCommand();
+ db.Deleteable<MES_WO_EDGE>().Where(expEdge).ExecuteCommand();
+ db.Deleteable<MES_WO_NODE_ACT>().Where(expAct).ExecuteCommand();
+ db.Updateable(bizMesWo).ExecuteCommand();
+ });
+ if (!dbTran.IsSuccess)
+ {
+ result.IsSuccessed = false;
+ result.LocaleMsg = new($"鍒犻櫎宸ヨ壓璺嚎寮傚父");
+ }
+ }
+ catch (Exception ex)
+ {
+ result.CatchExceptionWithLog(ex, "鍒犻櫎宸ヨ壓璺嚎寮傚父");
+ }
+ return result;
+ }
+
+ /// <summary>
+ /// 淇濆瓨榛樿宸ヨ壓璺嚎鍒颁骇鍝�
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ public async Task<ApiAction> SetDefaultRoute(ProdRotInput input)
+ {
+ var result = new ApiAction();
+ try
+ {
+ var item = await Biz.Db.Queryable<BAS_ITEM>().ByAuth(input.options).Where(x => x.ITEM_CODE == input.prodCode).FirstAsync();
+ if (item == null)
+ {
+ result.IsSuccessed = false;
+ result.LocaleMsg = new($"浜у搧[{input.prodCode}]涓嶅瓨鍦紒");
+ return result;
+ }
+ item.DEFAULT_ROUTE = input.isDefault ? input.rotCode : "";
+ var db = Db;
+ var dbTran = db.UseTran(() =>
+ {
+ db.Updateable(item).UpdateColumns(q => new { q.DEFAULT_ROUTE }).ExecuteCommand();
+ });
+ if (!dbTran.IsSuccess)
+ {
+ result.IsSuccessed = false;
+ result.LocaleMsg = new($"淇濆瓨榛樿宸ヨ壓璺嚎鍒颁骇鍝佸紓甯�");
+ }
+ }
+ catch (Exception ex)
+ {
+ result.CatchExceptionWithLog(ex, "淇濆瓨榛樿宸ヨ壓璺嚎鍒颁骇鍝佸紓甯�");
+ }
+ return result;
+ }
+
+ #region 宸ュ崟宸ヨ壓璺嚎鐩稿叧
+
+
+ /// <summary>
+ /// 鑾峰彇宸ュ崟宸ヨ壓璺嚎鍥惧舰鏁版嵁
+ /// </summary>
+ /// <param name="workorder"></param>
+ /// <returns></returns>
+ public async Task<ApiAction<WoRouteData>> GetWoRouteData(string workorder)
+ {
+ var res = new ApiAction<WoRouteData>();
+ WoRouteData rotData = new WoRouteData();
+ try
+ {
+ if (string.IsNullOrEmpty(workorder))
+ {
+ res.IsSuccessed = false;
+ res.LocaleMsg = new($"浼犲叆鐨勫伐鑹鸿矾绾縄D涓虹┖锛屼笉鑳芥煡鎵惧伐鑹鸿矾绾匡紒");
+ return res;
+ }
+ //宸ヨ壓璺嚎
+ var route = await Db.Queryable<BIZ_MES_WO, MES_ROUTE>((q, s) => new JoinQueryInfos(JoinType.Inner, q.ROUTE_CODE == s.ROT_CODE))
+ .Where((q, s) => q.ID.Equals(workorder) || q.ORDER_NO == workorder).Select((q, s) => new MES_ROUTE
+ {
+ ID = s.ID,
+ ROT_CODE = s.ROT_CODE,
+ ROT_NAME = s.ROT_NAME,
+ ROT_TYPE = s.ROT_TYPE,
+ ROT_VER = s.ROT_VER,
+ IS_ACTIVE = s.IS_ACTIVE,
+ REMARK = s.REMARK,
+ WORK_ORDER = q.ORDER_NO,
+ PROD_CODE = q.ITEM_CODE,
+ CUST_CODE = q.CUST_CODE,
+ }).FirstAsync();
+ rotData.route = route;
+ if (route == null)
+ {
+ res.IsSuccessed = false;
+ res.LocaleMsg = new($"涓嶈兘鏌ユ壘鍒板伐鍗曞伐鑹鸿矾绾匡紒");
+ return res;
+ }
+ //鑺傜偣
+ var nodes = await Db.Queryable<MES_WO_NODE>()
+ .WhereIF(!string.IsNullOrEmpty(route.ID), x => x.WORK_ORDER.Equals(route.WORK_ORDER))
+ .ToListAsync();
+ foreach (var node in nodes)
+ {
+ node.node = new()
+ {
+ id = node.ID,
+ type = node.GPH_TYPE,
+ x = node.GPH_X,
+ y = node.GPH_Y,
+ properties = node.GPH_PROP,
+ text = new()
+ {
+ x = node.GPH_X,
+ y = node.GPH_Y,
+ value = node.GPH_TEXT
+ }
+ };
+ }
+ rotData.nodes = nodes;
+
+ var acts = await Db.Queryable<MES_WO_NODE_ACT>()
+ .WhereIF(!string.IsNullOrEmpty(route.ID), x => x.WORK_ORDER.Equals(route.WORK_ORDER))
+ .ToListAsync();
+ foreach (var act in acts)
+ {
+ act.node = new()
+ {
+ id = act.ID,
+ type = act.GPH_TYPE,
+ x = act.GPH_X,
+ y = act.GPH_Y,
+ properties = act.GPH_PROP,
+ text = new()
+ {
+ x = act.GPH_X,
+ y = act.GPH_Y,
+ value = act.GPH_TEXT
+ }
+ };
+ }
+ rotData.acts = acts;
+
+ //杈�
+ var edges = await Db.Queryable<MES_WO_EDGE>()
+ .WhereIF(!string.IsNullOrEmpty(route.ID), x => x.WORK_ORDER.Equals(route.WORK_ORDER))
+ .ToListAsync();
+ foreach (var edge in edges)
+ {
+ edge.edge = new()
+ {
+ id = edge.ID,
+ type = edge.GPH_TYPE,
+ sourceNodeId = edge.SRC_NODE,
+ targetNodeId = edge.TGT_NODE,
+ properties = edge.GPH_PROP,
+ startPoint = new()
+ {
+ x = edge.GPH_SRC_X,
+ y = edge.GPH_SRC_Y,
+ },
+ endPoint = new()
+ {
+ x = edge.GPH_TGT_X,
+ y = edge.GPH_TGT_Y,
+ },
+ pointsList = new()
+ {
+ new(){
+ x = edge.GPH_SRC_X,
+ y = edge.GPH_SRC_Y,
+ },
+ new(){
+ x = edge.GPH_TGT_X,
+ y = edge.GPH_TGT_Y,
+ }
+ }
+ };
+ }
+ rotData.edges = edges;
+ }
+ catch (Exception ex)
+ {
+ res.CatchExceptionWithLog(ex, "鏌ヨ寮傚父");
+ }
+ res.Data = rotData;
+ return res;
+ }
+
+ /// <summary>
+ /// 淇濆瓨宸ュ崟宸ヨ壓璺嚎鍥惧舰鏁版嵁
+ /// </summary>
+ /// <param name="routeData"></param>
+ /// <returns></returns>
+ public async Task<ApiAction> SaveWoRouteData(WoRouteData routeData)
+ {
+ var result = new ApiAction();
+ try
+ {
+ var nodeIds = routeData.nodes.Select(x => x.ID).ToList();
+ var actIds = routeData.acts.Select(x => x.ID).ToList();
+ //濡傛灉宸ュ簭鑺傜偣ID娌″湪宸ュ崟宸ュ簭閲屽氨鏂板
+ List<MES_WO_OPER> operList = new List<MES_WO_OPER>();
+ foreach (var node in routeData.nodes)
+ {
+ if (!Db.Queryable<MES_WO_OPER>().Any(q => q.NODE_ID == node.ID))
+ {
+ operList.Add(new()
+ {
+ WORK_ORDER = node.WORK_ORDER,
+ PROD_CODE = node.PROD_CODE,
+ CUST_CODE = node.CUST_CODE,
+ NODE_ID = node.ID,
+ NODE_NAME = node.NODE_NAME,
+ ROT_ID = node.ROT_ID,
+ OPER_CODE = node.OPER_CODE,
+ IS_ACTIVE = "Y",
+ CAN_SKIP = "N",
+ IS_CALC_FPY = "N",
+ ALLOW_DFT_IN = "N",
+ IS_INPUT = "N",
+ IS_OUTPUT = "N",
+ AUTH_ORG = node.AUTH_ORG,
+ AUTH_PROD = node.AUTH_PROD,
+ AUTH_WH = node.AUTH_WH,
+ });
+ }
+ }
+ //濡傛灉琛屼负鑺傜偣ID娌″湪宸ュ崟琛屼负閲屽氨鏂板
+ List<MES_WO_ACTION> actList = new List<MES_WO_ACTION>();
+ foreach (var act in routeData.acts)
+ {
+ if (!Db.Queryable<MES_WO_ACTION>().Any(q => q.ACT_ID == act.ID))
+ {
+ actList.Add(new()
+ {
+ WORK_ORDER = act.WORK_ORDER,
+ PROD_CODE = act.PROD_CODE,
+ CUST_CODE = act.CUST_CODE,
+ NODE_ID = act.NODE_ID,
+ ACT_ID = act.ID,
+ ACT_TYPE = act.ACT_TYPE,
+ ROT_ID = act.ROT_ID,
+ ACT_CODE = act.ACT_CODE,
+ RULE_CODE = "",
+ ITEM_CODE = "",
+ TEST_CODE = "",
+ SAPL_CODE = "",
+ LABEL_CODE = "",
+ PKG_CODE = "",
+ IS_ACTIVE = "Y",
+ SETUP_FINISH = "N",
+ AUTH_ORG = act.AUTH_ORG,
+ AUTH_PROD = act.AUTH_PROD,
+ AUTH_WH = act.AUTH_WH,
+ });
+ }
+ }
+ var db = Db;
+ var dbTran = db.UseTran(() =>
+ {
+ //if (routeData.route != null)
+ //{
+ // var y = db.Storageable(routeData.route)
+ // .WhereColumns(t => new { t.ROT_CODE, t.GHOST_ROW })
+ // .ToStorage();
+ // y.AsInsertable.ExecuteCommand();
+ // y.AsUpdateable.IgnoreColumns(x => x.ID).ExecuteCommand();
+ //}
+ db.Deleteable<MES_WO_OPER>().Where(x => x.WORK_ORDER == routeData.route.WORK_ORDER && !SqlFunc.ContainsArray(nodeIds, x.NODE_ID)).ExecuteCommand();
+ db.Deleteable<MES_WO_ACTION>().Where(x => x.WORK_ORDER == routeData.route.WORK_ORDER && !SqlFunc.ContainsArray(actIds, x.ACT_ID)).ExecuteCommand();
+ db.Deleteable<MES_WO_NODE>(false).Where(x => x.WORK_ORDER == routeData.route.WORK_ORDER).ExecuteCommand();
+ db.Deleteable<MES_WO_EDGE>(false).Where(x => x.WORK_ORDER == routeData.route.WORK_ORDER).ExecuteCommand();
+ db.Deleteable<MES_WO_NODE_ACT>(false).Where(x => x.WORK_ORDER == routeData.route.WORK_ORDER).ExecuteCommand();
+ if (routeData.nodes != null)
+ {
+ db.Insertable(routeData.nodes).ExecuteCommand();
+ }
+ if (routeData.edges != null)
+ {
+ db.Insertable(routeData.edges).ExecuteCommand();
+ }
+ if (routeData.acts != null)
+ {
+ db.Insertable(routeData.acts).ExecuteCommand();
+ }
+ if (operList.Count > 0)
+ {
+ db.Insertable(operList).ExecuteCommand();
+ }
+ if (actList.Count > 0)
+ {
+ db.Insertable(actList).ExecuteCommand();
+ }
+ });
+ if (!dbTran.IsSuccess)
+ {
+ result.IsSuccessed = false;
+ result.LocaleMsg = new($"淇濆瓨宸ュ崟宸ヨ壓璺嚎鍥惧舰鏁版嵁寮傚父");
+ }
+ }
+ catch (Exception ex)
+ {
+ result.CatchExceptionWithLog(ex, "淇濆瓨宸ュ崟宸ヨ壓璺嚎鍥惧舰鏁版嵁寮傚父");
+ }
+ return await Task.FromResult(result);
+ }
+
+ /// <summary>
+ /// 淇濆瓨宸ュ崟宸ヨ壓鑺傜偣宀椾綅璧勬簮
+ /// </summary>
+ /// <param name="nodePost"></param>
+ /// <returns></returns>
+ public async Task<ApiAction> SaveWoRouteNodePost(List<MES_WO_NODE_POST> nodePost)
+ {
+ var result = new ApiAction();
+ try
+ {
+ var db = Db;
+ var dbTran = db.UseTran(() =>
+ {
+ var y = db.Storageable(nodePost)
+ .ToStorage();
+ y.AsInsertable.ExecuteCommand();
+ y.AsUpdateable.ExecuteCommand();
+ });
+ if (!dbTran.IsSuccess)
+ {
+ result.IsSuccessed = false;
+ result.LocaleMsg = new($"淇濆瓨宸ュ崟宸ヨ壓鑺傜偣宀椾綅璧勬簮鏁版嵁寮傚父");
+ }
+ }
+ catch (Exception ex)
+ {
+ result.CatchExceptionWithLog(ex, "淇濆瓨宸ュ崟宸ヨ壓鑺傜偣宀椾綅璧勬簮鏁版嵁寮傚父");
+ }
+ return await Task.FromResult(result);
+ }
+ #endregion
+ /// <summary>
+ /// 鑾峰彇宸ヨ壓璺嚎鏍戝舰缁撴瀯
+ /// </summary>
+ /// <param name="prodCode"></param>
+ /// <param name="orgCode"></param>
+ /// <returns></returns>
+ public async Task<List<V_MES_ROUTE_PTREE>> GetRoutePTree(string prodCode, string orgCode)
+ {
+ var result = new List<V_MES_ROUTE_PTREE>();
+ try
+ {
+
+ SugarParameter[] pars = Biz.Db.Ado.GetParameters(new { PROD_CODE = prodCode, ORG_CODE = orgCode });
+ result = Biz.Db.Ado.UseStoredProcedure().SqlQuery<V_MES_ROUTE_PTREE>("SP_MES_GET_ROUTE_PTREE", pars);//杩斿洖List
+ var item = await Db.Queryable<BAS_ITEM>().Where(q => q.ITEM_CODE == prodCode).FirstAsync();
+ if (item != null && !item.DEFAULT_ROUTE.IsNullOrEmpty())
+ {
+ var pid = result.Where(q => q.code == $"DefaultRoute_{orgCode}_{prodCode}").Select(q => q.tid).FirstOrDefault();
+ result.ForEach(d =>
+ {
+ if (d.pid == pid && d.code == item.DEFAULT_ROUTE)
+ {
+ d.isDefault = true;
+ }
+ else
+ {
+ d.isDefault = false;
+ }
+ });
+ }
+ }
+ catch (Exception ex)
+ {
+ Logger.Default.Error(ex, "淇濆瓨榛樿宸ヨ壓璺嚎鍒颁骇鍝佸紓甯�");
+ }
+ return result;
+ }
+ } //endClass Route
+ } //endClass Biz
}
--
Gitblit v1.9.3