整併安勤內部有修改的程式

AMESCoreStudio.Web/Controllers/BASController.cs

@@ -10,6 +10,9 @@ using AMESCoreStudio.WebApi.Models.BAS;
 using AMESCoreStudio.WebApi.Models.AMES;
 using AMESCoreStudio.CommonTools.Result;
 using System.Linq;
+using Castle.Core.Resource;
+using System;
+using System.Linq.Expressions;
 
 namespace AMESCoreStudio.Web.Controllers
 {
@@ -97,7 +100,7 @@ namespace AMESCoreStudio.Web.Controllers
             var StationTypeItems = new List<SelectListItem>();
             for (int i = 0; i < result.Count; i++)
             {
-                StationTypeItems.Add(new SelectListItem(result[i].TypeNo +"-" + result[i].TypeDesc, result[i].TypeNo.ToString()));
+                StationTypeItems.Add(new SelectListItem(result[i].TypeNo + "-" + result[i].TypeDesc, result[i].TypeNo.ToString()));
             }
             ViewBag.StationTypeList = StationTypeItems;
         }
@@ -110,7 +113,7 @@ namespace AMESCoreStudio.Web.Controllers
 
             for (int i = 0; i < result.Count; i++)
             {
-                MailGroupItems.Add(new SelectListItem( result[i].GroupDesc, result[i].GroupID.ToString()));
+                MailGroupItems.Add(new SelectListItem(result[i].GroupDesc, result[i].GroupID.ToString()));
             }
             ViewBag.MailGroupList = MailGroupItems;
         }
@@ -540,7 +543,7 @@ namespace AMESCoreStudio.Web.Controllers
         {
 
             model.UpdateDate = System.DateTime.Now;
-            if(model.StatusNo == "S")
+            if (model.StatusNo == "S")
                 model.StatusNo = "A";
             else if (model.StatusNo == "A")
                 model.StatusNo = "S";
@@ -916,7 +919,7 @@ namespace AMESCoreStudio.Web.Controllers
         public async Task<IActionResult> GetStationTypesAsync(int page = 0, int limit = 10)
         {
             var result_total = await _basApi.GetStationTypes(0, limit);
-            var result = await _basApi.GetStationTypes(page,limit);
+            var result = await _basApi.GetStationTypes(page, limit);
 
             if (result.Count > 0)
             {
@@ -978,7 +981,7 @@ namespace AMESCoreStudio.Web.Controllers
             if (ModelState.IsValid)
             {
                 IResultModel result;
-                if (model.StationID==0)
+                if (model.StationID == 0)
                 {
                     result = await _basApi.PostStations(JsonConvert.SerializeObject(model));
                 }
@@ -1205,7 +1208,7 @@ namespace AMESCoreStudio.Web.Controllers
             }
             else
             {
-                if (result.Errors!=null)
+                if (result.Errors != null)
                 {
                     ModelState.AddModelError(result.Errors[0].Id, result.Errors[0].Msg);
                 }
@@ -1392,7 +1395,7 @@ namespace AMESCoreStudio.Web.Controllers
 
         [ResponseCache(Duration = 0)]
         [HttpGet]
-        public async Task<IActionResult> GetRuleStationsByFlowAsync(string unitNo,int flowId, int page = 0, int limit = 10)
+        public async Task<IActionResult> GetRuleStationsByFlowAsync(string unitNo, int flowId, int page = 0, int limit = 10)
         {
             var flow_id = "";
             HttpContext.Request.Cookies.TryGetValue("FlowID4BAS010", out flow_id);
@@ -1564,7 +1567,7 @@ namespace AMESCoreStudio.Web.Controllers
                 if (result.Success)
                 {
                     HttpContext.Response.Cookies.Append("FlowID4BAS011", model.FlowRuleID.ToString());
-                    var _msg="";
+                    var _msg = "";
                     if (result.Msg != "")
                     {
                         _msg = result.Msg;
@@ -2008,7 +2011,7 @@ namespace AMESCoreStudio.Web.Controllers
             await GetUnitList();
             await GetFlowRuleList();
             var aStr = id.Split("=");
-            var iID= int.Parse(aStr[0]);
+            var iID = int.Parse(aStr[0]);
             ViewBag.item = aStr[1];
 
             var result = await _basApi.GetMaterialFlow(iID);
@@ -2097,11 +2100,11 @@ namespace AMESCoreStudio.Web.Controllers
 
         public async Task<IActionResult> GetMaterialFlowsByQueryAsync(string itemno, string unitNo, int page = 0, int limit = 10)
         {
-            if(string.IsNullOrEmpty(itemno)  && string.IsNullOrEmpty(unitNo))
+            if (string.IsNullOrEmpty(itemno) && string.IsNullOrEmpty(unitNo))
                 return Json(new Table() { count = 0, data = null });
             if (string.IsNullOrEmpty(itemno))
                 itemno = "*";
-            if (string.IsNullOrEmpty(unitNo) )
+            if (string.IsNullOrEmpty(unitNo))
                 unitNo = "*";
 
             var result = await _basApi.GetMaterialFlowsByQuery(itemno, unitNo, page, limit);
@@ -2188,7 +2191,7 @@ namespace AMESCoreStudio.Web.Controllers
 
                 if (result.Success)
                 {
-                    var _msg = "添加成功！" ;
+                    var _msg = "添加成功！";
                     return RedirectToAction("Refresh", "Home", new { msg = _msg });
                 }
                 else
@@ -2659,7 +2662,7 @@ namespace AMESCoreStudio.Web.Controllers
                 }
                 if (model.Rule.Contains("[LOT3]"))
                 {
-                    model.LotLen=3;
+                    model.LotLen = 3;
                 }
                 if (model.Rule.Contains("[LOT4]"))
                 {
@@ -2770,7 +2773,7 @@ namespace AMESCoreStudio.Web.Controllers
         [HttpGet]
         public async Task<IActionResult> GetSerialRulesAsync(int page = 0, int limit = 10)
         {
-            var result = await _basApi.GetSerialRules(page,limit);
+            var result = await _basApi.GetSerialRules(page, limit);
 
             var result_total = await _basApi.GetSerialRules(0, limit);
 
@@ -2812,5 +2815,169 @@ namespace AMESCoreStudio.Web.Controllers
 
         #endregion
 
+        #region BAS020 客戶資料維護
+
+        /// <summary>
+        /// 顯示頁面
+        /// </summary>
+        /// <returns></returns>
+        public IActionResult BAS020()
+        {
+            GetUserID();
+            return View();
+        }
+
+        /// <summary>
+        /// 新增頁面
+        /// </summary>
+        /// <returns></returns>
+        public IActionResult BAS020C()
+        {
+            GetUserID();
+            return View();
+        }
+
+        /// <summary>
+        /// 新增頁面提交
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public async Task<IActionResult> BAS020CSaveAsync(PnQcCustomerRecord model)
+        {
+            var check = await _basApi.GetPnQcCustomerRecordsByMaterialNo(model.MaterialNo);
+            if (check.Count > 0)
+            {
+                return Json(new Result() { success = false, msg = "料號已存在！" });
+            }
+
+
+            var result = await _basApi.PostPnQcCustomerRecords(JsonConvert.SerializeObject(model));
+            if (result.Success)
+            {
+                return Json(new Result() { success = true, msg = "新增成功!" });
+
+            }
+            else
+            {
+                if (result.Errors.Count > 0)
+                {
+                    ModelState.AddModelError(result.Errors[0].Id, result.Errors[0].Msg);
+                }
+                else
+                {
+                    ModelState.AddModelError("error", result.Msg);
+                }
+            }
+
+            return View("BAS020C", model);
+        }
+
+        /// <summary>
+        /// 刪除頁面查詢
+        /// </summary>
+        /// <param name="materialNo"></param>
+        /// <returns></returns>
+        public async Task<IActionResult> BAS020DAsync(string materialNo)
+        {
+            var result = await _basApi.DeletePnQcCustomerRecords(materialNo);
+            if (result.Success)
+            {
+                return Json(new Result() { success = true, msg = "刪除成功!" });
+
+            }
+            else
+            {
+                if (result.Errors.Count > 0)
+                {
+                    ModelState.AddModelError(result.Errors[0].Id, result.Errors[0].Msg);
+                }
+                else
+                {
+                    ModelState.AddModelError("刪除失敗", result.Msg);
+                }
+            }
+            return View();
+        }
+
+        /// <summary>
+        /// 修改頁面查詢
+        /// </summary>
+        /// <param name="materialNo"></param>
+        /// <returns></returns>
+        [HttpGet("/BAS/BAS020U/{materialNo}")]
+        public async Task<IActionResult> BAS020UAsync(string materialNo)
+        {
+            GetUserID();
+            try
+            {
+                var result = await _basApi.GetPnQcCustomerRecordsByMaterialNo(materialNo);
+                if (result.Count == 0)
+                {
+                    return View();
+                }
+                return View(result.FirstOrDefault());
+            }
+            catch (Exception ex)
+            {
+                return View("修改錯誤訊息:" + ex.Message);
+            }
+        }
+
+        /// <summary>
+        /// 修改頁面提交
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public async Task<IActionResult> BAS020USaveAsync(PnQcCustomerRecord model)
+        {
+            try
+            {
+                var result = await _basApi.PutPnQcCustomerRecords(model.MaterialNo, JsonConvert.SerializeObject(model));
+                if (result.Success)
+                {
+                    return Json(new Result() { success = true });
+                }
+                else
+                {
+                    if (result.Errors.Count > 0)
+                    {
+                        return Json(new Result() { success = false });
+                    }
+                }
+
+                return View();
+
+            }
+            catch (Exception ex)
+            {
+                return View("修改錯誤訊息:" + ex.Message);
+            }
+
+        }
+
+        public async Task<IActionResult> GetPnQcCustomerRecordsByCriteria(string materialNo, string customerName, string customerID, int page = 1, int limit = 10)
+        {
+            try
+            {
+                var result = await _basApi.GetPnQcCustomerRecordsByCriteria(materialNo, customerName, customerID, page, limit);
+
+                if (result != null && result.Count > 0)
+                {
+                    var paginatedData = result.Skip((page - 1) * limit).Take(limit);
+                    return Ok(new { code = 0, msg = "", data = paginatedData, count = result.Count });
+                }
+
+                return Ok(new { code = 0, msg = "No data found", data = new List<PnQcCustomerRecord>(), count = 0 });
+            }
+            catch (Exception ex)
+            {
+                throw;
+            }
+
+
+        }
+        #endregion
     }
 }

AMESCoreStudio.Web/Controllers/FQCController.cs

@@ -2410,18 +2410,26 @@ namespace AMESCoreStudio.Web.Controllers
         #endregion
 
         #region FQC013 檢驗項目群組名稱維護
+
         public IActionResult FQC013()
         {
             return View();
         }
 
-        //新增頁面
+        /// <summary>
+        /// 新增頁面
+        /// </summary>
+        /// <returns></returns>
         public IActionResult FQC013C()
         {
             return View();
         }
 
-        //修改页面
+        /// <summary>
+        /// 修改頁面
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
         [HttpGet]
         public async Task<IActionResult> FQC013U(int id)
         {
@@ -2522,6 +2530,8 @@ namespace AMESCoreStudio.Web.Controllers
             return Json(new Table() { count = 0, data = null });
         }
 
+        #endregion
+
         #region FQC013A FQC群組綁設定檢驗工項維護
 
         public async Task<IActionResult> FQC013A(int fqcItemGroupId = 0)
@@ -2701,7 +2711,7 @@ namespace AMESCoreStudio.Web.Controllers
         }
 
         //  [HttpGet]
-        public async Task<IActionResult> GetNGINFOAlertMasterByQuery(string caseID,string itemNoF,string modelName,string wipNoF,string errorCode,string statusNo, string dateStart, string dateEnd, int page, int limit)
+        public async Task<IActionResult> GetNGINFOAlertMasterByQuery(string caseID, string itemNoF, string modelName, string wipNoF, string errorCode, string statusNo, string dateStart, string dateEnd, int page, int limit)
         {
             var result = await _fqcApi.GetNGINFOAlertMasterByQuery(caseID, itemNoF, modelName, wipNoF, errorCode, statusNo, dateStart, dateEnd, page, limit);
 
@@ -2802,7 +2812,7 @@ namespace AMESCoreStudio.Web.Controllers
                 }
 
                 // 檢查檔案副檔名
-                var allowedExtensions = new[] { ".png", ".jpg", ".bmp", ".gif", ".xlsx",".xls",".docx",".pdf",".pptx",".txt",".eml",".etc", ".msg" };
+                var allowedExtensions = new[] { ".png", ".jpg", ".bmp", ".gif", ".xlsx", ".xls", ".docx", ".pdf", ".pptx", ".txt", ".eml", ".etc", ".msg" };
                 var fileExtension = Path.GetExtension(formFile.FileName).ToLower();
 
                 if (!allowedExtensions.Contains(fileExtension))
@@ -2820,12 +2830,12 @@ namespace AMESCoreStudio.Web.Controllers
 
                     //指定要寫入的路徑、檔名和副檔名
 
-                    FilePath = $"D:\\JinHon\\AMES_Upload\\FactoryMergerDocuments\\" +model.CaseID +"\\";//本機目錄
+                    FilePath = $"D:\\JinHon\\AMES_Upload\\FactoryMergerDocuments\\" + model.CaseID + "\\";//本機目錄
-                    if (!System.IO.Directory.Exists( FilePath))
+                    if (!System.IO.Directory.Exists(FilePath))
                     {
-                        System.IO.Directory.CreateDirectory( FilePath);
+                        System.IO.Directory.CreateDirectory(FilePath);
                     }
-                    using (var stream = new FileStream( FilePath + formFile.FileName, FileMode.Create))
+                    using (var stream = new FileStream(FilePath + formFile.FileName, FileMode.Create))
                     {
                         await formFile.CopyToAsync(stream);
                     }
@@ -2859,14 +2869,14 @@ namespace AMESCoreStudio.Web.Controllers
             return View("FQC014R");
         }
 
-        public async Task<IActionResult> FQC014RAsync(string id )
+        public async Task<IActionResult> FQC014RAsync(string id)
         {
 
             ViewBag.CaseID = id;
 
             return View();
         }
-        public async Task<IActionResult> GetNgInfoAlertBlobsAsync(string id )
+        public async Task<IActionResult> GetNgInfoAlertBlobsAsync(string id)
         {
             if (id == null)
                 return Json(new Table() { count = 0, data = null });
@@ -2964,8 +2974,7 @@ namespace AMESCoreStudio.Web.Controllers
 
         #endregion
 
-        #endregion
+        #region 登入UserID
-
         /// <summary>
         /// 登入UserID
         /// </summary>
@@ -2984,6 +2993,10 @@ namespace AMESCoreStudio.Web.Controllers
             }
             return user_id;
         }
+
+        #endregion
+
+        #region 使用角色ID查詢人員清單
         /// <summary>
         /// 使用角色ID查詢人員清單
         /// </summary>
@@ -3010,5 +3023,6 @@ namespace AMESCoreStudio.Web.Controllers
 
             ViewBag.UserList = UserItems;
         }
+        #endregion
     }
 }

AMESCoreStudio.Web/Controllers/HomeController.cs

@@ -2,14 +2,10 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 using System;
-using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 using System.Threading.Tasks;
-using AMESCoreStudio.WebApi;
-using Microsoft.AspNetCore.Authorization;
 using Microsoft.Extensions.Localization;
-using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using Microsoft.Extensions.Configuration;
 

AMESCoreStudio.Web/Controllers/JIGController.cs

@@ -135,6 +135,7 @@ namespace AMESCoreStudio.Web.Controllers
             }
             ViewBag.DeptList = DeptItems;
         }
+
         private async Task GetUserInfo()
         {
             var result = await _sysApi.GetUserInfoes();
@@ -146,18 +147,10 @@ namespace AMESCoreStudio.Web.Controllers
             }
             ViewBag.UserList = UserItems;
         }
-        //private async Task GetFactoryUnitsList()
+
-        //{
+        /// <summary>
-        //    var result = await _basApi.GetFactoryUnits();
+        /// 主要作用是從 HTTP 請求的 Cookie 中獲取用戶 ID，並將其存儲在 ViewBag 中，以便在視圖中使用。這樣可以在視圖中方便地訪問當前用戶的 ID。
-
+        /// </summary>
-        //    var UnitItems = new List<SelectListItem>();
-        //    UnitItems.Add(new SelectListItem("NA", "0"));
-        //    for (int i = 0; i < result.Count; i++)
-        //    {
-        //        UnitItems.Add(new SelectListItem(result[i].UnitName, result[i].UnitNo.ToString()));
-        //    }
-        //    ViewBag.FactoryUnit = UnitItems;
-        //}
         public void GetUserID()
         {
             var userID = "";

AMESCoreStudio.Web/Controllers/PTDController.cs

@@ -329,7 +329,7 @@ namespace AMESCoreStudio.Web.Controllers
         }
 
         [HttpPost]
