1. 移除PCB加工 註解字樣

2. 加入作業流程註解
3. FQC008 查詢 檢驗結果顏色變更，加入檢驗時間

AMESCoreStudio.Web/Views/FQC/FQC008.cshtml

@@ -154,7 +154,7 @@
                 field: 'createDate',
                 title: '入庫時間',
                 sort: true,
-                emplet: '<div>{{ layui.util.toDateString(d.createDate, "yyyy/MM/dd") }}</div>'
+                templet: '<div>{{ layui.util.toDateString(d.createDate, "yyyy/MM/dd") }}</div>'
             },
             {
                 field: 'serialNo',
@@ -164,8 +164,15 @@
             {
                 field: 'statusName',
                 title: '檢驗狀態',
-                sort: true
-            }
+                sort: true,
+                templet:'#statusName'
+            },
+            {
+                field: 'endTime',
+                title: '抽驗結束時間',
+                sort: true,
+                templet: '<div>{{ layui.util.toDateString(d.endTime, "yyyy/MM/dd") }}</div>'
+            },
             //,
             //{
             //    field: 'right',
@@ -197,4 +204,15 @@
         var table = hg.table.datatable('query', 'FQC查詢', '/FQC/FQC008Query', {}, tableCols, '', true, 'full-100', ['filter', 'print', 'exports']);
                                                                                        // var table = hg.table.datatable('test', '條碼狀態維護', '/PCS/GetWipInfo', {}, tableCols, toolbar, true, 'full-100', ['filter', 'print', 'exports']);
     </script>
+
+    <script type="text/html" id="statusName">
+        {{#  if(d.statusName === '允收'){ }}
+        <span style="color: #07ab2a;">{{ d.statusName }}</span>
+        {{#  } else if(d.statusName === '批退'){ }}
+        <span style="color: #d70841;">{{ d.statusName }}</span>
+        {{#  } else { }}
+        {{ d.statusName }}
+        {{#  } }}
+    </script>
+    }
 }

AMESCoreStudio.Web/Views/PCS/PCS001R.cshtml

@@ -361,6 +361,13 @@
                             <div class="layui-inline">
                                 <input type="checkbox" title="途程確認" @(Model.wipInfo.SFISFlowCk == "Y" ? "checked" : "") />
                             </div>
+                        </div>
+                        <div class="layui-form-item">
+                            <label class="layui-form-label">作業流程註解</label>
+                            <div class="layui-input-block">
+                                <textarea placeholder="請輸入作業流程註解" class="layui-textarea"></textarea>
+                            </div>
+                        </div>
                         <table id="rulestionOld" class="layui-table">
                             <thead>
                                 <tr>
@@ -405,7 +412,6 @@
                             </tbody>
                         </table>
                 </div>
-                    </div>
 
 
                 @* 板卡-工程資訊sheet *@

AMESCoreStudio.Web/Views/PCS/PCS003.cshtml

@@ -393,6 +393,12 @@
                                 <input @(Model.wipInfo.SFISFlowCk == "Y" ? "checked" : "") type="checkbox" title="途程確認" name="wipInfo.SFISFlowCk" />
                             </div>
                             <table class="layui-hide" id="ruleStation" lay-filter="ruleStation"></table>
+                            <div class="layui-form-item">
+                                <label class="layui-form-label">作業流程註解</label>
+                                <div class="layui-input-block">
+                                    <textarea placeholder="請輸入作業流程註解" class="layui-textarea"></textarea>
+                                </div>
+                            </div>
                             <table id="rulestionOld" class="layui-table">
                                 <thead>
                                     <tr>
@@ -1097,7 +1103,7 @@
                  $("#board").show();
              }
 
-            if ($('#wipAtt_ItemNO').val() != "" && $('#wipInfo_PlanQTY').val() != "") {
+            if ($('#wipMAC_StartNO').val() != "" && $('#wipMAC_EndNO').val() != "") {
                 $("#GetMAC").hide();
             }
 

AMESCoreStudio.WebApi/Controllers/AMES/FqcInhouseMasterController.cs

@@ -97,6 +97,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
         {
             IQueryable<FqcInhouseMasterDto> q = from q1 in _context.FqcInhouseMasters
                                                 join q2 in _context.FqcInhouseDetails on new { q1.InhouseNo, q1.SeqID } equals new { q2.InhouseNo, q2.SeqID }
+                                                join q3 in _context.FqcResultMasters on q1.InhouseNo equals q3.InhouseNo
                                                 select new FqcInhouseMasterDto
                                                 {
                                                     InhouseNo = q1.InhouseNo,
@@ -107,7 +108,8 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                                                     SerialNo = q2.SerialNo,
                                                     StatusName = q1.Status,
                                                     ProTypeName = q1.ProType,
-                                                    CreateDate = q1.CreateDate
+                                                    CreateDate = q1.CreateDate,
+                                                    EndTime = q3.EndTime
                                                 };
             //q1.Status == "P" ? "允收" : q1.Status == "R" ? "批退" : "未驗收完成",
             //IQueryable <FqcInhouseDetail> q1 = _context.FqcInhouseDetails;
@@ -157,8 +159,15 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                 q = q.Skip((page - 1) * limit).Take(limit);
             }
             result.Data = await q.ToListAsync();
+
+            // 判斷結束時間
+            result.Data = result.Data.Select(s => { s.EndTime = s.StatusName == "A" ? null : s.EndTime; return s; })
+             .ToList();
+
+            // 修改狀態名稱
             result.Data = result.Data.Select(s => { s.StatusName = s.StatusName == "P" ? "允收" : s.StatusName == "R" ? "批退" : "未驗收完成"; return s; })
                           .ToList();
+
             return result;
         }
 
@@ -267,9 +276,10 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
         public async Task<ResultModel<FqcInhouseMaster>> PostFqcInhouseMaster(FqcInhouseMaster fqcInhouseMaster)
         {
             ResultModel<FqcInhouseMaster> result = new ResultModel<FqcInhouseMaster>();
-            _context.FqcInhouseMasters.Add(fqcInhouseMaster);
+         
             try
             {
+                _context.FqcInhouseMasters.Add(fqcInhouseMaster);
                 await _context.SaveChangesAsync();
                 result.Success = true;
                 result.Msg = "OK";

AMESCoreStudio.WebApi/DTO/AMES/FqcInhouseMasterDto.cs

@@ -72,6 +72,14 @@ namespace AMESCoreStudio.WebApi.DTO.AMES
 
         public string ProTypeName { get; set; }
 
+        /// <summary>
+        /// 結束抽驗時間
+        /// </summary>
+        [DataMember]
+        [Display(Name = "結束抽驗時間")]
+
+        public DateTime? EndTime { get; set; }
+
         /// <summary>
         /// 建立UserID
         /// </summary>

AMESCoreStudio.WebApi/Enums/EnumPCS.cs

@@ -310,9 +310,9 @@ namespace AMESCoreStudio.WebApi.Enum
         public enum EnumWipBoardPCBProcessingType
         {
             /// <summary>
-            /// 噴印字樣 (給備註填寫欄位)
+            /// 噴印字樣
             /// </summary>
-            [Display(Name = "噴印字樣 (給備註填寫欄位)")]
+            [Display(Name = "噴印字樣")]
             A = 1,
 
             /// <summary>