1.修改直通率,修改F/T站別邏輯取消製程別

2.修改iRepair查詢,增加工單查詢條件
3.修改iRepair增加警報鏈接url,"警報鏈接:" + webSiteUrl + "/QRS/QRS012/" + wip_no
3.1.appsettings.json增加參數WebSiteUrl,設定網站url

AMESCoreStudio.Web/Controllers/QRSController.cs

@@ -834,14 +834,16 @@ namespace AMESCoreStudio.Web.Controllers
             return Json(new Table() { count = 0, data = null });
         }
 
-        public IActionResult QRS012()
+        public IActionResult QRS012(string id)
         {
+            ViewBag.WipNo = id;
             return View();
         }
 
-        public async Task<IActionResult> GetWipAlarmsByType(int alarmTypeID, int page = 0, int limit = 10)
+        public async Task<IActionResult> GetWipAlarmsByType(int alarmTypeID, string wipNO, int page = 0, int limit = 10)
         {
-            var result = await _repApi.GetWipAlarmsByType(alarmTypeID, page, limit);
+            //var result = await _repApi.GetWipAlarmsByType(alarmTypeID, page, limit);
+            var result = await _repApi.GetWipAlarm2(alarmTypeID, wipNO, page, limit);
 
             if (result.DataTotal > 0)
             {

AMESCoreStudio.Web/Controllers/REPController.cs

@@ -1346,7 +1346,6 @@ namespace AMESCoreStudio.Web.Controllers
 
         public async Task<IActionResult> GetLocation4REP012ListAsync(string id)
         {
-
             string[] param = id.Split('_');
 
             var result = await _repApi.GetLocation4REP012(param[0], param[1], param[2], param[3], param[4], param[5], param[6], param[7], param[8], param[9]);

AMESCoreStudio.Web/HttpApis/AMES/IREP.cs

@@ -238,6 +238,13 @@ namespace AMESCoreStudio.Web
         [WebApiClient.Attributes.HttpGet("api/WipAlarms/Type/{id}")]
         ITask<ResultModel<WipAlarm>> GetWipAlarmsByType(int id, int page = 0, int limit = 10);
 
+        /// <summary>
+        /// 根据警報類別ID+工單號碼獲取警報資料
+        /// </summary>
+        /// <returns></returns>
+        [WebApiClient.Attributes.HttpGet("api/WipAlarms/GetWipAlarm2")]
+        ITask<ResultModel<WipAlarm>> GetWipAlarm2(int alarmTypeID, string wipNO, int page = 0, int limit = 10);
+
         #endregion
 
         #region REP006 報廢轉出資料輸入

AMESCoreStudio.Web/Views/QRS/QRS012.cshtml

@@ -21,6 +21,12 @@
                         </select>
                     </div>
                     <input id="alarmTypeID" type="hidden" name="alarmTypeID" value="0" />
+                        <div class="layui-inline">
+                            <label class="layui-form-label">工單號碼:</label>
+                            <div class="layui-input-inline" style="width:150px">
+                                <input id="wipNO" name="wipNo" autocomplete="off" class="layui-input" placeholder="請輸入工單號碼" value="@ViewBag.WipNo">
+                            </div>
+                        </div>
                 </div>
                 <div class="layui-inline layui-show-xs-block">
                     <button class="layui-btn layui-btn-sm layui-btn-normal" lay-submit lay-filter="querysubmit">
@@ -44,7 +50,7 @@
             form.on('select(alarmType)', function (data) {
                 $("#alarmTypeID").val(data.value);
 
-                //alert(alarmTypeID.value);
+                alert(alarmTypeID.value);
 
                 var qs = $('button[lay-filter="querysubmit"]');
                 qs.click();
@@ -92,6 +98,6 @@
         ];
 
         //基本数据表格
-        var table = hg.table.datatable('test', '警報資料查詢', '/QRS/GetWipAlarmsByType/' + alarmTypeID.value, {}, tableCols, toolbar, true, 'full-100', ['filter', 'print', 'exports']);
+        var table = hg.table.datatable('test', '警報資料查詢', '/QRS/GetWipAlarmsByType', {}, tableCols, toolbar, true, 'full-100', ['filter', 'print', 'exports']);
     </script>
 }

AMESCoreStudio.WebApi/Controllers/AMES/NgComponentsController.cs

@@ -254,12 +254,14 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                     await _context.SaveChangesAsync();
 
                     //发送警报资料
+                    string webSiteUrl = _config["WebSiteUrl"].ToString();
 
                     string mailSubject = "警報持續郵件" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
                     string mailBody = "";
                     mailBody = mailBody + "警報工單:" + wip_no + "<br />";
                     mailBody = mailBody + "警報時間:" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "<br />";
                     mailBody = mailBody + "警報原因:" + alarmDesc + "<br />";
+                    mailBody = mailBody + "警報鏈接:" + webSiteUrl + "/QRS/QRS012/" + wip_no + "<br />";
 
                     string mailFrom = _config["MailFrom"].ToString();
                     //string mailTo = _config["MailTo"].ToString();

AMESCoreStudio.WebApi/Controllers/AMES/NgRepairsController.cs

@@ -1263,12 +1263,14 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                     await _context.SaveChangesAsync();
 
                     //发送警报资料
+                    string webSiteUrl = _config["WebSiteUrl"].ToString();
 
                     string mailSubject = "警報持續郵件" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
                     string mailBody = "";
                     mailBody = mailBody + "警報工單:" + wip_no + "<br />";
                     mailBody = mailBody + "警報時間:" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "<br />";
                     mailBody = mailBody + "警報原因:" + alarmDesc + "<br />";
+                    mailBody = mailBody + "警報鏈接:" + webSiteUrl + "/QRS/QRS012/" + wip_no + "<br />";
 
                     string mailFrom = _config["MailFrom"].ToString();
                     //string mailTo = _config["MailTo"].ToString();
@@ -1366,13 +1368,16 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                     _context.WipAlarms.Add(wipAlarm);
                     await _context.SaveChangesAsync();
 
+
                     //发送警报资料
+                    string webSiteUrl = _config["WebSiteUrl"].ToString();
 
                     string mailSubject = "警報持續郵件" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
                     string mailBody = "";
                     mailBody = mailBody + "警報工單:" + wip_no + "<br />";
                     mailBody = mailBody + "警報時間:" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "<br />";
                     mailBody = mailBody + "警報原因:" + alarmDesc + "<br />";
+                    mailBody = mailBody + "警報鏈接:" + webSiteUrl + "/QRS/QRS012/" + wip_no + "<br />";
 
                     string mailFrom = _config["MailFrom"].ToString();
                     //string mailTo = _config["MailTo"].ToString();

AMESCoreStudio.WebApi/Controllers/AMES/WipAlarmsController.cs

@@ -50,6 +50,58 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
             return wipAlarm;
         }
 
+        /// <summary>
+        /// 根據警報類型ID查詢警報資料
+        /// </summary>
+        /// <param name="alarmTypeID"></param>
+        /// <param name="wipNO"></param>
+        /// <param name="page"></param>
+        /// <param name="limit"></param>
+        /// <returns></returns>
+        [Route("[action]")]
+        [HttpGet]
+        public async Task<ResultModel<WipAlarm>> GetWipAlarm2(int alarmTypeID, string wipNO, int page = 0, int limit = 10)
+        {
+            ResultModel<WipAlarm> result = new ResultModel<WipAlarm>();
+
+            IQueryable<WipAlarm> q = _context.WipAlarms;
+
+            if (alarmTypeID > 0)
+            {
+                q = q.Where(p => p.AlarmTypeID.Equals(alarmTypeID));
+            }
+            if (wipNO != "" && wipNO != null)
+            {
+                q = q.Where(p => p.WipNO.Equals(wipNO));
+            }
+
+            result.DataTotal = q.ToList().Count;
+
+            if (page > 0)
+            {
+                q = q.OrderBy(p => p.AlarmDateTime).Skip((page - 1) * limit).Take(limit);
+            }
+            else
+            {
+                q = q.OrderBy(p => p.AlarmDateTime);
+            }
+
+            var wipAlarm = await q.ToListAsync();
+
+            result.Data = wipAlarm;
+
+            if (wipAlarm == null)
+            {
+                result.Success = false;
+                result.Msg = "查无资料";
+                return result;
+            }
+
+            result.Success = true;
+            result.Msg = "OK";
+            return result; ;
+        }
+
         /// <summary>
         /// 根據警報類型ID查詢警報資料
         /// </summary>
@@ -239,11 +291,14 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
 
                     //发送警报资料
 
+                    string webSiteUrl = _config["WebSiteUrl"].ToString();
+
                     string mailSubject = "警報持續郵件" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
                     string mailBody = "";
                     mailBody = mailBody + "警報工單:" + wipNO + "<br />";
                     mailBody = mailBody + "警報時間:" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "<br />";
                     mailBody = mailBody + "警報原因:" + alarmDesc + "<br />";
+                    mailBody = mailBody + "警報鏈接:" + webSiteUrl + "/QRS/QRS012/" + wipNO + "<br />";
 
                     string mailFrom = _config["MailFrom"].ToString();
                     //string mailTo = _config["MailTo"].ToString();

AMESCoreStudio.WebApi/Controllers/BAS/StationsesController.cs

@@ -88,10 +88,12 @@ namespace AMESCoreStudio.WebApi.Controllers.BAS
         public async Task<ActionResult<IEnumerable<Stations>>> GetStations4FT(string id)
         {
             IQueryable<Stations> q = _context.Stationses;
+            /*
             if (id != "0")
             {
                 q = q.Where(p => p.UnitNo.Equals(id));
             }
+            */
             q = q.Where(p => p.TestType == "F/T" && p.TypeNo == "T" && p.StatusNo == "A");
             q = q.OrderBy(p => p.StationName);
 

AMESCoreStudio.WebApi/appsettings.json

@@ -12,6 +12,7 @@
     //"AMESContext": "Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=61.216.68.18)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=jhdb)));User Id=system;Password=admin;"
     //"AMESContextO": "Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=61.216.68.18)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=cpadb)));User Id=JHSYS;Password=ASYS666;"
   },
+  "WebSiteUrl": "",
   "MailSmtpServer": "",
   "MailSmtpPort": "25",
   "MailFrom": "",