diff --git a/AMESCoreStudio.Web/Controllers/PCSController.cs b/AMESCoreStudio.Web/Controllers/PCSController.cs
index 1ab6ab76..8f2d2c09 100644
--- a/AMESCoreStudio.Web/Controllers/PCSController.cs
+++ b/AMESCoreStudio.Web/Controllers/PCSController.cs
@@ -3603,14 +3603,18 @@ namespace AMESCoreStudio.Web.Controllers
         /// <returns></returns>
         public async Task<IActionResult> PCS004QueryAsync(string unitno, string wipno, int page = 0, int limit = 10)
         {
-            IResultModel<dynamic> result = await _pcsApi.GetWipInfoSelectParameter(unitno: unitno
-                , wipno: wipno
-                , page: page
-                , limit: limit);
-
-            if (result.Data != null)
+            // 安勤要求需要輸入工單號碼
+            if (!string.IsNullOrWhiteSpace(wipno))
             {
-                return Json(new Table() { code = 0, msg = "", data = result.Data, count = result.DataTotal });
+                IResultModel<dynamic> result = await _pcsApi.GetWipInfoSelectParameter(unitno: unitno
+                    , wipno: wipno
+                    , page: page
+                    , limit: limit);
+
+                if (result.Data != null)
+                {
+                    return Json(new Table() { code = 0, msg = "", data = result.Data, count = result.DataTotal });
+                }
             }
             return Json(new Table() { count = 0, data = null });
         }
