diff --git a/AMESCoreStudio.Web/Views/PCS/PCS001C.cshtml b/AMESCoreStudio.Web/Views/PCS/PCS001C.cshtml index 94228259..654ead9b 100644 --- a/AMESCoreStudio.Web/Views/PCS/PCS001C.cshtml +++ b/AMESCoreStudio.Web/Views/PCS/PCS001C.cshtml @@ -14,157 +14,134 @@
-
-
    -
  • 工單基本資料
    • -
  • 單板-工程資訊
    • -
  • 系統組裝-工程資訊
    • -
-
- @* 基本資料sheet *@ -
-
- -
- -
-
- -
- -
- -
-
- -
- -
- -
-
- -
- -
- -
-
- -
-
- -
- -
- -
- -
- -
-
- -
-
- -
- - - -
- -
- -
-
-
+
+ +
-
-
- -
- +
+
+ +
+ +
- -
- -
- -
-
-
+ +
+ +
+ +
+ +
+
+
-
-
- -
- - -
- -
- - -
-
-
+
+
+ +
+ +
+ +
+ +
+ +
+ +
+
+
-
-
- -
- - -
+
+
+ +
+ + +
+ +
+ + +
+ +
+ +
+
+
- -
- - -
-
+
+
+ +
+ + +
+ +
+ + +
+ +
+ + +
+
+
-
+
+
+ +
+ + +
+ +
+ + +
+ +
+ + +
+
+
-
-
- -
- - -
- -
- - -
-
-
+
+ +
+ +
+
-
- -
- -
-
+
+ +
+ +
+
-
- -
- -
-
+
+ + + +
-
- - - -
+
+
    +
  • 工單屬性
    • +
  • 單板-工程資訊
    • +
  • 系統組裝-工程資訊
    • +
