1. 新增 過站程式(包含委外廠)加入刷入時間判斷

2. 新版過站呼叫 api/BarCodeCheck2025/PassIngByCheck，新增參數：startTime(字串格式)=刷入時間 =>"2025-01-02 13:18:32"
3. BarCode_Station 新增DB欄位
   ALTER TABLE BARCODE_STATION
   ADD (START_DATE DATE );
   COMMENT ON COLUMN BARCODE_STATION.START_DATE IS '過站刷入時間';

AMESCoreStudio.Web/Controllers/PCSController.cs

@@ -1,34 +1,29 @@
 using AMESCoreStudio.CommonTools.Result;
+using AMESCoreStudio.Web.Code;
 using AMESCoreStudio.Web.Models;
-using AMESCoreStudio.Web.ViewModels;
 using AMESCoreStudio.Web.ViewModels.PCS;
 using AMESCoreStudio.WebApi.DTO.AMES;
+using AMESCoreStudio.WebApi.Enum;
 using AMESCoreStudio.WebApi.Models.AMES;
 using AMESCoreStudio.WebApi.Models.BAS;
+using AMESCoreStudio.WebApi.Models.SYS;
+using ClosedXML.Excel;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Rendering;
-using Microsoft.Extensions.Logging;
 using Microsoft.AspNetCore.StaticFiles;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Localization;
+using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.IO;
 using System.Linq;
-using Newtonsoft.Json.Linq;
 using System.Threading.Tasks;
-using AMESCoreStudio.WebApi.Enum;
-using Microsoft.Extensions.Localization;
-using Microsoft.Extensions.Configuration;
-using ClosedXML.Excel;
-using Microsoft.VisualBasic;
-using AMESCoreStudio.WebApi.Models.SYS;
-using System.IO.Pipes;
-using System.Net;
-using System.Net.Http;
-using AMESCoreStudio.Web.Code;
 
 namespace AMESCoreStudio.Web.Controllers
 {
@@ -270,6 +265,7 @@ namespace AMESCoreStudio.Web.Controllers
         {
             var result = await _pcsApi.GetLineInfo();
             result = result.Where(w => w.StatusNo == "A").OrderBy(o => o.LineID).ToList();
+
             var LineInfo = new List<SelectListItem>();
             for (int i = 0; i < result.Count; i++)
             {
@@ -2425,7 +2421,7 @@ namespace AMESCoreStudio.Web.Controllers
                     }
 
                     var Memo = _pcsApi.GetPlmMeterialInfo(model.wipAtt.ItemNO).InvokeAsync().Result;
-                        model.wipSystem.Memo = Memo.Count() == 0 ? "": Memo.FirstOrDefault().ProductionMemo;               
+                    model.wipSystem.Memo = Memo.Count() == 0 ? "" : Memo.FirstOrDefault().ProductionMemo;
                 }
 
                 model.wipMACs = await _pcsApi.GetWipMAC(model.wipInfo.WipNO);
@@ -10187,7 +10183,7 @@ namespace AMESCoreStudio.Web.Controllers
                 , desc: null
                 , sdate: "*"
                 , edate: "*"
-                , productionSID: productionSID) ;
+                , productionSID: productionSID);
 
             var storeProuctionNotice = result.Data.Select(d => (string)d.productionID).Where(ppid => !string.IsNullOrEmpty(ppid)).Distinct();
 
@@ -10494,6 +10490,468 @@ namespace AMESCoreStudio.Web.Controllers
 
         #endregion
 
