1. 新增過站相關Table資料

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<MaterialStationsItem> materialStations
+
+        //    public IEnumerable<MaterialOutfit> materialOutfits
+
         public WipInfo WipInfo { get; set; }
 
         public WipAtt wipAtt { get; set; }
@@ -22,7 +38,6 @@ namespace AMESCoreStudio.Web.ViewModels.PCS
         public IEnumerable<MaterialKpDto> materialKpDto { get; set; }
 
 
-
         public IEnumerable<WipBarcode> WipBarcodes { get; set; }
 
         public IEnumerable<RuleStation> RuleStation { get; set; }

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;
+
+        /// <summary>
+        /// 料號治具資訊資料檔
+        /// </summary>
+        [ForeignKey("ItemID")]
+        public virtual IEquatable<MaterialOutfit> materialOutfits  { get; set; }
+
+        /// <summary>
+        /// 料號治具資訊資料檔
+        /// </summary>
+        [ForeignKey("ItemID")]
+        public virtual IEquatable<MaterialKp> materialKps { get; set; }
+
+        /// <summary>
+        /// 料號站別工項資料檔
+        /// </summary>
+        [ForeignKey("ItemID")]
+        public virtual IEquatable<MaterialStationsItem> materialStationsItems { get; set; }
     }
 }

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
+{
+    /// <summary>
+    /// 料號治具資訊資料檔
+    /// </summary>
+    [Table("MATERIAL_OUTFIT", Schema = "JHAMES")]
+    public partial class MaterialOutfit
+    {
+        /// <summary>
+        /// 料號治具ID
+        /// </summary>
+        [Key]
+        [Column("MATERIAL_OUTFIT_ID")]
+        [DataMember]
+        [Required(ErrorMessage = "{0},不能空白")]
+        [Display(Name = "料號治具ID")]
+        public int MaterialOutfitID { get; set; }
+
+        /// <summary>
+        /// 料號ID
+        /// </summary>
+        [DataMember]
+        [Required(ErrorMessage = "{0},不能空白")]
+        [Display(Name = "料號ID")]
+        [Column("ITEM_ID")]
+        public int ItemId { get; set; }
+
+        /// <summary>
+        /// 治具NO
+        /// </summary>
+        [DataMember]
+        [Required(ErrorMessage = "{0},不能空白")]
+        [Display(Name = "治具NO")]
+        [Column("OUTFIT_NO")]
+        [StringLength(15)]
+        public string OutfitNo { get; set; }
+
+        /// <summary>
+        /// 站(前段)
+        /// </summary>
+        [DataMember]
+        [Required(ErrorMessage = "{0},不能空白")]
+        [Display(Name = "站(前段)")]
+        [Column("STATION_TYPE")]
+        [StringLength(25)]
+        public string StationType { get; set; }
+
+
+        /// <summary>
+        /// 建立UserID
+        /// </summary>
+        [Column("CREATE_USERID")]
+        [Required]
+        [DataMember]
+        public int CreateUserID { get; set; } = 0;
+
+        /// <summary>
+        /// 建立日期
+        /// </summary>
+        [Required]
+        [Column("CREATE_DATE")]
+        [DataMember]
+        public DateTime CreateDate { get; set; } = System.DateTime.Now;
+
+        /// <summary>
+        /// 更新UserID
+        /// </summary>
+        [Column("UPDATE_USERID")]
+        [DataMember]
+        [Required]
+        public int UpdateUserID { get; set; }
+
+        /// <summary>
+        /// 更新日期
+        /// </summary>
+        [Column("UPDATE_DATE")]
+        [DataMember]
+        [Required]
+        public DateTime? UpdateDate { get; set; }
+    }
+}

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
+{
+    /// <summary>
+    /// 料號站別工項資料檔
+    /// </summary>
+    [Table("MATERIAL_STATIONS_ITEM", Schema = "JHAMES")]
+    public partial class MaterialStationsItem
+    {
+        /// <summary>
+        /// 料號站別工項ID
+        /// </summary>
+        [Key]
+        [Column("MSI_ID")]
+        [DataMember]
+        public int MsiID { get; set; }
+
+        /// <summary>
+        /// 料號ID
+        /// </summary>
+        [Column("ITEM_ID")]
+        [DataMember]
+        [Required(ErrorMessage = "{0},不能空白")]
+        [Display(Name = "料號ID")]
+        public int ItemID { get; set; }
+
+        /// <summary>
+        /// 生產單位
+        /// </summary>
+        [Column("UNIT_NO")]
+        [StringLength(1)]
+        [DataMember]
+        [Required(ErrorMessage = "{0},不能空白")]
+        [Display(Name = "生產單位")]
+        public string UnitNo { get; set; }
+
+        /// <summary>
+        /// 站(前段)
+        /// </summary>
+        [Column("STATION_TYPE")]
+        [StringLength(10)]
+        [DataMember]
+        [Required(ErrorMessage = "{0},不能空白")]
+        [Display(Name = "站(前段)")]
+        public string StationType { get; set; }
+
+
+        /// <summary>
+        /// 工項名稱
+        /// </summary>
+        [Column("STATIONS_ITEM_NO")]
+        [StringLength(20)]
+        [DataMember]
+        [Required(ErrorMessage = "{0},不能空白")]
+        [Display(Name = "工項名稱")]
+        public string StationsItemNo { get; set; }
+
+        /// <summary>
+        /// 工項描述
+        /// </summary>
+        [Column("STATIONS_ITEM_DESC")]
+        [StringLength(50)]
+        [DataMember]
+        [Display(Name = "工項描述")]
+        public string StationsItemDesc { get; set; }
+
+        /// <summary>
+        /// 工項順序
+        /// </summary>
+        [Column("STATIONS_ITEM_SEQ")]
+        [DataMember]
+        [Required(ErrorMessage = "{0},不能空白")]
+        [Display(Name = "工項順序")]
+        public int StationsItemSeq { get; set; }
+
+
+        /// <summary>
+        /// 建立UserID
+        /// </summary>
+        [Column("CREATE_USERID")]
+        [Required]
+        [DataMember]
+        public int CreateUserID { get; set; } = 0;
+
+        /// <summary>
+        /// 建立日期
+        /// </summary>
+        [Required]
+        [Column("CREATE_DATE")]
+        [DataMember]
+        public DateTime CreateDate { get; set; } = System.DateTime.Now;
+
+        /// <summary>
+        /// 更新UserID
+        /// </summary>
+        [Column("UPDATE_USERID")]
+        [DataMember]
+        [Required]
+        public int UpdateUserID { get; set; }
+
+        /// <summary>
+        /// 更新日期
+        /// </summary>
+        [Column("UPDATE_DATE")]
+        [DataMember]
+        [Required]
+        public DateTime? UpdateDate { get; set; }
+
+
+    }
+}

AMESCoreStudio.WebApi/Models/AMESContext.cs

@@ -453,6 +453,16 @@ namespace AMESCoreStudio.WebApi
         /// </summary>
         public DbSet<BarcodeItemChange> BarcodeItemChanges { get; set; }
 
+        /// <summary>
+        /// 料號站別工項資料檔
+        /// </summary>
+        public virtual DbSet<MaterialStationsItem> MaterialStationsItems { get; set; }
+
+        /// <summary>
+        /// 料號治具資訊資料檔
+        /// </summary>
+        public virtual DbSet<MaterialOutfit> MaterialOutfits { get; set; }
+
     }
 
 }