-        public async Task<JsonResult> PTD002_CheckInputData(WebApi.Models.AMES.PTDCheckInputData model)
+        public async Task<JsonResult> PTD002_CheckInputData(PTDCheckInputData model)
         {
             var inputCheck = await CheckInputData(model);
             var msg = string.Empty;
@@ -998,7 +998,8 @@ namespace AMESCoreStudio.Web.Controllers
             }
         }
 
-        public async Task<JsonResult> PTD006_CheckInputData(WebApi.Models.AMES.PTDCheckInputData model)
+
+        public async Task<JsonResult> PTD006_CheckInputData(PTDCheckInputData model)
         {
             // 基本資料判定
             var inputCheck = await CheckInputData(model);

AMESCoreStudio.Web/Controllers/REPController.cs

@@ -1871,7 +1871,7 @@ namespace AMESCoreStudio.Web.Controllers
             }
             model.barcodeQngInfo.CreateUserID = user_id;
             model.barcodeQngInfo.CreateDate = System.DateTime.Now;
-            model.barcodeQngInfo.RuleStatus = "C";
+            model.barcodeQngInfo.RuleStatus = "P";
 
             result = await _repApi.PostBarcodeQngInfo(JsonConvert.SerializeObject(model.barcodeQngInfo));
 

AMESCoreStudio.Web/Controllers/SPCController.cs

@@ -1717,7 +1717,7 @@ namespace AMESCoreStudio.Web.Controllers
                     MedicalModel = IPQCQuery.CustomerMedical,
                     VIP = IPQCQuery.CustomerVIP,
                     BIOSVer = IPQCQuery.BIOS,
-                    Approved = "陳信志",
+                    Approved = "連枝雄",
                     Inspector = IPQCQuery.UpdateUser_Name,
                     ItemNoDesc = IPQCQuery.ItemNoDesc
 

AMESCoreStudio.Web/HttpApis/AMES/IBLL.cs

@@ -1,12 +1,6 @@
-using System.Collections.Generic;
+using WebApiClient;
-using WebApiClient;
 using WebApiClient.Attributes;
-using AMESCoreStudio.WebApi;
-using Microsoft.AspNetCore.Mvc;
-using AMESCoreStudio.WebApi.Models.AMES;
-using AMESCoreStudio.WebApi.Models.BAS;
 using AMESCoreStudio.CommonTools.Result;
-using AMESCoreStudio.WebApi.DTO.AMES;
 
 namespace AMESCoreStudio.Web
 {
@@ -30,15 +24,5 @@ namespace AMESCoreStudio.Web
         [WebApiClient.Attributes.HttpPost("api/Mail/ToMail")]
         ITask<ResultModel<dynamic>> PostToMail(string Subject, string Body, string ToMailGroup, string ToMail, bool ToCC = false, string Attachment = null);
         #endregion
-
-        //#region 新增 DB資料異動紀錄
-        ///// <summary>
-        ///// 新增 DB資料異動紀錄
-        ///// </summary>
-        ///// <param name="model">Mail主旨</param>
-        ///// <returns></returns>
-        //[WebApiClient.Attributes.HttpPost("api/TableChangeLog/Add")]
-        //ITask<ResultModel<TableChangeLog>> PostTableChangeLog([FromBody, RawJsonContent] string model);
-        //#endregion
     }
 }

AMESCoreStudio.Web/HttpApis/AMES/IFQC.cs

@@ -798,8 +798,6 @@ namespace AMESCoreStudio.Web
         #endregion
 
         #region FQC014 異常不良警示
-
-
         /// <summary>
         ///  查詢異常不良警示
         /// </summary>
@@ -870,8 +868,6 @@ namespace AMESCoreStudio.Web
         [WebApiClient.Attributes.HttpGet("api/NgInfoAlertBlobs/{id}")]
         ITask<List<NgInfoAlertBlob>> GetNgInfoAlertBlobs(string id);
 
-
-
         /// <summary>
         /// 刪除圖檔資料表
         /// </summary>
@@ -887,23 +883,20 @@ namespace AMESCoreStudio.Web
         ITask<ResultModel<dynamic>> GetNgRepairDataByBarcodeNO(string barcodeNo);
 
 
-        // <summary>
+        /// <summary>
         /// 查詢工單條碼資料-WipNo
         /// </summary>
         /// <returns></returns>
         [WebApiClient.Attributes.HttpGet("api/NgRepairs/GetNgRepairDataByBarcodeNO_ESUN")]
         ITask<ResultModel<dynamic>> GetNgRepairDataByBarcodeNO_ESUN(string barcodeNo);
 
-
         /// <summary>
         ///  查詢異常不良警示
         /// </summary>
         /// <returns></returns>
         [WebApiClient.Attributes.HttpGet("api/NgInfoAlertDetail/{id}")]
         ITask<List<NgInfoAlertDetail>> GetNgInfoAlertDetail(string id);
-      
-
-
         #endregion
+
     }
 }

AMESCoreStudio.Web/HttpApis/AMES/IPCS.cs

@@ -10,6 +10,7 @@ using AMESCoreStudio.CommonTools.Result;
 using AMESCoreStudio.WebApi.DTO.AMES;
 using AMESCoreStudio.WebApi.Models.QASRV;
 using AMESCoreStudio.WebApi.Models.SYS;
+using AMESCoreStudio.WebApi.Models.aValue_API;
 
 namespace AMESCoreStudio.Web
 {
@@ -18,10 +19,10 @@ namespace AMESCoreStudio.Web
     {
 
 
-        //////////////////////////////////////
+
         [WebApiClient.Attributes.HttpPost("api/BarCodeCheck/PassIngByCheck")]
         ITask<ResultModel<string>> PassIngByCheck([FromBody, RawJsonContent] string model);
-        //////////////////////////////////////
+
 
         #region 下拉選單
         /// <summary>
@@ -324,6 +325,11 @@ namespace AMESCoreStudio.Web
         #endregion
 
         #region WipBarcodeOthers 工單出貨條碼區間設定檔 PCS017
+        /// <summary>
+        /// 抓工單出貨序號區間(單筆)
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
         [WebApiClient.Attributes.HttpGet("api/WipBarcodeOther/WipNo/{id}")]
         ITask<WipBarcodeOther> GetWipBarcodeOther(string id);
 
@@ -342,6 +348,7 @@ namespace AMESCoreStudio.Web
         #endregion
 
         #region BarCodeInfo 條碼資料檔 PCS021
+
         [WebApiClient.Attributes.HttpGet("api/BarcodeInfoes/{id}")]
         ITask<List<BarcodeInfo>> GetBarcodeInfoes(int id);
 
@@ -1726,8 +1733,6 @@ namespace AMESCoreStudio.Web
 
         #region PCS031 昶亨 YIRU ADD  ----------------------------------------------------------------------------------------
 
-
-
         /// <summary>
         /// 用入庫單號與序號取完工入庫明细資料
         /// </summary>
@@ -1858,7 +1863,6 @@ namespace AMESCoreStudio.Web
         [WebApiClient.Attributes.HttpGet("http://192.168.4.109:5088/api/WipInfos/WipInfoByWipNo/{wipno}")]
         ITask<List<WipInfo>> GetWipInfoByWipNO_EVER(string wipno);
 
-
         [WebApiClient.Attributes.HttpPut("http://192.168.4.109:5088/api/BarcodeInfoes")]
         ITask<ResultModel<BarcodeInfo>> PutBarcodeInfoes_EVER([FromBody, RawJsonContent] string model);
 
@@ -1924,10 +1928,14 @@ namespace AMESCoreStudio.Web
         [WebApiClient.Attributes.HttpPut("api/SerialRuleDetails/{id}")]
         ITask<ResultModel<SerialRuleDetail>> PutSerialRuleDetail(int id, [FromBody, RawJsonContent] string model);
 
+        /// <summary>
+        /// 抓取安勤工單出貨序號區間(多筆)
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
         [WebApiClient.Attributes.HttpGet("api/WipBarcodeOther/WipNos/{id}")]
         ITask<List<WipBarcodeOther>> GetWipBarcodeOthers(string id);
 
-
         /// <summary>
         ///查詢工單出貨條碼區間 by OTHERID
         /// </summary>
@@ -1940,7 +1948,6 @@ namespace AMESCoreStudio.Web
 
         #endregion
 
-
         #region PCS041 生產注意事項
         /// <summary>
         /// Get by PK
@@ -2087,5 +2094,53 @@ namespace AMESCoreStudio.Web
         ITask<ResultModel<string>> PassIngByCheck_2025([FromBody, RawJsonContent] string model);
 
         #endregion
+
+        #region 序號異動通知昶亨
+
+        /// <summary>
+        /// 刪除昶亨TempTable
+        /// </summary>
+        /// <param name="id">料號ID</param>
+        [WebApiClient.Attributes.HttpDelete("api/ESUNAMESNotice/ESUNAMESTempTableByAvalueWipNo")]
+        ITask<bool> DeleteESUNAMESTempTableByAvalueWipNo([FromQuery] string wipNo);
+
+        /// <summary>
+        /// 寫進昶亨TempTable
+        /// </summary>
+        /// <param name="models"></param>
+        /// <returns></returns>
+        [WebApiClient.Attributes.HttpPost("api/ESUNAMESNotice/ESUNAMESTempTableByAvalue")]
+        ITask<ResultModel<WipBarcodeOther>> PostESUNAMESTempTableByAvalue([FromBody, RawJsonContent] string models, [FromQuery] string userName);
+
+        /// <summary>
+        /// 查看是否安勤有對應昶亨工單
+        /// </summary>
+        /// <param name="wipNo"></param>
+        /// <returns></returns>
+        [WebApiClient.Attributes.HttpGet("api/ESUNAMESNotice/AvalueCorrespondingESUNAMESWipInfo")]
+        ITask<bool> GetAvalueCorrespondingESUNAMESWipInfo(string wipNo);
+
+        /// <summary>
+        /// 判斷有昶亨有無設定出貨序號，有的話就抓取資料
+        /// </summary>
+        /// <param name="wipNo"></param>
+        /// <returns></returns>
+        [WebApiClient.Attributes.HttpGet("api/ESUNAMESNotice/CheckESUNAMESShipmentNo")]
+        ITask<List<ESUNAMESNotice>> GetCheckESUNAMESShipmentNo(string wipNo);
+
+        #endregion
+
+        #region PCS042 組件清單查詢
+
+        /// <summary>
+        /// 查詢組件清單資料
+        /// </summary>
+        /// <returns></returns>
+        /// Get: api/PnQcCustomerRecords/Query/GetPnQcCustomerRecordsByCriteria
+        [WebApiClient.Attributes.HttpGet("api/BarcodeItems/GetBarcodeItemsByBarcodeIDWipIDItemIDPartNo")]
+        ITask<List<BarcodeItemDTO>> GetBarcodeItemsByBarcodeIDWipIDItemIDPartNo([FromQuery] string barcodeNo, [FromQuery] string wipNo, [FromQuery] string itemNo, [FromQuery] string partNo);
+
+        #endregion
+
     }
 }

AMESCoreStudio.Web/HttpApis/IBAS.cs

@@ -765,6 +765,8 @@ namespace AMESCoreStudio.Web
 
         #endregion
 
+        #region 獲取工單屬性資料
+
         /// <summary>
         /// 獲取工單屬性資料
         /// </summary>
@@ -772,6 +774,8 @@ namespace AMESCoreStudio.Web
         [WebApiClient.Attributes.HttpGet("api/ProcessTypes")]
         ITask<List<AMESCoreStudio.WebApi.Models.AMES.ProcessType>> GetProcessType();
 
+        #endregion
+
         #region BAS017料號工作項目對應維護相關
 
         /// <summary>
@@ -914,6 +918,49 @@ namespace AMESCoreStudio.Web
 
 
 
+        #endregion
+
+        #region BAS020 客戶資料維護相關
+        /// <summary>
+        /// 查詢料號對應客戶資料檔 
+        /// </summary>
+        /// <returns></returns>
+        /// Get: api/PnQcCustomerRecords/Query/GetPnQcCustomerRecordsByCriteria
+        [WebApiClient.Attributes.HttpGet("api/PnQcCustomerRecords/Query")]
+        ITask<List<PnQcCustomerRecord>> GetPnQcCustomerRecordsByCriteria(string materialNo, string customerNo, string customerId, int page = 0, int limit = 10);
+
+        /// <summary>
+        /// 查詢料號對應客戶資料檔 By料號
+        /// </summary>
+        /// <returns></returns>
+        /// Get: api/PnQcCustomerRecords/GetPnQcCustomerRecordsByMaterialNo
+        [WebApiClient.Attributes.HttpGet("api/PnQcCustomerRecords")]
+        ITask<List<PnQcCustomerRecord>> GetPnQcCustomerRecordsByMaterialNo(string materialNo);
+
+        /// <summary>
+        /// 新增料號對應客戶資料檔
+        /// </summary>
+        /// <returns></returns>
+        /// Post: api/PnQcCustomerRecords
+        [WebApiClient.Attributes.HttpPost("api/PnQcCustomerRecords")]
+        ITask<ResultModel<PnQcCustomerRecord>> PostPnQcCustomerRecords([FromBody, RawJsonContent] string model);
+
+        /// <summary>
+        /// 刪除料號對應客戶資料檔 By料號
+        /// </summary>
+        /// <returns></returns>
+        /// Delete: api/PnQcCustomerRecords/{materialNo}
+        [WebApiClient.Attributes.HttpDelete("api/PnQcCustomerRecords/{materialNo}")]
+        ITask<ResultModel<string>> DeletePnQcCustomerRecords(string materialNo);
+
+        /// <summary>
+        /// 更新料號對應客戶資料檔 By料號
+        /// </summary>
+        /// <returns></returns>
+        /// Put: api/PnQcCustomerRecords/{materialNo}
+        [WebApiClient.Attributes.HttpPut("api/PnQcCustomerRecords/{materialNo}")]
+        ITask<ResultModel<PnQcCustomerRecord>> PutPnQcCustomerRecords(string materialNo, [FromBody, RawJsonContent] string model);
+
         #endregion
 
     }

AMESCoreStudio.Web/ViewModels/PCS/PCS009RViewModel.cs