+        #region PCS021_2025 條碼輸入作業 2025(新版)
+
+        [ResponseCache(Duration = 0)]
+        [HttpGet]
+        public async Task<IActionResult> PCS021_2025()
+        {
+            var model = new PCS021ViewModel();
+            await GetFactoryUnit(false);
+            return View(model);
+        }
+
+        [HttpPost]
+        public async Task<IActionResult> PCS021_2025_GetWip(PCS021ViewModel model)
+        {
+            await GetFactoryUnit(false);
+            model.KpItemName += "null";
+            if (string.IsNullOrWhiteSpace(model.WipNO))
+            {
+                ModelState.AddModelError("error", "請輸入工單號碼");
+            }
+
+            if (string.IsNullOrWhiteSpace(model.UnitNO))
+            {
+                ModelState.AddModelError("error", "請選擇生產單位");
+            }
+
+            if (model.LineID == 0)
+            {
+                ModelState.AddModelError("error", "請選擇線別");
+            }
+
+            var q = await _pcsApi.GetWipInfoByWipNO(model.WipNO);
+            var firstWipNo = q.Where(w => w.UnitNO == model.UnitNO).FirstOrDefault();
+
+            if (firstWipNo == null)
+            {
+                ModelState.AddModelError("error", "找不到該生產單位的工單號碼");
+            }
+
+            try
+            {
+                if (q.Count != 0)
+                {
+                    model.WipID = firstWipNo.WipID;
+                    model.PlanQTY = firstWipNo.PlanQTY;
+                    model.UnitNO = firstWipNo.UnitNO;
+                    model.FlowRuleID = firstWipNo.FlowRuleID;
+                    model.ItemNO = (await _pcsApi.GetWipAtt(model.WipNO)).ItemNO ?? "";
+
+                    // 判斷工單狀態
+                    var BarCodeWip = await _pcsApi.CheckBarCodeWip_2025(model.WipNO, model.UnitNO, model.LineID, model.FlowRuleID);
+                    if (!BarCodeWip.Success)
+                    {
+                        ModelState.AddModelError("error", BarCodeWip.Msg);
+                        return View("PCS021_2025", model);
+                    }
+
+                    // 工單流程ID 取站別
+                    var ruleStations = await GetRuleStationByFlowRuleID(model.FlowRuleID, true);
+                    if (!ruleStations.Any())
+                    {
+                        ModelState.AddModelError("error", $"找不到該筆工單流程作業站設定 ID【{model.FlowRuleID}】");
+                        return View("PCS021_2025", model);
+                    }
+
+                    // 作業站名稱代碼 提供不二過
+                    var StationNameSt = "";
+                    // 過站沒有作業站，就先帶預設
+                    if (model.Station == 0)
+                        model.Station = ruleStations.FirstOrDefault().StationID;
+
+                    // 取作業站的生產製程
+                    var stationUnit = string.Empty;
+                    var station = await _basApi.GetStations(model.Station);
+                    if (station.Any())
+                    {
+                        stationUnit = station.FirstOrDefault().UnitNo;
+                    }
+                    else
+                    {
+                        ModelState.AddModelError("error", "找不到該作業站的生產單位");
+                    }
+
+                    if (ruleStations.Any(a => a.StationID == model.Station))
+                    {
+                        model.RuleStation = ruleStations.Where(w => w.StationID == model.Station).FirstOrDefault().RuleStationID;
+                        model.StationTypeNo = ruleStations.Where(w => w.StationID == model.Station).FirstOrDefault().Station.TypeNo;
+                        StationNameSt = ruleStations.Where(w => w.StationID == model.Station).FirstOrDefault().Station.StationNameSt;
+                    }
+                    else
+                    {
+                        model.RuleStation = ruleStations.FirstOrDefault().RuleStationID;
+                        model.StationTypeNo = ruleStations.FirstOrDefault().Station.TypeNo;
+                        model.Station = ruleStations.FirstOrDefault().StationID;
+                        StationNameSt = ruleStations.FirstOrDefault().Station.StationNameSt;
+                    }
+
+                    // 工單已刷數量
+                    model.InputQTY = await _pcsApi.GetBarcodeStationByInputQty(model.WipID, model.Station);
+
+                    // 工單KeyParts
+                    model.WipKps = await _pcsApi.GetWipKpByWipNo(model.WipNO);
+                    model.WipKps = model.WipKps.Where(w => w.UnitNo == stationUnit).OrderBy(o => o.KpSeq).ToList();
+
+                    // 料號檔案
+                    model.MaterialItem = await _pcsApi.GetMaterialItemByItemNO(model.ItemNO);
+                    if (model.MaterialItem != null)
+                    {
+                        model.MaterialStationsItems = await _pcsApi.GetMaterialStationsItemByItemID(model.MaterialItem.ItemID);
+                        model.MaterialStationsItems = model.MaterialStationsItems.Where(w => w.StationID == model.Station).OrderBy(o => o.StationsItemSeq).ToList();
+                        if (model.MaterialStationsItems.Any())
+                        {
+                            ModelState.AddModelError("error", "該站別有設定作業工項");
+                        }
+
+                        // 治具
+                        var q1 = await _pcsApi.GetWipOutfitByWipNo(model.WipNO);
+                        q1 = q1.Where(w => (w.UnitNo == model.UnitNO && w.StationID == null) ||
+                                           (w.UnitNo == model.UnitNO && w.StationID == model.Station)).ToList();
+                        model.wipOutfits.Clear();
+                        foreach (var item in q1)
+                        {
+                            model.wipOutfits.Add(new WipOutfitDtos
+                            {
+                                OutfitNo = item.OutfitNo,
+                                PartNo = item.PartNo,
+                                PartNoName = item.PartNoName,
+                                StationName = item.StationName,
+                                UnitNoName = item.UnitNoName
+                            });
+                        }
+                    }
+
+                    // 工程工單備註
+                    var wipsystem = await _pcsApi.GetWipSystem(model.WipNO);
+                    if (wipsystem != null)
+                    {
+                        if (stationUnit == "B")
+                            model.SystemMemo = wipsystem.BabMemo;
+                        else if (stationUnit == "T")
+                            model.SystemMemo = wipsystem.TestMemo;
+                        else if (stationUnit == "P")
+                            model.SystemMemo = wipsystem.PackingMemo;
+                    }
+
+                    // KPSeq順序清除
+                    model.KpItemName = string.Empty;
+
+                    // 工單SOP
+                    var wipSOP = await _pcsApi.GetWipSopByWipNo(model.WipNO);
+                    // 標準SOP A
+                    if (wipSOP.Any(a => a.UnitNo == stationUnit && a.SOPType == "A"))
+                    {
+                        var wipSOPTypeA = wipSOP.Where(w => w.UnitNo == stationUnit && w.SOPType == "A")
+                                                .OrderByDescending(w => w.UpdateTime).FirstOrDefault();
+                        var Esop = await _pcsApi.GetDocEsopViewByNo(wipSOPTypeA.SOPName);
+                        if (Esop.Count != 0)
+                        {
+                            model.Sops.Add(new PCS021ViewModel_SOP
+                            {
+                                SopName = "SOP文件",
+                                SopPath = $@"/DocEsop/{Esop.FirstOrDefault().file_path}"
+                            });
+                        }
+                    }
+                    // 差異SOP F
+                    if (wipSOP.Any(a => a.UnitNo == stationUnit && a.SOPType == "F"))
+                    {
+                        var wipSOPTypeF = wipSOP.Where(w => w.UnitNo == stationUnit && w.SOPType == "F")
+                                                .OrderByDescending(w => w.UpdateTime).FirstOrDefault();
+                        var Esop = await _pcsApi.GetDocEsopViewByNo(wipSOPTypeF.SOPName);
+                        if (Esop.Count != 0)
+                        {
+                            model.Sops.Add(new PCS021ViewModel_SOP
+                            {
+                                SopName = "差異SOP",
+                                SopPath = $@"/DocEsop/{Esop.FirstOrDefault().file_path}"
+                            });
+                        }
+                    }
+                    // 暫行SOP D
+                    if (wipSOP.Any(a => a.UnitNo == stationUnit && a.SOPType == "D"))
+                    {
+                        var wipSOPTypeD = wipSOP.Where(w => w.UnitNo == stationUnit && w.SOPType == "D")
+                                                .OrderByDescending(w => w.UpdateTime).FirstOrDefault();
+                        var Esop = await _pcsApi.GetEsopBySopName(wipSOPTypeD.SOPName);
+                        if (Esop.Count != 0)
+                        {
+                            model.Sops.Add(new PCS021ViewModel_SOP
+                            {
+                                SopName = "暫行文件",
+                                SopPath = $@"/e-sop/{Esop.FirstOrDefault().Process}/{Esop.FirstOrDefault().SopName}.pdf"
+                            });
+                        }
+                    }
+                    // 不二過
+                    model.Sops.Add(new PCS021ViewModel_SOP
+                    {
+                        SopName = "不二過",
+                        SopPath = Url.Action("PCS041V2", "PCS", new
+                        {
+                            material = model.ItemNO,
+                            productionSID = model.Station
+                        })
+                    });
+                }
+            }
+            catch (Exception ex)
+            {
+                ModelState.AddModelError("error", $"系統錯誤：{ex.Message}");
+                return View("PCS021_2025", model);
+            }
+
+            return View("PCS021_2025", model);
+        }
+
+        [HttpPost]
+        public async Task<IActionResult> PCS021_2025_Input(PCS021ViewModel model)
+        {
+            // ResultModel
+            string Msg = string.Empty;
+            bool Success = true;
+            var input = model.Input.Trim().ToUpper();
+            string Data = input;
+
+            if (string.IsNullOrWhiteSpace(input))
+                return Json(new Result1() { success = Success, msg = "", data = "", data1 = "" });
+
+            // 刷入條碼+異常欄位
+            if (!string.IsNullOrWhiteSpace(model.InputNo))
+                Data += "＠" + model.InputNo;
+
+            string ExtNo = string.Empty;
+
+            try
+            {
+                #region 基本Input 輸入判斷
+                if (model.WipID == 0)
+                    Msg += "請確認是否有輸入工單相關訊息</br>";
+
+                // 當有作業站就必須要填治具編號
+                if (model.wipOutfits.Any(a => !string.IsNullOrWhiteSpace(a.StationName) && string.IsNullOrWhiteSpace(a.Inputs)))
+                    Msg += "請刷入治具編號</br>";
+
+                if (model.Station == 0)
+                {
+                    Msg += "請選擇作業站</br>";
+                }
+
+                if (string.IsNullOrWhiteSpace(input))
+                {
+                    Msg += "請刷讀條碼</br>";
+                }
+
+                if (string.IsNullOrWhiteSpace(model.startTime))
+                {
+                    Msg += "請刷入開始時間START</br>";
+                }
+
+                if (!string.IsNullOrWhiteSpace(Msg))
+                {
+                    Success = false;
+                    return Json(new Result() { success = Success, msg = Msg, data = Data });
+                }
+                #endregion
+
+                var q = await _pcsApi.CheckBarCodeByWipNo_2025(input, model.WipNO.Trim().ToUpper());
+                // 判斷是否序號與工單號碼是否對應條碼區間值，沒對應到視為組件或不良代碼
+                if (q.Success)
+                {
+                    #region 確認序號的狀態
+
+                    // 取作業站的生產製程
+                    var stationUnit = string.Empty;
+                    var station = await _basApi.GetStations(model.Station);
+                    if (station.Any())
+                    {
+                        stationUnit = station.FirstOrDefault().UnitNo;
+                    }
+                    var keyParts = new List<BarCodeCheckDto.inputItem>();
+
+                    // 先查詢已綁定組件數量 By WipID
+                    var BarCodeItems = await _pcsApi.GetBarcodeItemByBarCode(input);
+                    BarCodeItems = BarCodeItems.Where(w => w.S.UnitNo == stationUnit && w.WipID == model.WipID).ToList();
+
+                    //  WipKps - BarCodeItem 剩下未綁定的KpNo
+                    var ExceptWipKp = model.WipKps.ToList();
+                    foreach (var item in BarCodeItems)
+                    {
+                        var ByItemWipKp = ExceptWipKp.Where(w => w.KpNo.Trim().ToUpper() == item.ItemNo.Trim().ToUpper()).FirstOrDefault();
+                        if (ByItemWipKp != null)
+                            ExceptWipKp.Remove(ByItemWipKp);
+                    }
+
+                    //  KeyParts代碼順序
+                    var SpecifyKeyPartsNo = model.KpItemName == null ? new List<string>() : model.KpItemName.Split(',').ToList();
+                    int KpItemQty = BarCodeItems.Count();
+                    int i = 0;
+
+                    // 判斷指定KeyParts代碼是否有刷足夠數
+                    if (SpecifyKeyPartsNo.Count() > model.Inputs.Where(w => !w.Input.StartsWith("$")).Count())
+                    {
+                        Msg = "有指定KeyParts代號 刷入數量不足，請在確認！";
+                        return Json(new Result() { success = false, msg = Msg, data = Data });
+                    }
+
+                    foreach (var KeyPartItem in model.Inputs)
+                    {
+                        // 判斷是組件先+1
+                        if (!KeyPartItem.Input.StartsWith("$"))
+                            i += 1;
+
+                        // 當刷入組組件+已紀錄組件數量 大於 設定組件數量
+                        if (i + KpItemQty > model.WipKps.Count())
+                        {
+                            Msg = "已刷超過組件數量";
+                            Success = false;
+                            return Json(new Result() { success = Success, msg = Msg, data = Data });
+                        }
+
+                        // NG代碼
+                        if (KeyPartItem.Input.StartsWith("$"))
+                        {
+                            keyParts.Add(new BarCodeCheckDto.inputItem
+                            {
+                                inputType = "NG",
+                                inputData = KeyPartItem.Input,
+                                oldInputData = KeyPartItem.InputNo,
+                                kpItemNo = ""
+                            });
+                        }
+                        else // KeaParts
+                        {
+                            // 判斷是否有輸入KeyParts代碼順序
+                            // 有指定KeyParts順序
+                            if (i <= SpecifyKeyPartsNo.Count())
+                            {
+                                var WipKp = ExceptWipKp.Where(w => w.KpNoName.ToUpper() == SpecifyKeyPartsNo[i - 1].ToUpper()).FirstOrDefault();
+                                // 比對資料為空時
+                                if (WipKp == null)
+                                {
+                                    Msg = $"請確認KeyParts代號【{SpecifyKeyPartsNo[i - 1].ToUpper()}】是否數量全數已綁定？";
+                                    return Json(new Result() { success = false, msg = Msg, data = Data });
+                                }
+
+                                keyParts.Add(new BarCodeCheckDto.inputItem
+                                {
+                                    inputType = WipKp.KpNo,
+                                    inputData = KeyPartItem.Input,
+                                    oldInputData = KeyPartItem.InputNo,
+                                    kpItemNo = WipKp.KpName
+                                });
+                            }
+                            else
+                            {
+                                var WipKp = ExceptWipKp.Where(w => !SpecifyKeyPartsNo.Any(w1 => w1.ToUpper().Contains(w.KpNoName.ToUpper()))).ToList();
+
+                                // 排除有指定數量，其他按照WipKp順序取值
+                                var k = i - 1 - SpecifyKeyPartsNo.Count();
+                                keyParts.Add(new BarCodeCheckDto.inputItem
+                                {
+                                    inputType = WipKp[k].KpNo,
+                                    inputData = KeyPartItem.Input,
+                                    oldInputData = KeyPartItem.InputNo,
+                                    kpItemNo = WipKp[k].KpName
+                                });
+                            }
+                        }
+                    }
+
+                    // 判斷keyPart是否重複
+                    var duplicateKeyParts = keyParts.Where(item => item.inputType != "NG").GroupBy(item => item.inputData)
+                                             .Where(group => group.Count() > 1).Select(s => s.Key)
+                                             .Distinct().ToList();
+
+                    if (duplicateKeyParts.Any())
+                    {
+                        Msg = $"KeyParts有重複【{string.Join("，", duplicateKeyParts)}】，請在確認";
+                        return Json(new Result() { success = false, msg = Msg, data = Data });
+                    }
+
+                    // 治具
+                    var outfit = new List<BarCodeCheckDto.Outfit>();
+                    foreach (var outfitItem in model.wipOutfits)
+                    {
+                        outfit.Add(new BarCodeCheckDto.Outfit
+                        {
+                            inputData = outfitItem.Inputs,
+                            PartNo = outfitItem.PartNo
+                        });
+                    }
+
+                    var x = new BarCodeCheckDto
+                    {
+                        wipNo = model.WipNO,
+                        barcode = input,
+                        barcodeType = "M",
+                        stationID = model.Station,
+                        line = model.LineID,
+                        unitNo = model.UnitNO,
+                        inputItems = keyParts,
+                        outfits = outfit,
+                        userID = GetLogInUserID(),
+                        startTime = model.startTime
+                    };
+
+                    var barcode_result = await _pcsApi.PassIngByCheck_2025(JsonConvert.SerializeObject(x));
+                    // 過站失敗
+                    if (!barcode_result.Success)
+                        return Json(new Result() { success = barcode_result.Success, msg = barcode_result.Msg, data = input });
+                    // 過站成功
+                    else
+                        return Json(new Result1() { success = Success, msg = barcode_result.Msg, data = "", data1 = "" });
+
+                    #endregion
+                }
+                else
+                {
+                    // 組件資料
+                    var items = await _pcsApi.GetItems();
+                    items = items.Where(w => model.WipKps.Any(wi => wi.KpNo.Trim().ToUpper() == w.ItemNo.Trim().ToUpper())).ToList();
+                    // 判斷Input為指定KeyParts順序
+                    if (items.Any(a => a.ItemName.ToUpper() == input))
+                    {
+                        if (model.KpItemName != null)
+                        {
+                            // 取得目前Input指定KP代碼的綁定數量
+                            var KpItemNameByCount = model.KpItemName.Split(",").Where(w => w.ToUpper() == input).Count();
+                            // WipKp的ByKpNo數量
+                            var WipKpByCount = model.WipKps.Where(w1 => w1.KpNo == items.Where(w => w.ItemName.ToUpper() == input)
+                                                    .Select(s => s.ItemNo).FirstOrDefault()).Count();
+                            // 目前綁定KpNo 等於 WipKp ByKpNo 數量  
+                            if (KpItemNameByCount == WipKpByCount)
+                            {
+                                Success = false;
+                                Msg = $"指定KeyParts：{input} 已超過資料設定數量</br>";
+                                return Json(new Result() { success = Success, msg = Msg, data = Data });
+                            }
+                        }
+                        // 設定指定序號欄位
+                        return Json(new Result1() { success = Success, msg = Msg, data = "", data1 = Data });
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                return Json(new Result() { success = false, msg = $"系統錯誤：{ex.Message}", data = Data });
+            }
+
+            return Json(new Result1() { success = Success, msg = Msg, data = Data, data1 = "" });
+        }
+
+        /// <summary>
+        /// 取得目前過站刷入時間
+        /// </summary>
+        /// <returns></returns>
+        public IActionResult UpdateStartTime()
+        {
+            return Json(new Result() { success = true, data = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") });
+        }
+
+        #endregion
     }
 
     public static class ObjectExtension

AMESCoreStudio.Web/Controllers/QRSController.cs

@@ -11333,7 +11333,6 @@ namespace AMESCoreStudio.Web.Controllers
                     }
                 }
             }
