diff --git a/ZR.Admin.WebApi/appsettings.json b/ZR.Admin.WebApi/appsettings.json index 0663f920..42c236f3 100644 --- a/ZR.Admin.WebApi/appsettings.json +++ b/ZR.Admin.WebApi/appsettings.json @@ -9,9 +9,8 @@ "urls": "http://localhost:8888", //(app会默认去读)项目启动url,如果改动端口前端对应devServer也需要进行修改 "dbConfigs": [ { - //"Conn": "Data Source=192.168.0.36;User ID=root;Password=123456;Initial Catalog=ZrAdmin;", - - "Conn": "Data Source=47.116.122.230;Port=3307;User ID=root;Password=123456;Initial Catalog=ZrAdmin;", + "Conn": "Data Source=192.168.0.36;User ID=root;Password=123456;Initial Catalog=ZrAdmin;", + //"Conn": "Data Source=47.116.122.230;Port=3307;User ID=root;Password=123456;Initial Catalog=ZrAdmin;", "DbType": 0, //数据库类型 MySql = 0, SqlServer = 1, Oracle = 3,PgSql = 4 "ConfigId": "0", //多租户唯一标识 "IsAutoCloseConnection": true diff --git a/ZR.Model/MES/qc/QcFqc.cs b/ZR.Model/MES/qc/QcFqc.cs index 618e6bee..e8db4b48 100644 --- a/ZR.Model/MES/qc/QcFqc.cs +++ b/ZR.Model/MES/qc/QcFqc.cs @@ -6,14 +6,13 @@ using System.Threading.Tasks; namespace ZR.Model.MES.qc { + /// /// 终检收集表 /// [SugarTable("qc_fqc")] public class QcFqc { - - /// /// 流水号 /// @@ -99,11 +98,37 @@ namespace ZR.Model.MES.qc /// [SugarColumn(ColumnName = "scrapNum03")] public string ScrapNum03 { get; set; } + /// - /// 乐观锁 + /// 一次合格数量 /// - [SugarColumn(ColumnName = "REVISION")] - public int? Revision { get; set; } + [SugarColumn(ColumnName = "firstgoodNum")] + public int? FirstgoodNum { get; set; } + /// + /// 一次合格率80 + /// + [SugarColumn(ColumnName = "firstgoodRate")] + public int? FirstgoodRate { get; set; } + /// + /// 最终合格数量 + /// + [SugarColumn(ColumnName = "finalgoodNum")] + public int? FinalgoodNum { get; set; } + /// + /// 最终合格率70 + /// + [SugarColumn(ColumnName = "finalgoodRate")] + public int? FinalgoodRate { get; set; } + /// + /// 报废数 + /// + [SugarColumn(ColumnName = "polishNum")] + public int? PolishNum { get; set; } + /// + /// 报废率70 + /// + [SugarColumn(ColumnName = "polishRate")] + public int? PolishRate { get; set; } /// /// 创建人 /// @@ -128,3 +153,5 @@ namespace ZR.Model.MES.qc } + +