diff --git a/DOAN.Admin.WebApi/appsettings.Development.json b/DOAN.Admin.WebApi/appsettings.Development.json
index a79d208..6387714 100644
--- a/DOAN.Admin.WebApi/appsettings.Development.json
+++ b/DOAN.Admin.WebApi/appsettings.Development.json
@@ -8,8 +8,8 @@
},
"dbConfigs": [
{
- //"Conn": "Data Source=139.224.232.211;User ID=root;Password=doantech123;Initial Catalog=GXAssembly;Port=3308",
- "Conn": "Data Source=192.168.0.58;User ID=root;Password=123456;Initial Catalog=GXAssembly;Port=3306;AllowLoadLocalInfile=true",
+ "Conn": "Data Source=139.224.232.211;User ID=root;Password=doantech123;Initial Catalog=GXAssembly;Port=3308",
+ //"Conn": "Data Source=192.168.0.58;User ID=root;Password=123456;Initial Catalog=GXAssembly;Port=3306;AllowLoadLocalInfile=true",
// "Conn": "Data Source=127.0.0.1;User ID=root;Password=123456;Initial Catalog=GXAssembly;Port=3306",
//"Conn": "Data Source=192.168.50.163;User ID=root;Password=123456;Initial Catalog=GXAssembly;Port=3306",
"DbType": 0, //数据库类型 MySql = 0, SqlServer = 1, Oracle = 3,PgSql = 4
@@ -50,7 +50,7 @@
"DemoMode": false, //是否演示模式
"SingleLogin": false, //是否单点登录
"Upload": {
- "rootDirectory": "E:/git仓库/上海干巷/MES/file",
+ "rootDirectory": "F:\\MES\\file",
"uploadUrl": "http://127.0.0.1:7000", //本地存储资源访问路径
"localSavePath": "", //本地上传默认文件存储目录 wwwroot+localSavePath
"maxSize": 15, //上传文件大小限制 15M
diff --git a/DOAN.Model/MES/quality/QcFinishedproductDefectCollection.cs b/DOAN.Model/MES/quality/QcFinishedproductDefectCollection.cs
new file mode 100644
index 0000000..a0bf1f4
--- /dev/null
+++ b/DOAN.Model/MES/quality/QcFinishedproductDefectCollection.cs
@@ -0,0 +1,62 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DOAN.Model.MES.quality
+{
+ ///
+ /// 成品缺陷
+ ///
+ [SugarTable("qc_finishedproduct_defect_collection")]
+ public class QcFinishedproductDefectCollection
+ {
+ ///
+ /// 雪花
+ ///
+ [SugarColumn(IsPrimaryKey = true, IsIdentity = false)]
+ public string Id { get; set; }
+
+ ///
+ /// 工单号
+ ///
+ public string Workorder { get; set; }
+
+ ///
+ /// 缺陷描述
+ ///
+ [SugarColumn(ColumnName = "defect_describe")]
+ public string DefectDescribe { get; set; }
+
+ ///
+ /// 数量
+ ///
+ public int? Number { get; set; }
+
+ ///
+ /// CreatedBy
+ ///
+ [SugarColumn(ColumnName = "created_by")]
+ public string CreatedBy { get; set; }
+
+ ///
+ /// CreatedTime
+ ///
+ [SugarColumn(ColumnName = "created_time")]
+ public DateTime? CreatedTime { get; set; }
+
+ ///
+ /// UpdatedBy
+ ///
+ [SugarColumn(ColumnName = "updated_by")]
+ public string UpdatedBy { get; set; }
+
+ ///
+ /// UpdatedTime
+ ///
+ [SugarColumn(ColumnName = "updated_time")]
+ public DateTime? UpdatedTime { get; set; }
+
+ }
+}
\ No newline at end of file
diff --git a/DOAN.ServiceCore/SqlSugar/SqlsugarSetup.cs b/DOAN.ServiceCore/SqlSugar/SqlsugarSetup.cs
index c539cbd..eeb0bfe 100644
--- a/DOAN.ServiceCore/SqlSugar/SqlsugarSetup.cs
+++ b/DOAN.ServiceCore/SqlSugar/SqlsugarSetup.cs
@@ -195,6 +195,7 @@ namespace DOAN.ServiceCore.SqlSugar
{
IsAutoRemoveDataCache = true
};
+ //TODO???
db.GetConnectionScope(configId).CurrentConnectionConfig.ConfigureExternalServices = new ConfigureExternalServices()
{
DataInfoCacheService = cache,
diff --git a/Infrastructure/Cache/CacheHelper.cs b/Infrastructure/Cache/CacheHelper.cs
index d361fac..2deb7a9 100644
--- a/Infrastructure/Cache/CacheHelper.cs
+++ b/Infrastructure/Cache/CacheHelper.cs
@@ -132,9 +132,10 @@ namespace DOAN.Common
const BindingFlags flags = BindingFlags.Instance | BindingFlags.NonPublic;
//var entries = Cache.GetType().GetField("_entries", flags).GetValue(Cache);
+ //TODO ???
//.net7需要这样写
var coherentState = Cache.GetType().GetField("_coherentState", flags).GetValue(Cache);
- var entries = coherentState.GetType().GetField("_entries", flags).GetValue(coherentState);
+ var entries = coherentState.GetType()?.GetField("_entries", flags)?.GetValue(coherentState);
var keys = new List();
if (entries is not IDictionary cacheItems) return keys;