-
             return factoryNo;
         }
 
@@ -11643,6 +11642,471 @@ namespace AMESCoreStudio.Web.Controllers
             return Json(new Table() { code = 0, msg = "", data = null, count = 0 });
         }
 
+
+        #region QRS021_2025 委外廠條碼輸入作業 2025(新版)
+        [ResponseCache(Duration = 0)]
+        [HttpGet]
+        public async Task<IActionResult> QRS021_2025()
+        {
+            var model = new QRS021ViewModel();
+            await GetUnitList();
+            await GetLineInfoList(GetFactoryNo().Result);
+            return View(model);
+        }
+
+        [HttpPost]
+        public async Task<IActionResult> QRS021_2025_GetWip(QRS021ViewModel model)
+        {
+            await GetUnitList();
+            await GetLineInfoList(GetFactoryNo().Result);
+            model.KpItemName += "null";
+            if (string.IsNullOrWhiteSpace(model.WipNO))
+            {
+                ModelState.AddModelError("error", "請輸入工單號碼");
+            }
+
+            if (string.IsNullOrWhiteSpace(model.UnitNO))
+            {
+                ModelState.AddModelError("error", "請選擇生產單位");
+            }
+
+            if (model.LineID == 0)
+            {
+                ModelState.AddModelError("error", "請選擇線別");
+            }
+
+            var q = await _pcsApi.GetWipInfoByWipNO(model.WipNO);
+            var firstWipNo = q.Where(w => w.UnitNO == model.UnitNO).FirstOrDefault();
+
+            if (firstWipNo == null)
+            {
+                ModelState.AddModelError("error", "找不到該生產單位的工單號碼");
+            }
+
+            // 取作業站的生產製程
+            var stationUnit = string.Empty;
+            var station = await _basApi.GetStations(model.Station);
+            if (station.Any())
+            {
+                stationUnit = station.FirstOrDefault().UnitNo;
+            }
+            else
+            {
+                ModelState.AddModelError("error", "找不到該作業站的生產單位");
+            }
+
+            try
+            {
+                if (q.Count != 0)
+                {
+                    model.WipID = firstWipNo.WipID;
+                    model.PlanQTY = firstWipNo.PlanQTY;
+                    model.UnitNO = firstWipNo.UnitNO;
+                    model.FlowRuleID = firstWipNo.FlowRuleID;
+                    model.ItemNO = (await _pcsApi.GetWipAtt(model.WipNO)).ItemNO ?? "";
+
+                    // 判斷工單狀態
+                    var BarCodeWip = await _pcsApi.CheckBarCodeWip_2025(model.WipNO, model.UnitNO, model.LineID, model.FlowRuleID);
+                    if (!BarCodeWip.Success)
+                    {
+                        ModelState.AddModelError("error", BarCodeWip.Msg);
+                        return View("QRS021_2025", model);
+                    }
+
+                    // 工單流程ID 取站別
+                    var ruleStations = await GetRuleStationByFlowRuleID(model.FlowRuleID, true);
+                    if (!ruleStations.Any())
+                    {
+                        ModelState.AddModelError("error", $"找不到該筆工單流程作業站設定 ID【{model.FlowRuleID}】");
+                        return View("QRS021_2025", model);
+                    }
+
+                    // 作業站名稱代碼 提供不二過
+                    var StationNameSt = "";
+                    // 過站沒有作業站，就先帶預設
+                    if (model.Station == 0)
+                        model.Station = ruleStations.FirstOrDefault().StationID;
+
+                    if (ruleStations.Any(a => a.StationID == model.Station))
+                    {
+                        model.RuleStation = ruleStations.Where(w => w.StationID == model.Station).FirstOrDefault().RuleStationID;
+                        model.StationTypeNo = ruleStations.Where(w => w.StationID == model.Station).FirstOrDefault().Station.TypeNo;
+                        StationNameSt = ruleStations.Where(w => w.StationID == model.Station).FirstOrDefault().Station.StationNameSt;
+                    }
+                    else
+                    {
+                        model.RuleStation = ruleStations.FirstOrDefault().RuleStationID;
+                        model.StationTypeNo = ruleStations.FirstOrDefault().Station.TypeNo;
+                        model.Station = ruleStations.FirstOrDefault().StationID;
+                        StationNameSt = ruleStations.FirstOrDefault().Station.StationNameSt;
+                    }
+
+                    // 工單已刷數量
+                    model.InputQTY = await _pcsApi.GetBarcodeStationByInputQty(model.WipID, model.Station);
+
+                    // 工單KeyParts
+                    model.WipKps = await _pcsApi.GetWipKpByWipNo(model.WipNO);
+                    model.WipKps = model.WipKps.Where(w => w.UnitNo == stationUnit).OrderBy(o => o.KpSeq).ToList();
+
+                    // 料號檔案
+                    model.MaterialItem = await _pcsApi.GetMaterialItemByItemNO(model.ItemNO);
+                    if (model.MaterialItem != null)
+                    {
+                        model.MaterialStationsItems = await _pcsApi.GetMaterialStationsItemByItemID(model.MaterialItem.ItemID);
+                        model.MaterialStationsItems = model.MaterialStationsItems.Where(w => w.StationID == model.Station).OrderBy(o => o.StationsItemSeq).ToList();
+                        if (model.MaterialStationsItems.Any())
+                        {
+                            ModelState.AddModelError("error", "該站別有設定作業工項");
+                        }
+
+                        // 治具
+                        var q1 = await _pcsApi.GetWipOutfitByWipNo(model.WipNO);
+                        q1 = q1.Where(w => (w.UnitNo == model.UnitNO && w.StationID == null) ||
+                                           (w.UnitNo == model.UnitNO && w.StationID == model.Station)).ToList();
+                        model.wipOutfits.Clear();
+                        foreach (var item in q1)
+                        {
+                            model.wipOutfits.Add(new WipOutfitDtos
+                            {
+                                OutfitNo = item.OutfitNo,
+                                PartNo = item.PartNo,
+                                PartNoName = item.PartNoName,
+                                StationName = item.StationName,
+                                UnitNoName = item.UnitNoName
+                            });
+
+                        }
+                    }
+
+                    // 工程工單備註
+                    var wipsystem = await _pcsApi.GetWipSystem(model.WipNO);
+                    if (wipsystem != null)
+                    {
+                        if (stationUnit == "B")
+                            model.SystemMemo = wipsystem.BabMemo;
+                        else if (stationUnit == "T")
+                            model.SystemMemo = wipsystem.TestMemo;
+                        else if (stationUnit == "P")
+                            model.SystemMemo = wipsystem.PackingMemo;
+                    }
+
+                    // KPSeq順序清除
+                    model.KpItemName = string.Empty;
+
+                    // 工單SOP
+                    var wipSOP = await _pcsApi.GetWipSopByWipNo(model.WipNO);
+                    // 標準SOP A
+                    if (wipSOP.Any(a => a.UnitNo == stationUnit && a.SOPType == "A"))
+                    {
+                        var wipSOPTypeA = wipSOP.Where(w => w.UnitNo == stationUnit && w.SOPType == "A")
+                                                .OrderByDescending(w => w.UpdateTime).FirstOrDefault();
+                        var Esop = await _pcsApi.GetDocEsopViewByNo(wipSOPTypeA.SOPName);
+                        if (Esop.Count != 0)
+                        {
+                            model.Sops.Add(new QRS021ViewModel_SOP
+                            {
+                                SopName = "SOP文件",
+                                SopPath = $@"/DocEsop/{Esop.FirstOrDefault().file_path}"
+                            });
+                        }
+                    }
+                    // 差異SOP F
+                    if (wipSOP.Any(a => a.UnitNo == stationUnit && a.SOPType == "F"))
+                    {
+                        var wipSOPTypeF = wipSOP.Where(w => w.UnitNo == stationUnit && w.SOPType == "F")
+                                                .OrderByDescending(w => w.UpdateTime).FirstOrDefault();
+                        var Esop = await _pcsApi.GetDocEsopViewByNo(wipSOPTypeF.SOPName);
+                        if (Esop.Count != 0)
+                        {
+                            model.Sops.Add(new QRS021ViewModel_SOP
+                            {
+                                SopName = "差異SOP",
+                                SopPath = $@"/DocEsop/{Esop.FirstOrDefault().file_path}"
+                            });
+                        }
+                    }
+                    // 暫行SOP D
+                    if (wipSOP.Any(a => a.UnitNo == stationUnit && a.SOPType == "D"))
+                    {
+                        var wipSOPTypeD = wipSOP.Where(w => w.UnitNo == stationUnit && w.SOPType == "D")
+                                                .OrderByDescending(w => w.UpdateTime).FirstOrDefault();
+                        var Esop = await _pcsApi.GetEsopBySopName(wipSOPTypeD.SOPName);
+                        if (Esop.Count != 0)
+                        {
+                            model.Sops.Add(new QRS021ViewModel_SOP
+                            {
+                                SopName = "暫行文件",
+                                SopPath = $@"/e-sop/{Esop.FirstOrDefault().Process}/{Esop.FirstOrDefault().SopName}.pdf"
+                            });
+                        }
+                    }
+                    // 不二過
+                    model.Sops.Add(new QRS021ViewModel_SOP
+                    {
+                        SopName = "不二過",
+                        SopPath = Url.Action("PCS041V2", "PCS", new
+                        {
+                            material = model.ItemNO,
+                            productionSID = model.Station
+                        })
+                    });
+                }
+            }
+            catch (Exception ex)
+            {
+                ModelState.AddModelError("error", $"系統錯誤：{ex.Message}");
+                return View("QRS021_2025", model);
+            }
+
+            return View("QRS021_2025", model);
+        }
+
+        [HttpPost]
+        public async Task<IActionResult> QRS021_2025_Input(QRS021ViewModel model)
+        {
+            // ResultModel
+            string Msg = string.Empty;
+            bool Success = true;
+            var input = model.Input.Trim().ToUpper();
+            string Data = input;
+
+            if (string.IsNullOrWhiteSpace(input))
+                return Json(new Result1() { success = Success, msg = Msg, data = "", data1 = "" });
+
+            // 刷入條碼+異常欄位
+            if (!string.IsNullOrWhiteSpace(model.InputNo))
+                Data += "＠" + model.InputNo;
+
+            string ExtNo = string.Empty;
+
+            try
+            {
+                #region 基本Input 輸入判斷
+                if (model.WipID == 0)
+                    Msg += "請確認是否有輸入工單相關訊息</br>";
+
+                // 當有作業站就必須要填治具編號
+                if (model.wipOutfits.Any(a => !string.IsNullOrWhiteSpace(a.StationName) && string.IsNullOrWhiteSpace(a.Inputs)))
+                    Msg += "請刷入治具編號</br>";
+
+                if (model.Station == 0)
+                {
+                    Msg += "請選擇作業站</br>";
+                }
+
+                if (string.IsNullOrWhiteSpace(input))
+                {
+                    Msg += "請刷讀條碼</br>";
+                }
+
+                if (string.IsNullOrWhiteSpace(model.startTime))
+                {
+                    Msg += "請刷入開始時間START</br>";
+                }
+
+                if (!string.IsNullOrWhiteSpace(Msg))
+                {
+                    Success = false;
+                    return Json(new Result() { success = Success, msg = Msg, data = Data });
+                }
+                #endregion
+
+                var q = await _pcsApi.CheckBarCodeByWipNo_2025(input, model.WipNO.Trim().ToUpper());
+                // 判斷是否序號與工單號碼是否對應條碼區間值，沒對應到視為組件或不良代碼
+                if (q.Success)
+                {
+                    #region 確認序號的狀態
+
+                    // 取作業站的生產製程
+                    var stationUnit = string.Empty;
+                    var station = await _basApi.GetStations(model.Station);
+                    if (station.Any())
+                    {
+                        stationUnit = station.FirstOrDefault().UnitNo;
+                    }
+                    var keyParts = new List<BarCodeCheckDto.inputItem>();
+
+                    // 先查詢已綁定組件數量 By WipID
+                    var BarCodeItems = await _pcsApi.GetBarcodeItemByBarCode(input);
+                    BarCodeItems = BarCodeItems.Where(w => w.S.UnitNo == stationUnit && w.WipID == model.WipID).ToList();
+
+                    //  WipKps - BarCodeItem 剩下未綁定的KpNo
+                    var ExceptWipKp = model.WipKps.ToList();
+                    foreach (var item in BarCodeItems)
+                    {
+                        var ByItemWipKp = ExceptWipKp.Where(w => w.KpNo.Trim().ToUpper() == item.ItemNo.Trim().ToUpper()).FirstOrDefault();
+                        if (ByItemWipKp != null)
+                            ExceptWipKp.Remove(ByItemWipKp);
+                    }
+
+                    //  KeyParts代碼順序
+                    var SpecifyKeyPartsNo = model.KpItemName == null ? new List<string>() : model.KpItemName.Split(',').ToList();
+                    int KpItemQty = BarCodeItems.Count();
+                    int i = 0;
+
+                    // 判斷指定KeyParts代碼是否有刷足夠數
+                    if (SpecifyKeyPartsNo.Count() > model.Inputs.Where(w => !w.Input.StartsWith("$")).Count())
+                    {
+                        Msg = "有指定KeyParts代號 刷入數量不足，請在確認！";
+                        return Json(new Result() { success = false, msg = Msg, data = Data });
+                    }
+
+                    foreach (var KeyPartItem in model.Inputs)
+                    {
+                        // 判斷是組件先+1
+                        if (!KeyPartItem.Input.StartsWith("$"))
+                            i += 1;
+
+                        // 當刷入組組件+已紀錄組件數量 大於 設定組件數量
+                        if (i + KpItemQty > model.WipKps.Count())
+                        {
+                            Msg = "已刷超過組件數量";
+                            Success = false;
+                            return Json(new Result() { success = Success, msg = Msg, data = Data });
+                        }
+
+                        // NG代碼
+                        if (KeyPartItem.Input.StartsWith("$"))
+                        {
+                            keyParts.Add(new BarCodeCheckDto.inputItem
+                            {
+                                inputType = "NG",
+                                inputData = KeyPartItem.Input,
+                                oldInputData = KeyPartItem.InputNo,
+                                kpItemNo = ""
+                            });
+                        }
+                        else // KeaParts
+                        {
+                            // 判斷是否有輸入KeyParts代碼順序
+                            // 有指定KeyParts順序
+                            if (i <= SpecifyKeyPartsNo.Count())
+                            {
+                                var WipKp = ExceptWipKp.Where(w => w.KpNoName.ToUpper() == SpecifyKeyPartsNo[i - 1].ToUpper()).FirstOrDefault();
+                                // 比對資料為空時
+                                if (WipKp == null)
+                                {
+                                    Msg = $"請確認KeyParts代號【{SpecifyKeyPartsNo[i - 1].ToUpper()}】是否數量全數已綁定？";
+                                    return Json(new Result() { success = false, msg = Msg, data = Data });
+                                }
+
+                                keyParts.Add(new BarCodeCheckDto.inputItem
+                                {
+                                    inputType = WipKp.KpNo,
+                                    inputData = KeyPartItem.Input,
+                                    oldInputData = KeyPartItem.InputNo,
+                                    kpItemNo = WipKp.KpName
+                                });
+                            }
+                            else
+                            {
+                                var WipKp = model.WipKps.Where(w => !SpecifyKeyPartsNo.Any(w1 => w1.ToUpper().Contains(w.KpNoName.ToUpper())))
+                                                              .ToList();
+                                // 排除有指定數量，其他按照WipKp順序取值
+                                var k = i - 1 - SpecifyKeyPartsNo.Count();
+                                keyParts.Add(new BarCodeCheckDto.inputItem
+                                {
+                                    inputType = WipKp[k].KpNo,
+                                    inputData = KeyPartItem.Input,
+                                    oldInputData = KeyPartItem.InputNo,
+                                    kpItemNo = WipKp[k].KpName
+                                });
+                            }
+                        }
+                    }
+
+                    // 判斷keyPart是否重複
+                    var duplicateKeyParts = keyParts.Where(item => item.inputType != "NG").GroupBy(item => item.inputData)
+                                             .Where(group => group.Count() > 1).Select(s => s.Key)
+                                             .Distinct().ToList();
+
+                    if (duplicateKeyParts.Any())
+                    {
+                        Msg = $"KeyParts有重複【{string.Join("，", duplicateKeyParts)}】，請在確認";
+                        return Json(new Result() { success = false, msg = Msg, data = Data });
+                    }
+
+                    // 治具
+                    var outfit = new List<BarCodeCheckDto.Outfit>();
+                    foreach (var outfitItem in model.wipOutfits)
+                    {
+                        outfit.Add(new BarCodeCheckDto.Outfit
+                        {
+                            inputData = outfitItem.Inputs,
+                            PartNo = outfitItem.PartNo
+                        });
+                    }
+
+                    var x = new BarCodeCheckDto
+                    {
+                        wipNo = model.WipNO,
+                        barcode = input,
+                        barcodeType = "M",
+                        stationID = model.Station,
+                        line = model.LineID,
+                        unitNo = model.UnitNO,
+                        inputItems = keyParts,
+                        outfits = outfit,
+                        userID = GetLogInUserID(),
+                        startTime = model.startTime
+                    };
+
+                    var barcode_result = await _pcsApi.PassIngByCheck_2025(JsonConvert.SerializeObject(x));
+                    // 過站失敗
+                    if (!barcode_result.Success)
+                        return Json(new Result() { success = barcode_result.Success, msg = barcode_result.Msg, data = input });
+                    // 過站成功
+                    else
+                        return Json(new Result1() { success = Success, msg = barcode_result.Msg, data = "", data1 = "" });
+
+                    #endregion
+                }
+                else
+                {
+                    // 組件資料
+                    var items = await _pcsApi.GetItems();
+                    items = items.Where(w => model.WipKps.Any(wi => wi.KpNo.Trim().ToUpper() == w.ItemNo.Trim().ToUpper())).ToList();
+                    // 判斷Input為指定KeyParts順序
+                    if (items.Any(a => a.ItemName.ToUpper() == input))
+                    {
+                        if (model.KpItemName != null)
+                        {
+                            // 取得目前Input指定KP代碼的綁定數量
+                            var KpItemNameByCount = model.KpItemName.Split(",").Where(w => w.ToUpper() == input).Count();
+                            // WipKp的ByKpNo數量
+                            var WipKpByCount = model.WipKps.Where(w1 => w1.KpNo == items.Where(w => w.ItemName.ToUpper() == input)
+                                                    .Select(s => s.ItemNo).FirstOrDefault()).Count();
+                            // 目前綁定KpNo 等於 WipKp ByKpNo 數量  
+                            if (KpItemNameByCount == WipKpByCount)
+                            {
+                                Success = false;
+                                Msg = $"指定KeyParts：{input} 已超過資料設定數量</br>";
+                                return Json(new Result() { success = Success, msg = Msg, data = Data });
+                            }
+                        }
+                        // 設定指定序號欄位
+                        return Json(new Result1() { success = Success, msg = Msg, data = "", data1 = Data });
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                return Json(new Result() { success = false, msg = $"系統錯誤：{ex.Message}", data = Data });
+            }
+
+            return Json(new Result1() { success = Success, msg = Msg, data = Data, data1 = "" });
+        }
+
+        /// <summary>
+        /// 取得目前過站刷入時間
+        /// </summary>
+        /// <returns></returns>
+        public IActionResult UpdateStartTime()
+        {
+            return Json(new Result() { success = true, data = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") });
+        }
+
+        #endregion
     }
 
 

AMESCoreStudio.Web/HttpApis/AMES/IPCS.cs

@@ -2062,6 +2062,30 @@ namespace AMESCoreStudio.Web
 
         #endregion
 
+        #region PCS021_2025 條碼輸入作業 2025(新版)
 
+        /// <summary>
+        /// 判斷工單狀態
+        /// </summary>
+        /// <param name="wipno">工單號碼</param>
+        /// <param name="unitno">生產單位</param>
+        /// <param name="line">線別</param>
+        /// <param name="flowrule">流程</param>
+        /// <returns></returns>
+        [WebApiClient.Attributes.HttpGet("api/BarCodeCheck2025/CheckWipNoSation")]
+        ITask<ResultModel<string>> CheckBarCodeWip_2025(string wipno, string unitno, int? line, int flowrule);
+
+        /// <summary>
+        /// 查詢序號是否有在該工單 條碼區間內
+        /// </summary>
+        /// <param name="barcode">內部序號</param>
+        /// <param name="wipNo">工單號碼</param>
+        [WebApiClient.Attributes.HttpGet("api/BarCodeCheck2025/CheckBarCodeByWipNo")]
+        ITask<ResultModel<string>> CheckBarCodeByWipNo_2025(string barcode, string wipNo);
+
+        [WebApiClient.Attributes.HttpPost("api/BarCodeCheck2025/PassIngByCheck")]
+        ITask<ResultModel<string>> PassIngByCheck_2025([FromBody, RawJsonContent] string model);
+
+        #endregion
     }
 }

AMESCoreStudio.Web/ViewModels/PCS/PCS021ViewModel.cs

@@ -1,10 +1,6 @@
-using System;
+using AMESCoreStudio.WebApi.DTO.AMES;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 using AMESCoreStudio.WebApi.Models.AMES;
-using AMESCoreStudio.WebApi.Models.BAS;
+using System.Collections.Generic;
-using AMESCoreStudio.WebApi.DTO.AMES;
 
 namespace AMESCoreStudio.Web.ViewModels.PCS
 {
@@ -137,6 +133,11 @@ namespace AMESCoreStudio.Web.ViewModels.PCS
         public List<MaterialStationsItem> MaterialStationsItems { get; set; } = new List<MaterialStationsItem>();
 
         public List<PCS021ViewModel_SOP> Sops { get; set; } = new List<PCS021ViewModel_SOP>();
+
+        /// <summary>
+        /// 刷入時間
+        /// </summary>
+        public string startTime { get; set; }
     }
 
     public class WipOutfitDtos : WipOutfitDto

AMESCoreStudio.Web/ViewModels/QRS/QRS021ViewModel.cs

@@ -137,6 +137,11 @@ namespace AMESCoreStudio.Web.ViewModels.QRS
         public List<MaterialStationsItem> MaterialStationsItems { get; set; } = new List<MaterialStationsItem>();
 
         public List<QRS021ViewModel_SOP> Sops { get; set; } = new List<QRS021ViewModel_SOP>();
+
+        /// <summary>
+        /// 刷入時間
+        /// </summary>
+        public string startTime { get; set; }
     }
 
     public class WipOutfitDtos : WipOutfitDto

