diff --git a/AMESCoreStudio.Web/Controllers/PCSController.cs b/AMESCoreStudio.Web/Controllers/PCSController.cs
index d0c9eff4..8173905d 100644
--- a/AMESCoreStudio.Web/Controllers/PCSController.cs
+++ b/AMESCoreStudio.Web/Controllers/PCSController.cs
@@ -293,7 +293,6 @@ namespace AMESCoreStudio.Web.Controllers
         private async Task GetMFGType()
         {
             var result = await _pcsApi.GetMFGTypes();
-
             var MFGType = new List<SelectListItem>();
             for (int i = 0; i < result.Count; i++)
             {
@@ -486,34 +485,6 @@ namespace AMESCoreStudio.Web.Controllers
             ViewBag.GetWipTypeList = WipType;
         }
 
-
-
-        /// <summary>
-        /// 客戶類別
-        /// </summary>
-        /// <returns></returns>
-        private void GetCustomerType()
-        {
-            var CustomerType = new List<SelectListItem>(){
-                new SelectListItem() {
-                    Text = "醫療",
-                    Value = "1",
-                },
-                new SelectListItem
-                {
-                    Text = "VIP",
-                    Value = "2",
-                },
-                new SelectListItem
-                {
-                   Text = "其他",
-                   Value = "3",
-                }
-            };
-
-            ViewBag.GetCustomerTypeList = CustomerType;
-        }
-
         /// <summary>
         /// SMD點膠
         /// </summary>
@@ -1189,7 +1160,6 @@ namespace AMESCoreStudio.Web.Controllers
             GetPCBWorkingType();
             GetSolderPaste();
             GetWipType();
-            GetCustomerType();
             GetPCSOPList();
             GetSOPTypeSelect();
             GetWipSystemTypeSelect();
@@ -1200,6 +1170,7 @@ namespace AMESCoreStudio.Web.Controllers
             GetCheckboxWipAttr();
             //var result = new WipAllViewModel();
             //return View(result);
+
             return View(model);
         }
 
@@ -1224,7 +1195,6 @@ namespace AMESCoreStudio.Web.Controllers
             GetPCBWorkingType();
             GetSolderPaste();
             GetWipType();
-            GetCustomerType();
             GetPCSOPList();
             GetSOPTypeSelect();
             GetWipSystemTypeSelect();
@@ -1481,7 +1451,6 @@ namespace AMESCoreStudio.Web.Controllers
             GetPCBWorkingType();
             GetSolderPaste();
             GetWipType();
-            GetCustomerType();
             GetPCSOPList();
             GetSOPTypeSelect();
             GetWipSystemTypeSelect();
@@ -1577,7 +1546,6 @@ namespace AMESCoreStudio.Web.Controllers
             GetPCBWorkingType();
             GetSolderPaste();
             GetWipType();
-            GetCustomerType();
             GetPCSOPList();
             GetWipSystemTypeSelect();
             GetWipSystemPMTypeSelect();
@@ -1655,7 +1623,6 @@ namespace AMESCoreStudio.Web.Controllers
             GetWipType();
             GetWipSystemTypeSelect();
             GetWipSystemPMTypeSelect();
-            GetCustomerType();
             GetPCSOPList();
             GetSOPTypeSelect();
             GetCheckboxApproveLogo(model.wipLabel != null ? model.wipLabel.ApproveLogo : null);
@@ -1687,7 +1654,6 @@ namespace AMESCoreStudio.Web.Controllers
             GetSolderPaste();
             GetWipType();
             GetWipSystemTypeSelect();
-            GetCustomerType();
             GetPCSOPList();
             GetSOPTypeSelect();
             GetCheckboxApproveLogo();
