1. 修改WebAPI Model 判斷

AMESCoreStudio.Web/Views/PCS/PCS001C.cshtml

@@ -240,8 +240,8 @@
                     </td>
                     <td>
                         <div class="form-group form-inline my-sm-1">
-                            <label asp-for="WipInfo.WipScheduleDate" class="control-label col-sm-3"></label>
+                            <label asp-for="WipInfo.WipScheduleDate" class="control-label col-sm-4"></label>
-                            <input asp-for="WipInfo.WipScheduleDate" class="form-control col-sm-3" placeholder="請輸入客戶料號" />
+                            <input asp-for="WipInfo.WipScheduleDate" class="form-control col-sm-4"  />
                             <span asp-validation-for="WipInfo.WipScheduleDate" class="text-danger offset-sm-3 my-sm-1"></span>
                         </div>
                     </td>
@@ -252,8 +252,8 @@
                     </td>
                     <td>
                         <div class="form-group form-inline my-sm-1">
-                            <label asp-for="WipInfo.WipDueDate" class="control-label col-sm-3"></label>
+                            <label asp-for="WipInfo.WipDueDate" class="control-label col-sm-4"></label>
-                            <input asp-for="WipInfo.WipDueDate" class="form-control col-sm-3" placeholder="請輸入客戶料號" />
+                            <input asp-for="WipInfo.WipDueDate" placeholder="YYYY/MM/DD" class="form-control col-sm-4">
                            <span asp-validation-for="WipInfo.WipDueDate" class="text-danger offset-sm-3 my-sm-1"></span>
                         </div>
                     </td>
@@ -281,6 +281,7 @@
                 parent.hg.msg(error);
             }
         });
+
     </script>
 
 

AMESCoreStudio.WebApi/Models/AMES/FactoryInfo.cs

@@ -17,6 +17,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         /// </summary>
         [Key]
         [Column("FACTORY_ID")]
+        [Required(ErrorMessage = "{0},不能空白")]
         [DataMember]
         public decimal FactoryID { get; set; }
 
@@ -25,6 +26,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         /// </summary>
         [Column("FACTORY_NAME_CH")]
         [DataMember]
+        [Required(ErrorMessage = "{0},不能空白")]
         [Display(Name = "廠別中文名稱")]
         public string FactoryNameCH { get; set; }
 
@@ -73,6 +75,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         /// </summary>
         [Column("ORG_ID")]
         [DataMember]
+        [Required(ErrorMessage = "{0},不能空白")]
         [Display(Name = "")]
         public decimal OrgID { get; set; }
 
@@ -81,6 +84,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         /// </summary>
         [Column("CREATE_USERID")]
         [DataMember]
+        [Required(ErrorMessage = "{0},不能空白")]
         [Display(Name = "建立者")]
         public decimal CreateUserID { get; set; }
 
@@ -105,6 +109,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         /// </summary>
         [Column("FACTORY_NO")]
         [DataMember]
+        [Required(ErrorMessage = "{0},不能空白")]
         [Display(Name = "廠別代碼")]
         public string FactoryNO { get; set; }
 
@@ -113,6 +118,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         /// </summary>
         [Column("FACTORY_CODE")]
         [DataMember]
+        [Required(ErrorMessage = "{0},不能空白")]
         [Display(Name = "區域")]
         public string FactoryCode { get; set; }
 
@@ -121,6 +127,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         /// </summary>
         [Column("VIRTUAL_FLAG")]
         [DataMember]
+        [Required(ErrorMessage = "{0},不能空白")]
         [Display(Name = "")]
         public string VirtualFlag { get; set; }
 
@@ -129,6 +136,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         /// </summary>
         [Column("STATUS_NO")]
         [DataMember]
+        [Required(ErrorMessage = "{0},不能空白")]
         [Display(Name = "廠別狀態")]
         public string StatusNO { get; set; }
 

AMESCoreStudio.WebApi/Models/AMES/FactoryUnit.cs

@@ -25,6 +25,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         /// </summary>
         [Column("UNIT_NAME")]
         [DataMember]