AMESCoreStudio.Web/Views/PCS/PCS021_2025.cshtml

@@ -0,0 +1,631 @@
+@model AMESCoreStudio.Web.ViewModels.PCS.PCS021ViewModel
+@{
+    ViewData["Title"] = "過站作業";
+    Layout = "~/Views/Shared/_AMESLayout.cshtml";
+}
+
+<script src="~/js/sweetalert2.all.min.js"></script>
+<style type="text/css">
+    .layui-table-main .layui-table-cell {
+        /*height: auto !important;*/
+        white-space: normal;
+    }
+
+    .layui-table img {
+        max-width: 60px;
+        max-height: 28px;
+    }
+
+    .layui-tree-main {
+        cursor: pointer;
+        padding-right: 10px;
+        float: left;
+        border-width: 1px;
+        border-style: solid;
+        border-color: #e6e6e6;
+        margin: 10px 0;
+    }
+
+    .layui-form > iframe {
+        height: 100%;
+        width: 100%;
+        border: none;
+    }
+
+    .element {
+        float: left;
+    }
+
+    .layui-field-title {
+        margin: auto;
+    }
+
+    .layui-form-item {
+        margin-bottom: auto;
+    }
+
+    .barcodeInput {
+        border: 2px solid #090;
+        color: blue;
+    }
+
+        .barcodeInput:focus {
+            border: 3px solid #0026ff;
+            color: blue;
+        }
+
+    .td-Input {
+        white-space: pre;
+    }
+</style>
+
+<div class="layui-card" style="height:auto;">
+    <form id="PCS021_2025_Form" method="post" asp-action="PCS021_2025" class="layui-form">
+        <div asp-validation-summary="ModelOnly" class="text-danger"></div>
+        <div class="layui-card-body">
+            <div class="layui-row">
+                <div class="layui-col-md5 element">
+                    <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
+                        <ul class="layui-tab-title">
+                            <li class="layui-this">過站資料</li>
+                            <li>治具資料</li>
+                        </ul>
+                        <div class="layui-tab-content">
+                            <div class="layui-tab-item layui-show">
+                                <div class="layui-col-md12">
+                                    <div class="layui-form-item">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">製程：</label>
+                                            <div class="layui-input-inline" style="width:100px">
+                                                <select id="unit" lay-filter="unit" lay-verify="required" asp-for="UnitNO" style="width:100px" lay-submit asp-items="@ViewBag.FactoryUnitList">
+                                                </select>
+                                            </div>
+                                            <label class="layui-form-label">線別：</label>
+                                            <div class="layui-input-inline" style="width:100px">
+                                                <select id="line" lay-filter="line" lay-verify="required" asp-for="LineID" lay-submit>
+                                                </select>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-form-item">
+                                    </div>
+
+                                    <div class="layui-form-item">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">工單號碼：</label>
+                                            <div class="layui-input-inline" style="width:100px">
+                                                <input type="text" onkeydown="SearchNo(event);" asp-for="WipNO" asp-action="PCS021_2025_GetWip" class="layui-input" autocomplete="off" />
+                                                <input type="hidden" asp-for="WipID" value="@Model.WipID" />
+                                                <input type="hidden" asp-for="FlowRuleID" value="@Model.FlowRuleID" />
+                                                <input type="hidden" asp-for="StationTypeNo" value="@Model.StationTypeNo" />
+                                                <input type="submit" id="GetWipData" asp-action="PCS021_2025_GetWip" style="display:none;" />
+                                            </div>
+                                            <label class="layui-form-label">作業站：</label>
+                                            <div class="layui-input-inline" style="width:100px">
+                                                <select id="stations" lay-filter="stations" lay-verify="required" asp-for="Station" asp-items="@ViewBag.GetRuleStationByFlowRuleIDList" lay-submit>
+                                                </select>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="layui-col-md12">
+                                    <div class="layui-form-item">
+                                        <div class="layui-inline" style="height:25px;">
+                                            <label class="layui-form-label">料號：</label>
+                                            <label class="layui-form-label" style="text-align: left; width: 200px;">@Model.ItemNO</label>
+                                        </div>
+                                    </div>
+                                    <div class="layui-form-item">
+                                        <div class="layui-inline" style="height:25px;">
+                                            <label class="layui-form-label">開始時間：</label>
+                                            <label class="layui-form-label" id="startTime" name="startTime" style="text-align: left; width: 200px;color:red"></label>
+                                            <input type="hidden" id="hiddenStartTime" name="startTime" />
+                                        </div>
+                                    </div>
+                                    <div class="layui-form-item">
+                                        <div class="layui-inline" style="height:25px;">
+                                            <label class="layui-form-label" style="width:100px;text-align:left; padding: 9px 10px">已刷數/工單數：</label>
+                                            <label class="layui-form-label" style="width:150px;text-align:left"><span id="InputQty">@Model.InputQTY</span>/@Model.PlanQTY</label>
+                                        </div>
+                                    </div>
+                                    <fieldset class="layui-elem-field layui-field-title">
+                                        <legend style="color: #e18917">刷讀條碼</legend>
+                                    </fieldset>
+                                    <div class="layui-form-item" style="background-color: #acdbe36b">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">刷讀條碼：</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" onkeypress="if( event.keyCode == 13 ) {  $(':input:visible:enabled:eq(' + ($(':input:visible:enabled').index(this) + 1) + ')').focus();
+                                                    event.preventDefault(); return false; }" asp-for="InputNo" id="inputNo" style="width:100px" class="layui-input" autocomplete="off" placeholder="可輸入異常位置" />
+                                            </div>
+                                            <div class="layui-input-inline">
+                                                <input type="text" onkeydown="input(event);" id="inputtxt" asp-for="Input" class="layui-input barcodeInput" autocomplete="off" />
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                                <fieldset class="layui-elem-field layui-field-title">
+                                    <legend style="color: #e18917">刷入資料</legend>
+                                    <table id="tblCustomers" class="layui-table" cellpadding="0" cellspacing="0">
+                                        <tbody id="tblCustomersBody">
+                                        </tbody>
+                                    </table>
+                                </fieldset>
+                                <fieldset class="layui-elem-field layui-field-title">
+                                    <legend style="color: #e18917">檢查項目</legend>
+                                    <table id="MydataTable" class="layui-table">
+                                        @{
+                                            int i = 0;
+                                        }
+                                        <thead>
+                                            <tr>
+                                                <th>
+                                                    工項順序
+                                                </th>
+                                                <th>
+                                                    工項名稱
+                                                </th>
+                                                <th>
+                                                    工項描述
+                                                </th>
+                                            </tr>
+                                        </thead>
+                                        <tbody>
+                                            @foreach (var index in Model.MaterialStationsItems)
+                                            {
+                                                <tr>
+                                                    <td>
+                                                        @index.StationsItemSeq
+                                                    </td>
+                                                    <td>
+                                                        @index.StationsItemNo
+                                                    </td>
+                                                    <td>
+                                                        <input asp-for="@index.StationsItemDesc" name="MaterialStationsItems[@i].StationsItemDesc" readonly="readonly" />
+                                                    </td>
+                                                </tr>
+                                                i++;
+                                            }
+                                        </tbody>
+                                    </table>
+                                </fieldset>
+                                <fieldset id="KpItemDiv" class="layui-elem-field layui-field-title">
+                                    <legend style="color: #e18917">指定KeyPart</legend>
+                                    <input type="text" class="layui-input" asp-for="KpItemName" />
+                                </fieldset>
+                                <fieldset id="Memo" class="layui-elem-field layui-field-title">
+                                    <legend style="color: #e18917">工程備註</legend>
+                                    <div class="layui-form-item">
+                                        <label class="layui-form-label" style="width:auto; text-align: left; color: blue;">@Model.SystemMemo</label>
+                                    </div>
+                                </fieldset>
+                                <fieldset class="layui-elem-field layui-field-title">
+                                    <legend style="color: #e18917">KeyParts</legend>
+                                </fieldset>
+                                <div class="layui-col-md12">
+                                    <div class="layui-form-item">
+                                        <table id="MydataTable" class="layui-table">
+                                            @{
+                                                int j = 0;
+                                            }
+                                            <thead>
+                                                <tr>
+                                                    <th>
+                                                        KP料號名稱
+                                                    </th>
+                                                    <th>
+                                                        KP料號NO
+                                                    </th>
+                                                    <th>
+                                                        順序
+                                                    </th>
+                                                    <th>
+                                                        前置碼
+                                                    </th>
+                                                    <th>
+                                                        長度
+                                                    </th>
+                                                    <th>
+                                                        生產單位
+                                                    </th>
+                                                </tr>
+                                            </thead>
+                                            <tbody>
+                                                @foreach (var index in Model.WipKps)
+                                                {
+                                                    <tr>
+                                                        <td>
+                                                            <input type="text" class="layui-input" value="@index.KpName" name="WipKps[@j].KpName" style="width:100px" readonly="readonly">
+                                                            <input type="hidden" name="WipKps[@j].KpNoName" value="@index.KpNoName">
+                                                        </td>
+                                                        <td>
+                                                            <input type="text" class="layui-input" value="@index.KpNoName" name="WipKps[@j].KpNoName" style="width:100px" readonly="readonly">
+                                                            <input type="hidden" value="@index.KpNo" name="WipKps[@j].KpNo" />
+                                                        </td>
+                                                        <td>
+                                                            <input type="text" class="layui-input" value="@index.KpSeq" name="WipKps[@j].KpSeq" style="width:40px" readonly="readonly">
+                                                        </td>
+                                                        <td>
+                                                            <input type="text" class="layui-input" value="@index.Title" name="WipKps[@j].Title" style="width:40px" readonly="readonly">
+                                                        </td>
+                                                        <td>
+                                                            <input value="@index.Length" class="layui-input" name="WipKps[@j].Length" style="width:40px" readonly="readonly">
+                                                        </td>
+                                                        <td>
+                                                            @index.UnitNoName
+                                                        </td>
+                                                    </tr>
+                                                    j++;
+                                                }
+                                            </tbody>
+                                        </table>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="layui-tab-item">
+                                <table id="MydataTable" class="layui-table">
+                                    @{
+                                        int k = 0;
+                                    }
+                                    <thead>
+                                        <tr>
+                                            <th>
+                                                治具種類
+                                            </th>
+                                            <th>
+                                                生產單位
+                                            </th>
+                                            <th>
+                                                作業站
+                                            </th>
+                                            <th>
+                                                刷入治具條碼
+                                            </th>
+                                        </tr>
+                                    </thead>
+                                    <tbody>
+                                        @foreach (var index in Model.wipOutfits)
+                                        {
+                                            <tr>
+                                                <td>
+                                                    <input type="text" class="layui-input" asp-for="@index.PartNoName" name="wipOutfits[@k].PartNoName" readonly="readonly" />
+                                                    <input type="hidden" asp-for="@index.PartNo" value="@index.PartNo" name="wipOutfits[@k].PartNo" />
+                                                </td>
+                                                <td>
+                                                    <input type="text" class="layui-input" asp-for="@index.UnitNoName" name="wipOutfits[@k].UnitNoName" readonly="readonly" />
+                                                </td>
+                                                <td>
+                                                    <input type="text" class="layui-input" asp-for="@index.StationName" name="wipOutfits[@k].StationName" readonly="readonly" />
+                                                </td>
+                                                <td>
+                                                    <input onkeypress="if( event.keyCode == 13 ) { checkOutfit(this); return false; }" onchange="checkOutfit(this);" asp-for="@index.Inputs" name="wipOutfits[@k].Inputs" class="layui-input" />
+                                                </td>
+                                            </tr>
+                                            k++;
+                                        }
+                                    </tbody>
+                                </table>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="layui-col-md7 element" style="height:100%">
+                    @if (Model.Sops.Count != 0)
+                    {
+                        bool sopfirst = true;
+                        <div class="layui-tab layui-tab-brief">
+                            <ul class="layui-tab-title ">
+                                @foreach (var index in Model.Sops)
+                                {
+                                    if (sopfirst)
+                                    {
+                                        <li class="layui-this">@index.SopName</li>
+                                        sopfirst = false;
+                                    }
+                                    else
+                                    {
+                                        <li>@index.SopName</li>
+                                    }
+                                }
+                            </ul>
+
+                            <div class="layui-tab-content">
+                                @foreach (var index in Model.Sops)
+                                {
+                                    if (!sopfirst)
+                                    {
+                                        <div class="layui-tab-item layui-show" style="height:90vh">
+                                            <iframe frameborder="0" style="width:100%;height:100%;" src='@index.SopPath'></iframe>
+                                        </div>
+                                        sopfirst = true;
+                                    }
+                                    else
+                                    {
+                                        <div class="layui-tab-item" style="height:90vh">
+                                            <iframe frameborder="0" style="width:100%;height:100%;" src='@index.SopPath'></iframe>
+                                        </div>
+                                    }
+                                }
+                            </div>
+                        </div>
+                    }
+                </div>
+            </div>
+        </div>
+    </form>
+</div>
+
+@section Scripts {
+    @{
+        await Html.RenderPartialAsync("_ValidationScriptsPartial");
+        await Html.RenderPartialAsync("_FileinputScriptsPartial");
+    }
+    <script type="text/javascript" src="~/js/grids.min.js"></script>
+    <script type="text/javascript">
+
+        // Jquery 將兩邊DIV設定同高度
+        jQuery(function ($) {
+            $('.element').responsiveEqualHeightGrid();
+            getUnitLineList($("#unit").val());
+        });
+
+        $(document).ready(function () {
+            var error = '@Html.ValidationMessage("error")';
+            if ($(error).text() != '') {
+                ShowInputError(error);
+            }
+
+            if ($("#StationTypeNo").val() == "U" || $("#StationTypeNo").val() == "A") {
+                $("#inputNo").show();
+            }
+            else {
+                $("#inputNo").hide();
+            }
+
+        @if (!string.IsNullOrWhiteSpace(Model.SystemMemo))
+        {
+            <text>$("#Memo").show(); </text>
+        }
+        else
+        {
+            <text>$("#Memo").hide(); </text>
+        }
+
+            });
+
+        function getUnitLineList(data) {
+            $.ajax(
+                {
+                    url: "@Url.Action("GetUnitLineJson", "BAS")",
+                    dataType: 'json',
+                    data: { "unit_no": $("#unit").val() },
+                    type: 'post',
+                    success: function (result) {
+                        $("#line").empty();//清空下拉框的值
+                        $.each(result.data, function (index, item) {
+                            $("#line").append($("<option>").text(item.text).val(item.value))
+                        });
+                        $("#line").val(@Model.LineID);
+                        layui.form.render("select");//重新渲染 固定写法
+                    },
+                    error: function (result) {
+                        alert(result);
+                    }
+                });
+        };
+
+        function SearchNo(e) {
+            if (e.keyCode == 13) {
+                $("#GetWipData").click();
+                $("#KpItemName").val('');
+            }
+        };
+
+        function input(e) {
+            if (e.keyCode == 13) {
+
+                // 先判斷過站刷入時間
+                if (!checkInputStart()) {
+                    event.preventDefault();
+                    return false;
+                }
+
+                var Inputs = GetAllEmpData();
+                var data = $("#PCS021_2025_Form").serialize();
+                var InputsTotal = Inputs.length;
+                for (i = 0; i < InputsTotal; i++) {
+                    data += "&Inputs[" + i + "].Input=" + Inputs[i].Input;
+                    data += "&Inputs[" + i + "].InputNo=" + Inputs[i].InputNo;
+                }
+
+                $.ajax({
+                    url: "@Url.Action("PCS021_2025_Input", "PCS")",
+                    type: "POST",
+                    data: data,
+                    success: function (result) {
+                        $("#inputtxt").val('');
+                        $("#inputNo").val('');
+                        // 錯誤訊息
+                        if (!result.success) {
+                            ShowInputError(result.msg);
+                        }
+                        else {
+                            if (result.msg.length != 0) {
+                                ShowInputOK(result.msg);
+                            }
+
+                            // 指定KP 順序
+                            if (result.data1.length != 0) {
+                                var value = $("#KpItemName").val();
+                                if (value != '')
+                                    $("#KpItemName").val(value + "," + result.data1);
+                                else
+                                    $("#KpItemName").val(result.data1);
+                            }
+                            // 回傳有值
+                            else if (result.data.length != 0) {
+                                // 新增資料
+                                TableAddRow(result.data);
+                            }
+                            else {
+                                $("#startTime").text('');
+                                $("#hiddenStartTime").val('');
+                                $("#tblCustomersBody").empty();
+                                InputQty();
+                            }
+                        }
+                    }
+                });
+                event.preventDefault();
+                return false;
+            }
+        };
+
+        layui.use(['form', 'layer'], function () {
+            form = layui.form;
+
+            form.on('select(unit)', function (data) {
+                getUnitLineList(data.value);
+                $("#stations").empty();//清空下拉框的值
+                $("#KpItemName").val('');
+            });
+
+            form.on('select(line)', function (data) {
+                $("#stations").empty();//清空下拉框的值
+                $("#KpItemName").val('');
+                layui.form.render("select");//重新渲染 固定写法
+            });
+
+            form.on('select(stations)', function (data) {
+                $("#KpItemName").val('');
+                $("#GetWipData").click();
+            });
+        });
+
+        // 已過站數與工單數量
+        function InputQty() {
+            $.ajax({
+                url: "@Url.Action("getBarcodeStationByInputQty", "PCS")",
+                type: "POST",
+                data: { "wipNo": $("#WipNO").val(), "unitNo": $("#unit").val(), "ststionID": $("#stations").val() },
+                success: function (result) {
+                    $("#InputQty").text(result.data);
+                }
+            });
+        };
+
+        // 新增trRow
+        function TableAddRow(e) {
+            console.log(e);
+            var strAry = e.split('＠');
+            var InputNo = strAry[1];//異常代碼
+            if (InputNo == undefined)
+                InputNo = '';
+
+            var contactdiv = '<tr class="data-contact-person">' +
+                '<td style="width:10%;"><input style="width:80px" readonly="readonly" onkeypress="if( event.keyCode == 13 ) { return false; }" type="text" name="f-name" class="form-control td-InputNo" value=' + InputNo + '/></td>' +
+                `<td style="width:90%;"><input readonly="readonly" style="width:100%;" onkeypress="if( event.keyCode == 13 ) { return false; }" type="text" name="f-name" class="td-Input" value="${strAry[0]}"/></td>` +
+                '<td><a class="layui-btn layui-btn-danger layui-btn-xs layui-icon layui-icon-delete" onclick="Remove(this);">刪除</a></td>' +
+                '</tr>';
+            $('#tblCustomers').append(contactdiv);
+            AutoWindowSize();
+        };
+
+        // Table 刪除
+        function Remove(button) {
+            var row = $(button).closest("TR");
+            var table = $("#tblCustomers")[0];
+            table.deleteRow(row[0].rowIndex);
+        };
+
+        // 紀錄表格欄位
+        function GetAllEmpData() {
+            var data = [];
+            $('tr.data-contact-person').each(function () {
+                var Input = $(this).find('.td-Input').val();
+                var InputNo = $(this).find('.td-InputNo').val();
+                data.push({ Input: Input, InputNo: InputNo });
+            });
+            return data;
+        }
+
+        function AutoWindowSize() {
+            $(window).on('resize', function () {
+            }).resize();
+        }
+
+        // 顯示過站(OK)訊息
+        function ShowInputOK(Msg) {
+            Swal.fire({
+                icon: 'success',
+                title: Msg,
+                showConfirmButton: false,
+                timer: 2000
+            })
+        }
+
+        // 顯示過站(NG)訊息
+        function ShowInputError(Msg) {
+            Swal.fire({
+                color: '#716add',
+                icon: 'warning',
+                title: "<h3 style='color:#FFFFFF'>" + Msg + "</h3>",
+                background: '#db4444',
+            })
+        }
+
+        // 確認治具
+        function checkOutfit(val) {
+            console.log(val.value);
+            var partNo = $(val).closest('tr').find('input:hidden[id*=PartNo]').val();
+            if (val.value.length != 0) {
+                $.ajax(
+                    {
+                        url: "@Url.Action("CheckOutfitInfoPartNo", "PCS")",
+                        dataType: 'json',
+                        data: { "outfitNo": val.value, "partNo": partNo },
+                        type: 'post',
+                        success: function (result) {
+                            if (result.data.length != 0) {
+                                ShowInputError(result.data);
+                            }
+                        },
+                        error: function (result) {
+                            alert(result);
+                        }
+                    });
+            }
+        }
+
+        // 確認有刷入時間
+        function checkInputStart(event) {
+            const inputElement = document.querySelector("#inputtxt");
+            const inputVal = inputElement ? inputElement.value.trim().toUpperCase() : "";
+            const startTime = document.querySelector("#startTime");
+            if (inputVal === "START") {
+                $.ajax({
+                    url: "@Url.Action("UpdateStartTime", "PCS")",
+                    dataType: 'json',
+                    type: 'get',
+                    success: function (result) {
+                        $("#startTime").text(result.data);
+                        $("#hiddenStartTime").val(result.data);
+                        $("#inputtxt").val('');
+                    },
+                    error: function (result) {
+                        ShowInputError(result);
+                    }
+                });
+                return false;
+            }
+            else if (!startTime || startTime.textContent.trim() === "") {
+                $("#inputtxt").val('');
+                ShowInputError('請先刷入START 開始刷入時間');
+                return false;
+            }
+
+            return true;
+        }
+
+    </script>
+}

