From d57d44bf22f7516500999a4935d8a589ae90e29c Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期二, 15 四月 2025 08:43:29 +0800
Subject: [PATCH] 1.委外订单主表入参新增fbillno 2.erp-》mes调拨单新增有无源单字段 3.生产订单优化
---
MES.Service/DB/Repository.cs | 63 +------------------------------
1 files changed, 2 insertions(+), 61 deletions(-)
diff --git a/MES.Service/DB/Repository.cs b/MES.Service/DB/Repository.cs
index 9906f8f..c9a8bba 100644
--- a/MES.Service/DB/Repository.cs
+++ b/MES.Service/DB/Repository.cs
@@ -7,7 +7,7 @@
{
protected static SqlSugarScope Db = new(new ConnectionConfig
{
- DbType = DbType.Oracle,
+ DbType = DbType.SqlServer,
ConnectionString = AppsettingsUtility.Settings.DataBaseConn,
IsAutoCloseConnection = true
},
@@ -16,7 +16,7 @@
db.Aop.OnLogExecuting = (sql, pars) =>
{
Console.WriteLine(
- UtilMethods.GetSqlString(DbType.Oracle, sql, pars));
+ UtilMethods.GetSqlString(DbType.SqlServer, sql, pars));
};
});
@@ -40,63 +40,4 @@
throw; // 閲嶆柊鎶涘嚭寮傚父
}
}
-
- public object CommonPage(QueryParameters pars, int pageIndex, int pagesize)
- {
- var tolCount = 0;
- var sugarParamters = pars.Parameters.Select(it =>
- (IConditionalModel)new ConditionalModel
- {
- ConditionalType = it.ConditionalType,
- FieldName = it.FieldName,
- FieldValue = it.FieldValue
- }).ToList();
- var query = Db.Queryable<T>();
- if (pars.OrderBys != null)
- foreach (var item in pars.OrderBys)
- query.OrderBy(item.ToSqlFilter());
- var result = query.Where(sugarParamters)
- .ToPageList(pageIndex, pagesize, ref tolCount);
- return new
- {
- count = tolCount,
- data = result
- };
- }
-
- public object CommonPage<ViewModel>(ISugarQueryable<ViewModel> query,
- QueryParameters pars, int pageIndex, int pagesize)
- {
- var tolCount = 0;
- var sugarParamters = pars.Parameters.Select(it =>
- (IConditionalModel)new ConditionalModel
- {
- ConditionalType = it.ConditionalType,
- FieldName = it.FieldName,
- FieldValue = it.FieldValue
- }).ToList();
- if (pars.OrderBys != null)
- foreach (var item in pars.OrderBys)
- query.OrderBy(item.ToSqlFilter());
- var result = query.Where(sugarParamters)
- .ToPageList(pageIndex, pagesize, ref tolCount);
- return new
- {
- count = tolCount,
- data = result
- };
- }
-}
-
-public class QueryParameters
-{
- public List<QueryParameter> Parameters { get; set; }
- public List<string> OrderBys { get; set; }
-}
-
-public class QueryParameter
-{
- public string FieldName { get; set; }
- public string FieldValue { get; set; }
- public ConditionalType ConditionalType { get; set; }
}
\ No newline at end of file
--
Gitblit v1.9.3