diff --git a/AMESCoreStudio.Web/Controllers/FQCController.cs b/AMESCoreStudio.Web/Controllers/FQCController.cs
index 9e201fdf..11b1efae 100644
--- a/AMESCoreStudio.Web/Controllers/FQCController.cs
+++ b/AMESCoreStudio.Web/Controllers/FQCController.cs
@@ -1003,6 +1003,14 @@ namespace AMESCoreStudio.Web.Controllers
             }
         }
 
+        [HttpPost]
+        public async Task<IActionResult> FQC007GetPLMECN(string ItemNo)
+        {
+            IResultModel<string> result;
+            result = await _fqcApi.GetPLMEcn(ItemNo);
+            return Json(result);
+        }
+
         #region 抽驗
         [HttpGet]
         public async Task<IActionResult> FQC007C(string inhouseNo, string seq)
diff --git a/AMESCoreStudio.Web/Controllers/PCSController.cs b/AMESCoreStudio.Web/Controllers/PCSController.cs
index a880b103..c52ec4c1 100644
--- a/AMESCoreStudio.Web/Controllers/PCSController.cs
+++ b/AMESCoreStudio.Web/Controllers/PCSController.cs
@@ -5805,8 +5805,17 @@ namespace AMESCoreStudio.Web.Controllers
                 var ruleStations = await GetRuleStationByFlowRuleID(model.FlowRuleID);
                 if (model.Station != 0)
                 {
-                    model.RuleStation = ruleStations.Where(w => w.StationID == model.Station).FirstOrDefault().RuleStationID;
-                    model.StationTypeNo = ruleStations.Where(w => w.StationID == model.Station).FirstOrDefault().Station.TypeNo;
+                    if (ruleStations.Where(w => w.StationID == model.Station).Any())
+                    {
+                        model.RuleStation = ruleStations.Where(w => w.StationID == model.Station).FirstOrDefault().RuleStationID;
+                        model.StationTypeNo = ruleStations.Where(w => w.StationID == model.Station).FirstOrDefault().Station.TypeNo;
+                    }
+                    else
+                    {
+                        model.RuleStation = ruleStations.FirstOrDefault().RuleStationID;
+                        model.StationTypeNo = ruleStations.FirstOrDefault().Station.TypeNo;
+                        model.Station = ruleStations.FirstOrDefault().StationID;
+                    }
                 }
                 else
                 {
@@ -6910,7 +6919,7 @@ namespace AMESCoreStudio.Web.Controllers
             var result_BarcodeInfo = await _pcsApi.GetBarcodeInfoesByWipNo(model.WipNo.Trim().ToUpper());
             if (model.Type == "P")
             {
-                var put_BarcodeInfo = result_BarcodeInfo.Where(w => w.StationID == model.GoByStation).ToList();
+                var put_BarcodeInfo = result_BarcodeInfo.Where(w => w.StationID == model.GoByStation && w.StatusNo != "-1").ToList();
                 put_BarcodeInfo = put_BarcodeInfo.Select(s => { s.StationID = model.RetrueStation; return s; }).ToList();
                 foreach (var item in put_BarcodeInfo)
                 {
@@ -6924,7 +6933,7 @@ namespace AMESCoreStudio.Web.Controllers
                 var goByStations = result_RuleStation.Where(w => w.Sequence >= goBySequence).Select(s => s.StationID).ToList();
                 foreach (var Station in goByStations)
                 {
-                    var put_BarcodeInfo = result_BarcodeInfo.Where(w => w.StationID == Station).ToList();
+                    var put_BarcodeInfo = result_BarcodeInfo.Where(w => w.StationID == Station && w.StatusNo != "-1").ToList();
                     put_BarcodeInfo = put_BarcodeInfo.Select(s => { s.StationID = model.RetrueStation; return s; }).ToList();
                     foreach (var item in put_BarcodeInfo)
                     {
diff --git a/AMESCoreStudio.Web/HttpApis/AMES/IFQC.cs b/AMESCoreStudio.Web/HttpApis/AMES/IFQC.cs
index 713ee797..72d9da3e 100644
--- a/AMESCoreStudio.Web/HttpApis/AMES/IFQC.cs
+++ b/AMESCoreStudio.Web/HttpApis/AMES/IFQC.cs
@@ -83,7 +83,7 @@ namespace AMESCoreStudio.Web
         /// <param name="wipNo">工單號碼</param>
         /// <returns></returns>
         [WebApiClient.Attributes.HttpGet("api/QcItem/QcItemQuery")]
-        ITask<ResultModel<QcItemDto>> GetQcItemQuery(int groupID, int page, int limit,string itemNo = null,string wipNo = null);
+        ITask<ResultModel<QcItemDto>> GetQcItemQuery(int groupID, int page, int limit, string itemNo = null, string wipNo = null);
 
         /// <summary>
         /// 查詢檢驗項目維護 ID
@@ -210,7 +210,7 @@ namespace AMESCoreStudio.Web
         /// <param name="limit"></param>
         /// <returns></returns>
         [WebApiClient.Attributes.HttpGet("api/QcCriterion/QcCriterionQuery")]
-        ITask<ResultModel<QcCriterionDto>> GetQcCriterionQuery(int quotID, string AQLType , int QCQty, int page, int limit);
+        ITask<ResultModel<QcCriterionDto>> GetQcCriterionQuery(int quotID, string AQLType, int QCQty, int page, int limit);
 
         /// <summary>
         /// 查詢抽驗標準維護 ID
@@ -331,7 +331,7 @@ namespace AMESCoreStudio.Web
         /// </summary>
         /// <returns></returns>
         [WebApiClient.Attributes.HttpGet("api/FqcInhouseMaster/FqcQuery/{inhouseNo}")]
-        ITask<ResultModel<FqcDto>> GetFqcQuery(string inhouseNo,int? seqid = 1);
+        ITask<ResultModel<FqcDto>> GetFqcQuery(string inhouseNo, int? seqid = 1);
 
         /// <summary>
         /// 獲取不良現象群組資料
@@ -352,7 +352,7 @@ namespace AMESCoreStudio.Web
         /// </summary>
         /// <returns></returns>
         [WebApiClient.Attributes.HttpGet("api/NGReasons/Class/{no}")]
-        ITask<ResultModel<NGReason>> GetNGReasonsByClass(string no , int page = 0, int limit = 1000);
+        ITask<ResultModel<NGReason>> GetNGReasonsByClass(string no, int page = 0, int limit = 1000);
 
         /// <summary>
         /// 用內部序號取BarCode資料
@@ -380,7 +380,7 @@ namespace AMESCoreStudio.Web
         /// </summary>
         /// <returns></returns>
         [WebApiClient.Attributes.HttpGet("api/FqcResultMaster/ByInhouseNo/{inhouseNo}/{seq}")]
-        ITask<List<FqcResultMaster>> GetFqcResultMasterByInhouseNo(string inhouseNo,int seq);
+        ITask<List<FqcResultMaster>> GetFqcResultMasterByInhouseNo(string inhouseNo, int seq);
 
         /// <summary>
         /// 用入庫單號與序號取檢驗單明细資料
@@ -475,6 +475,13 @@ namespace AMESCoreStudio.Web
         /// <returns></returns>
         [WebApiClient.Attributes.HttpGet("api/FqcInhouseDetail/FqcInhouseDetailByFQC007All")]
         ITask<ResultModel<FqcResultDto>> FQC007InhouseDetails(string inhouseNo, int seqID);
+
+        /// <summary>
+        /// FQC007 取PLM ECN
+        /// </summary>
+        /// <returns></returns>
+        [WebApiClient.Attributes.HttpGet("api/GetPLMData/Get_PLM_ECN")]
+        ITask<ResultModel<string>> GetPLMEcn(string ItemNo);
         #endregion
 
         #region FQC008 FQC查詢
@@ -495,7 +502,7 @@ namespace AMESCoreStudio.Web
         [WebApiClient.Attributes.HttpGet("api/FqcInhouseMaster/FqcInhouseMasterQuery")]
         ITask<ResultModel<FqcInhouseMasterDto>> GetFqcInhouseMasterQuery(string barcodeNo = null, string wipNo = null
           , string boxNo = null, string inhouseNo = null, string date_str = null, string date_end = null
-            , string status = null, int page = 0, int limit = 10 ,string factoryID = null);
+            , string status = null, int page = 0, int limit = 10, string factoryID = null);
         #endregion
 
         #region FQC009 料號檢驗工項維護
@@ -559,7 +566,7 @@ namespace AMESCoreStudio.Web
         /// <param name="limit"></param>
         /// <returns></returns>
         [WebApiClient.Attributes.HttpGet("api/FqcNoticeMail/Query")]
-        ITask<ResultModel<FqcNoticeMailDto>> GetFqcNoticeMailQuery(string material, string fqcResult = null, string status = null,  int page = 0, int limit = 10);
+        ITask<ResultModel<FqcNoticeMailDto>> GetFqcNoticeMailQuery(string material, string fqcResult = null, string status = null, int page = 0, int limit = 10);
 
         /// <summary>
         /// 查詢FQC報表自動派送 ID
diff --git a/AMESCoreStudio.Web/Views/FQC/FQC007.cshtml b/AMESCoreStudio.Web/Views/FQC/FQC007.cshtml
index b557647d..2d598483 100644
--- a/AMESCoreStudio.Web/Views/FQC/FQC007.cshtml
+++ b/AMESCoreStudio.Web/Views/FQC/FQC007.cshtml
@@ -703,12 +703,16 @@
         // PLM_ECN
         function GetPLM_ECN() {
             $.ajax({
-                url: `http://plm935fs01:50786/RMA_GetLocation/QueryLastReleaseECN?item=@Model.ItemNo`,
-                type: "Get",
-                data: {},
+                url: "@Url.Action("FQC007GetPLMECN", "FQC")",
+                type: "Post",
+                data: { "unit_no":@Model.ItemNo},
                 success: function (result) {
-                    alert(resut.d);
-                    $('#PLMECN').val(result.d);
+                    if (result.success) {
+                        $('#PLMECN').val(result.msg);
+                    }
+                    else {
+                        alert(result.msg);
+                    }
                 },
                 error: function (result) {
                     alert(`呼叫API失敗`);
diff --git a/AMESCoreStudio.Web/Views/PCS/PCS021.cshtml b/AMESCoreStudio.Web/Views/PCS/PCS021.cshtml
index 6d4ce013..0804f9d0 100644
--- a/AMESCoreStudio.Web/Views/PCS/PCS021.cshtml
+++ b/AMESCoreStudio.Web/Views/PCS/PCS021.cshtml
@@ -510,6 +510,14 @@
                 $("#KpItemName").val('');
             });
 
+            form.on('select(line)', function (data) {
+                getUnitLineList(data.value);
+                $("#stations").empty();//清空下拉框的值
+                //getRuleStationList(data.value);
+                $("#KpItemName").val('');
+            });
+            
+
             form.on('select(stations)', function (data) {
                 $("#KpItemName").val('');
                 $("#GetWipData").click();
diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/NgInfoController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/NgInfoController.cs
index 18c4f351..a496906c 100644
--- a/AMESCoreStudio.WebApi/Controllers/AMES/NgInfoController.cs
+++ b/AMESCoreStudio.WebApi/Controllers/AMES/NgInfoController.cs
@@ -192,11 +192,11 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                     join q6 in _context.RMAReasons on q5.RepairNo equals q6.RMAReasonNo into s2
                     from q6 in s2.DefaultIfEmpty()
                     join q7 in _context.UserInfoes on q3.ReplyUserID equals q7.UserID
-                    join q8 in _context.WipInfos on q1.WipID equals q8.WipID
-                    join q9 in _context.RuleStations on new { q8.FlowRuleID, q1.StationID } equals new { q9.FlowRuleID, q9.StationID }
+                    join q8 in _context.WipInfos on q2.WipId equals q8.WipID
+                    join q9 in _context.Stationses on q2.StationId equals q9.StationID
                     select new NGInfoDto
                     {
-                        StationName = q9.StationDesc,
+                        StationName = q9.StationName,
                         LocationNo = q3.LocationNo,
                         NGNo = q3.NgNo.Replace("$", "") + "-" + q4.NGReasonDesc,
                         NGNoDesc = q4.NGReasonDesc,
diff --git a/AMESCoreStudio.WebApi/Controllers/BLL/BarCodeCheckController.cs b/AMESCoreStudio.WebApi/Controllers/BLL/BarCodeCheckController.cs
index 3956a188..4f3abab7 100644
--- a/AMESCoreStudio.WebApi/Controllers/BLL/BarCodeCheckController.cs
+++ b/AMESCoreStudio.WebApi/Controllers/BLL/BarCodeCheckController.cs
@@ -741,7 +741,8 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                 barcodeInfo.StatusNo = StatusNo;
                 barcodeInfo.WipID = barCodeCheckDto.wipID;
                 barcodeInfo.StatusID = 1;
-                barcodeInfo.ExtraBarcodeNo = barCodeCheckDto.extNo;
+                if (!string.IsNullOrWhiteSpace(barCodeCheckDto.extNo))
+                    barcodeInfo.ExtraBarcodeNo = barCodeCheckDto.extNo;
                 if (CheckNextStopCloseStation(barCodeCheckDto.wipNo, barCodeCheckDto.unitNo, barCodeCheckDto.stationID).Result.Success)
                 {
                     barcodeInfo.StatusID = -1;
diff --git a/AMESCoreStudio.WebApi/DTO/AMES/FQC010VIiew.cs b/AMESCoreStudio.WebApi/DTO/AMES/FQC010VIiew.cs
index 5e5d9b10..1474c2cf 100644
--- a/AMESCoreStudio.WebApi/DTO/AMES/FQC010VIiew.cs
+++ b/AMESCoreStudio.WebApi/DTO/AMES/FQC010VIiew.cs
@@ -175,12 +175,12 @@ namespace AMESCoreStudio.WebApi.DTO.AMES
         public string InspectionItems { get; set; } = "N/A";
 
         /// <summary>
-        /// 抽驗人員
+        /// 主管
         /// </summary>
         public string Approved { get; set; }
 
         /// <summary>
-        /// 主管
+        /// 抽驗人員
         /// </summary>
         public string Inspector { get; set; }