From 8b7ddc6137bdbd0ce37d8096a5bb3b81ec00beb7 Mon Sep 17 00:00:00 2001 From: Marvin Date: Mon, 10 Jan 2022 10:20:36 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=96=B0=E5=A2=9E=E5=89=8D=E5=88=A4=E7=BB=B4?= =?UTF-8?q?=E4=BF=AE=E8=BE=93=E5=85=A5=EF=BC=88=E6=9C=AA=E5=85=A8=E9=83=A8?= =?UTF-8?q?=E5=AE=8C=E6=88=90=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AMESCoreStudio.WebApi/Models/AMES/NgInfo.cs | 76 ++++++++++++++++----- AMESCoreStudio.WebApi/Models/AMESContext.cs | 10 +++ 2 files changed, 69 insertions(+), 17 deletions(-) diff --git a/AMESCoreStudio.WebApi/Models/AMES/NgInfo.cs b/AMESCoreStudio.WebApi/Models/AMES/NgInfo.cs index 33544ed0..57a7e536 100644 --- a/AMESCoreStudio.WebApi/Models/AMES/NgInfo.cs +++ b/AMESCoreStudio.WebApi/Models/AMES/NgInfo.cs @@ -17,10 +17,11 @@ namespace AMESCoreStudio.WebApi.Models.AMES /// 測試不良ID /// [Key] - [Column("NG_ID")] + [Column("NG_ID", TypeName = "NUMBER")] [DataMember] + [Display(Name = "測試不良ID")] [Required] - public int NgID { get; set; } + public decimal NgID { get; set; } /// /// 測試種類代碼 @@ -28,13 +29,15 @@ namespace AMESCoreStudio.WebApi.Models.AMES [Required] [Column("TYPE_NO")] [StringLength(6)] + [Display(Name = "測試種類代碼")] [DataMember] public string TypeNo { get; set; } /// /// 測試員代號 /// - [Column("OPERATOR_ID")] + [Column("OPERATOR_ID", TypeName = "NUMBER")] + [Display(Name = "測試員代號")] [DataMember] public int OperatorID { get; set; } @@ -44,6 +47,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES [Required] [Column("FIXTURE_NO")] [StringLength(20)] + [Display(Name = "治具代號")] [DataMember] public string FixtureNo { get; set; } @@ -53,6 +57,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES [Required] [Column("PROGRAM_NO")] [StringLength(20)] + [Display(Name = "測試程試代號/名稱")] [DataMember] public string ProgramNo { get; set; } @@ -62,27 +67,31 @@ namespace AMESCoreStudio.WebApi.Models.AMES [Required] [Column("MACHINE_NO")] [StringLength(20)] + [Display(Name = "設備代號")] [DataMember] public string MachineNo { get; set; } /// /// 測試總點數 /// - [Column("TEST_QTY")] + [Column("TEST_QTY", TypeName = "NUMBER")] + [Display(Name = "測試總點數")] [DataMember] - public int TestQty { get; set; } = 0; + public decimal TestQty { get; set; } = 0; /// /// 不良總點數 /// - [Column("NG_QTY")] + [Column("NG_QTY", TypeName = "NUMBER")] + [Display(Name = "不良總點數")] [DataMember] - public int NgQty { get; set; } = 0; + public decimal NgQty { get; set; } = 0; /// /// 開始測試時間 /// [Column("START_TIME")] + [Display(Name = "開始測試時間")] [DataMember] public DateTime StartTime { get; set; } = System.DateTime.Now; @@ -90,6 +99,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES /// 結束測試時間 /// [Column("END_TIME")] + [Display(Name = "結束測試時間")] [DataMember] public DateTime EndTime { get; set; } = System.DateTime.Now; @@ -99,41 +109,47 @@ namespace AMESCoreStudio.WebApi.Models.AMES [Required] [Column("TEST_STATUS")] [StringLength(1)] + [Display(Name = "測試狀態")] [DataMember] public string TestStatus { get; set; } = "F"; /// /// 內部條碼ID /// - [Column("BARCODE_ID")] + [Column("BARCODE_ID", TypeName = "NUMBER")] + [Display(Name = "內部條碼ID")] [DataMember] - public int BarcodeId { get; set; } + public int BarcodeID { get; set; } /// /// 流程站別ID /// - [Column("RULE_STATION_ID")] + [Column("RULE_STATION_ID", TypeName = "NUMBER")] + [Display(Name = "流程站別ID")] [DataMember] public int RuleStationId { get; set; } /// /// 工單ID /// - [Column("WIP_ID")] + [Column("WIP_ID", TypeName = "NUMBER")] + [Display(Name = "工單ID")] [DataMember] public int WipId { get; set; } /// /// 處理狀態(0:尚未維修處理, 1:已維修處理, 2:誤判) /// - [Column("STATUS")] + [Column("STATUS", TypeName = "NUMBER")] + [Display(Name = "處理狀態")] [DataMember] - public int Status { get; set; } = 0; + public decimal Status { get; set; } = 0; /// /// 不良現象原因代碼 /// [Column("REASON_NO")] + [Display(Name = "不良現象原因代碼")] [StringLength(6)] [DataMember] public string ReasonNo { get; set; } @@ -141,21 +157,24 @@ namespace AMESCoreStudio.WebApi.Models.AMES /// /// 不良代碼指向的下一站ID /// - [Column("NEXT_STATION_ID")] + [Column("NEXT_STATION_ID", TypeName = "NUMBER")] + [Display(Name = "不良代碼指向的下一站ID")] [DataMember] - public int NextStationId { get; set; } = -1; + public decimal NextStationId { get; set; } = -1; /// /// 不良時的組件數量 /// - [Column("ITEM_QTY")] + [Column("ITEM_QTY", TypeName = "NUMBER")] + [Display(Name = "不良時的組件數量")] [DataMember] - public int ItemQty { get; set; } = -1; + public decimal ItemQty { get; set; } = -1; /// /// 不良備註 /// [Column("NG_MEMO")] + [Display(Name = "不良備註")] [StringLength(300)] [DataMember] public string NgMemo { get; set; } @@ -187,5 +206,28 @@ namespace AMESCoreStudio.WebApi.Models.AMES [Column("UPDATE_DATE", TypeName = "DATE")] [DataMember] public DateTime UpdateDate { get; set; } = System.DateTime.Now; + + + /// + /// 條碼資料 + /// + public virtual AMESCoreStudio.WebApi.Models.AMES.BarcodeInfo Barcode { get; set; } + + + /// + /// 工單資料 + /// + public virtual AMESCoreStudio.WebApi.Models.AMES.WipInfo Wip { get; set; } + + + /// + /// 站別資料 + /// + public virtual AMESCoreStudio.WebApi.Models.BAS.Stations Station { get; set; } + + /// + /// 用戶資料 + /// + //public virtual AMESCoreStudio.WebApi.Models.SYS.UserInfo User { get; set; } } } diff --git a/AMESCoreStudio.WebApi/Models/AMESContext.cs b/AMESCoreStudio.WebApi/Models/AMESContext.cs index 6e1e1131..ce0ded90 100644 --- a/AMESCoreStudio.WebApi/Models/AMESContext.cs +++ b/AMESCoreStudio.WebApi/Models/AMESContext.cs @@ -87,6 +87,11 @@ namespace AMESCoreStudio.WebApi modelBuilder.Entity().HasKey(c => new { c.FqcID, c.BoxNo ,c.BarcodeNo }); modelBuilder.Entity().HasKey(c => new { c.FqcID, c.BarcodeID }); modelBuilder.Entity().HasKey(c => new { c.FqcID, c.ItemID }); + + modelBuilder.Entity().HasOne(r => r.Barcode).WithMany().HasForeignKey(r => r.BarcodeID).IsRequired(); + modelBuilder.Entity().HasOne(r => r.Wip).WithMany().HasForeignKey(r => r.WipId).IsRequired(); + modelBuilder.Entity().HasOne(r => r.Station).WithMany().HasForeignKey(r => r.RuleStationId).IsRequired(); + //modelBuilder.Entity().HasOne(r => r.User).WithMany().HasForeignKey(r => r.OperatorID).IsRequired(); } /// @@ -584,6 +589,11 @@ namespace AMESCoreStudio.WebApi /// 抽驗批退資料檔 /// public virtual DbSet QngInfos { get; set; } + + /// + /// 測試不良基本資料檔 + /// + public DbSet NgComponents { get; set; } } }