@@ -7371,21 +7375,21 @@ namespace AMESCoreStudio.Web.Controllers
             else
             {
 
-               var result_EVER = await _pcsApi.GetFqcInhouseMasterMultiQuery_Avalue(barcodeNo: barcodeNo, wipNo: wipNo
-                , boxNo: boxNo, inhouseNo: inhouseNo, date_str: date_str, date_end: date_end
-                , status: status, page: page, limit: limit);
+                var result_EVER = await _pcsApi.GetFqcInhouseMasterMultiQuery_Avalue(barcodeNo: barcodeNo, wipNo: wipNo
+                 , boxNo: boxNo, inhouseNo: inhouseNo, date_str: date_str, date_end: date_end
+                 , status: status, page: page, limit: limit);
+
 
-             
                 foreach (var item in result_EVER.Data)
-                { 
-                  var wipresult=  await _pcsApi.GetWipInfoByWipNO_EVER(wipno: item.WipNo); //查對應安勤工單&料號
-                  
+                {
+                    var wipresult = await _pcsApi.GetWipInfoByWipNO_EVER(wipno: item.WipNo); //查對應安勤工單&料號
+
                     item.WipNo = wipresult.Select(s => s.RelatedWONO).FirstOrDefault();
                     if (!string.IsNullOrWhiteSpace(item.WipNo))
                     {
 
                         var itemresult = await _pcsApi.GetWipAtt(id: item.WipNo);
-                        if ( itemresult != null)
+                        if (itemresult != null)
                         {
                             item.ItemNo = itemresult.ItemNO;
                         }
@@ -7396,11 +7400,11 @@ namespace AMESCoreStudio.Web.Controllers
                     }
                     else
                     {
-                        item.ItemNo ="";
+                        item.ItemNo = "";
                     }
 
                 }
-                result = result_EVER  ;
+                result = result_EVER;
             }
 
             if (result.Data.Count() != 0)
diff --git a/AMESCoreStudio.Web/Views/PCS/PCS004.cshtml b/AMESCoreStudio.Web/Views/PCS/PCS004.cshtml
index 065a4c3b..6cc08338 100644
--- a/AMESCoreStudio.Web/Views/PCS/PCS004.cshtml
+++ b/AMESCoreStudio.Web/Views/PCS/PCS004.cshtml
@@ -43,7 +43,7 @@
                 <div class="layui-inline">
                     <label class="layui-form-label">工單號碼:</label>
                     <div class="layui-input-inline">
-                        <input id="wipNo" name="wipNo" autocomplete="off" class="layui-input" placeholder="請輸入工單號碼">
+                        <input id="wipNo" name="wipNo" autocomplete="off" class="layui-input" oninput="let p=this.selectionStart;this.value=this.value.toUpperCase();this.setSelectionRange(p, p);" placeholder="請輸入工單號碼">
                     </div>
                 </div>
                 <div class="layui-inline layui-show-xs-block">
diff --git a/AMESCoreStudio.Web/Views/PCS/PCS005.cshtml b/AMESCoreStudio.Web/Views/PCS/PCS005.cshtml
index a45dc450..0601d5c2 100644
--- a/AMESCoreStudio.Web/Views/PCS/PCS005.cshtml
+++ b/AMESCoreStudio.Web/Views/PCS/PCS005.cshtml
@@ -28,7 +28,7 @@
                         <div class="layui-inline">
                             <label class="layui-form-label" style="width:50px">工單:</label>
                             <div class="layui-input-inline" style="width:120px">
-                                <input id="wipNo" name="wipNo" autocomplete="off" class="layui-input" placeholder="請輸入工單號碼">
+                                <input id="wipNo" name="wipNo" autocomplete="off" oninput="let p=this.selectionStart;this.value=this.value.toUpperCase();this.setSelectionRange(p, p);" class="layui-input" placeholder="請輸入工單號碼">
                             </div>
                         </div>
                     </div>
@@ -36,7 +36,7 @@
                         <div class="layui-inline">
                             <label class="layui-form-label" style="width:50px">料號:</label>
                             <div class="layui-input-inline" style="width:150px">
-                                <input id="itemNo" name="itemNo" autocomplete="off" class="layui-input" placeholder="請輸入料號">
+                                <input id="itemNo" name="itemNo" oninput="let p=this.selectionStart;this.value=this.value.toUpperCase();this.setSelectionRange(p, p);" autocomplete="off" class="layui-input" placeholder="請輸入料號">
                             </div>
                         </div>
                     </div>
diff --git a/AMESCoreStudio.Web/Views/PCS/PCS006.cshtml b/AMESCoreStudio.Web/Views/PCS/PCS006.cshtml
index 74805a4a..0bf6a2eb 100644
--- a/AMESCoreStudio.Web/Views/PCS/PCS006.cshtml
+++ b/AMESCoreStudio.Web/Views/PCS/PCS006.cshtml
@@ -43,7 +43,7 @@
                 <div class="layui-inline">
                     <label class="layui-form-label">工單號碼:</label>
                     <div class="layui-input-inline">
-                        <input id="wipNo" name="wipNo" autocomplete="off" class="layui-input" placeholder="請輸入工單號碼">
+                        <input id="wipNo" name="wipNo" autocomplete="off" oninput="let p=this.selectionStart;this.value=this.value.toUpperCase();this.setSelectionRange(p, p);" class="layui-input" placeholder="請輸入工單號碼">
                     </div>
                 </div>
                 <div class="layui-inline layui-show-xs-block">
diff --git a/AMESCoreStudio.Web/Views/PCS/PCS012.cshtml b/AMESCoreStudio.Web/Views/PCS/PCS012.cshtml
index f20df2fd..63690a37 100644
--- a/AMESCoreStudio.Web/Views/PCS/PCS012.cshtml
+++ b/AMESCoreStudio.Web/Views/PCS/PCS012.cshtml
@@ -88,7 +88,7 @@
                         <div class="layui-inline">
                             <label class="layui-form-label">工單:</label>
                             <div class="layui-input-inline" style="width:120px">
-                                <input id="wipNO" name="wipNO" autocomplete="off" class="layui-input" placeholder="請輸入工單號碼">
+                                <input id="wipNO" name="wipNO" autocomplete="off" oninput="let p=this.selectionStart;this.value=this.value.toUpperCase();this.setSelectionRange(p, p);" class="layui-input" placeholder="請輸入工單號碼">
                             </div>
                         </div>
                     </div>
@@ -96,7 +96,7 @@
                         <div class="layui-inline">
                             <label class="layui-form-label">料號:</label>
                             <div class="layui-input-inline" style="width:120px">
-                                <input id="itemNO" name="itemNO" autocomplete="off" class="layui-input" placeholder="請輸入料號">
+                                <input id="itemNO" name="itemNO" autocomplete="off" oninput="let p=this.selectionStart;this.value=this.value.toUpperCase();this.setSelectionRange(p, p);" class="layui-input" placeholder="請輸入料號">
                             </div>
                         </div>
                     </div>
diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/OutfitInfoesController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/OutfitInfoesController.cs
index 8f27f002..0e773ad5 100644
--- a/AMESCoreStudio.WebApi/Controllers/AMES/OutfitInfoesController.cs
+++ b/AMESCoreStudio.WebApi/Controllers/AMES/OutfitInfoesController.cs
@@ -135,6 +135,109 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
             return q;
         }
 
