diff --git a/AMESCoreStudio.Web/Controllers/PCSController.cs b/AMESCoreStudio.Web/Controllers/PCSController.cs
index abf68597..58d0b9e1 100644
--- a/AMESCoreStudio.Web/Controllers/PCSController.cs
+++ b/AMESCoreStudio.Web/Controllers/PCSController.cs
@@ -1358,14 +1358,15 @@ namespace AMESCoreStudio.Web.Controllers
 
 
         /// <summary>
-        /// 取出貨序號
+        /// 取出貨序號 取到資料先儲存出貨序號
         /// </summary>
         /// <param name="itemNo">料號</param>
         /// <param name="lotNo">生產序號</param>
         /// <param name="num">生產數量</param>
+        /// <param name="wipNo">工單號碼</param>
         /// <returns>RuleStation </returns>
         [HttpPost]
-        public async Task<JsonResult> GetBarcodeOther(string itemNo, string lotNo, int num)
+        public async Task<JsonResult> GetBarcodeOther(string itemNo, string lotNo, int num ,string wipNo)
         {
             var result = await _pcsApi.GetSerialRuleByQurey(itemNo, lotNo.Trim().ToUpper(), num);
             string StartNO = "";
@@ -1375,6 +1376,24 @@ namespace AMESCoreStudio.Web.Controllers
             {
                 StartNO = result.Msg.Split('~')[0];
                 EndNO = result.Msg.Split('~')[1] ?? result.Msg.Split('~')[0];
+
+                if (!string.IsNullOrWhiteSpace(StartNO) && !string.IsNullOrWhiteSpace(EndNO))
+                {
+                    var type_no = await _pcsApi.GetBarcodeTypeByTypeName("客戶條碼區間");
+                    if (type_no != null)
+                    {
+                        WipBarcodeOther wipBarcodeOther = new WipBarcodeOther
+                        {
+                            WipNO = wipNo,
+                            TypeNO = type_no.TypeNo,
+                            StartNO = StartNO,
+                            EndNO = EndNO,
+                            CreateUserID = GetLogInUserID(),
+                            UpdateUserID = GetLogInUserID()
+                        };
+                        await _pcsApi.PostWipBarcodeOther(JsonConvert.SerializeObject(wipBarcodeOther));
+                    }
+                }
             }
 
             return Json(new Result() { success = result.Success, msg = result.Msg, data = new { StartNO, EndNO } });
@@ -2232,20 +2251,20 @@ namespace AMESCoreStudio.Web.Controllers
 
                     }
 
-                    // 出貨序號
-                    if (!string.IsNullOrWhiteSpace(model.wipBarcodeOther.StartNO) && !string.IsNullOrWhiteSpace(model.wipBarcodeOther.EndNO))
-                    {
-                        var type_no = await _pcsApi.GetBarcodeTypeByTypeName("客戶條碼區間");
-                        if (type_no != null)
-                        {
-                            model.wipBarcodeOther.WipNO = model.wipInfo.WipNO;
-                            model.wipBarcodeOther.TypeNO = type_no.TypeNo;
-                            if (model.wipBarcodeOther.OtherID != 0)
-                                result = await _pcsApi.PutWipBarcodeOther(JsonConvert.SerializeObject(model.wipBarcodeOther));
-                            else
-                                result = await _pcsApi.PostWipBarcodeOther(JsonConvert.SerializeObject(model.wipBarcodeOther));
-                        }
-                    }
+                    //// 出貨序號 改換點出貨序號時有資料就先儲存
+                    //if (!string.IsNullOrWhiteSpace(model.wipBarcodeOther.StartNO) && !string.IsNullOrWhiteSpace(model.wipBarcodeOther.EndNO))
+                    //{
+                    //    var type_no = await _pcsApi.GetBarcodeTypeByTypeName("客戶條碼區間");
+                    //    if (type_no != null)
+                    //    {
+                    //        model.wipBarcodeOther.WipNO = model.wipInfo.WipNO;
+                    //        model.wipBarcodeOther.TypeNO = type_no.TypeNo;
+                    //        if (model.wipBarcodeOther.OtherID != 0)
+                    //            result = await _pcsApi.PutWipBarcodeOther(JsonConvert.SerializeObject(model.wipBarcodeOther));
+                    //        else
+                    //            result = await _pcsApi.PostWipBarcodeOther(JsonConvert.SerializeObject(model.wipBarcodeOther));
+                    //    }
+                    //}
 
                     // MAC
                     if (!string.IsNullOrWhiteSpace(model.wipMAC.StartNO) && !string.IsNullOrWhiteSpace(model.wipMAC.EndNO))
@@ -4556,7 +4575,8 @@ namespace AMESCoreStudio.Web.Controllers
                 }
             }
 