diff --git a/AMESCoreStudio.Web/ViewModels/PCS/WipViewModel.cs b/AMESCoreStudio.Web/ViewModels/PCS/WipViewModel.cs
index 4eb3d232..25b2eabe 100644
--- a/AMESCoreStudio.Web/ViewModels/PCS/WipViewModel.cs
+++ b/AMESCoreStudio.Web/ViewModels/PCS/WipViewModel.cs
@@ -80,6 +80,10 @@ namespace AMESCoreStudio.Web.ViewModels.PCS
 
     public class WipDataViewModel : WipNoDetailViewModel
     {
+        public WipDataViewModel()
+        {
+            wipInfo = new WipInfo();
+        }
 
         /// <summary>
         /// 工單資料
diff --git a/AMESCoreStudio.Web/Views/PCS/PCS001.cshtml b/AMESCoreStudio.Web/Views/PCS/PCS001.cshtml
index 986247bc..e2d2dd4e 100644
--- a/AMESCoreStudio.Web/Views/PCS/PCS001.cshtml
+++ b/AMESCoreStudio.Web/Views/PCS/PCS001.cshtml
@@ -19,11 +19,9 @@
     <div class="col-sm-12">
         <form enctype="multipart/form-data" method="post" id="PCS001" asp-action="PCS001" class="layui-form">
             <div asp-validation-summary="ModelOnly" class="text-danger"></div>
-            @*<input type="hidden" asp-for="wipSop.Status" value="Y" />*@
-
 
             <div class="layui-form-item" style="padding-left:30px">
-                <input asp-for="wipInfo.InputFlag" type="checkbox" title="判斷前製程是否已經投入" />
+                <input @(Model.wipInfo.InputFlag == "Y" ? "checked" : "") type="checkbox" title="判斷前製程是否已經投入" name="wipInfo.InputFlag" />
             </div>
 
             <div class="layui-form-item">
@@ -79,8 +77,8 @@
                 <div class="layui-inline">
                     <label class="layui-form-label">客戶類別</label>
                     <div class="layui-input-inline">
-                        <input asp-for="wipInfo.CustomerMedical" type="checkbox" title="醫療" />
-                        <input asp-for="wipInfo.CustomerVIP" type="checkbox" title="VIP" />
+                        <input @(Model.wipInfo.CustomerMedical == "Y" ? "checked" : "") type="checkbox" title="醫療" name="wipInfo.CustomerMedical" />
+                        <input @(Model.wipInfo.CustomerVIP == "Y" ? "checked" : "") type="checkbox" title="VIP" name="wipInfo.CustomerVIP" />
                     </div>
                     <label asp-for="wipInfo.CustomerNO" class="layui-form-label"></label>
                     <div class="layui-input-inline">
@@ -142,9 +140,9 @@
             </div>
 
             <div class="layui-form-item" style="padding-left:30px">
-                <input asp-for="wipInfo.ModelCheck" type="checkbox" title="混線投入機種檢查" />
-                <input asp-for="wipInfo.ECNCheck" type="checkbox" title="混線投入ECN相同檢查" />
-                <input asp-for="wipInfo.Priority" type="checkbox" title="線上強制工單" />
+                <input @(Model.wipInfo.ModelCheck == "Y" ? "checked" : "") type="checkbox" title="混線投入機種檢查" name="wipInfo.ModelCheck" />
+                <input @(Model.wipInfo.ECNCheck == "Y" ? "checked" : "") type="checkbox" title="混線投入ECN相同檢查" name="wipInfo.ECNCheck" />
+                <input @(Model.wipInfo.Priority == "Y" ? "checked" : "") type="checkbox" title="線上強制工單" name="wipInfo.Priority" />
             </div>
 
             <div class="layui-tab layui-tab-brief">
@@ -174,7 +172,7 @@
                                 </div>
                                 <label asp-for="wipAtt.Side" class="layui-form-label"></label>
                                 <div class="layui-input-inline">
-                                    <select asp-for="wipAtt.Side" asp-items="@ViewBag.MFGTypeList" class=""></select>
+                                    <select asp-for="wipAtt.Side" asp-items="@ViewBag.MFGTypeList" class="" ></select>
                                 </div>
 
                             </div>
@@ -327,8 +325,9 @@
                             <div class="layui-input-inline">
                                 <select asp-items="@ViewBag.GetDIPTypeList" asp-for="wipBoard.DipSide" class=""></select>
                             </div>
-                            <input asp-for="wipBoard.DipCarrier" type="checkbox" title="CARRIER" />
-                            <input asp-for="wipBoard.DipTape" type="checkbox" title="貼付膠帶" />
+                            <input @(Model.wipBoard.DipCarrier == "Y" ? "checked" : "") type="checkbox" title="CARRIER" name="wipBoard.DipCarrier" />
+                            <input @(Model.wipBoard.DipTape == "Y" ? "checked" : "") type="checkbox" title="貼付膠帶" name="wipBoard.DipTape" />
+                            <input @(Model.wipBoard.DipTape == "Y" ? "checked" : "") type="checkbox" title="點防焊膠" name="wipBoard.DipTape" />
                         </div>
                     </div>
 
diff --git a/AMESCoreStudio.Web/Views/PCS/PCS003.cshtml b/AMESCoreStudio.Web/Views/PCS/PCS003.cshtml
index 471c30b6..8b6a56dc 100644
--- a/AMESCoreStudio.Web/Views/PCS/PCS003.cshtml
+++ b/AMESCoreStudio.Web/Views/PCS/PCS003.cshtml
@@ -178,7 +178,7 @@
                                 </div>
                                 <label asp-for="wipAtt.Side" class="layui-form-label"></label>
                                 <div class="layui-input-inline">
-                                    <select asp-for="wipAtt.Side" asp-items="@ViewBag.MFGTypeList" class=""></select>
+                                    <select asp-for="wipAtt.Side" asp-items="@ViewBag.MFGTypeList"  class=""></select>
                                 </div>
 
                             </div>
diff --git a/AMESCoreStudio.WebApi/Enums/EnumPCS.cs b/AMESCoreStudio.WebApi/Enums/EnumPCS.cs
index 339a9ff8..2f44a749 100644
--- a/AMESCoreStudio.WebApi/Enums/EnumPCS.cs
+++ b/AMESCoreStudio.WebApi/Enums/EnumPCS.cs
@@ -209,6 +209,42 @@ namespace AMESCoreStudio.WebApi
             E = 5,
         }
 