+        /// <summary>
+        /// 取得治具與規格資料
+        /// </summary>
+        /// <param name="OutfitNo">治具編號</param>
+        /// <returns></returns>
+        [HttpGet("GetOutfitInfoAndOutfitVariety")]
+        public async Task<IEnumerable<dynamic>> GetOutfitInfoAndOutfitVariety(string OutfitNo)
+        {
+            var q = from q1 in _context.OutfitInfoes
+                    where q1.OutfitNo == OutfitNo.Trim().ToUpper()
+                    join q2 in _context.OutfitVarityInfoes on q1.VarietyID equals q2.VarityID
+                    select new
+                    {
+                        q1.OutfitNo,
+                        q1.StatusNo,
+                        q1.UseTimes,
+                        q1.UseStatusNo,
+                        q2.UseLimitTimes,
+                        q2.AlertForeDays,
+                        q2.Status,
+                        q2.SafeStock
+                    };
+            return await q.ToListAsync();
+        }
+
+        /// <summary>
+        /// 確認治具編號是否已到預警提醒
+        /// </summary>
+        /// <param name="OutfitNo">治具編號</param>
+        /// <returns>Y:是 N:否</returns>
+        [HttpGet("GetOutfitInfoByAlertTimes")]
+        public async Task<ActionResult<string>> GetOutfitInfoByAlertTimes(string OutfitNo)
+        {
+            var UseStatusNo = new List<string> { "N", "R" };
+            var q = await GetOutfitInfoAndOutfitVariety(OutfitNo);
+            if (q.Count() != 0)
+            {
+                if (q.Where(w => w.Status == "A" && w.StatusNo == "A" && UseStatusNo.Contains(w.UseStatusNo)).Any())
+                {
+                    if (q.Where(w => w.UseTimes >= Math.Abs(w.UseLimitTimes - w.AlertForeDays)).Any())
+                    {
+                        return "Y";
+                    }
+                }
+            }
+            return "N";
+        }
+
+        /// <summary>
+        /// 在庫治具可用數量
+        /// </summary>
+        /// <param name="OutfitNo">治具編號</param>
+        /// <returns></returns>
+        [HttpGet("GetTotalInStock")]
+        public async Task<ActionResult<int>> GetOutfitInfoByTotalInStock(string OutfitNo)
+        {
+            var q = await GetOutfitInfoByOutfitNo(OutfitNo.Trim().ToUpper());
+            var UseStatusNo = new List<string> { "N", "R" };
+            if (q.Value != null)
+            {
+                var qq = from q1 in _context.OutfitInfoes
+                         where q1.VarietyID == q.Value.VarietyID
+                         join q2 in _context.OutfitVarityInfoes on q1.VarietyID equals q2.VarityID
+                         select new
+                         {
+                             q1.OutfitNo,
+                             q1.StatusNo,
+                             q1.UseTimes,
+                             q1.UseStatusNo,
+                             q2.UseLimitTimes,
+                             q2.AlertForeDays,
+                             q2.Status,
+                             q2.SafeStock
+                         };
+
+                return qq.Where(w => w.Status == "A" && w.StatusNo == "A" && UseStatusNo.Contains(w.UseStatusNo))
+                         .Sum(s => s.SafeStock);
+            }
+            return 0;
+        }
+
+        /// <summary>
+        /// 確認治具編號使用次數已經超過預計次數
+        /// </summary>
+        /// <param name="OutfitNo">治具編號</param>
+        /// <returns>Y:是 N:否</returns>
+        [HttpGet("GetOutfitInfoByOverUseTimes")]
+        public async Task<ActionResult<string>> GetOutfitInfoByOverUseTimes(string OutfitNo)
+        {
+            var q = await GetOutfitInfoAndOutfitVariety(OutfitNo);
+            if (q.Count() != 0)
+            {
+                if (q.Where(w => w.Status == "A" && w.StatusNo == "A").Any())
+                {
+                    if (q.Where(w => w.UseTimes >= Math.Abs(w.UseLimitTimes)).Any())
+                    {
+                        return "Y";
+                    }
+                }
+            }
+            return "N";
+        }
+
         /// <summary>
         /// 
         /// </summary>
diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/WipAlarmsController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/WipAlarmsController.cs
index c53e4253..25f2d789 100644
--- a/AMESCoreStudio.WebApi/Controllers/AMES/WipAlarmsController.cs
+++ b/AMESCoreStudio.WebApi/Controllers/AMES/WipAlarmsController.cs
@@ -170,6 +170,20 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
             return wipAlarm;
         }
 
+        /// <summary>
+        /// By 工單號碼與治具編號查詢通知
+        /// </summary>
+        /// <param name="wipNo">工單號碼</param>
+        /// <param name="outfitNo">治具編號</param>
+        /// <returns></returns>
+        [HttpGet("ByOutfit")]
+        public async Task<ActionResult<IEnumerable<WipAlarm>>> GetWipAlarmByOutfit(string wipNo, string outfitNo)
+        {
+            IQueryable<WipAlarm> q = _context.WipAlarms.Where(w => w.WipNO == wipNo.Trim().ToUpper() && w.AlarmParam == outfitNo.Trim().ToUpper());
+            var wipAlarm = await q.ToListAsync();
+            return wipAlarm;
+        }
+
         /// <summary>
         /// 修改警報資料
         /// </summary>
diff --git a/AMESCoreStudio.WebApi/Controllers/BLL/BarCodeCheckController.cs b/AMESCoreStudio.WebApi/Controllers/BLL/BarCodeCheckController.cs
index 571d1ab8..12196b95 100644
--- a/AMESCoreStudio.WebApi/Controllers/BLL/BarCodeCheckController.cs
+++ b/AMESCoreStudio.WebApi/Controllers/BLL/BarCodeCheckController.cs
@@ -10,6 +10,9 @@ using AMESCoreStudio.WebApi.Models.AMES;
 using AMESCoreStudio.CommonTools.Result;
 using AMESCoreStudio.WebApi.Controllers.BAS;
 using AMESCoreStudio.WebApi.DTO.AMES;
