From 419314cddc560b0bcbbe77c4de86dc5ca8a0923d Mon Sep 17 00:00:00 2001 From: Ray Date: Wed, 15 Dec 2021 18:36:00 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E6=96=B0=E5=A2=9E=E9=81=8E=E7=AB=99?= =?UTF-8?q?=E7=9B=B8=E9=97=9CTable=E8=B3=87=E6=96=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ViewModels/PCS/PCS021ViewModel.cs | 17 ++- .../Models/AMES/MaterialItem.cs | 18 +++ .../Models/AMES/MaterialOutfit.cs | 87 +++++++++++++ .../Models/AMES/MaterialStationsItem.cs | 117 ++++++++++++++++++ AMESCoreStudio.WebApi/Models/AMESContext.cs | 10 ++ 5 files changed, 248 insertions(+), 1 deletion(-) create mode 100644 AMESCoreStudio.WebApi/Models/AMES/MaterialOutfit.cs create mode 100644 AMESCoreStudio.WebApi/Models/AMES/MaterialStationsItem.cs diff --git a/AMESCoreStudio.Web/ViewModels/PCS/PCS021ViewModel.cs b/AMESCoreStudio.Web/ViewModels/PCS/PCS021ViewModel.cs index ec316a64..c978726b 100644 --- a/AMESCoreStudio.Web/ViewModels/PCS/PCS021ViewModel.cs +++ b/AMESCoreStudio.Web/ViewModels/PCS/PCS021ViewModel.cs @@ -11,6 +11,22 @@ namespace AMESCoreStudio.Web.ViewModels.PCS public class PCS021ViewModel { + //public string WipNO { get; set; } + + //public int PlanQTY { get; set; } = 0; + + //public int? LineID { get; set; } + + //public string UnitNO { get; set; } = "1"; + + //public string itemNO + + // public string input + + // public IEnumerable materialStations + + // public IEnumerable materialOutfits + public WipInfo WipInfo { get; set; } public WipAtt wipAtt { get; set; } @@ -22,7 +38,6 @@ namespace AMESCoreStudio.Web.ViewModels.PCS public IEnumerable materialKpDto { get; set; } - public IEnumerable WipBarcodes { get; set; } public IEnumerable RuleStation { get; set; } diff --git a/AMESCoreStudio.WebApi/Models/AMES/MaterialItem.cs b/AMESCoreStudio.WebApi/Models/AMES/MaterialItem.cs index a549f076..c40bfdfd 100644 --- a/AMESCoreStudio.WebApi/Models/AMES/MaterialItem.cs +++ b/AMESCoreStudio.WebApi/Models/AMES/MaterialItem.cs @@ -77,5 +77,23 @@ namespace AMESCoreStudio.WebApi.Models.AMES [Column("UPDATE_DATE", TypeName = "DATE")] [DataMember] public DateTime UpdateDate { get; set; } = System.DateTime.Now; + + /// + /// 料號治具資訊資料檔 + /// + [ForeignKey("ItemID")] + public virtual IEquatable materialOutfits { get; set; } + + /// + /// 料號治具資訊資料檔 + /// + [ForeignKey("ItemID")] + public virtual IEquatable materialKps { get; set; } + + /// + /// 料號站別工項資料檔 + /// + [ForeignKey("ItemID")] + public virtual IEquatable materialStationsItems { get; set; } } } diff --git a/AMESCoreStudio.WebApi/Models/AMES/MaterialOutfit.cs b/AMESCoreStudio.WebApi/Models/AMES/MaterialOutfit.cs new file mode 100644 index 00000000..e35510f1 --- /dev/null +++ b/AMESCoreStudio.WebApi/Models/AMES/MaterialOutfit.cs @@ -0,0 +1,87 @@ +using System; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using System.Runtime.Serialization; +#nullable disable + +namespace AMESCoreStudio.WebApi.Models.AMES +{ + /// + /// 料號治具資訊資料檔 + /// + [Table("MATERIAL_OUTFIT", Schema = "JHAMES")] + public partial class MaterialOutfit + { + /// + /// 料號治具ID + /// + [Key] + [Column("MATERIAL_OUTFIT_ID")] + [DataMember] + [Required(ErrorMessage = "{0},不能空白")] + [Display(Name = "料號治具ID")] + public int MaterialOutfitID { get; set; } + + /// + /// 料號ID + /// + [DataMember] + [Required(ErrorMessage = "{0},不能空白")] + [Display(Name = "料號ID")] + [Column("ITEM_ID")] + public int ItemId { get; set; } + + /// + /// 治具NO + /// + [DataMember] + [Required(ErrorMessage = "{0},不能空白")] + [Display(Name = "治具NO")] + [Column("OUTFIT_NO")] + [StringLength(15)] + public string OutfitNo { get; set; } + + /// + /// 站(前段) + /// + [DataMember] + [Required(ErrorMessage = "{0},不能空白")] + [Display(Name = "站(前段)")] + [Column("STATION_TYPE")] + [StringLength(25)] + public string StationType { get; set; } + + + /// + /// 建立UserID + /// + [Column("CREATE_USERID")] + [Required] + [DataMember] + public int CreateUserID { get; set; } = 0; + + /// + /// 建立日期 + /// + [Required] + [Column("CREATE_DATE")] + [DataMember] + public DateTime CreateDate { get; set; } = System.DateTime.Now; + + /// + /// 更新UserID + /// + [Column("UPDATE_USERID")] + [DataMember] + [Required] + public int UpdateUserID { get; set; } + + /// + /// 更新日期 + /// + [Column("UPDATE_DATE")] + [DataMember] + [Required] + public DateTime? UpdateDate { get; set; } + } +} diff --git a/AMESCoreStudio.WebApi/Models/AMES/MaterialStationsItem.cs b/AMESCoreStudio.WebApi/Models/AMES/MaterialStationsItem.cs new file mode 100644 index 00000000..117c67bb --- /dev/null +++ b/AMESCoreStudio.WebApi/Models/AMES/MaterialStationsItem.cs @@ -0,0 +1,117 @@ +using System; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using System.Runtime.Serialization; + +#nullable disable + +namespace AMESCoreStudio.WebApi.Models.AMES +{ + /// + /// 料號站別工項資料檔 + /// + [Table("MATERIAL_STATIONS_ITEM", Schema = "JHAMES")] + public partial class MaterialStationsItem + { + /// + /// 料號站別工項ID + /// + [Key] + [Column("MSI_ID")] + [DataMember] + public int MsiID { get; set; } + + /// + /// 料號ID + /// + [Column("ITEM_ID")] + [DataMember] + [Required(ErrorMessage = "{0},不能空白")] + [Display(Name = "料號ID")] + public int ItemID { get; set; } + + /// + /// 生產單位 + /// + [Column("UNIT_NO")] + [StringLength(1)] + [DataMember] + [Required(ErrorMessage = "{0},不能空白")] + [Display(Name = "生產單位")] + public string UnitNo { get; set; } + + /// + /// 站(前段) + /// + [Column("STATION_TYPE")] + [StringLength(10)] + [DataMember] + [Required(ErrorMessage = "{0},不能空白")] + [Display(Name = "站(前段)")] + public string StationType { get; set; } + + + /// + /// 工項名稱 + /// + [Column("STATIONS_ITEM_NO")] + [StringLength(20)] + [DataMember] + [Required(ErrorMessage = "{0},不能空白")] + [Display(Name = "工項名稱")] + public string StationsItemNo { get; set; } + + /// + /// 工項描述 + /// + [Column("STATIONS_ITEM_DESC")] + [StringLength(50)] + [DataMember] + [Display(Name = "工項描述")] + public string StationsItemDesc { get; set; } + + /// + /// 工項順序 + /// + [Column("STATIONS_ITEM_SEQ")] + [DataMember] + [Required(ErrorMessage = "{0},不能空白")] + [Display(Name = "工項順序")] + public int StationsItemSeq { get; set; } + + + /// + /// 建立UserID + /// + [Column("CREATE_USERID")] + [Required] + [DataMember] + public int CreateUserID { get; set; } = 0; + + /// + /// 建立日期 + /// + [Required] + [Column("CREATE_DATE")] + [DataMember] + public DateTime CreateDate { get; set; } = System.DateTime.Now; + + /// + /// 更新UserID + /// + [Column("UPDATE_USERID")] + [DataMember] + [Required] + public int UpdateUserID { get; set; } + + /// + /// 更新日期 + /// + [Column("UPDATE_DATE")] + [DataMember] + [Required] + public DateTime? UpdateDate { get; set; } + + + } +} diff --git a/AMESCoreStudio.WebApi/Models/AMESContext.cs b/AMESCoreStudio.WebApi/Models/AMESContext.cs index b4da98ff..639000f6 100644 --- a/AMESCoreStudio.WebApi/Models/AMESContext.cs +++ b/AMESCoreStudio.WebApi/Models/AMESContext.cs @@ -453,6 +453,16 @@ namespace AMESCoreStudio.WebApi /// public DbSet BarcodeItemChanges { get; set; } + /// + /// 料號站別工項資料檔 + /// + public virtual DbSet MaterialStationsItems { get; set; } + + /// + /// 料號治具資訊資料檔 + /// + public virtual DbSet MaterialOutfits { get; set; } + } }