RIZO/Valeo_Line_MES_backend
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

123

Browse Source
This commit is contained in:
gcw_MV9p2JJN 2026-01-16 14:50:07 +08:00
parent 11f5359827
commit a148c7b8f5
7 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
MDM/InitModelTable.cs
View File

@ -52,10 +52,14 @@ namespace MDM
db.CodeFirst.InitTables(typeof(ProcessOperationWorkstationMapping)); db.CodeFirst.InitTables(typeof(ProcessOperationWorkstationMapping));
db.CodeFirst.InitTables(typeof(ProcessOprerationTransitionDict)); db.CodeFirst.InitTables(typeof(ProcessOprerationTransitionDict));
db.CodeFirst.InitTables(typeof(ProductLifecycle)); db.CodeFirst.InitTables(typeof(ProductLifecycle));
db.CodeFirst.InitTables(typeof(ProcessRouting));
db.CodeFirst.InitTables(typeof(ProductPassstationRecord)); db.CodeFirst.InitTables(typeof(ProductPassstationRecord));
db.CodeFirst.InitTables(typeof(ProductProcessData)); db.CodeFirst.InitTables(typeof(ProductProcessData));
db.CodeFirst.InitTables(typeof(ProductProcessParameters)); db.CodeFirst.InitTables(typeof(ProductProcessParameters));
db.CodeFirst.InitTables(typeof(ProductScanRecords)); db.CodeFirst.InitTables(typeof(ProductScanRecords));
db.CodeFirst.InitTables(typeof(ProcessFlowList));
db.CodeFirst.InitTables(typeof(PfRecipeIssueLog)); db.CodeFirst.InitTables(typeof(PfRecipeIssueLog));
db.CodeFirst.InitTables(typeof(PfRecipeParameters)); db.CodeFirst.InitTables(typeof(PfRecipeParameters));
db.CodeFirst.InitTables(typeof(PfRecipeTemplate)); db.CodeFirst.InitTables(typeof(PfRecipeTemplate));
@ -63,7 +67,7 @@ namespace MDM
db.CodeFirst.InitTables(typeof(PfRefProductRecipe)); db.CodeFirst.InitTables(typeof(PfRefProductRecipe));
} }
} }
} }

2
MDM/Models/Material/Dto/MaterialBomDto.cs
View File

@ -34,7 +34,7 @@ namespace MDM.Model.Material.Dto
public string? CreatedBy { get; set; } public string? CreatedBy { get; set; }
public DateTime? CreatedTime { get; set; } //public DateTime? CreatedTime { get; set; }
public string? UpdatedBy { get; set; } public string? UpdatedBy { get; set; }

6
MDM/Models/Material/MaterialBom.cs
View File

@ -62,8 +62,8 @@ namespace MDM.Model.Material
/// <summary> /// <summary>
/// CreatedTime /// CreatedTime
/// </summary> /// </summary>
[SugarColumn(ColumnName = "created_time", Length = 50, IsNullable = true)] // [SugarColumn(ColumnName = "created_time")]
public DateTime? CreatedTime { get; set; } // public DateTime? CreatedTime { get; set; }
/// <summary> /// <summary>
/// UpdatedBy /// UpdatedBy
@ -74,7 +74,7 @@ namespace MDM.Model.Material
/// <summary> /// <summary>
/// UpdatedTime /// UpdatedTime
/// </summary> /// </summary>
[SugarColumn(ColumnName = "updated_time",Length = 50, IsNullable = true)] [SugarColumn(ColumnName = "updated_time")]
public DateTime? UpdatedTime { get; set; } public DateTime? UpdatedTime { get; set; }
} }

2
MDM/Services/Material/MaterialBomService.cs
View File

@ -70,7 +70,7 @@ namespace MDM.Services.Material
Iusequantity = SqlFunc.AggregateMax(it.Iusequantity), Iusequantity = SqlFunc.AggregateMax(it.Iusequantity),
BOMVersion = SqlFunc.AggregateMax(it.BOMVersion), BOMVersion = SqlFunc.AggregateMax(it.BOMVersion),
CreatedBy = SqlFunc.AggregateMax(it.CreatedBy), CreatedBy = SqlFunc.AggregateMax(it.CreatedBy),
CreatedTime = SqlFunc.AggregateMax(it.CreatedTime), // CreateddTime = SqlFunc.AggregateMax(it.CreateddTime),
UpdatedBy = SqlFunc.AggregateMax(it.UpdatedBy), UpdatedBy = SqlFunc.AggregateMax(it.UpdatedBy),
UpdatedTime = SqlFunc.AggregateMax(it.UpdatedTime) UpdatedTime = SqlFunc.AggregateMax(it.UpdatedTime)

2
RIZO.Admin.WebApi/Controllers/MES/product/ProWorkorderController.cs
View File

@ -1,8 +1,6 @@
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using RIZO.Model.MES.product; using RIZO.Model.MES.product;
using RIZO.Model.MES.product.Dto; using RIZO.Model.MES.product.Dto;
using RIZO.Service.MES.product.IService; using RIZO.Service.MES.product.IService;
using RIZO.Service.MES.product; using RIZO.Service.MES.product;
using RIZO.Admin.WebApi.Filters; using RIZO.Admin.WebApi.Filters;

3
RIZO.Admin.WebApi/appsettings.Development.json
View File

@ -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=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": "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;", // "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 "DbType": 1, //数据库类型 MySql = 0, SqlServer = 1, Oracle = 3，PgSql = 4
"ConfigId": "0", //多租户唯一标识 "ConfigId": "0", //多租户唯一标识

4
RIZO.Admin.WebApi/appsettings.json
View File

@ -20,8 +20,8 @@
"UseTenant": 0, //是否启用多租户 0:不启用 1:启用 "UseTenant": 0, //是否启用多租户 0:不启用 1:启用
"InjectClass": [ "RIZO.Repository", "RIZO.Service", "RIZO.Tasks", "RIZO.ServiceCore", "RIZO.Mall", "MDM" ], //自动注入类 "InjectClass": [ "RIZO.Repository", "RIZO.Service", "RIZO.Tasks", "RIZO.ServiceCore", "RIZO.Mall", "MDM" ], //自动注入类
"ShowDbLog": false, //是否打印db日志 "ShowDbLog": false, //是否打印db日志
"InitDb": false, //是否初始化db "InitDb": true, //是否初始化db
"InitModelDb": false, //是否初始化model db "InitModelDb": true, //是否初始化model db
"DemoMode": false, //是否演示模式 "DemoMode": false, //是否演示模式
"SingleLogin": false, //是否允许多设备/浏览器登录 "SingleLogin": false, //是否允许多设备/浏览器登录
"workId": 1, //雪花id唯一数字 "workId": 1, //雪花id唯一数字