Merge branch 'master' of http://47.115.28.255:8110/r/TigerClouds-Tech/Serve...

Rodney Chen

2024-08-20 0b0a75aa37df49d9be66f5f6f75d91988fb8c129

 Tiger.Business/MES/Biz.Route.cs

@@ -333,6 +333,9 @@
                                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,
                            });
                        }
                    }
@@ -340,7 +343,7 @@
                    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.NODE_ID == act.ID && q.ROT_ID == routeData.route.ID))
                        if (!Db.Queryable<MES_PROD_ACTION>().Any(q => q.ACT_ID == act.ID && q.ROT_ID == routeData.route.ID))
                        {
                            actList.Add(new()
                            {
@@ -359,6 +362,9 @@
                                PKG_CODE = "",
                                IS_ACTIVE = "Y",
                                SETUP_FINISH = "N",
                                AUTH_ORG = act.AUTH_ORG,
                                AUTH_PROD = act.AUTH_PROD,
                                AUTH_WH = act.AUTH_WH,
                            });
                        }
                    }
@@ -374,7 +380,6 @@
                            y.AsUpdateable.IgnoreColumns(x => x.ID).ExecuteCommand();
                        }
                        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(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();
@@ -784,6 +789,9 @@
                                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,
                            });
                        }
                    }
@@ -791,7 +799,7 @@
                    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.NODE_ID == act.ID))
                        if (!Db.Queryable<MES_WO_ACTION>().Any(q => q.ACT_ID == act.ID))
                        {
                            actList.Add(new()
                            {
@@ -811,6 +819,9 @@
                                PKG_CODE = "",
                                IS_ACTIVE = "Y",
                                SETUP_FINISH = "N",
                                AUTH_ORG = act.AUTH_ORG,
                                AUTH_PROD = act.AUTH_PROD,
                                AUTH_WH = act.AUTH_WH,
                            });
                        }
                    }
@@ -826,7 +837,6 @@
                        //    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(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();