+        [Required(ErrorMessage = "{0},不能空白")]
         [Display(Name = "")]
         public string UnitName { get; set; }
 
@@ -33,6 +34,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         /// </summary>
         [Column("UNIT_CODE")]
         [DataMember]
+        [Required(ErrorMessage = "{0},不能空白")]
         [Display(Name = "")]
         public string UnitCode { get; set; }
 
@@ -41,6 +43,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         /// </summary>
         [Column("SEQ")]
         [DataMember]
+        [Required(ErrorMessage = "{0},不能空白")]
         [Display(Name = "")]
         public decimal SEQ { get; set; }
 

AMESCoreStudio.WebApi/Models/AMES/LineInfo.cs

@@ -17,6 +17,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         /// </summary>
         [Column("DEPT_ID")]
         [DataMember]
+        [Required(ErrorMessage = "{0},不能空白")]
         [Display(Name = "部門代碼")]
         public decimal DeptID { get; set; }
 
@@ -25,6 +26,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         /// </summary>
         [Key]
         [Column("LINE_ID")]
+        [Required(ErrorMessage = "{0},不能空白")]
         [DataMember]
         public decimal LineID { get; set; }
 
@@ -33,6 +35,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         /// </summary>
         [Column("LINE_DESC")]
         [DataMember]
+        [Required(ErrorMessage = "{0},不能空白")]
         [Display(Name = "線別說明")]
         public string LineDesc { get; set; }
 
@@ -49,6 +52,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         /// </summary>
         [Column("UNIT_NO")]
         [DataMember]
+        [Required(ErrorMessage = "{0},不能空白")]
         [Display(Name = "生產單位")]
         public string UnitNO { get; set; }
 
@@ -57,6 +61,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         /// </summary>
         [Column("WIP_ID")]
         [DataMember]
+        [Required(ErrorMessage = "{0},不能空白")]
         [Display(Name = "工單ID")]
         public decimal WipID { get; set; }
 

AMESCoreStudio.WebApi/Models/AMES/MFGType.cs

@@ -17,6 +17,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         /// </summary>
         [Key]
         [Column("MFG_TYPE_NO")]
+        [Required(ErrorMessage = "{0},不能空白")]
         [DataMember]
         public string MFGTypeNO { get; set; }
 
@@ -25,6 +26,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         /// </summary>
         [Column("MFG_TYPE_NAME")]
         [DataMember]
+        [Required(ErrorMessage = "{0},不能空白")]
         [Display(Name = "正背板類型名稱")]
         public string MFGTypeName { get; set; }
 

AMESCoreStudio.WebApi/Models/AMES/ProcessType.cs

@@ -17,6 +17,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         /// </summary>
         [Key]
         [Column("PROCESS_TYPE_NO")]
+        [Required(ErrorMessage = "{0},不能空白")]
         [DataMember]
         public string ProcessTypeNO{ get; set; }
 
@@ -26,6 +27,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         /// </summary>
         [Column("PROCESS_TYPE_NAME")]
         [DataMember]
+        [Required(ErrorMessage = "{0},不能空白")]
         [Display(Name = "工單屬性名稱")]
         public string ProcessTypeName { get; set; }
 

AMESCoreStudio.WebApi/Models/AMES/ProductType.cs

@@ -17,6 +17,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         /// </summary>
         [Key]
         [Column("PRODUCT_TYPE_ID")]
+        [Required(ErrorMessage = "{0},不能空白")]
         [DataMember]
         public decimal ProductTypeID { get; set; }
 
@@ -25,6 +26,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         /// </summary>
         [Column("PRODUCT_TYPE_NAME")]
         [DataMember]
+        [Required(ErrorMessage = "{0},不能空白")]
         [Display(Name = "產品別名稱")]
         public string ProductTypeName { get; set; }
 
@@ -33,6 +35,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         /// </summary>
         [Column("PRODUCT_TYPE_DESC")]
         [DataMember]
+        [Required(ErrorMessage = "{0},不能空白")]
         [Display(Name = "產品說明")]
         public string ProductTypeDesc { get; set; }
 
@@ -41,6 +44,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         /// </summary>
         [Column("PRODUCT_TYPE_NO")]
         [DataMember]
