新增属性和导航属性，调整枚举变量位置

Ben Lin

2025-01-08 c7327ce93612f6023b94982b4596ad4786567580

 Tiger.Business.MES/iERP/U9C_MES.cs

@@ -78,14 +78,16 @@
                            Accuracy = (di["Accuracy"] ?? "").ToString(),
                            Remark = (di["Remark"] ?? "").ToString(),
                            Packaging = (di["Packaging"] ?? "").ToString(),
                            SapCode = (di["Code1"] ?? "").ToString(),
                        };
                        itemExts.Add(extInfo);
                    }
                }
            }
            Logger.Scheduler.Info($"物料信息存入实体中，总数：[{items.Count}]");
            var dbTran = db.UseTran(() =>
            {
            db = Biz.Db;
            //var dbTran = db.UseTran(() =>
            //{
                if (items.Any())
                {
                    if (items.Count > 100)
@@ -117,7 +119,7 @@
                                    .WhereColumns(t => new { t.ITEM_ID, t.GHOST_ROW })
                                    .ToStorage();
                             y.AsInsertable.ExecuteCommand();
                             y.AsUpdateable.ExecuteCommand();
                             y.AsUpdateable.IgnoreColumns(x => x.ID).ExecuteCommand();
                         });
                    }
                    else
@@ -129,13 +131,14 @@
                        s.AsUpdateable.IgnoreColumns(x => x.ID).ExecuteCommand();
                    }
                }
            });
            if (!dbTran.IsSuccess)
            {
                action.CatchExceptionWithLog(dbTran.ErrorException, $"数据处理失败");
                Logger.Scheduler.Error(action.Message);
            }
            //});
            //if (!dbTran.IsSuccess)
            //{
            //    action.CatchExceptionWithLog(dbTran.ErrorException, $"数据处理失败");
            //    Logger.Scheduler.Error(action.Message);
            //}
            Logger.Scheduler.Info($"物料信息存入数据库，总数：[{items.Count}]");
            action.Message = $"物料信息存入数据库，总数：[{items.Count}]";
            return action;
        }

@@ -205,15 +208,15 @@
                db.Storageable(LastRun, "U9C_MES_GetWo").ExecuteCommand();
                if (items.Any())
                {
                    if (items.Count > 150)
                    if (items.Count > 100)
                    {
                        db.Utilities.PageEach(items, 1000, pageList =>
                        db.Utilities.PageEach(items, 100, pageList =>
                        {
                            var y = db.Storageable(pageList, "U9C")
                                   .WhereColumns(t => new { t.ORDER_NO, t.GHOST_ROW })
                                   .ToStorage();
                            y.BulkCopy();
                            y.BulkUpdate();
                            y.AsInsertable.ExecuteCommand();
                            y.AsUpdateable.IgnoreColumns(x => x.ID).ExecuteCommand();
                        });
                    }
                    else
@@ -282,11 +285,7 @@
                    {
                        if (woList.Any())
                        {
                            var s = _db.Storageable(woList, "U9C")
                                   .WhereColumns(t => new { t.ORDER_NO, t.GHOST_ROW })
                                   .ToStorage();
                            s.AsInsertable.ExecuteCommand();
                            s.AsUpdateable.IgnoreColumns(x => x.ID).UpdateColumns(x => new { x.ROUTE_STATUS}).ExecuteCommand();
                            _db.Updateable(woList, "U9C").UpdateColumns(x => new { x.ROUTE_STATUS }).ExecuteCommand();
                        }

                    });
@@ -340,8 +339,9 @@
                }
            }
            Logger.Scheduler.Info($"客户信息存入实体中，总数：[{items.Count}]");
            var dbTran = db.UseTran(() =>
                {
            db = Biz.Db;
            //var dbTran = db.UseTran(() =>
            //    {
                    if (items.Any())
                    {
                        if (items.Count > 100)
@@ -365,13 +365,14 @@
                        }
                    }

                });
            if (!dbTran.IsSuccess)
            {
                action.CatchExceptionWithLog(dbTran.ErrorException, $"数据处理失败");
                Logger.Scheduler.Error(action.Message);
            }
            //    });
            //if (!dbTran.IsSuccess)
            //{
            //    action.CatchExceptionWithLog(dbTran.ErrorException, $"数据处理失败");
            //    Logger.Scheduler.Error(action.Message);
            //}
            Logger.Scheduler.Info($"客户信息存入数据库，总数：[{items.Count}]");
            action.Message = $"客户信息存入数据库，总数：[{items.Count}]";
            return action;
        }

@@ -412,9 +413,10 @@
                }
            }
            Logger.Scheduler.Info($"供应商信息存入实体中，总数：[{items.Count}]");
            var dbTran = db.UseTran(() =>
            {
                if (items.Any())
            db = Biz.Db;
            //var dbTran = db.UseTran(() =>
            // {
            if (items.Any())
                {
                    if (items.Count > 100)
                    {
@@ -437,13 +439,14 @@
                    }
                }

            });
            if (!dbTran.IsSuccess)
            {
                action.CatchExceptionWithLog(dbTran.ErrorException, $"数据处理失败");
                Logger.Scheduler.Error(action.Message);
            }
            //});
            //if (!dbTran.IsSuccess)
            //{
            //    action.CatchExceptionWithLog(dbTran.ErrorException, $"数据处理失败");
            //    Logger.Scheduler.Error(action.Message);
            //}
            Logger.Scheduler.Info($"供应商信息存入数据库，总数：[{items.Count}]");
            action.Message = $"供应商信息存入数据库，总数：[{items.Count}]";
            return action;
        }