AMESCoreStudio.Web/Views/QRS/QRS021_2025.cshtml

@@ -0,0 +1,630 @@
+@model AMESCoreStudio.Web.ViewModels.QRS.QRS021ViewModel
+@{
+    ViewData["Title"] = "過站作業";
+    Layout = "~/Views/Shared/_AMESLayout.cshtml";
+}
+
+<script src="~/js/sweetalert2.all.min.js"></script>
+<style type="text/css">
+    .layui-table-main .layui-table-cell {
+        /*height: auto !important;*/
+        white-space: normal;
+    }
+
+    .layui-table img {
+        max-width: 60px;
+        max-height: 28px;
+    }
+
+    .layui-tree-main {
+        cursor: pointer;
+        padding-right: 10px;
+        float: left;
+        border-width: 1px;
+        border-style: solid;
+        border-color: #e6e6e6;
+        margin: 10px 0;
+    }
+
+    .layui-form > iframe {
+        height: 100%;
+        width: 100%;
+        border: none;
+    }
+
+    .element {
+        float: left;
+    }
+
+    .layui-field-title {
+        margin: auto;
+    }
+
+    .layui-form-item {
+        margin-bottom: auto;
+    }
+
+    .barcodeInput {
+        border: 2px solid #090;
+        color: blue;
+    }
+
+        .barcodeInput:focus {
+            border: 3px solid #0026ff;
+            color: blue;
+        }
+
+    .td-Input {
+        white-space: pre;
+    }
+</style>
+
+
+<div class="layui-card" style="height:auto;">
+    <form id="QRS021_2025_Form" method="post" asp-action="QRS021_2025" class="layui-form">
+        <div asp-validation-summary="ModelOnly" class="text-danger"></div>
+        <div class="layui-card-body">
+            <div class="layui-row">
+                <div class="layui-col-md5 element">
+                    <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
+                        <ul class="layui-tab-title">
+                            <li class="layui-this">過站資料</li>
+                            <li>治具資料</li>
+                        </ul>
+                        <div class="layui-tab-content">
+                            <div class="layui-tab-item layui-show">
+                                <div class="layui-col-md12">
+                                    <div class="layui-form-item">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">製程：</label>
+                                            <div class="layui-input-inline" style="width:100px">
+                                                <select id="unit" lay-filter="unit" lay-verify="required" asp-for="UnitNO" style="width:100px" lay-submit asp-items="@ViewBag.UnitList">
+                                                </select>
+                                            </div>
+                                            <label class="layui-form-label">線別：</label>
+                                            <div class="layui-input-inline" style="width:100px">
+                                                <select id="line" lay-filter="line" lay-verify="required" asp-for="LineID" lay-submit asp-items="@ViewBag.LineList">
+                                                </select>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="layui-form-item">
+                                    </div>
+
+                                    <div class="layui-form-item">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">工單號碼：</label>
+                                            <div class="layui-input-inline" style="width:100px">
+                                                <input type="text" onkeydown="SearchNo(event);" asp-for="WipNO" asp-action="QRS021_2025_GetWip" class="layui-input" autocomplete="off" />
+                                                <input type="hidden" asp-for="WipID" value="@Model.WipID" />
+                                                <input type="hidden" asp-for="FlowRuleID" value="@Model.FlowRuleID" />
+                                                <input type="hidden" asp-for="StationTypeNo" value="@Model.StationTypeNo" />
+                                                <input type="submit" id="GetWipData" asp-action="QRS021_2025_GetWip" style="display:none;" />
+                                            </div>
+                                            <label class="layui-form-label">作業站：</label>
+                                            <div class="layui-input-inline" style="width:100px">
+                                                <select id="stations" lay-filter="stations" lay-verify="required" asp-for="Station" asp-items="@ViewBag.GetRuleStationByFlowRuleIDList" lay-submit>
+                                                </select>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="layui-col-md12">
+                                    <div class="layui-form-item">
+                                        <div class="layui-inline" style="height:25px;">
+                                            <label class="layui-form-label">料號：</label>
+                                            <label class="layui-form-label" style="text-align: left; width: 150px;">@Model.ItemNO</label>
+                                        </div>
+                                    </div>
+                                    <div class="layui-form-item">
+                                        <div class="layui-inline" style="height:25px;">
+                                            <label class="layui-form-label">開始時間：</label>
+                                            <label class="layui-form-label" id="startTime" name="startTime" style="text-align: left; width: 200px;color:red"></label>
+                                            <input type="hidden" id="hiddenStartTime" name="startTime" />
+                                        </div>
+                                    </div>
+                                    <div class="layui-form-item">
+                                        <div class="layui-inline" style="height:25px;">
+                                            <label class="layui-form-label" style="width:100px;text-align:left; padding: 9px 10px">已刷數/工單數：</label>
+                                            <label class="layui-form-label" style="width:150px;text-align:left"><span id="InputQty">@Model.InputQTY</span>/@Model.PlanQTY</label>
+                                        </div>
+                                    </div>
+                                    <fieldset class="layui-elem-field layui-field-title">
+                                        <legend style="color: #e18917">刷讀條碼</legend>
+                                    </fieldset>
+                                    <div class="layui-form-item" style="background-color: #acdbe36b">
+                                        <div class="layui-inline">
+                                            <label class="layui-form-label">刷讀條碼：</label>
+                                            <div class="layui-input-inline">
+                                                <input type="text" onkeypress="if( event.keyCode == 13 ) {  $(':input:visible:enabled:eq(' + ($(':input:visible:enabled').index(this) + 1) + ')').focus();
+                event.preventDefault(); return false; }" asp-for="InputNo" id="inputNo" style="width:100px" class="layui-input" autocomplete="off" placeholder="可輸入異常位置" />
+                                            </div>
+                                            <div class="layui-input-inline">
+                                                <input type="text" onkeydown="input(event);" id="inputtxt" asp-for="Input" class="layui-input barcodeInput" autocomplete="off" />
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                                <fieldset class="layui-elem-field layui-field-title">
+                                    <legend style="color: #e18917">刷入資料</legend>
+                                    <table id="tblCustomers" class="layui-table" cellpadding="0" cellspacing="0">
+                                        <tbody id="tblCustomersBody">
+                                        </tbody>
+                                    </table>
+                                </fieldset>
+                                <fieldset class="layui-elem-field layui-field-title">
+                                    <legend style="color: #e18917">檢查項目</legend>
+                                    <table id="MydataTable" class="layui-table">
+                                        @{
+                                            int i = 0;
+                                        }
+                                        <thead>
+                                            <tr>
+                                                <th>
+                                                    工項順序
+                                                </th>
+                                                <th>
+                                                    工項名稱
+                                                </th>
+                                                <th>
+                                                    工項描述
+                                                </th>
+                                            </tr>
+                                        </thead>
+                                        <tbody>
+                                            @foreach (var index in Model.MaterialStationsItems)
+                                            {
+                                                <tr>
+                                                    <td>
+                                                        @index.StationsItemSeq
+                                                    </td>
+                                                    <td>
+                                                        @index.StationsItemNo
+                                                    </td>
+                                                    <td>
+                                                        <input asp-for="@index.StationsItemDesc" name="MaterialStationsItems[@i].StationsItemDesc" readonly="readonly" />
+                                                    </td>
+                                                </tr>
+                                                i++;
+                                            }
+                                        </tbody>
+
+                                    </table>
+                                </fieldset>
+                                <fieldset id="KpItemDiv" class="layui-elem-field layui-field-title">
+                                    <legend style="color: #e18917">指定KeyPart</legend>
+                                    <input type="text" class="layui-input" asp-for="KpItemName" />
+                                </fieldset>
+                                <fieldset id="Memo" class="layui-elem-field layui-field-title">
+                                    <legend style="color: #e18917">工程備註</legend>
+                                    <div class="layui-form-item">
+                                        <label class="layui-form-label" style="width:auto; text-align: left; color: blue;">@Model.SystemMemo</label>
+                                    </div>
+                                </fieldset>
+                                <fieldset class="layui-elem-field layui-field-title">
+                                    <legend style="color: #e18917">KeyParts</legend>
+                                </fieldset>
+                                <div class="layui-col-md12">
+                                    <div class="layui-form-item">
+                                        <table id="MydataTable" class="layui-table">
+                                            @{
+                                                int j = 0;
+                                            }
+                                            <thead>
+                                                <tr>
+                                                    <th>
+                                                        KP料號名稱
+                                                    </th>
+                                                    <th>
+                                                        KP料號NO
+                                                    </th>
+                                                    <th>
+                                                        順序
+                                                    </th>
+                                                    <th>
+                                                        前置碼
+                                                    </th>
+                                                    <th>
+                                                        長度
+                                                    </th>
+                                                    <th>
+                                                        生產單位
+                                                    </th>
+                                                </tr>
+                                            </thead>
+                                            <tbody>
+                                                @foreach (var index in Model.WipKps)
+                                                {
+                                                    <tr>
+                                                        <td>
+                                                            <input type="text" class="layui-input" asp-for="@index.KpName" name="WipKps[@j].KpName" style="width:100px" readonly="readonly" />
+                                                            <input type="hidden" name="WipKps[@j].KpNoName" value="@index.KpNoName" />
+                                                        </td>
+                                                        <td>
+                                                            <input type="text" class="layui-input" asp-for="@index.KpNoName" name="WipKps[@j].KpNoName" style="width:100px" readonly="readonly" />
+                                                            <input type="hidden" asp-for="@index.KpNo" value="@index.KpNo" name="WipKps[@j].KpNo" />
+                                                        </td>
+                                                        <td>
+                                                            <input type="text" class="layui-input" asp-for="@index.KpSeq" name="WipKps[@j].KpSeq" style="width:40px" readonly="readonly" />
+                                                        </td>
+                                                        <td>
+                                                            <input type="text" class="layui-input" asp-for="@index.Title" name="WipKps[@j].Title" style="width:40px" readonly="readonly" />
+                                                        </td>
+                                                        <td>
+                                                            <input asp-for="@index.Length" class="layui-input" name="WipKps[@j].Length" style="width:40px" readonly="readonly" />
+                                                        </td>
+                                                        <td>
+                                                            @index.UnitNoName
+                                                        </td>
+                                                    </tr>
+                                                    j++;
+                                                }
+                                            </tbody>
+                                        </table>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="layui-tab-item">
+                                <table id="MydataTable" class="layui-table">
+                                    @{
+                                        int k = 0;
+                                    }
+                                    <thead>
+                                        <tr>
+                                            <th>
+                                                治具種類
+                                            </th>
+                                            <th>
+                                                生產單位
+                                            </th>
+                                            <th>
+                                                作業站
+                                            </th>
+                                            <th>
+                                                刷入治具條碼
+                                            </th>
+                                        </tr>
+                                    </thead>
+                                    <tbody>
+                                        @foreach (var index in Model.wipOutfits)
+                                        {
+                                            <tr>
+                                                <td>
+                                                    <input type="text" class="layui-input" asp-for="@index.PartNoName" name="wipOutfits[@k].PartNoName" readonly="readonly" />
+                                                    <input type="hidden" asp-for="@index.PartNo" value="@index.PartNo" name="wipOutfits[@k].PartNo" />
+                                                </td>
+                                                <td>
+                                                    <input type="text" class="layui-input" asp-for="@index.UnitNoName" name="wipOutfits[@k].UnitNoName" readonly="readonly" />
+                                                </td>
+                                                <td>
+                                                    <input type="text" class="layui-input" asp-for="@index.StationName" name="wipOutfits[@k].StationName" readonly="readonly" />
+                                                </td>
+                                                <td>
+                                                    <input onkeypress="if( event.keyCode == 13 ) { checkOutfit(this); return false; }" onchange="checkOutfit(this);" asp-for="@index.Inputs" name="wipOutfits[@k].Inputs" class="layui-input" />
+                                                </td>
+                                            </tr>
+                                            k++;
+                                        }
+                                    </tbody>
+                                </table>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="layui-col-md7 element" style="height:100%">
+                    @if (Model.Sops.Count != 0)
+                    {
+                        bool sopfirst = true;
+                        <div class="layui-tab layui-tab-brief">
+                            <ul class="layui-tab-title ">
+                                @foreach (var index in Model.Sops)
+                                {
+                                    if (sopfirst)
+                                    {
+                                        <li class="layui-this">@index.SopName</li>
+                                        sopfirst = false;
+                                    }
+                                    else
+                                    {
+                                        <li>@index.SopName</li>
+                                    }
+                                }
+                            </ul>
+
+                            <div class="layui-tab-content">
+                                @foreach (var index in Model.Sops)
+                                {
+                                    if (!sopfirst)
+                                    {
+                                        <div class="layui-tab-item layui-show" style="height:90vh">
+                                            <iframe frameborder="0" style="width:100%;height:100%;" src='@index.SopPath'></iframe>
+                                        </div>
+                                        sopfirst = true;
+                                    }
+                                    else
+                                    {
+                                        <div class="layui-tab-item" style="height:90vh">
+                                            <iframe frameborder="0" style="width:100%;height:100%;" src='@index.SopPath'></iframe>
+                                        </div>
+                                    }
+                                }
+                            </div>
+                        </div>
+                    }
+                </div>
+            </div>
+        </div>
+    </form>
+</div>
+
+@section Scripts {
+    @{
+        await Html.RenderPartialAsync("_ValidationScriptsPartial");
+        await Html.RenderPartialAsync("_FileinputScriptsPartial");
+    }
+    <script type="text/javascript" src="~/js/grids.min.js"></script>
+    <script type="text/javascript">
+        // Jquery 將兩邊DIV設定同高度
+        jQuery(function ($) {
+            $('.element').responsiveEqualHeightGrid();
+        });
+
+        $(document).ready(function () {
+            var error = '@Html.ValidationMessage("error")';
+            if ($(error).text() != '') {
+                ShowInputError(error);
+            }
+
+            if ($("#StationTypeNo").val() == "U" || $("#StationTypeNo").val() == "A") {
+                $("#inputNo").show();
+            }
+            else {
+                $("#inputNo").hide();
+            }
+
+
+        @if (!string.IsNullOrWhiteSpace(Model.SystemMemo))
+        {
+            <text>$("#Memo").show(); </text>
+        }
+        else
+        {
+            <text>$("#Memo").hide(); </text>
+        }
+                                        });
+
+        function getUnitLineList(data) {
+            $.ajax(
+                {
+                    url: "@Url.Action("GetUnitLineJson", "BAS")",
+                    dataType: 'json',
+                    data: { "unit_no": $("#unit").val() },
+                    type: 'post',
+                    success: function (result) {
+                        $("#line").empty();//清空下拉框的值
+                        $.each(result.data, function (index, item) {
+                            $("#line").append($("<option>").text(item.text).val(item.value))
+                        });
+                        $("#line").val(@Model.LineID);
+                        layui.form.render("select");//重新渲染 固定写法
+                    },
+                    error: function (result) {
+                        alert(result);
+                    }
+                });
+        };
+
+        function SearchNo(e) {
+            if (e.keyCode == 13) {
+                $("#GetWipData").click();
+                $("#KpItemName").val('');
+            }
+        };
+
+        function input(e) {
+            if (e.keyCode == 13) {
+
+                // 先判斷過站刷入時間
+                if (!checkInputStart()) {
+                    event.preventDefault();
+                    return false;
+                }
+
+                var Inputs = GetAllEmpData();
+                var data = $("#QRS021_2025_Form").serialize();
+                var InputsTotal = Inputs.length;
+                for (i = 0; i < InputsTotal; i++) {
+                    data += "&Inputs[" + i + "].Input=" + Inputs[i].Input;
+                    data += "&Inputs[" + i + "].InputNo=" + Inputs[i].InputNo;
+                }
+
+
+                $.ajax({
+                    url: "@Url.Action("QRS021_2025_Input", "QRS")",
+                    type: "POST",
+                    data: data,
+                    success: function (result) {
+                        $("#inputtxt").val('');
+                        $("#inputNo").val('');
+                        // 錯誤訊息
+                        if (!result.success) {
+                            ShowInputError(result.msg);
+                        }
+                        else {
+                            if (result.msg.length != 0) { ShowInputOK(result.msg); }
+
+                            // 指定KP 順序
+                            if (result.data1.length != 0) {
+                                var value = $("#KpItemName").val();
+                                if (value != '')
+                                    $("#KpItemName").val(value + "," + result.data1);
+                                else
+                                    $("#KpItemName").val(result.data1);
+                            }
+                            // 回傳有值
+                            else if (result.data.length != 0) {
+                                // 新增資料
+                                TableAddRow(result.data);
+                            }
+                            else {
+                                $("#startTime").text('');
+                                $("#hiddenStartTime").val('');
+                                $("#tblCustomersBody").empty();
+                                InputQty();
+                            }
+                        }
+                    }
+                });
+                event.preventDefault();
+                return false;
+            }
+        };
+
+        layui.use(['form', 'layer'], function () {
+            form = layui.form;
+
+            form.on('select(unit)', function (data) {
+                getUnitLineList(data.value);
+                $("#stations").empty();//清空下拉框的值
+                $("#KpItemName").val('');
+            });
+
+            form.on('select(line)', function (data) {
+                $("#stations").empty();//清空下拉框的值
+                $("#KpItemName").val('');
+                layui.form.render("select");//重新渲染 固定写法
+            });
+
+            form.on('select(stations)', function (data) {
+                $("#KpItemName").val('');
+                $("#GetWipData").click();
+
+            });
+        });
+
+        function InputQty() {
+            $.ajax({
+                url: "@Url.Action("getBarcodeStationByInputQty", "QRS")",
+                type: "POST",
+                data: { "wipNo": $("#WipNO").val(), "unitNo": $("#unit").val(), "ststionID": $("#stations").val() },
+                success: function (result) {
+                    $("#InputQty").text(result.data);
+                }
+            });
+        };
+
+        // 新增trRow
+        function TableAddRow(e) {
+            console.log(e);
+            var strAry = e.split('＠');
+            var InputNo = strAry[1];
+            if (InputNo == undefined)
+                InputNo = '';
+
+            var contactdiv = '<tr class="data-contact-person">' +
+                '<td style="width:10%;"><input style="width:80px" readonly="readonly" onkeypress="if( event.keyCode == 13 ) { return false; }" type="text" name="f-name" class="form-control td-InputNo" value=' + InputNo + '/></td>' +
+                `<td style="width:90%;"><input readonly="readonly" style="width:100%;" onkeypress="if( event.keyCode == 13 ) { return false; }" type="text" name="f-name" class="td-Input" value="${strAry[0]}"/></td>` +
+                '<td><a class="layui-btn layui-btn-danger layui-btn-xs layui-icon layui-icon-delete" onclick="Remove(this);">刪除</a></td>' +
+                '</tr>';
+            $('#tblCustomers').append(contactdiv);
+            AutoWindowSize();
+        };
+
+        // Table 刪除
+        function Remove(button) {
+            var row = $(button).closest("TR");
+            var table = $("#tblCustomers")[0];
+            table.deleteRow(row[0].rowIndex);
+        };
+
+        // 紀錄表格欄位
+        function GetAllEmpData() {
+            var data = [];
+            $('tr.data-contact-person').each(function () {
+                var Input = $(this).find('.td-Input').val();
+                var InputNo = $(this).find('.td-InputNo').val();
+                data.push({ Input: Input, InputNo: InputNo });
+            });
+            return data;
+        }
+
+        function AutoWindowSize() {
+            $(window).on('resize', function () {
+            }).resize();
+        }
+
+        // 顯示過站(OK)訊息
+        function ShowInputOK(Msg) {
+            Swal.fire({
+                icon: 'success',
+                title: Msg,
+                showConfirmButton: false,
+                timer: 2000
+            })
+        }
+
+        // 顯示過站(NG)訊息
+        function ShowInputError(Msg) {
+            Swal.fire({
+                color: '#716add',
+                icon: 'warning',
+                title: "<h3 style='color:#FFFFFF'>" + Msg + "</h3>",
+                background: '#db4444',
+            })
+        }
+
+        // 確認治具
+        function checkOutfit(val) {
+            console.log(val.value);
+            var partNo = $(val).closest('tr').find('input:hidden[id*=PartNo]').val();
+            if (val.value.length != 0) {
+                $.ajax(
+                    {
+                        url: "@Url.Action("CheckOutfitInfoPartNo", "PCS")",
+                        dataType: 'json',
+                        data: { "outfitNo": val.value, "partNo": partNo },
+                        type: 'post',
+                        success: function (result) {
+                            if (result.data.length != 0) {
+                                ShowInputError(result.data);
+                            }
+                        },
+                        error: function (result) {
+                            alert(result);
+                        }
+                    });
+            }
+        }
+
+        // 確認有刷入時間
+        function checkInputStart(event) {
+            const inputElement = document.querySelector("#inputtxt");
+            const inputVal = inputElement ? inputElement.value.trim().toUpperCase() : "";
+            const startTime = document.querySelector("#startTime");
+            if (inputVal === "START") {
+                $.ajax({
+                    url: "@Url.Action("UpdateStartTime", "PCS")",
+                    dataType: 'json',
+                    type: 'get',
+                    success: function (result) {
+                        $("#startTime").text(result.data);
+                        $("#hiddenStartTime").val(result.data);
+                        $("#inputtxt").val('');
+                    },
+                    error: function (result) {
+                        ShowInputError(result);
+                    }
+                });
+                return false;
+            }
+            else if (!startTime || startTime.textContent.trim() === "") {
+                $("#inputtxt").val('');
+                ShowInputError('請先刷入START 開始刷入時間');
+                return false;
+            }
+
+            return true;
+        }
+
+    </script>
+}