+        [Required(ErrorMessage = "{0},不能空白")]
         [Display(Name = "產品別代碼")]
         public string ProductTypeNO { get; set; }
 

AMESCoreStudio.WebApi/Models/AMES/WipAtt.cs

@@ -17,6 +17,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         /// </summary>
         [Key]
         [Column("WIP_NO")]
+        [Required(ErrorMessage = "{0},不能空白")]
         [DataMember]
         public string WipNO { get; set; }
 
@@ -25,6 +26,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         /// </summary>
         [Column("ITEM_NO")]
         [DataMember]
+        [Required(ErrorMessage = "{0},不能空白")]
         [Display(Name = "料號")]
         public string ItemNO { get; set; }
 
@@ -49,6 +51,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         /// </summary>
         [Column("SIDE")]
         [DataMember]
+        [Required(ErrorMessage = "{0},不能空白")]
         [Display(Name = "正背面")]
         public decimal Side { get; set; }
 
@@ -57,6 +60,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         /// </summary>
         [Column("BOARDS")]
         [DataMember]
+        [Required(ErrorMessage = "{0},不能空白")]
         [Display(Name = "聯板數")]
         public decimal Boards { get; set; }
 
@@ -121,6 +125,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         /// </summary>
         [Column("UNIT_WEIGHT")]
         [DataMember]
+        [Required(ErrorMessage = "{0},不能空白")]
         [Display(Name = "單位重量")]
         public decimal UnitWeight { get; set; }
 
@@ -129,6 +134,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         /// </summary>
         [Column("WEIGHT_RANGE")]
         [DataMember]
+        [Required(ErrorMessage = "{0},不能空白")]
         [Display(Name = "誤差範圍")]
         public decimal WeightRange { get; set; }
 

AMESCoreStudio.WebApi/Models/AMES/WipInfo.cs

@@ -17,6 +17,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         /// </summary>
         [Key]
         [Column("WIP_ID")]
+        [Required(ErrorMessage = "{0},不能空白")]
         [DataMember]
         public decimal WipID { get; set; }
 
@@ -25,6 +26,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         /// </summary>
         [Column("WIP_NO")]
         [DataMember]
+        [Required(ErrorMessage = "{0},不能空白")]
         [Display(Name = "工單號碼")]
         public string WipNO { get; set; }
 
@@ -33,6 +35,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         /// </summary>
         [Column("PLAN_QTY")]
         [DataMember]
+        [Required(ErrorMessage = "{0},不能空白")]
         [Display(Name = "計劃數量")]
         public decimal PlanQTY { get; set; }
 
@@ -41,6 +44,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         /// </summary>
         [Column("COMPLETE_QTY")]
         [DataMember]
+        [Required(ErrorMessage = "{0},不能空白")]
         [Display(Name = "第一站完成數量")]
         public decimal CompleteQTY { get; set; }
 
@@ -49,6 +53,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         /// </summary>
         [Column("LINE_ID")]
         [DataMember]
+        [Required(ErrorMessage = "{0},不能空白")]
         [Display(Name = "線別ID")]
         public decimal LineID { get; set; }
 
@@ -57,6 +62,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         /// </summary>
         [Column("UNIT_NO")]
         [DataMember]
+        [Required(ErrorMessage = "{0},不能空白")]
         [Display(Name = "生產單位")]
         public string UnitNO { get; set; }
 
@@ -65,6 +71,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         /// </summary>
         [Column("PRODUCT_TYPE_ID")]
         [DataMember]
+        [Required(ErrorMessage = "{0},不能空白")]
         [Display(Name = "產品別")]
         public decimal ProductTypeID { get; set; }
 
@@ -89,6 +96,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         /// </summary>
         [Column("FLOW_RULE_ID")]
         [DataMember]
+        [Required(ErrorMessage = "{0},不能空白")]
         [Display(Name = "流程ID")]
         public decimal FlowRuleID { get; set; }
 
@@ -97,6 +105,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         /// </summary>
         [Column("STATUS_NO")]
         [DataMember]
