diff --git a/AMESCoreStudio.Web/Controllers/PCSController.cs b/AMESCoreStudio.Web/Controllers/PCSController.cs
index 32126fc3..bb8173c4 100644
--- a/AMESCoreStudio.Web/Controllers/PCSController.cs
+++ b/AMESCoreStudio.Web/Controllers/PCSController.cs
@@ -2196,7 +2196,7 @@ namespace AMESCoreStudio.Web.Controllers
                         if (!CheckBarCodeKP.Success)
                             return Json(new Result() { success = CheckBarCodeKP.Success, msg = CheckBarCodeKP.Msg, data = Data });
 
-                        if (CheckBarCodeKP.Data.Count() != 0)
+                        if (CheckBarCodeKP.Data != null)
                             ExtNo = CheckBarCodeKP.Data.FirstOrDefault();
                     }
                 }
@@ -2265,7 +2265,7 @@ namespace AMESCoreStudio.Web.Controllers
                     RuleStationID = model.RuleStation,
                     RuleStatus = !model.BarcodeNG ? "P" : "F", //F 不良 
                     InputDate = DateTime.Now,
-                    LineId = (decimal)model.LineID
+                    LineId = model.LineID
                 };
                 await _pcsApi.PostBarcodeStation(JsonConvert.SerializeObject(barcodeStation));
 
diff --git a/AMESCoreStudio.Web/ViewModels/PCS/PCS021ViewModel.cs b/AMESCoreStudio.Web/ViewModels/PCS/PCS021ViewModel.cs
index 414e0237..39daabc9 100644
--- a/AMESCoreStudio.Web/ViewModels/PCS/PCS021ViewModel.cs
+++ b/AMESCoreStudio.Web/ViewModels/PCS/PCS021ViewModel.cs
@@ -33,7 +33,7 @@ namespace AMESCoreStudio.Web.ViewModels.PCS
         /// <summary>
         /// 線別
         /// </summary>
-        public int? LineID { get; set; }
+        public int LineID { get; set; }
 
         /// <summary>
         /// 生產單位
diff --git a/AMESCoreStudio.WebApi/Models/AMES/BarcodeGroup.cs b/AMESCoreStudio.WebApi/Models/AMES/BarcodeGroup.cs
index b748e5db..930e2ec1 100644
--- a/AMESCoreStudio.WebApi/Models/AMES/BarcodeGroup.cs
+++ b/AMESCoreStudio.WebApi/Models/AMES/BarcodeGroup.cs
@@ -10,7 +10,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
     /// <summary>
     /// 條碼關聯資料檔
     /// </summary>
-    [Table("BARCODE_GROUP")]
+    [Table("BARCODE_GROUP", Schema = "JHAMES")]
     public partial class BarcodeGroup
     {
         /// <summary>
diff --git a/AMESCoreStudio.WebApi/Models/AMES/BarcodeStation.cs b/AMESCoreStudio.WebApi/Models/AMES/BarcodeStation.cs
index 8b58d5ce..c1c6c714 100644
--- a/AMESCoreStudio.WebApi/Models/AMES/BarcodeStation.cs
+++ b/AMESCoreStudio.WebApi/Models/AMES/BarcodeStation.cs
@@ -10,7 +10,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
     /// <summary>
     /// 條碼過站資料檔
     /// </summary>
-    [Table("BARCODE_STATION")]
+    [Table("BARCODE_STATION", Schema = "JHAMES")]
     [DataContract]
     public partial class BarcodeStation
     {
@@ -18,28 +18,28 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         /// 內部條碼ID
         /// </summary>
         [Key]
-        [Column("BARCODE_ID", TypeName = "NUMBER")]
+        [Column("BARCODE_ID")]
         [DataMember]
         [Display(Name = "內部條碼ID")]
-        public decimal BarcodeID { get; set; }
+        public int BarcodeID { get; set; }
 
         /// <summary>
         /// 工單ID
         /// </summary>
         [Key]
-        [Column("WIP_ID", TypeName = "NUMBER")]
+        [Column("WIP_ID")]
         [DataMember]
         [Display(Name = "工單ID")]
-        public decimal WipID { get; set; }
+        public int WipID { get; set; }
 
         /// <summary>
         /// 流程站別ID
         /// </summary>
         [Key]
-        [Column("RULE_STATION_ID", TypeName = "NUMBER")]
+        [Column("RULE_STATION_ID")]
         [DataMember]
         [Display(Name = "流程站別ID")]
-        public decimal RuleStationID { get; set; }
+        public int RuleStationID { get; set; }
 
         /// <summary>
         /// 規則狀態值
@@ -74,26 +74,26 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         /// <summary>
         /// 線别ID
         /// </summary>
-        [Column("LINE_ID", TypeName = "NUMBER")]
+        [Column("LINE_ID")]
         [DataMember]
         [Display(Name = "線别ID")]
-        public decimal LineId { get; set; } = -1;
+        public int LineId { get; set; } = -1;
 
         /// <summary>
         /// 站别的次數
         /// </summary>
-        [Column("STATION_FLAG", TypeName = "NUMBER")]
+        [Column("STATION_FLAG")]
         [DataMember]
         [Display(Name = "站别的次數")]
-        public decimal StationFlag { get; set; } = 1;
+        public int StationFlag { get; set; } = 1;
 
         /// <summary>
         /// 過站次數（不限定工單）
         /// </summary>
-        [Column("STATION_TIMES", TypeName = "NUMBER")]
+        [Column("STATION_TIMES")]
         [DataMember]
         [Display(Name = "過站次數")]
-        public decimal StationTimes { get; set; } = 1;
+        public int StationTimes { get; set; } = 1;
 
         /// <summary>
         /// 建立者