1. LayUi 改回舊版

2. 過站加入掃毒判斷

AMESCoreStudio.Web/Controllers/PCSController.cs

@@ -1878,23 +1878,25 @@ namespace AMESCoreStudio.Web.Controllers
                     await _pcsApi.PostWipAtt(JsonConvert.SerializeObject(model.wipAtt));
 
                     // 內部條碼
-                    if (!string.IsNullOrWhiteSpace(model.wipBarcode.StartNO) && !string.IsNullOrWhiteSpace(model.wipBarcode.EndNO))
+                    if (model.wipBarcode != null)
                     {
-                        model.wipBarcode.WipID = wipID;
+                        if (!string.IsNullOrWhiteSpace(model.wipBarcode.StartNO) && !string.IsNullOrWhiteSpace(model.wipBarcode.EndNO))
-                        model.wipBarcode.WipNO = model.wipInfo.WipNO;
+                        {
-                        model.wipBarcode.UnitNO = model.wipInfo.UnitNO;
+                            model.wipBarcode.WipID = wipID;
-                        model.wipBarcode.CreateUserID = UserID;
+                            model.wipBarcode.WipNO = model.wipInfo.WipNO;
-                        result = await _pcsApi.PostWipBarcode(JsonConvert.SerializeObject(model.wipBarcode));
+                            model.wipBarcode.UnitNO = model.wipInfo.UnitNO;
-
+                            model.wipBarcode.CreateUserID = UserID;
-                        // 工單條碼規則設定文件檔
+                            result = await _pcsApi.PostWipBarcode(JsonConvert.SerializeObject(model.wipBarcode));
-                        WipRule wipRule = new WipRule();
+
-                        wipRule.WipNO = model.wipInfo.WipNO;
+                            // 工單條碼規則設定文件檔
-                        wipRule.KeyNo = "00";
+                            WipRule wipRule = new WipRule();
-                        wipRule.BarcodeLen = 14;
+                            wipRule.WipNO = model.wipInfo.WipNO;
-                        wipRule.BarcodeFormat = model.wipInfo.UnitNO;
+                            wipRule.KeyNo = "00";
-                        result = await _pcsApi.PostWipRule(JsonConvert.SerializeObject(wipRule));
+                            wipRule.BarcodeLen = 14;
+                            wipRule.BarcodeFormat = model.wipInfo.UnitNO;
+                            result = await _pcsApi.PostWipRule(JsonConvert.SerializeObject(wipRule));
+                        }
                     }
-
                     // 出貨序號
                     //if (!string.IsNullOrWhiteSpace(model.wipBarcodeOther.StartNO) && !string.IsNullOrWhiteSpace(model.wipBarcodeOther.EndNO))
                     //{
@@ -1909,7 +1911,6 @@ namespace AMESCoreStudio.Web.Controllers
                     //    }
                     //}
 
-
                     // 料號相關
                     var materialItem = await _pcsApi.GetMaterialItemByItemNO(model.wipAtt.ItemNO);
                     if (materialItem != null)
@@ -2629,6 +2630,7 @@ namespace AMESCoreStudio.Web.Controllers
                     "E1587","E1588","E1589","E158C"};
                     if (AntivirusItemNo.Any(item => model.wipAtt.ItemNO.StartsWith(item)))
                     {
+                        model.wipSystem = new WipSystem();
                         model.wipSystem.Antivirus = "Y";
                     }
                 }

AMESCoreStudio.Web/Views/PCS/PCS001R.cshtml

@@ -886,11 +886,8 @@
                                 <div class="layui-input-inline" style="width: 300px;">
                                     <input class="layui-input" asp-for="wipSystem.OsVer_Desc" readonly="readonly" />
                                 </div>
-                                <input @if (Model.wipSystem != null)
+                                <input @if (Model.wipSystem != null) { @(Model.wipSystem.Antivirus == "Y" ? "checked" : "")  }
-                                {
+                                       type="checkbox" title="T3是否需掃毒" name="wipSystem.Antivirus" />
-                                    @(Model.wipSystem.Antivirus == "Y" ? "checked" : "")
-                                }
-                                type="checkbox" title="T3是否需掃毒" name="wipSystem.Antivirus" />
                             </div>
                         </div>
 