+        [Required(ErrorMessage = "{0},不能空白")]
         [Display(Name = "工單狀態")]
         public string StatusNO { get; set; }
 
@@ -105,6 +114,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         /// </summary>
         [Column("WIP_TIMES")]
         [DataMember]
+        [Required(ErrorMessage = "{0},不能空白")]
         [Display(Name = "工單開工次數")]
         public decimal WipTimes { get; set; }
 
@@ -121,6 +131,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         /// </summary>
         [Column("BOX_CNT")]
         [DataMember]
+        [Required(ErrorMessage = "{0},不能空白")]
         [Display(Name = "單箱數量")]
         public decimal BoxCNT { get; set; }
 
@@ -129,6 +140,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         /// </summary>
         [Column("INPUT_FLAG")]
         [DataMember]
+        [Required(ErrorMessage = "{0},不能空白")]
         [Display(Name = "判斷前製程")]
         public string InputFlag { get; set; }
 
@@ -137,6 +149,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         /// </summary>
         [Column("MODEL_CHECK")]
         [DataMember]
+        [Required(ErrorMessage = "{0},不能空白")]
         [Display(Name = "混線投入機")]
         public string ModelCheck { get; set; }
 
@@ -145,6 +158,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         /// </summary>
         [Column("WIP_SEQ")]
         [DataMember]
+        [Required(ErrorMessage = "{0},不能空白")]
         [Display(Name = "制令序號")]
         public decimal WipSEQ { get; set; }
 
@@ -153,6 +167,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         /// </summary>
         [Column("ECN_CHECK")]
         [DataMember]
+        [Required(ErrorMessage = "{0},不能空白")]
         [Display(Name = "混線投入ECN相同檢查")]
         public string ECNCheck { get; set; }
 
@@ -185,6 +200,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         /// </summary>
         [Column("PRINT_FLAG")]
         [DataMember]
+        [Required(ErrorMessage = "{0},不能空白")]
         [Display(Name = "打印狀態")]
         public decimal PrintFlag { get; set; }
 
@@ -209,7 +225,8 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         /// </summary>
         [Column("PRIORITY")]
         [DataMember]
-        [Display(Name = "線上強制工單(Y-是;N-否)")]
+        [Required(ErrorMessage = "{0},不能空白")]
+        [Display(Name = "線上強制工單")]
         public string Priority { get; set; }
 
         /// <summary>
@@ -217,6 +234,8 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         /// </summary>
         [Column("WIP_SCHEDULE_DATE")]
         [DataMember]
+        [Required(ErrorMessage = "{0},不能空白")]
+        [DataType(DataType.Date), DisplayFormat(DataFormatString = "{0:yyyy/MM/dd}", ApplyFormatInEditMode = true)]
         [Display(Name = "預計開工日期")]
         public DateTime WipScheduleDate { get; set; }
 
@@ -225,6 +244,8 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         /// </summary>
         [Column("WIP_DUE_DATE")]
         [DataMember]
+        [Required(ErrorMessage = "{0},不能空白")]
+        [DataType(DataType.Date), DisplayFormat(DataFormatString = "{0:yyyy/MM/dd}", ApplyFormatInEditMode = true)]
         [Display(Name = "預計完工日期")]
         public DateTime WipDueDate { get; set; }
 
@@ -233,6 +254,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         /// </summary>
         [Column("WERKS")]
         [DataMember]
+        [Required(ErrorMessage = "{0},不能空白")]
         [Display(Name = "廠別/委外廠")]
         public string Werks { get; set; }
 
@@ -241,7 +263,8 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         /// </summary>
         [Column("WIP_TYPE")]
         [DataMember]
-        [Display(Name = "工單類型(S-標準工單;R-重工工單)")]
+        [Required(ErrorMessage = "{0},不能空白")]
+        [Display(Name = "工單類型")]
         public string WipType { get; set; }
 
         /// <summary>
@@ -249,6 +272,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         /// </summary>
         [Column("CUSTOMER_TYPE")]
         [DataMember]
+        [Required(ErrorMessage = "{0},不能空白")]
         [Display(Name = "客戶類別")]
         public decimal CustomerType { get; set; }