From 1f1daf8fd3b6fd0759d17facc0ad97562e516a3a Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期二, 10 九月 2024 17:38:13 +0800
Subject: [PATCH] 包装规则保存
---
Tiger.Business/MES/Biz.Route.cs | 156 ++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 152 insertions(+), 4 deletions(-)
diff --git a/Tiger.Business/MES/Biz.Route.cs b/Tiger.Business/MES/Biz.Route.cs
index cd069f1..771a429 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)
{
@@ -311,6 +317,63 @@
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_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(() =>
{
@@ -321,6 +384,11 @@
.ToStorage();
y.AsInsertable.ExecuteCommand();
y.AsUpdateable.IgnoreColumns(x => x.ID).ExecuteCommand();
+ }
+ 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_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();
@@ -336,6 +404,17 @@
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)
@@ -699,6 +778,65 @@
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(() =>
{
@@ -710,6 +848,8 @@
// 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();
@@ -725,6 +865,14 @@
{
db.Insertable(routeData.acts).ExecuteCommand();
}
+ if (operList.Count>0)
+ {
+ db.Insertable(operList).ExecuteCommand();
+ }
+ if (actList.Count > 0)
+ {
+ db.Insertable(actList).ExecuteCommand();
+ }
});
if (!dbTran.IsSuccess)
{
--
Gitblit v1.9.3