AMESCoreStudio.Web/Views/PCS/PCS003.cshtml

@@ -875,7 +875,8 @@
                                 <div class="layui-input-inline" style="width: 300px;">
                                     <input class="layui-input" asp-for="wipSystem.OsVer_Desc" readonly="readonly" />
                                 </div>
-                                <input @(Model.wipSystem.Antivirus == "Y" ? "checked" : "") type="checkbox" title="T3是否需掃毒" name="wipSystem.Antivirus" />
+                                <input @if (Model.wipSystem != null) { @(Model.wipSystem.Antivirus == "Y" ? "checked" : "")  }
+                                       type="checkbox" title="T3是否需掃毒" name="wipSystem.Antivirus" />
                             </div>
                         </div>
 

AMESCoreStudio.Web/Views/PCS/PCS034.cshtml

@@ -857,7 +857,8 @@
                                 <div class="layui-input-inline" style="width: 300px;">
                                     <input class="layui-input" asp-for="wipSystem.OsVer_Desc" readonly="readonly" />
                                 </div>
-                                <input @(Model.wipSystem.Antivirus == "Y" ? "checked" : "") type="checkbox" title="T3是否需掃毒" name="wipSystem.Antivirus" />
+                                <input @if (Model.wipSystem != null) { @(Model.wipSystem.Antivirus == "Y" ? "checked" : "")  }
+                                       type="checkbox" title="T3是否需掃毒" name="wipSystem.Antivirus" />
                             </div>
                         </div>
 

AMESCoreStudio.WebApi/Controllers/BLL/BarCodeCheckController.cs

@@ -2571,7 +2571,9 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
             }
             else
             {
-                if (1 == 2)
+                TestLogController testLogController = new TestLogController(_context, _config);
+                var resultAntivirus = testLogController.GetSacnvirus(wipNo).Result;
+                if (resultAntivirus.Count() != 0)
                 {
                     resultModel.Success = true;
                     return resultModel;
@@ -2581,7 +2583,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                     string MailGroup = "PE_SCANV";
                     string Subject = $"[AMES系統通知] 工單號碼【{wipNo}】，未執行掃毒，請確認";
                     string Body = $"工單號碼【{wipNo}】，未執行掃毒，請確認";
-                    await new MailController(_context, _config).PostMail(Subject, Body, MailGroup, "", false);
+                    new MailController(_context, _config).PostMail(Subject, Body, MailGroup, "", false);
 
                     WipAlarm wipAlarm = new WipAlarm();
                     wipAlarm.AlarmTypeID = (int)EnumWipAlarm.EnumTypeId.Antivirus;
@@ -2595,7 +2597,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                     wipAlarm.WipAlarmID = helper.GetIDKey("WIP_ALARMID").Result;
 
                     _context.WipAlarms.Add(wipAlarm);
-                    await _context.SaveChangesAsync();
+                    _context.SaveChanges();
 
                     resultModel.Success = false;
                     resultModel.Msg = "未執行掃毒，請確認";

AMESCoreStudio.WebApi/Controllers/BLL/TestLogController.cs

@@ -80,5 +80,28 @@ namespace AMESCoreStudio.WebApi.Controllers.BLL
                 return q.ToList();
             }
         }
+
+        /// <summary>
+        /// 查詢 是否有掃毒資料
+        /// </summary>
+        /// <param name="id">工單號碼</param>
+        /// <returns></returns>
+        [HttpGet("AcnvirusLog/{id}")]
+        public async Task<List<dynamic>> GetSacnvirus(string id)
+        {
+            var context = _config.GetConnectionString("TestLogConnection");
+            using (IDbConnection _TestLog_context = new SqlConnection(context))
+            {
+                if (_TestLog_context.State != ConnectionState.Open)
+                {
+                    _TestLog_context.Open();
+                }
+                var query = @$" SELECT * FROM iFactory.PE.Sacnvirus_Table_View WHERE WIP=@id";
+                DynamicParameters p = new DynamicParameters();
+                p.Add("id", id, DbType.String);
+                var q = await _TestLog_context.QueryAsync<dynamic>(query, p);
+                return q.ToList();
+            }
+        }
     }
 }