AMESCoreStudio.WebApi/DTO/BLL/BarCodeCheckDto.cs

@@ -104,7 +104,6 @@ namespace AMESCoreStudio.WebApi.DTO.AMES
         [DataMember]
         public int userID { get; set; } = 0;
 
-
         /// <summary>
         /// 紀錄組件或不良代碼
         /// </summary>
@@ -156,6 +155,12 @@ namespace AMESCoreStudio.WebApi.DTO.AMES
             /// </summary>
             public string PartNo { get; set; } = string.Empty;
         }
+
+        [DataMember]
+        /// <summary>
+        /// 刷入時間
+        /// </summary>
+        public string startTime { get; set; }
     }
 
     public class BarCodeCheckDtoForDBData : BarCodeCheckDto
@@ -207,5 +212,10 @@ namespace AMESCoreStudio.WebApi.DTO.AMES
         /// </summary>
         [DataMember]
         public string factoryUnit_UnitCode { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 刷入時間
+        /// </summary>
+        public DateTime? start_Time { get; set; }
     }
 }

AMESCoreStudio.WebApi/Models/AMES/BarcodeStation.cs

@@ -123,6 +123,14 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         [Display(Name = "建立時間")]
         public DateTime CreateDate { get; set; } = DateTime.Now;
 
+        /// <summary>
+        /// 過站刷入時間
+        /// </summary>
+        [Column("START_DATE")]
+        [DataMember]
+        [Display(Name = "過站刷入時間")]
+        public DateTime? StartDate { get; set; }
+
         /// <summary>
         /// 工單-基本資料
         /// </summary>