-            WipReturn wipReturn = new WipReturn{
+            WipReturn wipReturn = new WipReturn
+            {
                 WipNo = model.WipNo.Trim().ToUpper(),
                 GoruleStationId = model.GoByRuleStation,
                 ReruleStationId = model.RetrueRuleStation,
diff --git a/AMESCoreStudio.Web/Views/PCS/PCS003.cshtml b/AMESCoreStudio.Web/Views/PCS/PCS003.cshtml
index e5cd4f0a..e8a3dfee 100644
--- a/AMESCoreStudio.Web/Views/PCS/PCS003.cshtml
+++ b/AMESCoreStudio.Web/Views/PCS/PCS003.cshtml
@@ -273,11 +273,11 @@
                             <div class="layui-inline">
                                 <label class="layui-form-label">出貨序號</label>
                                 <div class="layui-input-inline">
-                                    <input asp-for="wipBarcodeOther.StartNO" class="layui-input" />
+                                    <input asp-for="wipBarcodeOther.StartNO" class="layui-input" readonly="readonly" />
                                 </div>
                                 <div class="layui-form-mid">-</div>
                                 <div class="layui-input-inline">
-                                    <input asp-for="wipBarcodeOther.EndNO" class="layui-input" />
+                                    <input asp-for="wipBarcodeOther.EndNO" class="layui-input" readonly="readonly" />
                                 </div>
                                 <div id="barcodeOtherDiv" style="display:inline;">
                                     <label class="layui-form-label">lotNo</label>
@@ -310,7 +310,7 @@
                         <div class="layui-form-item">
                             <label class="layui-form-label">備註</label>
                             <div class="layui-input-block">
-                                <input asp-for="wipBarcode.Remarks" class="layui-input" type="text" />
+                                <textarea asp-for="wipBarcode.Remarks" class="layui-textarea" type="text"></textarea>
                             </div>
                         </div>
                     </div>
@@ -1178,7 +1178,7 @@
                 $.ajax({
                     url: '@Url.Action("GetBarcodeOther", "PCS")',
                     dataType: 'json',
-                    data: { "itemNo": itemNo, "lotNo": lotNo, "num": planQTY },
+                    data: { "itemNo": itemNo, "lotNo": lotNo, "num": planQTY ,"wipNo":'@Model.wipInfo.WipNO'},
                     cache: false,
                     type: "POST",
                     success: function (result) {
@@ -1220,8 +1220,13 @@
                         if (data._msg != undefined) {
                             parent.hg.msg(data._msg);
                         }
-                        $("#wipMAC_StartNO").val(data.mix);
-                        $("#wipMAC_EndNO").val(data.max);
+                        else
+                        {
+                            $("#wipMAC_StartNO").val(data.mix);
+                            $("#wipMAC_EndNO").val(data.max);
+                            $("#wipMAC_StartNO").attr("readonly", "readonly");
+                            $("#wipMAC_EndNO").attr("readonly", "readonly");
+                        }
                     },
                     error: function (jqXHR, textStatus, errorThrown) {
                         alert("Found error when using Ajax!!");
diff --git a/AMESCoreStudio.Web/Views/PCS/PCS009R.cshtml b/AMESCoreStudio.Web/Views/PCS/PCS009R.cshtml
index 53f82c93..32fb2365 100644
--- a/AMESCoreStudio.Web/Views/PCS/PCS009R.cshtml
+++ b/AMESCoreStudio.Web/Views/PCS/PCS009R.cshtml
@@ -57,7 +57,7 @@
                 <div class="layui-col-xs2">
                     <div class="layui-form-item">
                         <div class="layui-input-block" style="margin-left:auto;">
-                            <input asp-for="StatusNo" type="text" class="layui-input">
+                            <label class="layui-form-label" style="text-align: left; width: 150px;">@Model.StatusNo</label>
                         </div>
                     </div>
                 </div>
@@ -67,7 +67,7 @@
                 <div class="layui-col-xs2">
                     <div class="layui-form-item">
                         <div class="layui-input-block" style="margin-left:auto;">
-                            <input asp-for="InhouseNo" type="text" class="layui-input">
+                            <label class="layui-form-label" style="text-align: left; width: 150px;">@Model.InhouseNo</label>
                         </div>
                     </div>
                 </div>
@@ -77,7 +77,7 @@
                 <div class="layui-col-xs2">
                     <div class="layui-form-item">
                         <div class="layui-input-block" style="margin-left:auto;">
-                            <input asp-for="Wight" type="text" class="layui-input">
+                            <label class="layui-form-label" style="text-align: left; width: 150px;">@Model.Wight</label>
                         </div>
                     </div>
                 </div>
@@ -91,7 +91,7 @@
                         @foreach (var index in Model.WinInfos)
                         {
                             <tr>
-                                <td>
+                                <td style="width:70px;">
                                     工單號碼：
                                 </td>
                                 <td>
@@ -140,7 +140,7 @@
                                     建置日期：
                                 </td>
                                 <td>
-                                    @index.CreateDate
+                                    @DateTime.Parse(index.CreateDate).ToString("yyyy/MM/dd HH:mm:ss")
                                 </td>
                                 <td>
                                     DATE CODE：
@@ -216,7 +216,7 @@
                                     @index.User
                                 </td>
                                 <td>
-                                    @index.InputDate
+                                    @DateTime.Parse(index.InputDate).ToString("yyyy/MM/dd HH:mm:ss")
                                 </td>
                             </tr>
                         }
@@ -243,7 +243,10 @@
                                 組件料號
                             </th>
                             <th>
-                                過站時間
+                                綁入人員
+                            </th>
+                            <th>
+                                綁入時間
                             </th>
                         </tr>
                     </thead>
@@ -264,7 +267,7 @@
                                     @index.KpItemNo
                                 </td>
                                 <td>
-                                    @index.CreateDate
+                                  @index.CreateDate.ToString("yyyy/MM/dd HH:mm:ss")
                                 </td>
                             </tr>
                         }
@@ -287,6 +290,9 @@
                             <th>
                                 零件位置
                             </th>
+                            <th>
+                                維修代碼
+                            </th>
                             <th>
                                 維修狀態
                             </th>
@@ -318,7 +324,7 @@
                                 @index.ReplyUser
                             </td>
                             <td>
-                                @index.ReplyDate
+                                @DateTime.Parse(index.ReplyDate).ToString("yyyy/MM/dd HH:mm:ss")
                             </td>
                         </tr>
                         }
@@ -354,7 +360,7 @@
                                     @index.OutfitNo
                                 </td>
                                 <td>
-                                    @index.InputDate
+                                    @DateTime.Parse(index.InputDate).ToString("yyyy/MM/dd HH:mm:ss")
                                 </td>
                             </tr>
                         }
@@ -407,7 +413,7 @@
                                     @index.CreateUser
                                 </td>
                                 <td>
-                                    @index.CreateDate
+                                    @index.CreateDate.ToString("yyyy/MM/dd HH:mm:ss")
                                 </td>
                             </tr>
                         }
diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/NgInfoController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/NgInfoController.cs
index b185fb65..e930dce3 100644
--- a/AMESCoreStudio.WebApi/Controllers/AMES/NgInfoController.cs
+++ b/AMESCoreStudio.WebApi/Controllers/AMES/NgInfoController.cs
@@ -141,12 +141,25 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
             var q = from q1 in _context.BarcodeInfoes.Where(w => w.BarcodeNo == id)
                     join q2 in _context.NgInfos on q1.BarcodeID equals q2.BarcodeID
                     join q3 in _context.NgComponents on q2.NgID equals q3.NgID
+                    join q4 in _context.NGReasons on q3.NgNo.Replace("$","") equals q4.NGReasonNo
+                    into s 
+                    from q4 in s.DefaultIfEmpty()
+                    join q5 in _context.NgRepairs on q3.ComponentID equals q5.ComponentID
+                    into s1
+                    from q5 in s1.DefaultIfEmpty()
+                    join q6 in _context.RMAReasons on q5.RepairNo equals q6.RMAReasonNo
+                    into s2 
+                    from q6 in s2.DefaultIfEmpty()
                     select new NGInfoDto
                     {
                         StationName = q2.Station.StationName,
                         LocationNo = q3.LocationNo,
-                        NGNo = q3.NgNo,
+                        NGNo = q3.NgNo.Replace("$",""),
+                        NGNoDesc = q4.NGReasonDesc,
                         Status = q3.Status == 0 ? "尚未處理" : q3.Status == 1 ? "已維修處理" : "誤判",
+                        RepairNo = q5.RepairNo,
+                        RepairDesc = q5.RepairDesc,
+                        RepairNoDesc = q6.RMAReasonDesc,
                         ReplyUser = q3.ReplyUserID.ToString(),
                         ReplyDate = q3.ReplyDate.ToString("yyyy/MM/dd")
                     };
diff --git a/AMESCoreStudio.WebApi/DTO/AMES/NGInfoDto.cs b/AMESCoreStudio.WebApi/DTO/AMES/NGInfoDto.cs
index 4c586611..194e7642 100644
--- a/AMESCoreStudio.WebApi/DTO/AMES/NGInfoDto.cs
+++ b/AMESCoreStudio.WebApi/DTO/AMES/NGInfoDto.cs
@@ -25,6 +25,11 @@ namespace AMESCoreStudio.WebApi.DTO.AMES
         /// </summary>
         public string NGNo { get; set; }
 
+        /// <summary>
+        /// 不良代碼說明
+        /// </summary>
+        public string NGNoDesc { get; set; }
+
         /// <summary>
         /// 零件位置
         /// </summary>
@@ -35,6 +40,21 @@ namespace AMESCoreStudio.WebApi.DTO.AMES
         /// </summary>
         public string Status { get; set; }
 
+        /// <summary>
+        /// 維修代碼
+        /// </summary>
+        public string RepairNo { get; set; }
+
+        /// <summary>
+        /// 維修代碼說明
+        /// </summary>
+        public string RepairNoDesc { get; set; }
+
+        /// <summary>
+        /// 維修說明
+        /// </summary>
+        public string RepairDesc { get; set; }
+
         /// <summary>
         /// 回覆人員
         /// </summary>