+
+ @* 基本資料sheet *@ +
-
- [ 工單屬性 ] -
@@ -292,10 +269,11 @@
+
-
- +
+
@@ -454,7 +432,7 @@
-
+
@@ -489,7 +467,7 @@
-
+
@@ -764,7 +742,7 @@
-
+
diff --git a/AMESCoreStudio.WebApi/Models/AMES/BarcodeChange.cs b/AMESCoreStudio.WebApi/Models/AMES/BarcodeChange.cs new file mode 100644 index 00000000..8f722126 --- /dev/null +++ b/AMESCoreStudio.WebApi/Models/AMES/BarcodeChange.cs @@ -0,0 +1,61 @@ +using System; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using System.Runtime.Serialization; + +namespace AMESCoreStudio.WebApi.Models.AMES +{ + /// + /// 條碼變更資料表 + /// + [Table("BARCODE_CHANGE", Schema = "JHAMES")] + [DataContract] + public class BarcodeChange + { + /// + /// 條碼ID + /// + [Column("BARCODE_ID")] + [DataMember] + [Display(Name = "條碼ID")] + + public decimal BarcodeID { get; set; } + + /// + /// 舊條碼序號 + /// + [Column("BARCODE_NO_OLD")] + [DataMember] + [Required(ErrorMessage = "{0},不能空白")] + [Display(Name = "舊條碼序號")] + public string BarcodeNOOld { get; set; } + + /// + /// 建立者 + /// + [Column("CREATE_USERID")] + [DataMember] + [Required(ErrorMessage = "{0},不能空白")] + [Display(Name = "建立者")] + public decimal CreateUserID { get; set; } = -1; + + /// + /// 建立時間 + /// + [Column("CREATE_DATE")] + [DataMember] + [Required(ErrorMessage = "{0},不能空白")] + [Display(Name = "建立時間")] + public DateTime CreateDate { get; set; } = DateTime.Now; + + /// + /// 修改時間 + /// + [Column("UPDATE_DATE")] + [DataMember] + [Required(ErrorMessage = "{0},不能空白")] + [Display(Name = "修改時間")] + public DateTime UpdateDate { get; set; } = DateTime.Now; + + } +} diff --git a/AMESCoreStudio.WebApi/Models/AMES/BarcodeLock.cs b/AMESCoreStudio.WebApi/Models/AMES/BarcodeLock.cs new file mode 100644 index 00000000..e69cc636 --- /dev/null +++ b/AMESCoreStudio.WebApi/Models/AMES/BarcodeLock.cs @@ -0,0 +1,114 @@ +using System; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using System.Runtime.Serialization; + +namespace AMESCoreStudio.WebApi.Models.AMES +{ + /// + /// 條碼鎖定資料表 + /// + [Table("BARCODE_LOCK", Schema = "JHAMES")] + [DataContract] + public class BarcodeLock + { + /// + /// 條鎖定ID + /// + [Key] + [Column("BARCODE_LOCK_ID")] + [DataMember] + [Display(Name = "條鎖定ID")] + + public decimal BarcodeLockID { get; set; } + /// + /// 條碼ID + /// + [Column("BARCODE_ID")] + [DataMember] + [Required(ErrorMessage = "{0},不能空白")] + [Display(Name = "條碼ID")] + public decimal BarcodeID { get; set; } + + /// + /// 工單ID + /// + [Column("WIP_ID")] + [DataMember] + [Required(ErrorMessage = "{0},不能空白")] + [Display(Name = "工單ID")] + public decimal WIP_ID { get; set; } + + /// + /// 條碼流程狀態 + /// + [Column("STATUS_ID")] + [DataMember] + [Required(ErrorMessage = "{0},不能空白")] + [Display(Name = "條碼流程狀態")] + public decimal StatusID { get; set; } + + /// + /// 鎖定原因 + /// + [Column("LOCK_REASON")] + [DataMember] + [Required(ErrorMessage = "{0},不能空白")] + [Display(Name = "鎖定原因")] + public string LockReason { get; set; } + + /// + /// 解鎖原因 + /// + [Column("UNLOCK_REASON")] + [DataMember] + [Display(Name = "解鎖原因")] + public string UnLockReason { get; set; } + + /// + /// 條碼鎖定狀態(0-鎖定; 1-解鎖) + /// + [Column("LOCK_STATUS")] + [DataMember] + [Required(ErrorMessage = "{0},不能空白")] + [Display(Name = "條碼鎖定狀態")] + public decimal LockStatus { get; set; } = 0; + + /// + /// 鎖定者 + /// + [Column("LOCK_USERID")] + [DataMember] + [Required(ErrorMessage = "{0},不能空白")] + [Display(Name = "鎖定者")] + public decimal LockUserID { get; set; } + + /// + /// 鎖定時間 + /// + [Column("LOCK_DATE")] + [DataMember] + [Required(ErrorMessage = "{0},不能空白")] + [Display(Name = "鎖定時間")] + public DateTime LockDate { get; set; } = DateTime.Now; + + /// + /// 解鎖者 + /// + [Column("UNLOCK_USERID")] + [DataMember] + [Required(ErrorMessage = "{0},不能空白")] + [Display(Name = "單箱數量")] + public decimal? UnLockUserID { get; set; } + + /// + /// 解鎖時間 + /// + [Column("UNLOCK_DATE")] + [DataMember] + [Required(ErrorMessage = "{0},不能空白")] + [Display(Name = "單箱數量")] + public DateTime? UnLockDate { get; set; } = DateTime.Now; + + } +} diff --git a/AMESCoreStudio.WebApi/Models/AMES/WipBarcode.cs b/AMESCoreStudio.WebApi/Models/AMES/WipBarcode.cs new file mode 100644 index 00000000..f4c2fe86 --- /dev/null +++ b/AMESCoreStudio.WebApi/Models/AMES/WipBarcode.cs @@ -0,0 +1,84 @@ +using System; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using System.Runtime.Serialization; + +namespace AMESCoreStudio.WebApi.Models.AMES +{ + /// + /// 工單條碼起迄資料檔 + /// + [Table("WIP_BARCODE", Schema = "JHAMES")] + [DataContract] + public class WipBarcode + { + /// + /// 工單號碼 + /// + [Key] + [Column("WIP_NO")] + [Required(ErrorMessage = "{0},不能空白")] + [DataMember] + public string WipNO { get; set; } + + /// + /// 起始條碼NO + /// + [Column("START_NO")] + [DataMember] + [Required(ErrorMessage = "{0},不能空白")] + [Display(Name = "起始條碼")] + public string StartNO { get; set; } + + /// + /// 結束條碼NO + /// + [Column("END_NO")] + [DataMember] + [Required(ErrorMessage = "{0},不能空白")] + [Display(Name = "結束條碼")] + public string EndNO { get; set; } + + /// + /// 工單ID + /// + [Column("WIP_ID")] + [DataMember] + [Display(Name = "工單ID")] + public decimal? WipID { get; set; } = -1; + + /// + /// 生產單位 + /// + [Column("UNIT_NO")] + [DataMember] + [Required(ErrorMessage = "{0},不能空白")] + [Display(Name = "生產單位")] + public string UnitNO { get; set; } = "S"; + + /// + /// 建立者 + /// + [Column("CREATE_USERID")] + [DataMember] + [Display(Name = "建立者")] + public decimal CreateUserID { get; set; } = 0; + + /// + /// 建立日期 + /// + [Column("CREATE_DATE")] + [DataMember] + [Display(Name = "建立日期")] + public DateTime CreateDate { get; set; } = DateTime.Now; + + /// + /// 修改日期 + /// + [Column("UPDATE_DATE")] + [DataMember] + [Display(Name = "修改日期")] + public DateTime UpdateDate { get; set; } = DateTime.Now; + + } +} diff --git a/AMESCoreStudio.WebApi/Models/AMES/WipBarcodeOther.cs b/AMESCoreStudio.WebApi/Models/AMES/WipBarcodeOther.cs new file mode 100644 index 00000000..e399a8c9 --- /dev/null +++ b/AMESCoreStudio.WebApi/Models/AMES/WipBarcodeOther.cs @@ -0,0 +1,100 @@ +using System; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using System.Runtime.Serialization; + +namespace AMESCoreStudio.WebApi.Models.AMES +{ + /// + /// 工單條碼區間設定檔（除内部SN） + /// + [Table("WIP_BARCODE_OTHER", Schema = "JHAMES")] + [DataContract] + public class WipBarcodeOther + { + /// + /// 其他ID + /// + [Key] + [Column("OTHER_ID")] + [DataMember] + public decimal OtherID { get; set; } + + /// + /// 工單號碼 + /// + [Column("WIP_NO")] + [DataMember] + [Required(ErrorMessage = "{0},不能空白")] + [Display(Name = "")] + public string WipNO { get; set; } + + /// + /// 開始條碼 + /// + [Column("START_NO")] + [DataMember] + [Required(ErrorMessage = "{0},不能空白")] + [Display(Name = "開始條碼")] + public string StartNO { get; set; } + + /// + /// 結束條碼 + /// + [Column("END_NO")] + [DataMember] + [Required(ErrorMessage = "{0},不能空白")] + [Display(Name = "結束條碼")] + public string EndNO { get; set; } + + /// + /// 類别代碼 + /// + [Column("TYPE_NO")] + [DataMember] + [Required(ErrorMessage = "{0},不能空白")] + [Display(Name = "類别代碼")] + public string TypeNO { get; set; } + + /// + /// + /// + [Column("TITLE")] + [DataMember] + [Display(Name = "")] + public string Title { get; set; } + + /// + /// 創建者ID + /// + [Column("CREATE_USERID")] + [DataMember] + [Display(Name = "創建者ID")] + public decimal CreateUserID { get; set; } + + /// + /// 創建日期 + /// + [Column("CREATE_DATE")] + [DataMember] + [Display(Name = "創建日期")] + public DateTime CreateDate { get; set; } = DateTime.Now; + + /// + /// 更新日期 + /// + [Column("UPDATE_DATE")] + [DataMember] + [Display(Name = "更新日期")] + public DateTime UpdateDate { get; set; } = DateTime.Now; + + /// + /// 更新者ID + /// + [Column("UPDATE_USERID")] + [DataMember] + [Display(Name = "更新者ID")] + public decimal UpdateUserID { get; set; } + + } +} diff --git a/AMESCoreStudio.WebApi/Models/AMES/WipLock.cs b/AMESCoreStudio.WebApi/Models/AMES/WipLock.cs new file mode 100644 index 00000000..2c48e8e4 --- /dev/null +++ b/AMESCoreStudio.WebApi/Models/AMES/WipLock.cs @@ -0,0 +1,120 @@ +using System; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using System.Runtime.Serialization; + +namespace AMESCoreStudio.WebApi.Models.AMES +{ + /// + /// 工單鎖定資料檔 + /// + [Table("WIP_LOCK", Schema = "JHAMES")] + [DataContract] + public class WipLock + { + /// + /// 工單鎖定ID + /// + [Key] + [Column("WIP_LOCK_ID")] + [DataMember] + public decimal WipLockID { get; set; } + + /// + /// 工單號碼 + /// + [Column("WIP_NO")] + [DataMember] + [Required(ErrorMessage = "{0},不能空白")] + [Display(Name = "工單號碼")] + public string WipNO { get; set; } + + /// + /// 鎖定狀態(0:鎖定;1:解鎖) + /// + [Column("LOCK_STATUS")] + [DataMember] + [Required(ErrorMessage = "{0},不能空白")] + [Display(Name = "鎖定狀態")] + public string LockStatus { get; set; } = "0"; + + /// + /// 鎖定原因 + /// + [Column("LOCK_REASON")] + [DataMember] + [Required(ErrorMessage = "{0},不能空白")] + [Display(Name = "鎖定原因")] + public string LockReason { get; set; } + + /// + /// 解鎖原因 + /// + [Column("UNLOCK_REASON")] + [DataMember] + [Display(Name = "解鎖原因")] + public string UnLockReason { get; set; } + + /// + /// 站別ID + /// + [Column("STATION_ID")] + [DataMember] + [Required(ErrorMessage = "{0},不能空白")] + [Display(Name = "站別ID")] + public decimal StationID { get; set; } = 0; + + /// + /// + /// + [Column("LOCK_TYPE")] + [DataMember] + [Required(ErrorMessage = "{0},不能空白")] + [Display(Name = "")] + public string LockType { get; set; } = "WIP"; + + /// + /// 鎖定原因類別(0-3C認證工單;1-驗證工單;3-維修換料待分析) + /// + [Column("LOCK_REASON_TYPE")] + [DataMember] + [Required(ErrorMessage = "{0},不能空白")] + [Display(Name = "鎖定原因類別")] + public string LOCK_REASON_TYPE { get; set; } = "0"; + + /// + /// 鎖定人員 + /// + [Column("LOCK_USERID")] + [DataMember] + [Required(ErrorMessage = "{0},不能空白")] + [Display(Name = "鎖定人員")] + public decimal LockUserID { get; set; } + + /// + /// 鎖定日期 + /// + [Column("LOCK_DATE")] + [DataMember] + [Required(ErrorMessage = "{0},不能空白")] + [Display(Name = "鎖定日期")] + public DateTime LockDate { get; set; } = DateTime.Now; + + /// + /// 解鎖人員 + /// + [Column("UNLOCK_USERID")] + [DataMember] + [Display(Name = "解鎖人員")] + public decimal? UnLockUserID { get; set; } + + /// + /// 解鎖日期 + /// + [Column("UNLOCK_DATE")] + [DataMember] + [Display(Name = "解鎖日期")] + public DateTime? UnLockDate { get; set; } + + } +} diff --git a/AMESCoreStudio.WebApi/Models/AMES/WipLog.cs b/AMESCoreStudio.WebApi/Models/AMES/WipLog.cs new file mode 100644 index 00000000..38776631 --- /dev/null +++ b/AMESCoreStudio.WebApi/Models/AMES/WipLog.cs @@ -0,0 +1,76 @@ +using System; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using System.Runtime.Serialization; + +namespace AMESCoreStudio.WebApi.Models.AMES +{ + /// + /// 工單投產纪錄資料文件 + /// + [Table("WIP_LOG", Schema = "JHAMES")] + [DataContract] + public class WipLog + { + /// + /// 工單ID + /// + [Key] + [Column("WIP_ID")] + [DataMember] + public decimal WipID { get; set; } + + /// + /// 工單狀態(A= ACTIVE, H = HOLD, N = NEW, S = STOP, E = FINAL END,R = REFLOW END) + /// + [Column("STATUS_NO")] + [DataMember] + [Required(ErrorMessage = "{0},不能空白")] + [Display(Name = "工單狀態")] + public string StatusNO { get; set; } + + /// + /// 工單敘述 + /// + [Column("WIP_DESC")] + [DataMember] + [Required(ErrorMessage = "{0},不能空白")] + [Display(Name = "工單敘述")] + public string WipDesc { get; set; } + + /// + /// 次數 + /// + [Column("TIMES")] + [DataMember] + [Required(ErrorMessage = "{0},不能空白")] + [Display(Name = "次數")] + public decimal Times { get; set; } = 0; + + /// + /// 建立者 + /// + [Column("CREATE_USERID")] + [DataMember] + [Display(Name = "建立者")] + public decimal CreateUserID { get; set; } = 0; + + /// + /// 建立日期 + /// + [Key] + [Column("CREATE_DATE")] + [DataMember] + [Display(Name = "建立日期")] + public DateTime CreateDate { get; set; } = DateTime.Now; + + /// + /// 修改日期 + /// + [Column("UPDATE_DATE")] + [DataMember] + [Display(Name = "修改日期")] + public DateTime UpdateDate { get; set; } = DateTime.Now; + + } +}