+        /// <summary>
+        /// SMD點膠
+        /// </summary>
+        public enum EnumWipBoardSMDType
+        {
+            /// <summary>
+            /// SOP
+            /// </summary>
+            [Display(Name = "SOP")]
+            A = 1,
+
+            /// <summary>
+            /// 技術轉移
+            /// </summary>
+            [Display(Name = "技術轉移")]
+            B = 2,
+
+            /// <summary>
+            /// N/A
+            /// </summary>
+            [Display(Name = "N/A")]
+            C = 3,
+
+            /// <summary>
+            /// 暫時文件
+            /// </summary>
+            [Display(Name = "暫時文件")]
+            D = 4,
+
+            /// <summary>
+            /// REWORK
+            /// </summary>
+            [Display(Name = "REWORK")]
+            E = 5,
+        }
+
         /// <summary>
         /// Get Enum Display
         /// </summary>
diff --git a/AMESCoreStudio.WebApi/Models/AMES/WipBarcode.cs b/AMESCoreStudio.WebApi/Models/AMES/WipBarcode.cs
index dcdc60ae..6f041a8e 100644
--- a/AMESCoreStudio.WebApi/Models/AMES/WipBarcode.cs
+++ b/AMESCoreStudio.WebApi/Models/AMES/WipBarcode.cs
@@ -59,6 +59,14 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         [Display(Name = "生產單位")]
         public string UnitNO { get; set; } = "S";
 
+        /// <summary>
+        /// 備註
+        /// </summary>
+        [Column("REMARKS")]
+        [DataMember]
+        [Display(Name = "備註")]
+        public string ReMarks { get; set; }
+
         /// <summary>
         /// 建立者
         /// </summary>
diff --git a/AMESCoreStudio.WebApi/Models/AMES/WipInfo.cs b/AMESCoreStudio.WebApi/Models/AMES/WipInfo.cs
index 48932c3a..3fdfa75d 100644
--- a/AMESCoreStudio.WebApi/Models/AMES/WipInfo.cs
+++ b/AMESCoreStudio.WebApi/Models/AMES/WipInfo.cs
@@ -135,7 +135,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         [DataMember]
         [Required(ErrorMessage = "{0},不能空白")]
         [Display(Name = "單箱數量")]
-        public int BoxCNT { get; set; } = 1;
+        public int BoxCNT { get; set; } = 0;
 
         /// <summary>
         /// 判斷前製程是否已經投入 (Y-判斷;N-不判斷)