@@ -172,6 +172,11 @@ namespace AMESCoreStudio.Web.ViewModels.PCS
     /// </summary>
     public class BarCodeLog
     {
+        /// <summary>
+        /// 工單號碼
+        /// </summary>
+        public string WipNo { get; set; }
+
         /// <summary>
         /// 編號
         /// </summary>

AMESCoreStudio.Web/ViewModels/PCS/PCS009ViewModel.cs

@@ -11,11 +11,6 @@ namespace AMESCoreStudio.Web.ViewModels.PCS
     public class PCS009ViewModel
     {
 
-        public PCS009ViewModel()
-        {
-
-        }
-
         /// <summary>
         /// 內部條碼
         /// </summary>

AMESCoreStudio.Web/Views/BAS/BAS020.cshtml

@@ -0,0 +1,174 @@
+@{
+    ViewData["Title"] = "客戶資料維護";
+    Layout = "~/Views/Shared/_AMESLayout.cshtml";
+}
+
+<div class="layui-card">
+    <div class="layui-card-header">
+        <div class="layui-form">
+            <div class="layui-form-item ">
+                <div class="layui-inline"><i class="fa fa-file-text-o fa-fw"></i> @ViewBag.Title</div>
+            </div>
+        </div>
+    </div>
+    <div class="layui-card-body">
+        <div class="layui-form" style="margin-bottom:5px;">
+            <div class="layui-form-item">
+                <div class="layui-col-sm3">
+                    <div class="layui-inline">
+                        <label class="layui-form-label" style="width:70px">料號:</label>
+                        <div class="layui-input-inline" style="width:120px">
+                            <input id="MaterialNo" name="MaterialNo" autocomplete="off" oninput="let p=this.selectionStart;this.value=this.value.trim();this.setSelectionRange(p, p);" class="layui-input" placeholder="請輸入料號">
+                        </div>
+                    </div>
+                </div>
+                <div class="layui-col-sm3">
+                    <div class="layui-inline">
+                        <label class="layui-form-label" style="width:70px">客戶代號:</label>
+                        <div class="layui-input-inline" style="width:150px">
+                            <input id="CustomerID" name="CustomerID" autocomplete="off" oninput="let p=this.selectionStart;this.value=this.value.trim();this.setSelectionRange(p, p);" class="layui-input" placeholder="請輸入客戶代號">
+                        </div>
+                    </div>
+                </div>
+                <div class="layui-col-sm3">
+                    <div class="layui-inline">
+                        <label class="layui-form-label" style="width:70px">客戶名稱:</label>
+                        <div class="layui-input-inline" style="width:150px">
+                            <input id="CustomerName" name="CustomerName" autocomplete="off" oninput="let p=this.selectionStart;this.value=this.value.trim();this.setSelectionRange(p, p);" class="layui-input" placeholder="請輸入客戶代號">
+                        </div>
+                    </div>
+                </div>
+                <div class="layui-col-sm3">
+                    <button id="querysubmit" class="layui-btn layui-btn-sm layui-btn-normal" lay-submit lay-filter="querysubmit">
+                        <i class="layui-icon layui-icon-sm">&#xe615;</i>
+                    </button>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <table class="layui-hide" id="test" lay-filter="test"></table>
+</div>
+
+@section Scripts {
+    <script type="text/javascript">
+        var tableCols = [[
+            {
+                field: 'materialNo',
+                title: '料號',
+                sort: true
+            },
+            {
+                field: 'customerID',
+                title: '客戶代號',
+                sort: true
+            },
+            {
+                field: 'customerName',
+                title: '客戶名稱',
+                sort: true
+            },
+            {
+                field: 'right',
+                width: 200,
+                title: '操作',
+                fixed: 'right',
+                templet: function (d) {
+                    var btn = '<a class="layui-btn layui-btn-normal layui-btn-xs layui-icon layui-icon-edit" lay-event="edit">修改</a>';
+                    btn += '<a class="layui-btn layui-btn-danger layui-btn-xs layui-icon layui-icon-delete" lay-event="del">刪除</a>';
+                    return btn;
+                }
+            }
+        ]];
+
+
+        // 修改
+        function edit(obj) {
+            console.log("修改");
+            console.log("obj", obj);
+            console.log("obj.data", obj.data);
+            console.log("obj.data.materialNo", obj.data.materialNo);
+             if (obj.data.materialNo) {
+                 console.log('修改', obj.data.materialNo)
+                hg.open('修改料號對應客戶資料', '/BAS/BAS020U/' + obj.data.materialNo , 640, 550);
+            }
+        }
+
+        // 刪除
+        function del(obj) {
+            console.log("刪除");
+            if (obj.data.materialNo) {
+                hg.confirm("料號：" + obj.data.materialNo + "，確定要刪除嗎？", function () {
+                    $.ajax({
+                        url: '/BAS/BAS020D',
+                        data: { materialNo: obj.data.materialNo },
+                        type: 'POST',
+                        success: function (data) {
+                            if (data.success) {
+                                obj.del();
+                                hg.msghide("刪除成功！");
+                            } else {
+                                hg.msg("刪除失敗，原因:" + data.msg);
+                            }
+                        },
+                        error: function () {
+                            hg.msg("刪除失敗！");
+                        }
+                    });
+                });
+            }
+        }
+
+        layui.use(['form', 'layer', 'laydate', 'table'], function () {
+            var form = layui.form;
+            var table = layui.table;
+
+            // 搜索按鈕點擊事件
+            $('#querysubmit').click(function () {
+                renderTable();
+            });
+
+            // 渲染數據表格
+            function renderTable() {
+                console.log("ABC",$("#MaterialNo").val())
+                console.log("ABB",$("#CustomerName").val())
+                table.render({
+                    elem: '#test',
+                    url: '/BAS/GetPnQcCustomerRecordsByCriteria',
+                    where: {
+                        materialNo: $("#MaterialNo").val(),
+                        customerName: $("#CustomerName").val(),
+                        customerID: $("#CustomerID").val()
+                    },
+                    cols: tableCols,
+                    page: { curr: 1 }, // 預設從第一頁開始
+                    limit: 20, // 預設每頁顯示 20 筆
+                    toolbar: ' <div id="toolbar"><button class="layui-btn layui-btn-sm layui-btn-normal" id="addButton"><i class="layui-icon">&#xe608;</i> 新增</button></div>',
+                    defaultToolbar: ['filter', 'print', 'exports'],
+                    done: function(res, curr, count){
+                        console.log("res.data",res.data); // 列出查詢的資料
+                        // 新增按鈕點擊事件
+                        $('#addButton').click(function () {
+                            hg.open('新增料號對應客戶資料', '/BAS/BAS020C', 640, 550);
+                        });
+                    }
+                });
+            }
+
+            // 監聽工具列事件
+            table.on('tool(test)', function(obj){
+                console.log("obj.event", obj.event);
+                var event = obj.event;
+                if(event === 'edit'){
+                    edit(obj);
+                } else if(event === 'del'){
+                    del(obj);
+                }
+            });
+
+            renderTable(); // 初始化表格
+        });
+    </script>
+}
+
+

AMESCoreStudio.Web/Views/BAS/BAS020C.cshtml

@@ -0,0 +1,126 @@
+@model AMESCoreStudio.WebApi.Models.AMES.PnQcCustomerRecord
+
+@{ 
+    ViewData["Title"] = "BAS020C";
+    Layout = "~/Views/Shared/_FormLayout.cshtml"; 
+}
+
+<style>
+    .control-label {
+        justify-content: flex-end !重要;
+    }
+</style>
+
+<div class="row">
+    <div class="col-sm-12">
+        <form enctype="multipart/form-data" method="post" asp-action="BAS020CSave">
+            <div asp-validation-summary="ModelOnly" class="text-danger"></div>
+            <input type="hidden" asp-for="CreateUserID" value="@ViewBag.UserID" />
+            <input type="hidden" asp-for="UpdateUserID" value="@ViewBag.UserID" />
+            <input type="hidden" asp-for="CreateDate" value="@System.DateTime.Now" />
+            <input type="hidden" asp-for="UpdateDate" value="@System.DateTime.Now" />
+
+            <div class="form-group form-inline my-sm-1">
+                <label asp-for="MaterialNo" class="control-label col-sm-3">料號:</label>
+                <input asp-for="MaterialNo" class="form-control col-sm-9" id="MaterialNo" />
+                <span asp-validation-for="MaterialNo" class="text-danger offset-sm-3 my-sm-1"></span>
+            </div>
+            <div class="form-group form-inline my-sm-1">
+                <label asp-for="CustomerID" class="control-label col-sm-3">客戶代號:</label>
+                <input asp-for="CustomerID" class="form-control col-sm-9" id="CustomerID" />
+                <span asp-validation-for="CustomerID" class="text-danger offset-sm-3 my-sm-1"></span>
+            </div>
+            <div class="form-group form-inline my-sm-1">
+                <label asp-for="CustomerName" class="control-label col-sm-3">客戶名稱</label>
+                <input asp-for="CustomerName" class="form-control col-sm-9" id="CustomerName"/>
+                <span asp-validation-for="CustomerName" class="text-danger offset-sm-3 my-sm-1"></span>
+            </div>
+
+            <div style="text-align:center">
+                <div class="layui-inline">
+                    <span style="color: firebrick;word-break: break-all;" class="text-danger offset-sm-3">@Html.ValidationMessage("error")</span>
+                </div>
+            </div>
+
+            <span style="color: firebrick;word-break: break-all;" class="text-danger offset-sm-3">@Html.ValidationMessage("error")</span>
+            <div class="form-group">
+                <input type="submit" value="儲存" class="btn btn-primary offset-sm-3" />
+            </div>
+        </form>
+    </div>
+</div>
+
+@section Scripts {
+    @{ 
+        await Html.RenderPartialAsync("_ValidationScriptsPartial");
+        await Html.RenderPartialAsync("_FileinputScriptsPartial"); 
+    }
+
+    <script type="text/javascript">
+        layui.use(['form', 'layer'], function () {
+            var form = layui.form;
+            var layer = layui.layer;
+
+            // 防止輸入前後空白和特殊字元
+            function validateInput(input) {
+                var value = input.value.trim();
+                if (value !== input.value) {
+                    input.value = value;
+                    showError(input, "輸入文字包含前後空白!");
+                } else {
+                    clearError(input);
+                }
+            }
+
+            function showError(input, message) {
+                layer.msg(message, { icon: 5, time: 2000 });
+                var errorSpan = $(input).next('.text-danger');
+                errorSpan.text(message);
+            }
+
+            function clearError(input) {
+                var errorSpan = $(input).next('.text-danger');
+                errorSpan.text('');
+            }
+
+            $('#MaterialNo, #CustomerID, #CustomerName').on('input', function () {
+                validateInput(this);
+            });
+
+            $('form').on('submit', function (e) {
+                console.log('formsubmit')
+                e.preventDefault();
+                var isValid = true;
+                $('#MaterialNo, #CustomerID, #CustomerName').each(function () {
+                    validateInput(this);
+                    if ($(this).next('.text-danger').text() !== '') {
+                        isValid = false;
+                    }
+                });
+                if (isValid) {
+                    console.log('isValid')
+                    $.ajax({
+                        url: $(this).attr('action'),
+                        type: 'POST',
+                        data: $(this).serialize(),
+                        success: function (response) {
+                            if (response.success) {
+                                layer.msg('儲存成功！', { icon: 1, time: 2000 }, function () {
+                                    window.parent.location.reload(); // 刷新父頁面
+                                    var index = parent.layer.getFrameIndex(window.name); // 獲取窗口索引
+                                    parent.layer.close(index); // 關閉當前窗口
+                                });
+                            } else {
+                                layer.msg('新增失敗：' + response.msg, { icon: 5, time: 2000 });
+                            }
+                        },
+                        error: function () {
+                            layer.msg('新增失敗！', { icon: 5, time: 2000 });
+                        }
+                    });
+                }
+            });
+        });
+    </script>
+}
+

AMESCoreStudio.Web/Views/BAS/BAS020U.cshtml

@@ -0,0 +1,125 @@
+@model AMESCoreStudio.WebApi.Models.AMES.PnQcCustomerRecord
+
+@{
+    ViewData["Title"] = "BAS020U";
+    Layout = "~/Views/Shared/_FormLayout.cshtml";
+}
+
+<style>
+    .control-label {
+        justify-content: flex-end !重要;
+    }
+</style>
+
+<div class="row">
+    <div class="col-sm-12">
+        <form enctype="multipart/form-data" method="post" asp-action="BAS020USave" id="saveForm">
+            <div asp-validation-summary="ModelOnly" class="text-danger"></div>
+            <input type="hidden" asp-for="UpdateUserID" value="@ViewBag.UserID" />
+            <input type="hidden" asp-for="UpdateDate" value="@System.DateTime.Now" />
+            <input type="hidden" asp-for="MaterialNo" value="@Model.MaterialNo" /> <!-- 新增這行隱藏的輸入欄位 -->
+
+            <div class="form-group form-inline my-sm-1">
+                <label asp-for="MaterialNo" class="control-label col-sm-3">料號:</label>
+                <input asp-for="MaterialNo" class="form-control col-sm-9" id="MaterialNo" readonly /> <!-- 將這行設為只讀 -->
+                <span asp-validation-for="MaterialNo" class="text-danger offset-sm-3 my-sm-1"></span>
+            </div>
+            <div class="form-group form-inline my-sm-1">
+                <label asp-for="CustomerID" class="control-label col-sm-3">客戶代號:</label>
+                <input asp-for="CustomerID" class="form-control col-sm-9" id="CustomerID" />
+                <span asp-validation-for="CustomerID" class="text-danger offset-sm-3 my-sm-1"></span>
+            </div>
+            <div class="form-group form-inline my-sm-1">
+                <label asp-for="CustomerName" class="control-label col-sm-3">客戶名稱</label>
+                <input asp-for="CustomerName" class="form-control col-sm-9" id="CustomerName" />
+                <span asp-validation-for="CustomerName" class="text-danger offset-sm-3 my-sm-1"></span>
+            </div>
+
+            <div style="text-align:center">
+                <div class="layui-inline">
+                    <span style="color: firebrick;word-break: break-all;" class="text-danger offset-sm-3">@Html.ValidationMessage("error")</span>
+                </div>
+            </div>
+
+            <span style="color: firebrick;word-break: break-all;" class="text-danger offset-sm-3">@Html.ValidationMessage("error")</span>
+            <div class="form-group">
+                <input type="submit" value="儲存" class="btn btn-primary offset-sm-3" />
+            </div>
+        </form>
+    </div>
+</div>
+
+@section Scripts {
+    @{
+        await Html.RenderPartialAsync("_ValidationScriptsPartial");
+        await Html.RenderPartialAsync("_FileinputScriptsPartial");
+    }
+
+    <script type="text/javascript">
+        layui.use(['form', 'layer'], function () {
+            console.log('Layui')
+            var form = layui.form;
+            var layer = layui.layer;
+
+            // 防止輸入前後空白和特殊字元
+            function validateInput(input) {
+                var value = input.value.trim();
+                if (value !== input.value) {
+                    input.value = value;
+                    showError(input, "輸入文字包含前後空白!");
+                } else {
+                    clearError(input);
+                }
+            }
+
+            function showError(input, message) {
+                layer.msg(message, { icon: 5, time: 2000 });
+                var errorSpan = $(input).next('.text-danger');
+                errorSpan.text(message);
+            }
+
+            function clearError(input) {
+                var errorSpan = $(input).next('.text-danger');
+                errorSpan.text('');
+            }
+
+            $('#MaterialNo, #CustomerID, #CustomerName').on('input', function () {
+                validateInput(this);
+            });
+
+            $('form').on('submit', function (e) {
+                console.log('formsubmit')
+                e.preventDefault();
+                var isValid = true;
+                $('#MaterialNo, #CustomerID, #CustomerName').each(function () {
+                    validateInput(this);
+                    if ($(this).next('.text-danger').text() !== '') {
+                        isValid = false;
+                    }
+                });
+                if (isValid) {
+                    console.log('isValid')
+                    $.ajax({
+                        url: $(this).attr('action'),
+                        type: 'POST',
+                        data: $(this).serialize(),
+                        success: function (response) {
+                            if (response.success) {
+                                layer.msg('儲存成功！', { icon: 1, time: 2000 }, function () {
+                                    window.parent.location.reload(); // 刷新父頁面
+                                    var index = parent.layer.getFrameIndex(window.name); // 獲取窗口索引
+                                    parent.layer.close(index); // 關閉當前窗口
+                                });
+                            } else {
+                                layer.msg('儲存失敗!', { icon: 5, time: 2000 });
+                            }
+                        },
+                        error: function (response) {
+                            layer.msg('儲存失敗！', { icon: 5, time: 2000 });
+                        }
+                    });
+                }
+            });
+        });
+    </script>
+}

AMESCoreStudio.Web/Views/Home/Framework.cshtml

@@ -1,14 +1,11 @@
-@{ 
+
-    ViewData["Title"] = "AMES ";
-}
-
 <!DOCTYPE html>
 
 <html>
 
 <head>
     <meta charset="UTF-8">
-    <title>@ViewData["Title"] @ViewBag.VersionCode</title>
+    <title>@ViewBag.VersionCode</title>
     <meta name="renderer" content="webkit|ie-comp|ie-stand">
     <meta http-equiv="hg-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="viewport" content="width=device-width,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no">

AMESCoreStudio.Web/Views/PCS/PCS001N.cshtml

@@ -36,10 +36,10 @@
                             <i class="layui-icon layui-icon-sm">&#xe669;</i>
                         </button>
                     </div>
-                    <label asp-for="wipInfo.WipSEQ" class="layui-form-label"></label>
+                    @* <label asp-for="wipInfo.WipSEQ" class="layui-form-label"></label>
                     <div class="layui-input-inline">
                         <select asp-for="wipInfo.WipSEQ" asp-items="@ViewBag.WipSEQTypeList" class=""></select>
-                    </div>
+                    </div> *@
                     <label asp-for="wipAtt.ItemNO" class="layui-form-label"></label>
                     <div class="layui-input-inline">
                         <input asp-for="wipAtt.ItemNO" style="width: 150px; display:initial" oninput="let p=this.selectionStart;this.value=this.value.toUpperCase();this.setSelectionRange(p, p);" maxlength="20" class="layui-input" autocomplete="off" />
@@ -60,10 +60,15 @@
                     <div class="layui-input-inline">
                         <select asp-for="wipInfo.WipType" asp-items="@ViewBag.GetWipTypeList" class=""></select>
                     </div>
-                    <label asp-for="wipInfo.ProductTypeID" class="layui-form-label"></label>
+                    <label class="layui-form-label">客戶類別</label>
                     <div class="layui-input-inline">
-                        <select asp-for="wipInfo.ProductTypeID" asp-items="@ViewBag.ProductTypesList"></select>
+                        <input asp-for="wipInfo.CustomerMedical" type="checkbox" title="醫療" />
+                        <input asp-for="wipInfo.CustomerVIP" type="checkbox" title="VIP" />
                     </div>
+@*                     <label asp-for="wipInfo.ProductTypeID" class="layui-form-label"></label>
+                    <div class="layui-input-inline">
+                        <select asp-for="wipInfo.ProductTypeID" asp-items="@ViewBag.ProductTypesList"></select>
+                    </div> *@
                     <label asp-for="wipInfo.Werks" class="layui-form-label"></label>
                     <div class="layui-input-inline">
                         <select asp-for="wipInfo.Werks" asp-items="@ViewBag.FactoryInfoList" style="color: #dc3545 !important;"></select>
@@ -78,10 +83,10 @@
 
             <div class="layui-form-item">
                 <div class="layui-inline">
-                    <label class="layui-form-label">客戶類別</label>
+                    <label asp-for="wipInfo.CustomerID" class="layui-form-label"></label>
                     <div class="layui-input-inline">
-                        <input asp-for="wipInfo.CustomerMedical" type="checkbox" title="醫療" />
+                        <input asp-for="wipInfo.CustomerID" class="layui-input" autocomplete="off" />
-                        <input asp-for="wipInfo.CustomerVIP" type="checkbox" title="VIP" />
+                        <span asp-validation-for="wipInfo.CustomerID" class="layui-bg-red"></span>
                     </div>
                     <label asp-for="wipInfo.CustomerNO" class="layui-form-label"></label>
                     <div class="layui-input-inline">

AMESCoreStudio.Web/Views/PCS/PCS003.cshtml

@@ -40,10 +40,10 @@
                         <input asp-for="wipInfo.WipNO" class="layui-input" autocomplete="off" disabled />
                         <span asp-validation-for="wipInfo.WipNO" class="layui-bg-red"></span>
                     </div>
-                    <label asp-for="wipInfo.WipSEQ" class="layui-form-label"></label>
+                    @* <label asp-for="wipInfo.WipSEQ" class="layui-form-label"></label>
                     <div class="layui-input-inline">
                         <select asp-for="wipInfo.WipSEQ" asp-items="@ViewBag.WipSEQTypeList" class=""></select>
-                    </div>
+                    </div> *@
                     <label asp-for="wipAtt.ItemNO" class="layui-form-label"></label>
                     <div class="layui-input-inline">
                         <input asp-for="wipAtt.ItemNO" class="layui-input" autocomplete="off" disabled />
@@ -63,10 +63,15 @@
                     <div class="layui-input-inline">
                         <select asp-for="wipInfo.WipType" asp-items="@ViewBag.GetWipTypeList" class=""></select>
                     </div>
-                    <label asp-for="wipInfo.ProductTypeID" class="layui-form-label"></label>
+                    <label class="layui-form-label">客戶類別</label>
                     <div class="layui-input-inline">
-                        <select asp-for="wipInfo.ProductTypeID" asp-items="@ViewBag.ProductTypesList"></select>
+                        <input @(Model.wipInfo.CustomerMedical == "Y" ? "checked" : "") name="wipInfo.CustomerMedical" type="checkbox" title="醫療" />
+                        <input @(Model.wipInfo.CustomerVIP == "Y" ? "checked" : "") name="wipInfo.CustomerVIP" type="checkbox" title="VIP" />
                     </div>
+                   @*  <label asp-for="wipInfo.ProductTypeID" class="layui-form-label"></label>
+                    <div class="layui-input-inline">
+                        <select asp-for="wipInfo.ProductTypeID" asp-items="@ViewBag.ProductTypesList"></select>
+                    </div> *@
                     <label asp-for="wipInfo.Werks" class="layui-form-label"></label>
                     <div class="layui-input-inline">
                         <select asp-for="wipInfo.Werks" asp-items="@ViewBag.FactoryInfoList" style="color: #dc3545 !important;"></select>
@@ -82,10 +87,10 @@
 
             <div class="layui-form-item">
                 <div class="layui-inline">
-                    <label class="layui-form-label">客戶類別</label>
+                    <label asp-for="wipInfo.CustomerID" class="layui-form-label"></label>
                     <div class="layui-input-inline">
-                        <input @(Model.wipInfo.CustomerMedical == "Y" ? "checked" : "") name="wipInfo.CustomerMedical" type="checkbox" title="醫療" />
+                        <input asp-for="wipInfo.CustomerID" class="layui-input" autocomplete="off" />
-                        <input @(Model.wipInfo.CustomerVIP == "Y" ? "checked" : "") name="wipInfo.CustomerVIP" type="checkbox" title="VIP" />
+                        <span asp-validation-for="wipInfo.CustomerID" class="layui-bg-red"></span>
                     </div>
                     <label asp-for="wipInfo.CustomerNO" class="layui-form-label"></label>
                     <div class="layui-input-inline">
@@ -1329,7 +1334,7 @@
                 $.ajax({
                     url: '@Url.Action("GetBarcodeOther", "PCS")',
                     dataType: 'json',
-                    data: { "itemNo": itemNo, "lotNo": lotNo, "num": planQTY, "wipNo": '@Model.wipInfo.WipNO', "wipShcDate": wipShcDate },
+                    data: { "itemNo": itemNo, "lotNo": lotNo, "num": planQTY, "wipNo": '@Model.wipInfo.WipNO', "wipShcDate": wipShcDate, "WerksNO":'@Model.wipInfo.WerksNO' },
                     cache: false,
                     type: "POST",
                     success: function (result) {

AMESCoreStudio.Web/Views/PCS/PCS009.cshtml

@@ -40,41 +40,43 @@
             </div>
         </div>
         <div class="layui-card-body">
-            <div class="layui-row" style="text-align:center">
+            <div class="layui-row">
-                <div class="layui-col-md3" style="text-align:center">
+                <div class="layui-col-md11">
+                    <div class="layui-col-md3">
                         <label class="layui-form-label">生產序號:</label>
                         <div class="layui-input-inline">
                             <input asp-for="BarCodeNo" class="layui-input">
                         </div>
                     </div>
-                <div class="layui-col-md3" style="text-align:center">
+                    <div class="layui-col-md3">
                         <label class="layui-form-label">組件條碼:</label>
                         <div class="layui-input-inline">
                             <input asp-for="PartNo" class="layui-input">
                         </div>
                     </div>
-                <div class="layui-col-md3" style="text-align:center">
+                    <div class="layui-col-md3">
                         <label class="layui-form-label">出貨序號:</label>
                         <div class="layui-input-inline">
                             <input asp-for="ExtraBarCodeNo" class="layui-input">
                         </div>
                     </div>
-                <div class="layui-col-md3" style="text-align:center">
+                    <div class="layui-col-md3">
                         <label class="layui-form-label">包裝箱號:</label>
                         <div class="layui-input-inline">
                             <input asp-for="BoxNo" class="layui-input">
                         </div>
                     </div>
                 </div>
-            <div class="layui-form-item">
+                <div class="layui-col-md1">
-                <br/>
+                    <div class="layui-col-md3" style="text-align:center">
-                <div class="layui-col-md12" style="text-align:center">
                         <div class="layui-inline layui-show-xs-block">
                             <a class="layui-btn layui-btn-normal layui-icon layui-icon-sm" lay-submit onclick="result()"><i class="layui-icon layui-icon-sm">&#xe615;</i></a>
-                        @*<input type="submit" class="layui-btn layui-btn-primary layui-border-blue layui-icon layui-icon-sm" lay-submit onclick="result()"><i class="layui-icon layui-icon-sm">&#xe615;</i></input>*@
                         </div>
                     </div>
                 </div>
+
+
+            </div>
         </div>
         <div class="layui-row" style="text-align:center">
             <div class="layui-col-md12" style="text-align:center">
@@ -84,9 +86,11 @@
     </form>
 </div>
 
-@section Scripts{
+@section Scripts {
-    @{ await Html.RenderPartialAsync("_ValidationScriptsPartial");
+    @{
-        await Html.RenderPartialAsync("_FileinputScriptsPartial"); }
+        await Html.RenderPartialAsync("_ValidationScriptsPartial");
+        await Html.RenderPartialAsync("_FileinputScriptsPartial");
+    }
     <script type="text/javascript">
         layui.use(['form', 'layer', 'laydate'], function () {
             var form = layui.form;
@@ -125,7 +129,6 @@
                         fixed: 'right',
                         templet: function (d) {
                             return '<a class="layui-btn layui-btn-warm layui-icon layui-icon-list layui-btn-xs" lay-event="detail">檢視</a>'
-                            /* < a class="layui-btn layui-btn-normal layui-btn-xs layui-icon layui-icon-edit" lay - event="edit" > 修改</a > '*/
                         }
                     }]
                 ];

AMESCoreStudio.Web/Views/PCS/PCS009R.cshtml

@@ -174,6 +174,9 @@
                 <table class="layui-table" lay-even lay-size="sm">
                     <thead>
                         <tr>
+                            <th>
+                                工單號碼
+                            </th>
                             <th>
                                 站別名稱
                             </th>
@@ -195,6 +198,9 @@
                         @foreach (var index in Model.BarCodeLogs)
                         {
                             <tr>
+                                <td>
+                                    @index.WipNo
+                                </td>
                                 <td>
                                     @index.Station
                                 </td>

AMESCoreStudio.Web/Views/PCS/PCS031.cshtml

@@ -1,10 +1,8 @@
-
+@{
-@{
     ViewData["Title"] = "完工入庫";
     Layout = "~/Views/Shared/_AMESLayout.cshtml";
 }
 
-
 <style type="text/css">
     .layui-table-main .layui-table-cell {
         /*height: auto !important;*/
@@ -21,15 +19,12 @@
         padding-right: 10px;
         float: left;
         border-width: 1px;
-        border-style: solid border-color: #e6e6e6;
+        border-style: solid;
+        border-color: #e6e6e6;
         margin: 10px 0;
     }
-
-
-
 </style>
 
-
 <div class="layui-card">
     <div class="layui-card-header">
         <div class="layui-form">
@@ -90,10 +85,11 @@
                             </div>
                         </div>
                     </div>
-                    <div class="layui-row">
+
-                        <div class="layui-form-item">
+
                 </div>
             </div>
+            <div class="layui-row">
                 <div class="layui-form-item">
                     <div class="layui-col-sm4">
                         <div class="layui-inline">
@@ -106,37 +102,32 @@
                                 </select>
                             </div>
                         </div>
-
                     </div>
-                        <div class="layui-col-sm4">
+                    <div class="layui-col-sm5">
                         <div class="layui-inline">
                             <label class="layui-form-label">廠別:</label>
                             <div class="layui-input-inline">
                                 <select name="Status" id="FactoryID" class="custom-select col-sm-2">
                                     <option value="1">安勤</option>
                                     <option value="2">昶亨</option>
-
                                 </select>
                             </div>
                         </div>
-
                     </div>
-
+                    <div class="layui-col-sm3">
-                        <div class="layui-col-sm">
+                        <div class="layui-inline">
-                            <div class="layui-inline layui-show-xs-block">
+                            <button id="querysubmit" class="layui-btn layui-btn-lg layui-btn-normal" lay-submit lay-filter="querysubmit">
-                                <button class="layui-btn layui-btn-sm layui-btn-normal" lay-submit lay-filter="querysubmit">
                                 <i class="layui-icon layui-icon-sm">&#xe615;</i>
                             </button>
                         </div>
                     </div>
                 </div>
             </div>
-                    </div>
             <div class="layui-row">
                 <div class="layui-form-item">
                     <div class="layui-col-sm4">
                         <div class="layui-inline">
-                            <label class="layui-form-label">RecordNumber 輸入:</label>
+                            <label class="layui-form-label" style="white-space: normal; word-wrap: break-word; width:82px; margin-top: -10px;">RecordNumber 輸入:</label>
                             <div class="layui-input-inline">
                                 <input id="inhouseNo1" name="inhouseNo1" autocomplete="off" class="layui-input">
                             </div>
@@ -144,355 +135,294 @@
                     </div>
                     <div class="layui-col-sm4">
                         <div class="layui-inline">
-                            <label class="layui-form-label">RecordDate 輸入:</label>
+                            <label class="layui-form-label" style="white-space: normal; word-wrap: break-word; width:78px; margin-top: -10px;">RecordDate 輸入:</label>
-                            <div class="layui-input-inline" style="width:150px">
+                            <div class="layui-input-inline">
                                 <input id="recordDate" name="date_str" autocomplete="off" value="@System.DateTime.Now.ToString("yyyy-MM-dd")" class="layui-input" readonly="">
                             </div>
                         </div>
                     </div>
-
                 </div>
             </div>
-            
+            <div class="layui-row">
-
+                <div class="layui-form-item">
+                    <div class="layui-code-ol">
+                        <label id="rowCount" class="layui-inline layui-form-label" style="color: red; text-align: left;">數量合計: 0</label>
+                    </div>
+                </div>
+            </div>
         </div>
         <table class="layui-hide" id="query" lay-filter="query"></table>
     </div>
 </div>
 
-
+@section Scripts {
-@section Scripts{
     <script type="text/javascript">
+        layui.use(['form', 'layer', 'laydate', 'table'], function () {
+            var form = layui.form;
+            var laydate = layui.laydate;
+            var table = layui.table;
+            var layer = layui.layer;
 
+            $('#querysubmit').click(function () {
+                console.log("查詢")
+                renderTable();
+            });
 
-        //var roleId = 0;
-        //var roleName = "";
-
-        layui.use(['form', 'layer', 'laydate'], function () {
-            form = layui.form;
-            laydate = layui.laydate;
             laydate.render({
-                elem: '#dateStr'
+                elem: '#dateStr',
-                , trigger: 'click'
+                trigger: 'click',
-                , format: 'yyyy/MM/dd'
+                format: 'yyyy/MM/dd',
-                , theme: 'grid'
+                theme: 'grid'
             });
 
             laydate.render({
-                elem: '#dateEnd'
+                elem: '#dateEnd',
-                , trigger: 'click'
+                trigger: 'click',
-                , format: 'yyyy/MM/dd'
+                format: 'yyyy/MM/dd',
-                , theme: 'grid'
+                theme: 'grid'
             });
             laydate.render({
-                elem: '#recordDate'
+                elem: '#recordDate',
-                , trigger: 'click'
+                trigger: 'click',
-                , format: 'yyyy-MM-dd'
+                format: 'yyyy-MM-dd',
-                , theme: 'grid'
+                theme: 'grid'
-            });
             });
 
             $('#inhouseNo1').on('keypress', function (event) {
-
                 if (event.keyCode == 13) {
                     var data = $("#inhouseNo1").val();
                     if (data == '') {
                         alert("請輸入recordNumber")
-                }
+                    } else {
-                else
-                {
                         $('#recordNumber2 ').each(function () {
                             $(this).val(data);
                         });
                     }
-
                 }
-
             });
 
             $('#querysubmitTmp').click(function () {
-            var data = $("#inhouseNo1").val();
-
                 var data = $("#inhouseNo1").val();
                 if (data == '') {
                     alert("請輸入recordNumber")
-            }
+                } else {
-            else {
                     $('#recordNumber2 ').each(function () {
                         $(this).val(data);
                     });
                 }
-
-        });
-
-        //监听表单提交事件
-        hg.form.onsubmit('querysubmit', function (data) {
-            hg.msghide("重新載入資料..");
-            // table && table.reload(data);
-            tt();
             });
 
             var tableCols = [[
+                { type: 'checkbox' },
+                { field: 'serialNo', title: '箱號', sort: true, totalRowText: '合計' },
+                { field: 'boxQty', title: '數量', sort: true, totalRow: true },
+                { field: 'inhouseNo', title: '送驗單號', sort: true },
+                { field: 'seqID', title: '順序', sort: true },
+                { field: 'wipNo', title: '工單號碼', sort: true },
+                { field: 'itemNo', title: '料號', sort: true },
+                { field: 'createDate', title: 'FQC時間', sort: true, templet: '<div>{{ layui.util.toDateString(d.createDate, "yyyy/MM/dd") }}</div>' },
+                { field: 'statusName', title: '檢驗狀態', sort: true, templet: '#statusName' },
+                { field: 'endTime', title: '抽驗結束時間', sort: true, templet: '<div>{{ layui.util.toDateString(d.endTime, "yyyy/MM/dd") }}</div>' },
                 {
-                type: 'checkbox'
+                    field: 'locationNo', title: '庫別', fixed: 'right', edit: 'text', templet: function (d) {
-
-            },
-            {
-                field: 'serialNo',
-                width: 145,
-                title: '箱號',
-                sort: true,
-                totalRowText : '合計:'
-            },
-            {
-                field: 'boxQty',
-                width: 70,
-                title: '數量',
-                sort: true,
-                totalRow: true
-            },
-            {
-                field: 'inhouseNo',
-                width: 140,
-                title: '送驗單號',
-                sort: true
-            },
-            {
-                field: 'seqID',
-                title: '順序',
-                width: 60,
-                sort: true
-            },
-            {
-                field: 'wipNo',
-                title: '工單號碼',
-                sort: true
-            },
-            {
-                field: 'itemNo',
-                title: '料號',
-                sort: true
-            },
-            {
-                field: 'createDate',
-                title: 'FQC時間',
-                sort: true,
-                templet: '<div>{{ layui.util.toDateString(d.createDate, "yyyy/MM/dd") }}</div>'
-            },
-            {
-                field: 'statusName',
-                title: '檢驗狀態',
-                width: 60,
-                sort: true,
-                templet: '#statusName'
-
-            },
-            {
-                field: 'endTime',
-                title: '抽驗結束時間',
-                sort: true,
-                templet: '<div>{{ layui.util.toDateString(d.endTime, "yyyy/MM/dd") }}</div>'
-            },
-            {
-                field: 'locationNo',
-                width: 150,
-                title: '庫別',
-                fixed: 'right',
-                edit: 'text',
-                templet: function (d) {
                         var txt = '<div class="layui-input-inline" style="width:130px"><input id="locationNo" name="locationNo" autocomplete="off" class="layui-input" placeholder="請輸入庫別"></div>';
                         if (d.locationNo != null)
-                        txt = '<div class="layui-input-inline" style="width:130px"><input id="locationNo" name="locationNo" autocomplete="off" class="layui-input" value="' + d.locationNo +'" ></div>';
+                            txt = '<div class="layui-input-inline" style="width:130px"><input id="locationNo" name="locationNo" autocomplete="off" class="layui-input" value="' + d.locationNo + '" ></div>';
                         if (d.recordNumber != null) {
                             if (d.locationNo != null)
                                 txt = d.locationNo
                             else
                                 txt = "";
                         }
-
-                    return txt;
-                }
-
-            }
-            @*,
-            {
-                field: 'recordNumber',
-                width: 150,
-                title: 'RecordNumber',
-                fixed: 'right',
-                edit: 'text',
-                templet: function (d) {
-                    var txt = '<div class="layui-input-inline" style="width:130px"><input id="recordNumber" name="recordNumber" autocomplete="off" class="layui-input" placeholder="請輸入recordNumber"></div>';
-                    if (d.recordNumber != null)
-                        txt = d.recordNumber;
-
                         return txt;
                     }
-
+                },
-
-            }*@,
                 {
-                field: 'right',
+                    field: 'right', title: '操作', fixed: 'right', templet: function (d) {
-                width: 150,
-                title: '操作',
-                fixed: 'right',
-                templet: function (d) {
                         var btn = '<a class="layui-btn layui-btn-warm layui-icon layui-icon-list layui-btn-xs" lay-event="detail">檢視</a>';
                         if (d.recordNumber == null)
                             btn = btn + '<a class="layui-btn layui-btn-xs layui-icon layui-icon-edit" lay-event="edit">入庫</a>';
                         else
                             btn = btn + '<a> 已入庫</a>';
                         return btn;
-
                     }
                 }
             ]];
 
-        //通过行tool编辑，lay-event="show"
+            // 箱號資料檢視
-        function show(obj) {
-                layui.use('layer', function () {
-                    var layer = layui.layer;
-                    layer.open({
-                        type: 2,
-                        area: ['900px', '650px'],
-                        fixed: false, //不固定
-                        maxmin: true,
-                        content: obj.data.filePath + obj.data.newName
-                    });
-                });
-            };
-
             function detail(obj) {
-
+                hg.open('箱號資料查詢', '/PCS/PCS031V?QuotName=' + $("#FactoryID").val() + '&InhouseNo=' + obj.data.inhouseNo + '&SeqID=' + obj.data.seqID, '', '', true);
-            hg.open('箱號資料查詢', '/PCS/PCS031V?QuotName=' + $("#FactoryID").val()+'&InhouseNo=' + obj.data.inhouseNo + '&SeqID=' + obj.data.seqID, '', '', true);
-
             }
 
+            // 箱號資料編輯
             function edit(obj) {
-            var recordmumber = $("#inhouseNo1").val();
+                var recordnumber = $("#inhouseNo1").val();
                 var recordDate = $("#recordDate").val();
                 var Factority_ID = $("#FactoryID").val();
 
-            if (recordmumber == '') {
+                if (recordnumber == '') {
-                hg.msg('請輸入recordmumber！');
+                    hg.msg('請輸入recordnumber！');
-            }
+                } else {
-            else {
                     hg.confirm("送驗單號_箱號：【" + obj.data.inhouseNo + "_" + obj.data.serialNo + "】，確定要入庫嗎？", function () {
                         $.ajax({
                             url: '/PCS/PCS031inhouse',
-                    data: { InhouseNo: obj.data.inhouseNo, boxNo: obj.data.serialNo, seq: obj.data.seqID, recordNumber: recordmumber, locationNo: obj.data.locationNo, recordDate: recordDate, factorityID: Factority_ID, itemNo: obj.data.itemNo },
+                            data: { InhouseNo: obj.data.inhouseNo, boxNo: obj.data.serialNo, seq: obj.data.seqID, recordNumber: recordnumber, locationNo: obj.data.locationNo, recordDate: recordDate, factorityID: Factority_ID, itemNo: obj.data.itemNo },
                             type: 'POST',
                             success: function (data) {
                                 if (data.success) {
                                     hg.msg("success" + data.msg);
-                            tt();
+                                    renderTable();
-                        }
+                                } else {
-                        else {
                                     hg.msg(data.msg);
                                 }
                             },
-                    error: function () {
+                            error: function (xhr, status, error) {
-                        hg.msg("網路請求失敗！" + data.msg);
+                                var err = eval("(" + xhr.responseText + ")");
+                                hg.msg(err.Message);
                             }
                         });
                     });
                 }
             }
 
-        var toolbar = [{
+            //批次入庫
-            text: '批次入庫',
+            function batchInhouse(obj){
-            layuiicon: '&#xe63c;',
+                console.log("批次入庫", obj)
-            class: 'ayui-btn-warm',
+                var index = layer.load(1, {
-            handler: function (obj, row) {
+                    shade: [0.4, '#000'],
-                if (obj.checkstatus && obj.checkstatus.data.length > 0) {
+                    content: '批次入庫中......',
-                    console.log(obj.checkstatus.data.map(function (x) { return x.serialNo }).join(','))
+                    success: function (layero) {
-                    var recordmumber = $("#inhouseNo1").val();
+                        layero.find('.layui-layer-content').css({
+                            'padding-top': '60px',
+                            'width': '200px'
+                        })
+                    }
+                });
+                if (obj && obj.length > 0) {
+                    var recordnumber = $("#inhouseNo1").val();
                     var recorddate = $("#recordDate").val();
                     var Factority_ID = $("#FactoryID").val();
 
-                    if (recordmumber == '') {
+                        if (recordnumber == '' && recordnumber != null) {
-                        hg.msg('請輸入recordmumber！');
+                            hg.msg('請輸入recordnumber！');
-                    }
+                            layer.close(index);
-                    else {
+                            return;
-                        hg.confirm("批量入庫所有选中的数据，確定要入庫吗？", function () {
+                        } else {
+                            hg.confirm("批量入庫所有勾選項目，確定要入庫吗？", function () {
                                 $.ajax({
                                     url: '/PCS/PCS031inhouse_all',
-                                data: { ids: obj.checkstatus.data.map(function (x) { return x.inhouseNo + "," + x.serialNo + "," + x.seqID + "," + recordmumber + "," + x.locationNo + "," + recorddate + "," + Factority_ID + "," + x.itemNo }) },
+                                    data: { ids: obj.map(function (x) { return x.inhouseNo + "," + x.serialNo + "," + x.seqID + "," + recordnumber + "," + x.locationNo + "," + recorddate + "," + Factority_ID + "," + x.itemNo }) },
                                     type: 'POST',
                                     success: function (data) {
                                         if (data.success) {
                                             hg.msg(data.msg);
-                                        //重载表格数据
+                                            renderTable();
-                                        tt();
+                                        } else {
-
-                                    }
-                                    else {
-                                        //hg.msg(data.msg);
                                             hg.msg('批量入庫失败！');
                                         }
                                     },
-                                error: function () {
+                                    error: function (xhr) {
-                                    hg.msg("网络请求失败！");
+                                         try {
+                                            var err = JSON.parse(xhr.responseText);
+                                            hg.msg(err.Message || "發生錯誤");
+                                        } catch (e) {
+                                            hg.msg("無法解析錯誤訊息");
+                                        }
+                                    },
+                                    complete: function () {
+                                        layer.close(index);
                                     }
                                 });
-
                             });
                         }
                     } else {
                     hg.msg('請選中一個或多個複選框，再操作！');
                 }
             }
-        }, {
-                text: '查詢勾選數量合計',
-                layuiicon: '&#xe63c;',
-                class: 'layui-btn-normal',
-                handler: function (obj, row) {
-                    if (obj.checkstatus && obj.checkstatus.data.length > 0) {
-                        console.log(obj.checkstatus.data.map(function (x) { return x.serialNo }).join(','))
 
+            //勾選數量合計
+            function sumSelected(obj) {
+                console.log("勾選數量合計", obj);
+                if (obj && obj.length > 0) {
+                    var totalQty = obj.reduce(function (sum, item) {
+                        return sum + (item.boxQty || 0);
+                    }, 0);
 
-                                $.ajax({
+                    // 顯示合計數量
-                                    url: '/PCS/PCS031sum',
+                    layer.msg('已選數量合計: ' + totalQty);
-                                    data: { ids: obj.checkstatus.data.map(function (x) { return x.boxQty }) },
+                } else {
-                                    type: 'POST',
+                    layer.msg('請選中一個或多個複選框，再操作！');
-                                    success: function (data) {
-                                        if (data.success) {
-                                            layer.msg('已選數量合計:' + data.msg);
                 }
-                                        else {
-                                            //hg.msg(data.msg);
-                                            layer.msg('查詢失败！');
             }
+
+            //渲染數據表格
+            function renderTable() {
+            var limitSelect = 50;
+            table.render({
+                elem: '#query',
+                url: '/PCS/PCS031Query',
+                where: {
+                    factority: $("#FactoryID").val(),
+                    barcodeNo: $("#barcodeNo").val(),
+                    wipNo: $("#wipNo").val(),
+                    boxNo: $("#boxNo").val(),
+                    inhouseNo: $("#inhouseNo").val(),
+                    date_str: $("#dateStr").val(),
+                    date_end: $("#dateEnd").val(),
+                    status: $("#Status").val()
                 },
-                                    error: function () {
+                cols: tableCols,
-                                        layer.msg("网络请求失败！");
+                page: {
+                    limit: limitSelect,
+                    limits:[50,100,150,200,250,300,350,400,450,500]
+                },
+                toolbar:'#toolbarDemo',
+                defaultToolbar: ['filter', 'exports', 'print'],
+                loading: true,
+                done: function (res, curr, count) {
+                    table.resize();
+                    limitSelect =$(this)[0].limit;
+                    // 计算合计数值
+                    var totalBoxQty = 0;
+                    if (res.data && res.data.length > 0) {
+                        for (var i = 0; i < res.data.length; i++) {
+                            totalBoxQty += res.data[i].boxQty || 0; // 确保 boxQty 存在并累加
+                        }
                     }
-                                });
-
-                           
 
-                    } else {
+                    var rowCountElement = document.getElementById('rowCount');
-                        layer.msg('請選中一個或多個複選框，再操作！');
+                    if (rowCountElement) {
+                        rowCountElement.innerHTML = `合計: ${totalBoxQty}`;
                     }
                 }
+            });
         }
-        ];
 
-        //基本数据表格
-        //   var table = hg.table.datatable('query', 'FQC查詢', '/PCS/PCS031Query', {}, tableCols, toolbar, true, 'full-100', ['filter', 'print', 'exports'], true);
-       // var table = hg.table.datatable('query', 'FQC查詢', '/PCS/PCS031Query?'+'barcodeNo=' + $("#barcodeNo").val() + '&wipNo=' + $("#wipNo").val() + '&boxNo=' + $("#boxNo").val() + '&inhouseNo=' + $("#inhouseNo").val() + '&date_str=' + $("#dateStr").val() + '&date_end=' + $("#dateEnd").val() + '&status=' + $("#Status").val(), {}, tableCols, toolbar, true, 'full-100', ['filter', 'print', 'exports'], true);
 
-        var table;
+            // 監聽工具列事件
-        $(function () {
+            table.on('toolbar(query)', function (obj) {
-            tt();
+                var checkStatus = table.checkStatus(obj.config.id);
-        });
+                var data = checkStatus.data;
-        //基本数据表格
+                var event = obj.event;
-        function tt() {
+                if (event === 'batchInhouse') {
-            table = hg.table.datatable('query', 'FQC查詢', '/PCS/PCS031Query?' + 'factority=' + $("#FactoryID").val()+'&barcodeNo=' + $("#barcodeNo").val() + '&wipNo=' + $("#wipNo").val() + '&boxNo=' + $("#boxNo").val() + '&inhouseNo=' + $("#inhouseNo").val() +'&date_str=' + $("#dateStr").val() + '&date_end=' + $("#dateEnd").val() + '&status=' + $("#Status").val(), {}, tableCols, toolbar, true, 'full-100', ['filter', 'print', 'exports'], true);
+                    batchInhouse(data);
+                } else if (event === 'sumSelected') {
+                    sumSelected(data);
                 }
+            });
 
+            // 監聽行工具事件
+            table.on('tool(query)', function (obj) {
+                var event = obj.event;
+                if (event === 'edit') {
+                    edit(obj);
+                } else if (event === 'detail') {
+                    detail(obj);
+                }
+            });
 
-
+            renderTable(); // 初始化表格
+        });
     </script>
 
     <script type="text/html" id="statusName">
@@ -505,7 +435,10 @@
         {{#  } }}
     </script>
 
-
+    <script type="text/html" id="toolbarDemo">
-
+        <div class="layui-btn-container">
+            <button class="layui-btn layui-btn-sm" lay-event="batchInhouse">批次入庫</button>
+            <button class="layui-btn layui-btn-sm" lay-event="sumSelected">查詢勾選數量合計</button>
+        </div>
+    </script>
 }
-

AMESCoreStudio.Web/Views/PCS/PCS042.cshtml

@@ -0,0 +1,142 @@
+@{
+    ViewData["Title"] = "組件清單查詢";
+    Layout = "~/Views/Shared/_AMESLayout.cshtml";
+}
+
+<div class="layui-card">
+    <div class="layui-card-header">
+        <div class="layui-form">
+            <div class="layui-form-item ">
+                <div class="layui-inline"><i class="fa fa-file-text-o fa-fw"></i> @ViewBag.Title</div>
+            </div>
+        </div>
+    </div>
+    <div class="layui-card-body">
+        <div class="layui-form" style="margin-bottom:5px;">
+            <div class="layui-form-item">
+                <div class="layui-col-md10">
+                    <div class="layui-col-sm3">
+                        <div class="layui-inline">
+                            <label class="layui-form-label" style="width:70px">生產序號:</label>
+                            <div class="layui-input-inline" style="width:150px">
+                                <input id="BarCodeNo" name="BarCodeNo" autocomplete="off" class="layui-input" placeholder="請輸入生產序號">
+                            </div>
+                        </div>
+                    </div>
+                    <div class="layui-col-sm3">
+                        <div class="layui-inline">
+                            <label class="layui-form-label" style="width:70px">工單:</label>
+                            <div class="layui-input-inline" style="width:150px">
+                                <input id="WipNo" name="WipNo" autocomplete="off" class="layui-input" placeholder="請輸入工單">
+                            </div>
+                        </div>
+                    </div>
+                    <div class="layui-col-sm3">
+                        <div class="layui-inline">
+                            <label class="layui-form-label" style="width:70px">組件代碼:</label>
+                            <div class="layui-input-inline" style="width:150px">
+                                <input id="ItemNo" name="ItemNo" autocomplete="off" oninput="let p=this.selectionStart;this.value=this.value.trim();this.setSelectionRange(p, p);" class="layui-input" placeholder="請輸入組件代碼">
+                            </div>
+                        </div>
+                    </div>
+                    <div class="layui-col-sm3">
+                        <div class="layui-inline">
+                            <label class="layui-form-label" style="width:70px">組件條碼:</label>
+                            <div class="layui-input-inline" style="width:150px">
+                                <input id="PartNo" name="PartNo" autocomplete="off" oninput="let p=this.selectionStart;this.value=this.value.trim();this.setSelectionRange(p, p);" class="layui-input" placeholder="請輸入組件條碼">
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="layui-col-md2">
+                    <button id="querysubmit" class="layui-btn layui-btn-sm layui-btn-normal" lay-submit lay-filter="querysubmit">
+                        <i class="layui-icon layui-icon-sm">&#xe615;</i>
+                    </button>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <table class="layui-hide" id="test" lay-filter="test"></table>
+</div>
+
+@section Scripts {
+    <script type="text/javascript">
+        var tableCols = [[
+            {
+                field: 'wipNo',
+                title: '工單號碼',
+            },
+            {
+                field: 'barcodeNo',
+                title: '生產序號',
+            },
+            {
+                field: 'stationName',
+                title: '站別名稱',
+            },
+            {
+                field: 'itemNoName',
+                title: '組件名稱',
+            },
+            {
+                field: 'partNo',
+                title: '組件條碼',
+            },
+            {
+                field: 'kpItemNo',
+                title: '組件料號',
+            },
+            {
+                field: 'createUser',
+                title: '綁入人員',
+            },
+            {
+                field: 'createDate',
+                title: '綁入時間',
+                templet: '<div>{{ layui.util.toDateString(d.createDate, "yyyy/MM/dd HH:mm:ss") }}</div>'
+            }
+        ]];
+
+        layui.use(['form', 'layer', 'laydate', 'table'], function () {
+            var form = layui.form;
+            var table = layui.table;
+
+            // 搜索按鈕點擊事件
+            $('#querysubmit').click(function (e) {
+                e.preventDefault(); // 防止表單提交
+                console.log("搜索按鈕點擊事件")
+                renderTable();
+            });
+
+            // 渲染數據表格
+            function renderTable() {
+                console.log("渲染數據表格")
+                console.log("BarCodeNo", $("#BarCodeNo").val())
+                console.log("WipNo", $("#WipNo").val())
+                console.log("ItemNo", $("#ItemNo").val())
+                console.log("PartNo", $("#PartNo").val())
+                table.render({
+                    elem: '#test',
+                    url: '/PCS/GetComponents',
+                    where: {
+                        barcodeNo: $("#BarCodeNo").val(),
+                        wipNo: $("#WipNo").val(),
+                        itemNo: $("#ItemNo").val(),
+                        partNo: $("#PartNo").val()
+                    },
+                    cols: tableCols,
+                    defaultToolbar: ['filter', 'print', 'exports'],
+                    done: function(res, curr, count){
+                        if (res.count == 0) {
+                                $(".layui-table-main").html('<div class="layui-none">無資料</div>');
+                            }
+                        console.log("res.data",res.data); // 列出查詢的資料
+                    }
+                });
+                console.log("tableCols", tableCols);
+            }
+            renderTable(); // 初始化表格
+        });
+    </script>
+}

AMESCoreStudio.Web/Views/PTD/PTD002.cshtml

@@ -401,17 +401,6 @@
             };
 
             var serializedData = new URLSearchParams(postData).toString();
-            var index = layer.load(1, {
-                shade: [0.4, '#000'],
-                content: '儲存中......',
-                success: function (layero) {
-                    layero.find('.layui-layer-content').css({
-                        'padding-top': '60px',
-                        'width': '200px'
-                    })
-                }
-            });
-
             $.ajax({
                 url: '@Url.Action("PTD002_CheckInputData", "PTD")',
                 type: 'POST',
@@ -419,8 +408,19 @@
                 success: function (res) {
                     if (res.success) {
                         if (res.msg) {
+                            if (res.data.length > 0) {
+                                console.log("res", res);
+                                hg.msg(res.msg);
+                                layui.table.reload('query', {
+                                    data: tableData,
+                                    page: false,
+                                    limit: 2000
+                                });
+                            } else {
                                 hg.msg(res.msg);
                             }
+                        }
+                        
                         // 用来统计重复的SN
                         var duplicateSNs = [];
                         // 检查表格是否为空
@@ -451,9 +451,6 @@
                         hg.msg('加入失敗：' + res.msg);
                     }
                 },
-                complete: function (XMLHttpRequest, status) { //请求完成后最终执行参数
-                    layer.close(index);
-                },
                 error: function (error) {
                     hg.msg('加入失敗：' + error.msg);
                     return;
@@ -473,8 +470,8 @@
             var material = document.getElementById('PartNumber').value;
             var loginNo = document.getElementById('loginNo').value;
 
-            var tableData = layui.table.cache['query'];
+            var tableData = layui.table.cache['query'] || [];
-                                    console.log("tableData",tableData)
+            console.log("tableData", tableData);
             if (material === "") {
                 hg.msg('料號不得為空!');
                 return; // Do not add the row
@@ -492,6 +489,17 @@
                 tableData: tableData
             };
 
+            var index = layer.load(1, {
+                shade: [0.4, '#000'], // 背景遮罩
+                content: '資料處理中......',
+                success: function (layero) {
+                    layero.find('.layui-layer-content').css({
+                        'padding-top': '60px',
+                        'width': '200px'
+                    });
+                }
+            });
+
             $.ajax({
                 url: '@Url.Action("PTD002_Commit", "PTD")',
                 dataType: 'json',
@@ -532,14 +540,22 @@
 
                     } else {
                         layer.msg('扣帳失敗，原因:' + result.data.msg, { icon: 2 });
+                        layer.close(index);
                     }
                 },
                 error: function (error) {
                     layer.msg('扣帳失敗!原因:' + error.msg, { icon: 2 });
+                    layer.close(index);
+                },
+                complete: function () {
+                    // 隱藏轉圈圈動畫
+                    layer.close(index);
                 }
             });
         });
 
+
+
         // 取料號DESC
         function getItemDesc(itemNo) {
             $.ajax({

AMESCoreStudio.Web/Views/PTD/PTD003.cshtml

@@ -5,7 +5,6 @@
 
 <style type="text/css">
     .layui-table-main .layui-table-cell {
-        /*height: auto !important;*/
         white-space: normal;
     }
 
@@ -18,9 +17,7 @@
         cursor: pointer;
         padding-right: 10px;
         float: left;
-        border-width: 1px;
+        border: 1px solid #e6e6e6;
-        border-style: solid;
-        border-color: #e6e6e6;
         margin: 10px 0;
     }
 </style>
@@ -144,6 +141,68 @@
     </script>
 
     <script type="text/javascript">
+        //渲染出表格
+        var tableCols = [[
+            {
+                field: 'recordTypeID',
+                title: 'RecordType',
+            },
+            {
+                field: 'recordNumber',
+                title: 'RecordNumber',
+            },
+            {
+                field: 'lineNo',
+                title: 'LineNo',
+            },
+            {
+                field: 'sn',
+                title: 'SN',
+                sort: true
+            },
+            {
+                field: 'productID',
+                title: 'ProductID',
+                width: 160,
+                sort: true
+            },
+            {
+                field: 'customer',
+                title: 'Customer',
+            },
+            {
+                field: 'soNumber',
+                title: 'SO Number',
+            },
+            {
+                field: 'soLineNo',
+                title: 'SO Line',
+            },
+            {
+                field: 'location',
+                title: 'Location',
+            },
+            {
+                field: 'empID',
+                title: 'EMP',
+                sort: true
+            },
+            {
+                field: 'extNotes',
+                title: 'Notes',
+            },
+            {
+                field: 'recordDate',
+                title: 'RecordDate',
+                templet: '<div>{{ layui.util.toDateString(d.recordDate, "yyyy/MM/dd HH:mm:ss") }}</div>'
+            },
+            {
+                field: 'createDate',
+                title: 'CreateDate',
+                templet: '<div>{{ layui.util.toDateString(d.createDate, "yyyy/MM/dd HH:mm:ss") }}</div>'
+            }]
+        ];
+
         layui.use(['dropdown','form', 'layer', 'laydate'], function () {
             laydate = layui.laydate;
             laydate.render({
@@ -161,47 +220,6 @@
             });
         });
 
-        function formatJSONDate(jsonDate) {
-            if (jsonDate == null) {
-                return "";
-            }
-            else {
-                var date = eval(jsonDate.replace(/\/Date\((\d+)\)\//gi, "new Date($1)"));
-                var myDate = new Date(date);
-                var yy = myDate.getFullYear();
-                var mm = (myDate.getMonth() + 1 < 10 ? '0' : '') + (myDate.getMonth() + 1);
-                var dd = (myDate.getDate() < 10 ? '0' : '') + myDate.getDate();
-                var h = (myDate.getHours() < 10 ? '0' : '') + myDate.getHours();
-                var m = (myDate.getMinutes() < 10 ? '0' : '') + myDate.getMinutes();
-                var s = (myDate.getSeconds() < 10 ? '0' : '') + myDate.getSeconds();
-                //mm + "/" + dd + " " +
-                //var output = yy + "-" + mm + "-" + dd + " " + h + ":" + m + ":" + s;
-                var output = yy + mm + dd + h + m + s;
-                // myDate.getHours() + ":" + myDate.getMinutes() + ":" + myDate.getSeconds();
-                return output;
-            }
-        }
-
-        function base64(content) {
-            return window.btoa(unescape(encodeURIComponent(content)));
-        }
-
-        function tableToExcel(tableID, fileName) {
-            var table = document.getElementById(tableID);
-            var excelContent = table.innerHTML;
-            var excelFile = "<html xmlns:o='urn:schemas-microsoft-com:office:office' xmlns:x='urn:schemas-microsoft-com:office:excel' xmlns='http://www.w3.org/TR/REC-html40'>";
-            excelFile += "<head><meta charset='utf-8'><!--[if gte mso 9]><xml><x:ExcelWorkbook><x:ExcelWorksheets><x:ExcelWorksheet><x:Name>{worksheet}</x:Name><x:WorksheetOptions><x:DisplayGridlines/></x:WorksheetOptions></x:ExcelWorksheet></x:ExcelWorksheets></x:ExcelWorkbook></xml><![endif]--></head>";
-            excelFile += "<body><table>";
-            excelFile += excelContent;
-            excelFile += "</table></body>";
-            excelFile += "</html>";
-            var link = "data:application/vnd.ms-excel;base64," + base64(excelFile);
-            var a = document.createElement("a");
-            a.download = fileName + formatJSONDate(Date.now().toString()) + ".xls";
-            a.href = link;
-            a.click();
-        }
-
         function getCustomer(data)
         {
             $.ajax(
@@ -234,7 +252,6 @@
         hg.form.onsubmit('querysubmit', function (data) {
             hg.msghide("重新載入資料..");
             data.autoLoad = 1;
-            //table && table.reload(data);
             console.log(data);
             layui.table.reload('query', {
                 where: {
@@ -257,68 +274,7 @@
             });
         });
 
-        var tableCols = [[
-            {
-                field: 'recordTypeID',
-                title: 'RecordType',
-            },
-            {
-                field: 'recordNumber',
-                title: 'RecordNumber',
-            },
-            {
-                field: 'lineNo',
-                title: 'LineNo',
-            },
-            {
-                field: 'sn',
-                title: 'SN',
-                sort: true
-            },
-            {
-                field: 'productID',
-                title: 'ProductID',
-                width: 160,
-                sort: true
-            },
-            {
-                field: 'customer',
-                title: 'Customer',
-            },
-            {
-                field: 'soNumber',
-                title: 'SO Number',
-            },
-            {
-                field: 'soLineNo',
-                title: 'SO Line',
-            },
-            {
-                field: 'location',
-                title: 'Location',
-            },
-            {
-                field: 'empID',
-                title: 'EMP',
-                sort: true
-            },
-            {
-                field: 'extNotes',
-                title: 'Notes',
-            },
-            {
-                field: 'recordDate',
-                title: 'RecordDate',
-                templet: '<div>{{ layui.util.toDateString(d.recordDate, "yyyy/MM/dd HH:mm:ss") }}</div>'
-            },
-            {
-                field: 'createDate',
-                title: 'CreateDate',
-                templet: '<div>{{ layui.util.toDateString(d.createDate, "yyyy/MM/dd HH:mm:ss") }}</div>'
-            }]
-        ];
         
-        //var param = productTypeNo.value + '_' + testTypeNo.value + '_' + unitNo.value + '_' + lineID.value + '_' + stationID.value + '_' + wipNO.value + '_' + itemNO.value + '_' + dateStart.value + '_' + dateEnd.value;
 
         //基本数据表格
         var table = hg.table.datatable('query', '作業查詢', '/PTD/PTD003Query', { recordType: $("#recordType").val() }, tableCols, toolbar, false, 'full-100', ['filter', 'print', 'exports']);

AMESCoreStudio.Web/Views/QRS/QRS013.cshtml

@@ -1,7 +1,9 @@
 @{
-    ViewData["Title"] = "工單KeyParts查詢";
+    ViewData["Title"] = "工單KeyParts查詢(停用)";
     Layout = "~/Views/Shared/_AMESLayout.cshtml";
 }
+<h1> 前端畫面功能已經註解，後端邏輯已經刪除! </h1>
+@* 
 
 <div class="layui-card">
     <div class="layui-card-header">
@@ -294,4 +296,4 @@
         //基本数据表格
         var table = hg.table.datatable('test', '工單KeyParts資料', '/QRS/QRS013A', {}, tableCols, toolbar, true, 'full-100', ['filter', 'print', 'exports']);
     </script>
-}
+} *@

AMESCoreStudio.Web/Views/QRS/QRS017.cshtml

@@ -26,121 +26,67 @@
         </div>
     </div>
     <div class="layui-card-body">
-        
+        <button id="btnExport" class="layui-btn layui-btn-sm layui-btn-normal">導出數據</button>
     </div>
 </div>
 
-@section Scripts{
+@section Scripts {
     <script type="text/javascript">
         layui.config({
             base: '../lib/layui_ext/',
         }).extend({
             excel: 'excel',
         });
-    </script>
-
-    <script type="text/javascript">
 
         function formatJSONDate(jsonDate) {
             if (jsonDate == null) {
                 return "";
-            }
+            } else {
-            else {
+                var date = new Date(parseInt(jsonDate.replace(/\/Date\((\d+)\)\//, "$1")));
-                var date = eval(jsonDate.replace(/\/Date\((\d+)\)\//gi, "new Date($1)"));
+                var yy = date.getFullYear();
-                var myDate = new Date(date);
+                var mm = (date.getMonth() + 1).toString().padStart(2, '0');
-                var yy = myDate.getFullYear();
+                var dd = date.getDate().toString().padStart(2, '0');
-                var mm = (myDate.getMonth() + 1 < 10 ? '0' : '') + (myDate.getMonth() + 1);
+                var h = date.getHours().toString().padStart(2, '0');
-                var dd = (myDate.getDate() < 10 ? '0' : '') + myDate.getDate();
+                var m = date.getMinutes().toString().padStart(2, '0');
-                var h = (myDate.getHours() < 10 ? '0' : '') + myDate.getHours();
+                var s = date.getSeconds().toString().padStart(2, '0');
-                var m = (myDate.getMinutes() < 10 ? '0' : '') + myDate.getMinutes();
+                return `${yy}${mm}${dd}${h}${m}${s}`;
-                var s = (myDate.getSeconds() < 10 ? '0' : '') + myDate.getSeconds();
-                //mm + "/" + dd + " " +
-                //var output = yy + "-" + mm + "-" + dd + " " + h + ":" + m + ":" + s;
-                var output = yy + mm + dd + h + m + s;
-                // myDate.getHours() + ":" + myDate.getMinutes() + ":" + myDate.getSeconds();
-                return output;
             }
         }
 
-        layui.use(['jquery', 'excel', 'layer'], function () {
+        layui.use(['jquery', 'excel', 'layer', 'table', 'form'], function () {
             var $ = layui.jquery;
             var layer = layui.layer;
             var excel = layui.excel;
+            var table = layui.table;
+            var form = layui.form;
 
-            $('#btnExport').on('click', function () {
 
+            $('#btnExport').on('click', function () {
                 $.ajax({
                     url: '@Url.Action("QRS013A", "QRS")',
                     data: { "wipNO": $("#wipNO").val() },
                     dataType: 'json',
                     success(res) {
                         var data = res.data;
-
-                        var keys = [];
-                        var cols1 = [];
-                        var cols2 = [];
-                        var cols = {};
-                        var i = 0;
-                        var cols_title = "";
-                        for (var item in data[0])
-                        {
-                            //alert(item);
-                            //alert(data[0][item]);
-                            keys.push(item);
-
-                            cols1[i] = item;
-                            cols_title = cols_title + item.toString() + ",";
-                            //cols2[i] = item.toString() + ":\"" + item.toString() + "\"";
-                            //cols2[i] = item + ":" + item.toString();
-                            i = i + 1;
-                            cols2.push(item);
-                        }
-                        
-                        var cols_header = cols_title.substring(0, cols_title.length - 1);
-
-
-                        //data.unshift({ wipno: "wipno" });
-                        
-                        //data = excel.filterExportData(data, cols2);
-                        //data.unshift({ keys });
-                        //data.unshift(cols1);
                         data.unshift({ wipno: "WipNo", barcodeno: "BarcodeNo", extrabarcodeno: "ExtraBarcodeNo", modelno: "ModelNo", itemno: "ItemNo" });
 
                         var timestart = Date.now();
                         excel.downloadExcel(data, '組件明細' + formatJSONDate(Date.now().toString()), 'xlsx');
-
-                        //excel.exportExcel(data, '組件明細' + formatJSONDate(Date.now().toString()) + '.xlsx', 'xlsx');
-
                         var timeend = Date.now();
-
                         var spent = (timeend - timestart) / 1000;
                         layer.alert('導出數據耗時 ' + spent + ' s');
-                    }
+                    },
-                    , error() {
+                    error() {
                         layer.alert('導出數據失敗');
                     }
                 });
             });
         });
 
-        layui.use(['form', 'layer'], function () {
+        function result() {
-            form = layui.form;
-        });
-
-        function result()
-        {
             var wipNO = $("#wipNO").val();
-
-
             var query = "?wipNO=" + wipNO;
             hg.open('工單KeyParts查詢2', '/QRS/QRS017A' + query, '', '', true);
-
+        }
-        };
-
-        //监听表单提交事件
-        hg.form.onsubmit('querysubmit', function (data) {
-            table && table.reload(data);
-        });
-
     </script>
 }

AMESCoreStudio.Web/Views/QRS/QRS017A.cshtml

@@ -33,10 +33,7 @@
             var h = (myDate.getHours() < 10 ? '0' : '') + myDate.getHours();
             var m = (myDate.getMinutes() < 10 ? '0' : '') + myDate.getMinutes();
             var s = (myDate.getSeconds() < 10 ? '0' : '') + myDate.getSeconds();
-            //mm + "/" + dd + " " +
-            //var output = yy + "-" + mm + "-" + dd + " " + h + ":" + m + ":" + s;
             var output = yy + mm + dd + h + m + s;
-            // myDate.getHours() + ":" + myDate.getMinutes() + ":" + myDate.getSeconds();
             return output;
         }
     }

AMESCoreStudio.Web/Views/QRS/QRS028A.cshtml

@@ -82,7 +82,7 @@
             field: 'startDate',
             width: 160,
             title: '進站時間',
-            templet: '<div>{{ layui.util.toDateString(d.createDate, "yyyy/MM/dd HH:mm:ss") }}</div>'
+                templet: '<div>{{ layui.util.toDateString(d.startDate, "yyyy/MM/dd HH:mm:ss") }}</div>'
         },
         {
             field: 'inputDateHMS',

AMESCoreStudio.Web/Views/Shared/_FormLayout.cshtml

@@ -5,8 +5,8 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>@ViewData["Title"]</title>
     <link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.min.css" />
-    <link rel="stylesheet" href="~/lib/bootstrap/dist/css/icheck-bootstrap.min.css" />
     <link rel="stylesheet" href="~/css/style.css" asp-append-version="true">
+    <link rel="stylesheet" href="~/lib/layui/css/layui.css">
 </head>
 <body>
     <div class="container">
@@ -14,9 +14,10 @@
             @RenderBody()
         </main>
     </div>
-    <script src="~/lib/jquery/dist/jquery.min.js"></script>
+    <script src="~/lib/jquery/dist/jquery.js"></script>
     <script src="~/lib/bootstrap/dist/js/bootstrap.bundle.min.js"></script>
     <script src="~/js/site.js" asp-append-version="true"></script>
+    <script src="~/lib/layui/layui.all.js"></script>
     @RenderSection("Scripts", required: false)
 </body>
 </html>

AMESCoreStudio.Web/wwwroot/Reports/FQC010View.rdlc

@@ -2284,7 +2284,7 @@
                                 <Paragraph>
                                   <TextRuns>
                                     <TextRun>
-                                      <Value>Is Sample</Value>
+                                      <Value>Inspection Sample</Value>
                                       <Style />
                                     </TextRun>
                                   </TextRuns>

AMESCoreStudio.Web/wwwroot/Reports/SPC005ViewFAI.rdlc

@@ -502,7 +502,7 @@
                   <Paragraph>
                     <TextRuns>
                       <TextRun>
-                        <Value>QQ4-067</Value>
+                        <Value>QO4-067</Value>
                         <Style>
                           <FontFamily>微軟正黑體</FontFamily>
                           <FontSize>12pt</FontSize>

AMESCoreStudio.WebApi/Controllers/AMES/BarcodeItemsController.cs

@@ -5,12 +5,12 @@ using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
-using AMESCoreStudio.WebApi;
 using AMESCoreStudio.WebApi.Models.AMES;
 using AMESCoreStudio.CommonTools.Result;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-using System.Xml ;
+using System.Xml;
+using Dapper;
 
 
 namespace AMESCoreStudio.WebApi.Controllers.AMES
@@ -247,7 +247,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
         [HttpGet("ByBarCodeIDPCS009")]
         public async Task<ActionResult<IEnumerable<BarcodeItemDTO>>> GetBarcodeItemByBarCodeIDPCS009(int barcodeID)
         {
-            var q = from q1 in _context.BarcodeItems.Where(w => w.BarcodeID == barcodeID).OrderBy(o => o.BarcodeItemID)
+            var q = from q1 in _context.BarcodeItems.Where(w => w.BarcodeID == barcodeID).OrderBy(o => o.ItemNo)
                     join q2 in _context.Items on q1.ItemNo equals q2.ItemNo
                     join q3 in _context.Stationses on q1.StationID equals q3.StationID
                     join q4 in _context.UserInfoes on q1.CreateUserID equals q4.UserID
@@ -527,7 +527,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
         /// <param name="kpDateTime"></param>
         /// <returns></returns>
         [HttpPut("WriteBarcodeItem4DataCarrier/{barcodeID}/{wipID}/{stationID}/{itemNo}/{partNo}/{kpItemNo}/{kpDateTime}")]
-        public async Task<ResultModel<dynamic>> WriteBarcodeItem4DataCarrier(int barcodeID, int wipID, int stationID,string itemNo, string partNo, string kpItemNo, string kpDateTime)
+        public async Task<ResultModel<dynamic>> WriteBarcodeItem4DataCarrier(int barcodeID, int wipID, int stationID, string itemNo, string partNo, string kpItemNo, string kpDateTime)
         {
             Helper helper = new Helper(_context);
             ResultModel<dynamic> result = new ResultModel<dynamic>();
@@ -618,7 +618,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                         _context.BarcodeItems.Add(barcode_item);
                         await _context.SaveChangesAsync();
                     }
-                    catch(Exception ex)
+                    catch (Exception ex)
                     {
                         ngQty = ngQty + 1;
                         msg = msg + ex.Message;
@@ -949,7 +949,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
         /// <param name="wipId"></param>
         /// <returns></returns>
         [HttpDelete("{id}/{barcodeId}/{wipId}")]
-        public async Task<ResultModel<BarcodeItem>> DeleteBarcodeItems(int id,int barcodeId , int wipId)
+        public async Task<ResultModel<BarcodeItem>> DeleteBarcodeItems(int id, int barcodeId, int wipId)
         {
             ResultModel<BarcodeItem> result = new ResultModel<BarcodeItem>();
             //var repairResponsibleUnits = await _context.BarcodeItems.FindAsync(id);
@@ -970,14 +970,111 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
             return result;
         }
 
-        private bool BarcodeItemsExists(int id)
+        /// <summary>
+        /// 依據生產序號ID、工單ID、組件代碼、組件條碼來查詢組件清單
+        /// </summary>
+        /// <returns></returns>
+        // GET: api/BarcodeItems
+        [HttpGet("GetBarcodeItemsByBarcodeIDWipIDItemIDPartNo")]
+        public async Task<ActionResult<IEnumerable<BarcodeItemDTO>>> GetBarcodeItemsByBarcodeIDWipIDItemIDPartNo(string barcodeNo, string wipNo, string itemNo, string partNo)
+        {
+            try
+            {
+                // 主要查詢 BarcodeItems
+                var q = from q1 in _context.BarcodeItems
+                        join q2 in _context.Items on q1.ItemNo equals q2.ItemNo
+                        join q3 in _context.Stationses on q1.StationID equals q3.StationID
+                        join q4 in _context.UserInfoes on q1.CreateUserID equals q4.UserID
+                        join q5 in _context.WipInfos on q1.WipID equals q5.WipID
+                        join q6 in _context.BarcodeInfoes on q1.BarcodeID equals q6.BarcodeID
+                        where
+                            (string.IsNullOrEmpty(barcodeNo) || q6.BarcodeNo == barcodeNo) &&
+                            (string.IsNullOrEmpty(wipNo) || q5.WipNO == wipNo) &&
+                            (string.IsNullOrEmpty(itemNo) || q1.ItemNo == itemNo) &&
+                            (string.IsNullOrEmpty(partNo) || q1.PartNo == partNo)
+                        orderby q6.BarcodeNo, q1.ItemNo
+                        select new BarcodeItemDTO
+                        {
+                            BarcodeID = q1.BarcodeID,
+                            BarcodeNo = q6.BarcodeNo,
+                            WipID = q1.WipID,
+                            PartNo = q1.PartNo,
+                            KpItemNo = q1.KpItemNo,
+                            ItemNoName = q2.ItemName,
+                            StationName = q3.StationName,
+                            StationID = q1.StationID,
+                            CreateUser = q4.UserName,
+                            CreateDate = q1.CreateDate,
+                            SysType = q1.SysType,
+                            WipNo = q5.WipNO
+                        };
+
+                //第一階查詢
+                var result = await q.ToListAsync();
+
+                // 針對 MB / MB1 額外處理
+                var mbDataList = new List<(BarcodeItemDTO item, int index)>();
+
+                foreach (var macData in result.Where(x => x.ItemNoName == "MB" || x.ItemNoName == "MB1").ToList())
+                {
+                    int index = result.IndexOf(macData);
+                    var mbresult_barcodeinfo = await _context.BarcodeInfoes
+                        .Where(b => b.BarcodeNo == macData.PartNo)
+                        .FirstOrDefaultAsync();
+
+                    if (mbresult_barcodeinfo != null)
+                    {
+                        var macDataItems = await (from q1 in _context.BarcodeItems
+                                                  join q2 in _context.Items on q1.ItemNo equals q2.ItemNo
+                                                  join q3 in _context.Stationses on q1.StationID equals q3.StationID
+                                                  join q4 in _context.UserInfoes on q1.CreateUserID equals q4.UserID
+                                                  join q5 in _context.WipInfos on q1.WipID equals q5.WipID
+                                                  join q6 in _context.BarcodeInfoes on q1.BarcodeID equals q6.BarcodeID
+                                                  where q1.BarcodeID == mbresult_barcodeinfo.BarcodeID
+                                                  select new BarcodeItemDTO
+                                                  {
+                                                      BarcodeID = q1.BarcodeID,
+                                                      BarcodeNo = q6.BarcodeNo,
+                                                      WipID = q1.WipID,
+                                                      PartNo = q1.PartNo,
+                                                      KpItemNo = q1.KpItemNo,
+                                                      ItemNoName = "★" + macData.PartNo + "★" + q2.ItemName,
+                                                      StationName = q3.StationName,
+                                                      StationID = q1.StationID,
+                                                      CreateUser = q4.UserName,
+                                                      CreateDate = q1.CreateDate,
+                                                      SysType = q1.SysType,
+                                                      WipNo = q5.WipNO
+                                                  }).ToListAsync();
+
+                        if (macDataItems.Any())
+                        {
+                            foreach (var item in macDataItems)
+                            {
+                                mbDataList.Add((item, index + 1));
+                            }
+                        }
+                    }
+                }
+
+                // 插入到正確的位置
+                foreach (var data in mbDataList.OrderByDescending(x => x.index))
                 {
-            return _context.BarcodeItems.Any(e => e.BarcodeID == id);
+                    result.Insert(data.index, data.item);
                 }
-        private bool KPItemNoExists(string id)
+
+                return Ok(result);
+            }
+            catch (Exception ex)
             {
-            return _context.BarcodeItems.Any(e => e.KpItemNo == id);
+                return StatusCode(StatusCodes.Status500InternalServerError, "Internal server error: " + ex.Message);
             }
+        }
+
+
+
+
+
         private bool PartNoExists(string id)
         {
             return _context.BarcodeItems.Any(e => e.PartNo == id);

AMESCoreStudio.WebApi/Controllers/AMES/FqcInhouseMasterController.cs

@@ -746,7 +746,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
             result.Data = result.Data.Select(s => { s.StatusName = s.StatusName == "P" ? "允收" : s.StatusName == "R" ? "批退" : "未驗收完成"; return s; })
                           .ToList();
 
-            result.Data = result.Data.Select(s => { s.BoxQty = _context.BarcodeInfoes.Where(w => w.BoxNo == s.SerialNo).Count().ToString(); return s; }).ToList();
+            result.Data = result.Data.Select(s => { s.BoxQty = _context.BarcodeInfoes.Where(w => w.BoxNo == s.SerialNo).Count(); return s; }).ToList();
 
             return result;
         }
@@ -862,7 +862,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
             result.Data = result.Data.Select(s => { s.StatusName = s.StatusName == "P" ? "允收" : s.StatusName == "R" ? "批退" : "未驗收完成"; return s; })
                           .ToList();
 
-            result.Data = result.Data.Select(s => { s.BoxQty = _context.BarcodeInfoes.Where(w => w.BoxNo == s.SerialNo).Count().ToString(); return s; }).ToList();
+            result.Data = result.Data.Select(s => { s.BoxQty = _context.BarcodeInfoes.Where(w => w.BoxNo == s.SerialNo).Count(); return s; }).ToList();
 
             return result;
         }

AMESCoreStudio.WebApi/Controllers/AMES/PnQcCustomerRecordsController.cs

@@ -0,0 +1,199 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.EntityFrameworkCore;
+using AMESCoreStudio.WebApi.Models.AMES;
+using AMESCoreStudio.CommonTools.Result;
+
+namespace AMESCoreStudio.WebApi.Controllers.AMES
+{
+    /// <summary>
+    /// 料號對應工項資料檔
+    /// </summary>
+    [Route("api/[controller]")]
+    [ApiController]
+    public class PnQcCustomerRecordsController : ControllerBase
+    {
+        private readonly AMESContext _context;
+
+        public PnQcCustomerRecordsController(AMESContext context)
+        {
+            _context = context;
+        }
+
+        /// <summary>
+        /// 料號流程查詢 By料號、客戶代號、客戶名稱
+        /// </summary>
+        /// <param name="materialNo">料號</param>
+        /// <param name="customerID">客戶代號</param>
+        /// <param name="customerName">客戶名稱</param>
+        /// <returns></returns>
+        /// Get: api/PnQcCustomerRecords/Query/GetPnQcCustomerRecordsByCriteria
+        [HttpGet("Query")]
+        public async Task<ActionResult<IEnumerable<PnQcCustomerRecord>>> GetPnQcCustomerRecordsByCriteria(string materialNo, string customerName, string customerID, int page = 0, int limit = 10)
+        {
+            try
+            {
+                var query = _context.PnQcCustomerRecords.AsQueryable();
+
+                if (!string.IsNullOrEmpty(materialNo))
+                {
+                    query = query.Where(record => record.MaterialNo.Contains(materialNo));
+                }
+
+                if (!string.IsNullOrEmpty(customerID))
+                {
+                    query = query.Where(record => record.CustomerID.Contains(customerID));
+                }
+
+                if (!string.IsNullOrEmpty(customerName))
+                {
+                    query = query.Where(record => record.CustomerName.Contains(customerName));
+                }
+                query = query.OrderByDescending(record => record.CreateDate);
+
+                return await query.ToListAsync();
+            }
+            catch (Exception ex)
+            {
+                return StatusCode(500, new { message = ex.Message });
+            }
+        }
+
+
+
+        /// <summary>
+        /// 料號流程查詢 By料號、客戶代號、客戶名稱
+        /// </summary>
+        /// <param name="materialNo">料號</param>
+        /// <returns></returns>
+        /// Get: api/PnQcCustomerRecords/GetPnQcCustomerRecordsByMaterialNo
+        [HttpGet]
+        public async Task<ActionResult<IEnumerable<PnQcCustomerRecord>>> GetPnQcCustomerRecordsByMaterialNo(string materialNo)
+        {
+
+            var query = _context.PnQcCustomerRecords.AsQueryable();
+
+            if (!string.IsNullOrEmpty(materialNo))
+            {
+                query = query.Where(record => record.MaterialNo == materialNo);
+            }
+
+            return await query.ToListAsync();
+        }
+
+
+        /// <summary>
+        /// 更新料號對應客戶資料檔
+        /// </summary>
+        /// <param name="pnQcCustomerRecord"></param>
+        /// <returns></returns>
+        /// Put: api/PnQcCustomerRecords/{materialNo}
+        [HttpPut("{materialNo}")]
+        public async Task<ResultModel<PnQcCustomerRecord>> PnQcCustomerRecords(string materialNo, PnQcCustomerRecord pnQcCustomerRecord)
+        {
+            ResultModel<PnQcCustomerRecord> result = new ResultModel<PnQcCustomerRecord>();
+
+            // 查找對應的記錄
+            var existingRecord = await _context.PnQcCustomerRecords
+                .Where(record => record.MaterialNo == materialNo)
+                .FirstOrDefaultAsync();
+
+            if (existingRecord == null)
+            {
+                result.Success = false;
+                result.Msg = "Record not found";
+                return result;
+            }
+
+            // 更新資料
+            existingRecord.UpdateDate = pnQcCustomerRecord.UpdateDate;
+            existingRecord.UpdateUserID = pnQcCustomerRecord.UpdateUserID;
+            existingRecord.CustomerName = pnQcCustomerRecord.CustomerName;
+            existingRecord.CustomerID = pnQcCustomerRecord.CustomerID;
+
+            // 不更新某些屬性
+            _context.Entry(existingRecord).State = EntityState.Modified;
+            _context.Entry(existingRecord).Property("MaterialNo").IsModified = false;
+            _context.Entry(existingRecord).Property("CreateDate").IsModified = false;
+            _context.Entry(existingRecord).Property("CreateUserID").IsModified = false;
+
+            try
+            {
+                await _context.SaveChangesAsync();
+                result.Success = true;
+                result.Msg = "OK";
+            }
+            catch (Exception ex)
+            {
+                result.Success = false;
+                result.Msg = ex.InnerException?.Message ?? ex.Message;
+            }
+
+            return result;
+        }
+
+
+
+        /// <summary>
+        /// 新增料號對應客戶資料檔
+        /// </summary>
+        /// <param name="pnQcCustomerRecord"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public async Task<ResultModel<PnQcCustomerRecord>> PostPnQcCustomerRecord(PnQcCustomerRecord pnQcCustomerRecord)
+        {
+            ResultModel<PnQcCustomerRecord> result = new ResultModel<PnQcCustomerRecord>();
+            _context.PnQcCustomerRecords.Add(pnQcCustomerRecord);
+            try
+            {
+                await _context.SaveChangesAsync();
+                result.Success = true;
+                result.Msg = "OK";
+            }
+            catch (Exception ex)
+            {
+                result.Success = false;
+                result.Msg = ex.InnerException.Message;
+            }
+            return result;
+        }
+
+        /// <summary>
+        /// 刪除料號對客戶資料檔
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        /// Delete: api/PnQcCustomerRecords/{materialNo}
+        [HttpDelete("{material}")]
+        public async Task<ResultModel<string>> DeletePnQcCustomerRecord(string material)
+        {
+            ResultModel<string> result = new ResultModel<string>();
+            var pnQcCustomerRecord = await _context.PnQcCustomerRecords.FindAsync(material);
+
+            try
+            {
+                if (pnQcCustomerRecord == null)
+                {
+                    result.Success = false;
+                    result.Msg = "找不到要刪除資料";
+                }
+                else
+                {
+                    _context.PnQcCustomerRecords.Remove(pnQcCustomerRecord);
+                    await _context.SaveChangesAsync();
+                    result.Success = true;
+                    result.Msg = "OK";
+                }
+            }
+            catch (Exception ex)
+            {
+                result.Success = false;
+                result.Msg = ex.InnerException.Message;
+            }
+            return result;
+        }
+    }
+}

AMESCoreStudio.WebApi/Controllers/BLL/RPTController.cs

@@ -101,7 +101,7 @@ namespace AMESCoreStudio.WebApi.Controllers.BLL
             var b = await new FqcInhouseMasterController(_context).GetFqcInhouseMasteMultiQuery("", "", "", "", date_str: sDate, date_end: eDate, "Y");
             //2024-03-26 BB.Wang Modify改為讀取數量(原為入庫單箱數)
             //result.finishedProducts = b.DataTotal;
-            result.finishedProducts = b.Data.Sum(s => int.Parse(s.BoxQty));
+            result.finishedProducts = b.Data.Sum(s => s.BoxQty);
 
             //異常工時：GetExceptionWorktime4RPT001
             var c = await new ExceptionWorktimesController(_context).GetExceptionWorktime4RPT001(sDate, eDate);

AMESCoreStudio.WebApi/Controllers/aValue_API/ESUNAMESNoticeController.cs

@@ -0,0 +1,156 @@
+using Microsoft.AspNetCore.Mvc;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net.Http;
+using System.Net.Http.Headers;
+using Microsoft.Extensions.Configuration;
+using Newtonsoft.Json;
+using System.Text;
+using AMESCoreStudio.WebApi.Extensions; //擴充EF Core語法
+using Dapper;
+using System.Data;
+using AMESCoreStudio.WebApi.Models.aValue_API;
+using Microsoft.EntityFrameworkCore;
+using AMESCoreStudio.CommonTools.Result;
+using AMESCoreStudio.WebApi.Models.AMES;
+using System.Threading.Tasks;
+
+namespace AMESCoreStudio.WebApi.Controllers.aValue_API
+{
+    [Route("api/[controller]")]
+    [ApiController]
+    public class ESUNAMESNoticeController : ControllerBase
+    {
+        private readonly AMESContext _amesContext;
+        private readonly ESUNAMESContext _esuContext;
+        private readonly IConfiguration _config;
+
+        /// <summary>
+        /// 建構式
+        /// </summary>
+        public ESUNAMESNoticeController(AMESContext aMESContext, ESUNAMESContext eSUNAMESContext, IConfiguration configuration)
+        {
+            _amesContext = aMESContext;
+            _esuContext = eSUNAMESContext;
+            _config = configuration;
+        }
+
+        /// <summary>
+        /// 刪除昶亨TempTable
+        /// </summary>
+        /// <param name="wipNo"></param>
+        /// <returns></returns>
+        [HttpDelete("ESUNAMESTempTableByAvalueWipNo")]
+        public bool DeleteESUNAMESTempTableByAvalueWipNo(string wipNo)
+        {
+            using (var connection = _esuContext.Database.GetDbConnection())
+            {
+                var sql = "DELETE FROM jhames.WIP_BARCODE_FROM_AVALUE WHERE AV_WIP_NO = :WipNo";
+                var rowsAffected = connection.Execute(sql, new { WipNo = wipNo });
+                return rowsAffected > 0;
+            }
+        }
+
+
+        /// <summary>
+        /// 寫進昶亨TempTable
+        /// </summary>
+        /// <param name="models"></param>
+        /// <param name="userName"></param>
+        /// <returns></returns>
+        [HttpPost("ESUNAMESTempTableByAvalue")]
+        public async Task<IActionResult> PostESUNAMESTempTableByAvalue([FromBody] List<WipBarcodeOther> models, [FromQuery] string userName)
+        {
+            try
+            {
+                using (var connection = _esuContext.Database.GetDbConnection())
+                {
+                    var sql = @"
+    INSERT INTO jhames.WIP_BARCODE_FROM_AVALUE (AV_WIP_NO, START_NO, END_NO, CREATE_DATE, CREATE_USER_NAME)
+    VALUES (:WipNO, :StartNO, :EndNO, :CreateDate, :CreateUserName)";
+
+                    const int batchSize = 100; // 每批次插入的資料量
+                    for (int i = 0; i < models.Count; i += batchSize)
+                    {
+                        var batch = models.Skip(i).Take(batchSize).Select(model => new
+                        {
+                            WipNO = model.WipNO,
+                            StartNO = model.StartNO,
+                            EndNO = model.EndNO,
+                            CreateDate = DateTime.Now,
+                            CreateUserName = userName
+                        }).ToList();
+
+                        await connection.ExecuteAsync(sql, batch);
+                    }
+                }
+
+                return Ok(new { Message = "資料已成功寫進昶亨TempTable" });
+            }
+            catch (Exception ex)
+            {
+                return BadRequest(new { Message = ex.Message });
+            }
+
+        }
+
+
+
+
+        /// <summary>
+        /// 抓取安勤對應昶亨工單
+        /// </summary>
+        /// <param name="wipNo"></param>
+        /// <returns></returns>
+        [HttpGet("AvalueCorrespondingESUNAMESWipInfo")]
+        public bool GetAvalueCorrespondingESUNAMESWipInfo([FromQuery] string wipNo)
+        {
+            try
+            {
+                using (var connection = _esuContext.Database.GetDbConnection())
+                {
+                    var sql = "SELECT COUNT(1) FROM jhames.wip_info WHERE related_wo_no = :WipNo";
+                    var exists = connection.ExecuteScalar<bool>(sql, new { WipNo = wipNo });
+                    return exists;
+                }
+            }
+            catch (Exception ex)
+            {
+                return false;
+            }
+
+        }
+
+
+        /// <summary>
+        /// 判斷有昶亨有無設定出貨序號，有的話就抓取資料
+        /// </summary>
+        /// <param name="wipNo"></param>
+        /// <returns></returns>
+        [HttpGet("CheckESUNAMESShipmentNo")]
+        public ActionResult<List<ESUNAMESNotice>> GetCheckESUNAMESShipmentNo([FromQuery] string wipNo)
+        {
+            try
+            {
+                using (var connection = _esuContext.Database.GetDbConnection())
+                {
+                    var sql = @"
+                    select * from wip_barcode_other where wip_no in 
+                    (
+                        select distinct WIP_NO from jhames.wip_info where related_wo_no=:WipNo
+                    )";
+
+                    var result = connection.Query<ESUNAMESNotice>(sql, new { WipNo = wipNo }).ToList();
+
+                    return result;
+                }
+            }
+            catch (Exception ex)
+            {
+                return BadRequest(new { Message = ex.Message });
+            }
+
+        }
+    }
+}

AMESCoreStudio.WebApi/DTO/AMES/BarcodeItemDto.cs

@@ -17,6 +17,11 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         /// </summary>
         public int BarcodeItemID { get; set; }
 
+        /// <summary>
+        /// 生產序號
+        /// </summary>
+        public string BarcodeNo { get; set; }
+
         /// <summary>
         /// 内部條碼ID
         /// </summary>

AMESCoreStudio.WebApi/DTO/AMES/FqcInhouseMaster_WareDto.cs

@@ -136,7 +136,7 @@ namespace AMESCoreStudio.WebApi.DTO.AMES
         /// </summary>
         [DataMember]
         [Display(Name = "數量")]
-        public string BoxQty { get; set; }
+        public int BoxQty { get; set; }
 
     }
 }

AMESCoreStudio.WebApi/DTO/AMES/FqcResultDto.cs

@@ -59,11 +59,11 @@ namespace AMESCoreStudio.WebApi.DTO.AMES
         public string ExtraBarcodeNo { get; set; }
 
         /// <summary>
-        /// 狀態 P-PASS;F-FAIL;C-CPN
+        /// 狀態 P-PASS;F-FAIL;C-CPN; NA-無關
         /// </summary>
         [Display(Name = "狀態")]
         [Column("STATUS_NO")]
-        public string StatusNo { get; set; }
+        public string StatusNo { get; set; } = "NA";
 
         /// <summary>
         /// IsSample

AMESCoreStudio.WebApi/Models/AMES/BarcodeItem.cs

@@ -24,8 +24,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         /// </summary>
         [Column("BARCODE_ID")]
         [DataMember]
-        [Display(Name = "内部條碼ID")]
+        [Display(Name = "生產序號ID(内部條碼ID)")]
-        //[Key]
         public int BarcodeID { get; set; }
 
         /// <summary>
@@ -33,6 +32,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         /// </summary>
         [Column("WIP_ID")]
         [DataMember]
+        [Display(Name = "工單ID")]
         public int WipID { get; set; }
 
         /// <summary>

AMESCoreStudio.WebApi/Models/AMES/PnQcCustomerRecord.cs

@@ -0,0 +1,66 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Runtime.Serialization;
+
+namespace AMESCoreStudio.WebApi.Models.AMES
+{
+    /// <summary>
+    /// 料號對應客戶資料檔
+    /// </summary>
+    [Table("PN_QC_CUSTOMER_RECORD", Schema = "JHAMES")]
+    [DataContract]
+    public class PnQcCustomerRecord
+    {
+        /// <summary>
+        /// 料號
+        /// </summary>
+        [Key]
+        [Column("MATERIAL_NO")]
+        [DataMember]
+        public string MaterialNo { get; set; }
+
+        /// <summary>
+        /// 客戶代號
+        /// </summary>
+        [Column("CUSTOMER_ID")]
+        [DataMember]
+        public string CustomerID { get; set; }
+
+        /// <summary>
+        /// 客戶名稱
+        /// </summary>
+        [Column("CUSTOMER_NAME")]
+        [DataMember]
+        public string CustomerName { get; set; }
+
+        /// <summary>
+        /// 建立人員
+        /// </summary>
+        [Column("CREATE_USERID")]
+        [DataMember]
+        public int CreateUserID { get; set; }
+
+        /// <summary>
+        /// 建立時間
+        /// </summary>
+        [Column("CREATE_DATE")]
+        [DataMember]
+        public DateTime CreateDate { get; set; }
+
+        /// <summary>
+        /// 修改人員
+        /// </summary>
+        [Column("UPDATE_USERID")]
+        [DataMember]
+        public int UpdateUserID { get; set; }
+
+        /// <summary>
+        /// 修改時間
+        /// </summary>
+        [Column("UPDATE_DATE")]
+        [DataMember]
+        public DateTime UpdateDate { get; set; }
+
+    }
+}

AMESCoreStudio.WebApi/Models/AMES/WipInfo.cs

@@ -331,6 +331,14 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         [Display(Name = "客戶料號")]
         public string CustomerItemNO { get; set; }
 
+        /// <summary>
+        /// 客戶代號
+        /// </summary>
+        [Column("CUST_ID")]
+        [DataMember]
+        [Display(Name = "客戶代號")]
+        public string CustomerID { get; set; }
+
         /// <summary>
         /// 作業流程備註
         /// </summary>

AMESCoreStudio.WebApi/Models/AMESContext.cs

@@ -846,6 +846,11 @@ namespace AMESCoreStudio.WebApi
         /// </summary>
         public virtual DbSet<MaterialFqcItem> MaterialFqcItems { get; set; }
 
+        /// <summary>
+        /// 料號對應客戶資料檔
+        /// </summary>
+        public virtual DbSet<PnQcCustomerRecord> PnQcCustomerRecords { get; set; }
+
         /// <summary>
         /// 工單對應工項資料檔
         /// </summary>

AMESCoreStudio.WebApi/Models/aValue_API/ESUNAMESWipInfo.cs

@@ -0,0 +1,28 @@
+namespace AMESCoreStudio.WebApi.Models.aValue_API
+{
+
+    public partial class ESUNAMESNotice
+    {
+        /// <summary>
+        /// 工單號碼
+        /// </summary>
+        public string WiP_NO { get; set; }
+
+        /// <summary>
+        /// 關聯工單
+        /// </summary>
+        public string  RELATED_WO_NO  { get; set; }
+
+        /// <summary>
+        /// 開始序號
+        /// </summary>
+        public string START_NO { get; set; }
+
+        /// <summary>
+        /// 結束序號
+        /// </summary>
+        public string END_NO { get; set; }
+
+    }
+
+}

AMESCoreStudio.WebApi/Models/aValue_API/WipBarcodeFromAvalue.cs

@@ -0,0 +1,33 @@
+using System;
+
+namespace AMESCoreStudio.WebApi.Models.aValue_API
+{
+
+    public partial class WipBarcodeFromAvalue
+    {
+        /// <summary>
+        /// 安勤工單號碼
+        /// </summary>
+        public string AV_WIP_NO { get; set; }
+
+        /// <summary>
+        /// 開始出貨序號
+        /// </summary>
+        public string START_NO { get; set; }
+
+        /// <summary>
+        /// 結束出貨序號
+        /// </summary>
+        public string END_NO { get; set; }
+
+        /// <summary>
+        /// 建立日期
+        /// </summary>
+        public DateTime CREATE_DATE { get; set; }
+
+        /// <summary>
+        /// 建立人員(誰修改出貨序號)
+        /// </summary>
+        public string CREATE_USER_NAME { get; set; }
+    }
+}