diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/BarcodeInfoesController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/BarcodeInfoesController.cs
index 47f91257..cf42b7d1 100644
--- a/AMESCoreStudio.WebApi/Controllers/AMES/BarcodeInfoesController.cs
+++ b/AMESCoreStudio.WebApi/Controllers/AMES/BarcodeInfoesController.cs
@@ -200,6 +200,20 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
             return barcodeInfo;
         }
 
+        /// <summary>
+        /// 用工單ID找條碼资料
+        /// </summary>
+        /// <param name="id">工單ID</param>
+        /// <returns></returns>
+        [HttpGet("ByWipID/{id}")]
+        public async Task<ActionResult<IEnumerable<BarcodeInfo>>> GetBarcodeInfoesByWipID(int id)
+        {
+            IQueryable<BarcodeInfo> q = _context.BarcodeInfoes;
+            q = q.Where(p => p.WipID == id);
+            var barcodeInfo = await q.ToListAsync();
+            return barcodeInfo;
+        }
+
         /// <summary>
         /// 更新條碼资料
         /// </summary>
diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs
index 94b6f558..4b5e45fd 100644
--- a/AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs
+++ b/AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs
@@ -393,7 +393,8 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
         public async Task<ResultModel<dynamic>> GetWipInfoPCS008([FromQuery] WipInfoDto value, string statusNo = null)
         {
             ResultModel<dynamic> result = new ResultModel<dynamic>();
-            var q = from q1 in _context.WipInfos where q1.CompleteQTY != 0
+            var q = from q1 in _context.WipInfos
+                    where q1.CompleteQTY != 0
                     join q2 in _context.WipAtts on q1.WipNO equals q2.WipNO
                     join q3 in _context.LineInfoes on q1.LineID equals q3.LineID
                     join q4 in _context.FactoryUnits on q1.UnitNO equals q4.UnitNo
@@ -434,7 +435,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
             }
 
             DateTime dateTime = DateTime.Now;
-            if (DateTime.TryParse(value.date_str , out dateTime))
+            if (DateTime.TryParse(value.date_str, out dateTime))
             {
                 q = q.Where(w => w.CreateDate >= DateTime.Parse(value.date_str));
             }
@@ -585,18 +586,21 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
             ResultModel<WipInfo> result = new ResultModel<WipInfo>();
             try
             {
-                WipInfo wipinfo = new WipInfo
-                {
-                    WipID = id,
-                    StatusNO = statusno,
-                    UpdateDate = DateTime.Now
-                };
-                _context.WipInfos.Attach(wipinfo);
-                // 指定更新某個欄位
-                _context.Entry(wipinfo).Property(p => p.StatusNO).IsModified = true;
-                _context.Entry(wipinfo).Property(p => p.UpdateDate).IsModified = true;
-
-                await _context.SaveChangesAsync();
+                await _context.Database.ExecuteSqlInterpolatedAsync
+                ($"UPDATE JHAMES.WIP_INFO SET STATUS_NO={statusno} , UPDATE_DATE={DateTime.Now} WHERE WIP_ID={id}");
+
+                //WipInfo wipinfo = new WipInfo
+                //{
+                //    WipID = id,
+                //    StatusNO = statusno,
+                //    UpdateDate = DateTime.Now
+                //};
+                //_context.WipInfos.Attach(wipinfo);
+                //// 指定更新某個欄位
+                //_context.Entry(wipinfo).Property(p => p.StatusNO).IsModified = true;
+                //_context.Entry(wipinfo).Property(p => p.UpdateDate).IsModified = true;
+
+                //await _context.SaveChangesAsync();
                 result.Success = true;
                 result.Msg = "OK";
             }
diff --git a/AMESCoreStudio.WebApi/Controllers/BLL/BarCodeCheckController.cs b/AMESCoreStudio.WebApi/Controllers/BLL/BarCodeCheckController.cs
index 3532e9cd..9851e5cf 100644
--- a/AMESCoreStudio.WebApi/Controllers/BLL/BarCodeCheckController.cs
+++ b/AMESCoreStudio.WebApi/Controllers/BLL/BarCodeCheckController.cs
@@ -2183,20 +2183,20 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
         [HttpGet("CheckWipNoBarCodeAllClost")]
         public async Task<IResultModel> CheckWipNoBarCodeAllClost(string wipno, string unitNo, int ruleStationID)
         {
-            ResultModel<string> resultModel = new ResultModel<string> { Success = false };
+            ResultModel<string> resultModel = new ResultModel<string> { Success = true };
             WipInfosController wipInfosController = new WipInfosController(_context);
             var wipInfo = wipInfosController.GetWipInfoByWipNo(wipno).Result.Value.FirstOrDefault(w => w.UnitNO == unitNo);
 
             if (wipInfo != null)
             {
                 int wipID = wipInfo.WipID;
-                BarcodeStationController barcodeStationController = new BarcodeStationController(_context);
-                var barCodeStations = await barcodeStationController.GetBarcodeStationByWipID(wipID);
+                BarcodeInfoesController barcodeInfoesController = new BarcodeInfoesController(_context);
+                var barcodeInfos = await barcodeInfoesController.GetBarcodeInfoesByWipID(wipID);
 
                 // 比對過站Station完工跟工單數一樣 = 完工
 
                 if (wipInfo.PlanQTY ==
-                    barCodeStations.Value.Where(w => w.RuleStatus == "P" && w.RuleStationID == ruleStationID).Count())
+                    barcodeInfos.Value.Where(w => w.RuleStatus == "P" && w.RuleStationID == ruleStationID).Count())
                 {
                     var result = await wipInfosController.PutWipinfoToStatusNO(wipID, "E");
                     if (!result.Success)