diff --git a/MDM/InitModelTable.cs b/MDM/InitModelTable.cs
index bc43d40..7764cbd 100644
--- a/MDM/InitModelTable.cs
+++ b/MDM/InitModelTable.cs
@@ -52,10 +52,14 @@ namespace MDM
db.CodeFirst.InitTables(typeof(ProcessOperationWorkstationMapping));
db.CodeFirst.InitTables(typeof(ProcessOprerationTransitionDict));
db.CodeFirst.InitTables(typeof(ProductLifecycle));
+ db.CodeFirst.InitTables(typeof(ProcessRouting));
db.CodeFirst.InitTables(typeof(ProductPassstationRecord));
db.CodeFirst.InitTables(typeof(ProductProcessData));
db.CodeFirst.InitTables(typeof(ProductProcessParameters));
db.CodeFirst.InitTables(typeof(ProductScanRecords));
+ db.CodeFirst.InitTables(typeof(ProcessFlowList));
+
+
db.CodeFirst.InitTables(typeof(PfRecipeIssueLog));
db.CodeFirst.InitTables(typeof(PfRecipeParameters));
db.CodeFirst.InitTables(typeof(PfRecipeTemplate));
@@ -63,7 +67,7 @@ namespace MDM
db.CodeFirst.InitTables(typeof(PfRefProductRecipe));
-
+
}
}
}
diff --git a/MDM/Models/Material/Dto/MaterialBomDto.cs b/MDM/Models/Material/Dto/MaterialBomDto.cs
index a575ff8..364dd61 100644
--- a/MDM/Models/Material/Dto/MaterialBomDto.cs
+++ b/MDM/Models/Material/Dto/MaterialBomDto.cs
@@ -34,7 +34,7 @@ namespace MDM.Model.Material.Dto
public string? CreatedBy { get; set; }
- public DateTime? CreatedTime { get; set; }
+ //public DateTime? CreatedTime { get; set; }
public string? UpdatedBy { get; set; }
diff --git a/MDM/Models/Material/MaterialBom.cs b/MDM/Models/Material/MaterialBom.cs
index b2b563d..153317f 100644
--- a/MDM/Models/Material/MaterialBom.cs
+++ b/MDM/Models/Material/MaterialBom.cs
@@ -62,8 +62,8 @@ namespace MDM.Model.Material
///
/// CreatedTime
///
- [SugarColumn(ColumnName = "created_time", Length = 50, IsNullable = true)]
- public DateTime? CreatedTime { get; set; }
+ // [SugarColumn(ColumnName = "created_time")]
+ // public DateTime? CreatedTime { get; set; }
///
/// UpdatedBy
@@ -74,7 +74,7 @@ namespace MDM.Model.Material
///
/// UpdatedTime
///
- [SugarColumn(ColumnName = "updated_time",Length = 50, IsNullable = true)]
+ [SugarColumn(ColumnName = "updated_time")]
public DateTime? UpdatedTime { get; set; }
}
diff --git a/MDM/Services/Material/MaterialBomService.cs b/MDM/Services/Material/MaterialBomService.cs
index d4fa6f8..ffdbd3c 100644
--- a/MDM/Services/Material/MaterialBomService.cs
+++ b/MDM/Services/Material/MaterialBomService.cs
@@ -70,7 +70,7 @@ namespace MDM.Services.Material
Iusequantity = SqlFunc.AggregateMax(it.Iusequantity),
BOMVersion = SqlFunc.AggregateMax(it.BOMVersion),
CreatedBy = SqlFunc.AggregateMax(it.CreatedBy),
- CreatedTime = SqlFunc.AggregateMax(it.CreatedTime),
+ // CreateddTime = SqlFunc.AggregateMax(it.CreateddTime),
UpdatedBy = SqlFunc.AggregateMax(it.UpdatedBy),
UpdatedTime = SqlFunc.AggregateMax(it.UpdatedTime)
diff --git a/RIZO.Admin.WebApi/Controllers/MES/product/ProWorkorderController.cs b/RIZO.Admin.WebApi/Controllers/MES/product/ProWorkorderController.cs
index bea1c8c..b44ac17 100644
--- a/RIZO.Admin.WebApi/Controllers/MES/product/ProWorkorderController.cs
+++ b/RIZO.Admin.WebApi/Controllers/MES/product/ProWorkorderController.cs
@@ -1,8 +1,6 @@
using Microsoft.AspNetCore.Mvc;
using RIZO.Model.MES.product;
using RIZO.Model.MES.product.Dto;
-
-
using RIZO.Service.MES.product.IService;
using RIZO.Service.MES.product;
using RIZO.Admin.WebApi.Filters;
diff --git a/RIZO.Admin.WebApi/appsettings.Development.json b/RIZO.Admin.WebApi/appsettings.Development.json
index ee80e66..3a11409 100644
--- a/RIZO.Admin.WebApi/appsettings.Development.json
+++ b/RIZO.Admin.WebApi/appsettings.Development.json
@@ -3,7 +3,8 @@
{
//"Conn": "Data Source=139.224.232.211;User ID=root;Password=RIZOtech123;Initial Catalog=ay2509055-guiyang-fluorescence-lmes;Port=3308;",
//"Conn": "Data Source=43.142.238.124;User ID=root;Password=mysql_3AMPxs;Initial Catalog=valeo_lmes;Port=3308;",
- "Conn": "Server=43.142.238.124,1433;Database=valeo_lmes_2;User Id=sa;Password=MSSQLP0ss_MBTc7D;Encrypt=True;TrustServerCertificate=True;",
+ // "Conn": "Server=43.142.238.124,1433;Database=valeo_lmes_2;User Id=sa;Password=MSSQLP0ss_MBTc7D;Encrypt=True;TrustServerCertificate=True;",
+ "Conn": "Server=192.168.1.48,1433;Database=valeo_lmes_2;User Id=sa;Password=RIZOtech123;Encrypt=True;TrustServerCertificate=True;",
// "Conn": "Data Source=127.0.0.1;User ID=root;Password=123456;Initial Catalog=valeo_lmes;Port=3306;",
"DbType": 1, //数据库类型 MySql = 0, SqlServer = 1, Oracle = 3,PgSql = 4
"ConfigId": "0", //多租户唯一标识
diff --git a/RIZO.Admin.WebApi/appsettings.json b/RIZO.Admin.WebApi/appsettings.json
index 3d7851f..b5e5f12 100644
--- a/RIZO.Admin.WebApi/appsettings.json
+++ b/RIZO.Admin.WebApi/appsettings.json
@@ -20,8 +20,8 @@
"UseTenant": 0, //是否启用多租户 0:不启用 1:启用
"InjectClass": [ "RIZO.Repository", "RIZO.Service", "RIZO.Tasks", "RIZO.ServiceCore", "RIZO.Mall", "MDM" ], //自动注入类
"ShowDbLog": false, //是否打印db日志
- "InitDb": false, //是否初始化db
- "InitModelDb": false, //是否初始化model db
+ "InitDb": true, //是否初始化db
+ "InitModelDb": true, //是否初始化model db
"DemoMode": false, //是否演示模式
"SingleLogin": false, //是否允许多设备/浏览器登录
"workId": 1, //雪花id唯一数字