From 730e2372617091716645ff34d8ebf2db59b9a33d Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期三, 16 十月 2024 20:43:28 +0800
Subject: [PATCH] 优化日志
---
Tiger.Business/MES/Biz.Route.cs | 102 +++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 90 insertions(+), 12 deletions(-)
diff --git a/Tiger.Business/MES/Biz.Route.cs b/Tiger.Business/MES/Biz.Route.cs
index 38f5200..2e6c16b 100644
--- a/Tiger.Business/MES/Biz.Route.cs
+++ b/Tiger.Business/MES/Biz.Route.cs
@@ -273,20 +273,26 @@
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())
+ //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($"宸ヨ壓璺嚎宸茬粡鏈夎璁¤褰曪紝涓嶈兘淇濆瓨锛�");
+ 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 })
+ //.WhereColumns(t => new { t.ROT_CODE, t.GHOST_ROW })
.ToStorage();
y.AsInsertable.ExecuteCommand();
- y.AsUpdateable.IgnoreColumns(x => x.ID).ExecuteCommand();
+ y.AsUpdateable.ExecuteCommand();
});
if (!dbTran.IsSuccess)
{
@@ -381,8 +387,8 @@
}
if (!routeData.route.PROD_CODE.IsNullOrEmpty())
{
- db.Deleteable<MES_PROD_OPER>().Where(x => x.PROD_CODE == routeData.route.PROD_CODE && !SqlFunc.ContainsArray(nodeIds, x.NODE_ID)).ExecuteCommand();
- db.Deleteable<MES_PROD_ACTION>().Where(x => x.PROD_CODE == routeData.route.PROD_CODE && !SqlFunc.ContainsArray(actIds, x.ACT_ID)).ExecuteCommand();
+ 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();
@@ -515,11 +521,10 @@
expableOper.And(x => x.ROT_ID == item.ID);
}
}
- if (!string.IsNullOrEmpty(input.prodCode))
- {
- expable.And(x => x.PROD_CODE == input.prodCode);
- expableOper.And(x => x.PROD_CODE == input.prodCode);
- }
+
+ expable.And(x => x.PROD_CODE == input.prodCode && x.CUST_CODE == input.custCode);
+ expableOper.And(x => x.PROD_CODE == input.prodCode && x.CUST_CODE == input.custCode);
+
var exp = expable.ToExpression();
var expOper = expableOper.ToExpression();
var db = Db;
@@ -625,6 +630,42 @@
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;
}
@@ -859,7 +900,7 @@
{
db.Insertable(routeData.acts).ExecuteCommand();
}
- if (operList.Count>0)
+ if (operList.Count > 0)
{
db.Insertable(operList).ExecuteCommand();
}
@@ -912,6 +953,43 @@
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