+using AMESCoreStudio.WebApi.Controllers.BLL;
+using AMESCoreStudio.WebApi.Enum;
+using Microsoft.Extensions.Configuration;
 
 namespace AMESCoreStudio.WebApi.Controllers.AMES
 {
@@ -21,13 +24,15 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
     public class BarCodeCheckController : ControllerBase
     {
         private readonly AMESContext _context;
+        private readonly IConfiguration _config;
 
         /// <summary>
         /// 
         /// </summary>
         /// <param name="context"></param>
-        public BarCodeCheckController(AMESContext context)
+        public BarCodeCheckController(AMESContext context, IConfiguration config)
         {
+            _config = config;
             _context = context;
         }
 
@@ -887,6 +892,36 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                     if (!result.Success)
                         return result;
                 }
+
+                WipAlarmsController wipAlarmsController = new WipAlarmsController(_context);
+                var wipAlarms = await wipAlarmsController.GetWipAlarmByOutfit(barCodeCheckDto.wipNo, item.inputData.Trim().ToUpper());
+                // 判斷確認治具編號是否已到預警提醒
+                if (outfitInfoesController.GetOutfitInfoByAlertTimes(item.inputData.Trim().ToUpper()).Result.Value == "Y")
+                {
+                    if (!wipAlarms.Value.Where(w => w.AlarmTypeID == (int)EnumWipAlarm.EnumTypeId.OutfitAlert).Any())
+                    {
+                        string MailGroup = "OUTFIT_ALARM";
+                        string Subject = $"[AMES系統通知] 治具編號:{item.inputData.Trim().ToUpper()}，預警提前通知";
+                        string Body = "";
+
+                        await new MailController(_context, _config).PostMail(Subject, Body, MailGroup, "", false);
+
+                        WipAlarm wipAlarm = new WipAlarm();
+                        wipAlarm.AlarmTypeID = (int)EnumWipAlarm.EnumTypeId.OutfitAlert;
+                        wipAlarm.WipNO = barCodeCheckDto.wipNo;
+                        wipAlarm.AlarmParam = item.inputData.ToUpper();
+                        wipAlarm.AlarmValue = "1";
+                        wipAlarm.AlarmDesc = Subject;
+                        wipAlarm.AlarmDateTime = DateTime.Now;
+
+                        await wipAlarmsController.PostWipAlarm(wipAlarm);
+                    }
+                }
+                //// 確認治具編號使用次數已經超過預計次數
+                //if (outfitInfoesController.GetOutfitInfoByOverUseTimes("").Result.Value == "Y")
+                //{
+
+                //}
             }
 
             return result;
diff --git a/AMESCoreStudio.WebApi/Enums/EnumWipAlarm.cs b/AMESCoreStudio.WebApi/Enums/EnumWipAlarm.cs
new file mode 100644
index 00000000..2b8dafae
--- /dev/null
+++ b/AMESCoreStudio.WebApi/Enums/EnumWipAlarm.cs
@@ -0,0 +1,63 @@
+using System.ComponentModel;
+using System.ComponentModel.DataAnnotations;
+using System;
+using System.Linq;
+using System.Reflection;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Mvc.Rendering;
+
+namespace AMESCoreStudio.WebApi.Enum
+{
+    /// <summary>
+    /// 工單警示通知
+    /// </summary>
+    public class EnumWipAlarm
+    {
+        /// <summary>
+        /// WipAlarm_TypeId 類型
+        /// </summary>
+        public enum EnumTypeId
+        {
+            /// <summary>
+            /// 工單號碼不良代碼累積超過
+            /// </summary>
+            [Description("工單號碼不良代碼累積超過")]
+            [Display(Name = "工單號碼不良代碼累積超過")]
+            BarCodeCheckNg = 1 ,
+
+            /// <summary>
+            /// 維修代碼累積超過
+            /// </summary>
+            [Description("維修代碼累積超過")]
+            [Display(Name = "維修代碼累積超過")]
+            PostNgComponent = 3,
+
+            /// <summary>
+            /// 治具到達預警提前通知
+            /// </summary>
+            [Description("治具到達預警提前通知")]
+            [Display(Name = "治具到達預警提前通知")]
+            OutfitAlert = 4,
+
+            /// <summary>
+            /// 治具使用次數已超過預計使用次數
+            /// </summary>
+            [Description("治具使用次數已超過預計使用次數")]
+            [Display(Name = "治具使用次數已超過預計使用次數")]
+            OutfitOutLimit = 5,
+        }
+
+        /// <summary>
+        /// Get Enum Display
+        /// </summary>
+        /// <param name="enumValue"></param>
+        /// <returns></returns>
+        public static string GetDisplayName(System.Enum enumValue)
+        {
+            return enumValue.GetType()?
+           .GetMember(enumValue.ToString())?.First()?
+           .GetCustomAttribute<DisplayAttribute>()?
+           .Name;
+        }
+    }
+}
\ No newline at end of file