@@ -489,8 +492,9 @@
                }
            }
            Logger.Scheduler.Info($"客户条码信息存入实体中，总数：[{items.Count}]");
            var dbTran = db.UseTran(() =>
            {
            db = Biz.Db;
            //var dbTran = db.UseTran(() =>
            //{
                if (items.Any())
                {
                    if (items.Count > 100)
@@ -501,7 +505,7 @@
                                   .WhereColumns(t => new { t.CUST_SN, t.GHOST_ROW })
                                   .ToStorage();
                            y.AsInsertable.ExecuteCommand();
                            y.AsUpdateable.IgnoreColumns(x => x.ID).ExecuteCommand();
                            y.AsUpdateable.IgnoreColumns(x => x.ID).UpdateColumns(q => new { q.CUST_CODE,q.WORK_ORDER,q.CUST_SN,q.FLOW_SN,q.ITEM_CODE,q.CREATE_TIME,q.UPDATE_TIME,q.UPDATE_USER,q.AUTH_ORG}).ExecuteCommand();
                        });
                    }
                    else
@@ -510,17 +514,18 @@
                               .WhereColumns(t => new { t.CUST_SN, t.GHOST_ROW })
                               .ToStorage();
                        s.AsInsertable.ExecuteCommand();
                        s.AsUpdateable.IgnoreColumns(x => x.ID).ExecuteCommand();
                        s.AsUpdateable.IgnoreColumns(x => x.ID).UpdateColumns(q => new { q.CUST_CODE, q.WORK_ORDER, q.CUST_SN, q.FLOW_SN, q.ITEM_CODE, q.CREATE_TIME, q.UPDATE_TIME, q.UPDATE_USER, q.AUTH_ORG }).ExecuteCommand();
                    }
                }

            });
            if (!dbTran.IsSuccess)
            {
                action.CatchExceptionWithLog(dbTran.ErrorException, $"数据处理失败");
                Logger.Scheduler.Error(action.Message);
            }
            //});
            //if (!dbTran.IsSuccess)
            //{
            //    action.CatchExceptionWithLog(dbTran.ErrorException, $"数据处理失败");
            //    Logger.Scheduler.Error(action.Message);
            //}
            Logger.Scheduler.Info($"客户条码信息存入数据库，总数：[{items.Count}]");
            action.Message = $"客户条码信息存入数据库，总数：[{items.Count}]";
            return action;
        }

@@ -556,6 +561,7 @@
                            UPDATE_TIME = di["ModifiedOn"].ToDateTime(),
                            PLAN_START_TIME = di["CreatedOn"].ToDateTime(),
                            STATUS = 0,
                            WS_CODE = di["DepartmentName"] == null ? "" : di["DepartmentName"].ToString(),
                            AUTH_ORG = orgs.Where(x => x.ID == orgId).Select(q => q.ORG_CODE).FirstOrDefault(),
                            SALES_ORDER = di["SrcDoc_SrcDocNo"] == null ? "" : di["SrcDoc_SrcDocNo"].ToString(),
                            SALES_REMARK = di["SoLineMemo"] == null ? "" : di["SoLineMemo"].ToString(),
@@ -564,7 +570,7 @@
                            CUST_PREFIX = di["OutBarHead"] == null ? "" : di["OutBarHead"].ToString(),
                            SALES_CONTRACT = di["Contracts"] == null ? "" : di["Contracts"].ToString(),
                        };
                        if (!Biz.Db.Queryable<BIZ_MES_WO>().Any(x => x.ORDER_NO == woItem.ORDER_NO && (x.STATUS > BIZ_MES_WO.STATUSs.Init.GetValue() || x.ROUTE_STATUS > BIZ_MES_WO.ROUTE_STATUSs.WaitSet.GetValue())))
                        if (!Biz.Db.Queryable<BIZ_MES_WO>().Any(x => x.ORDER_NO == woItem.ORDER_NO && x.STATUS > BIZ_MES_WO.STATUSs.Imported.GetValue()))
                        {
                            items.Add(woItem);
                        }
@@ -578,8 +584,8 @@
            }
            Logger.Scheduler.Info($"工单信息存入实体中，总数：[{items.Count}]");
            db = Biz.Db;
            var dbTran = db.UseTran(() =>
            {
            //var dbTran = db.UseTran(() =>
            //{
                if (items.Any())
                {
                    if (items.Count > 100)
@@ -603,12 +609,12 @@
                    }
                }

            });
            if (!dbTran.IsSuccess)
            {
                action.CatchExceptionWithLog(dbTran.ErrorException, $"数据处理失败");
                Logger.Scheduler.Error(action.Message);
            }
            //});
            //if (!dbTran.IsSuccess)
            //{
            //    action.CatchExceptionWithLog(dbTran.ErrorException, $"数据处理失败");
            //    Logger.Scheduler.Error(action.Message);
            //}
            action.Message = $"工单信息存入数据库，总数：[{items.Count}]";
            Logger.Scheduler.Info($"{action.Message}");
            if (action.IsSuccessed && items.Count > 0)