1. 修正FQC過站

2. 條碼歷程組件替換顯示修正

AMESCoreStudio.WebApi/Controllers/AMES/BarcodeItemChangesController.cs

@@ -77,19 +77,20 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
         public async Task<ActionResult<IEnumerable<BarcodeItemChangeDTO>>> GetBarcodeItemChangesByBarCodeIDPCS009(int id)
         {
             var q = from q1 in _context.BarcodeItemChanges.Where(w => w.BarcodeID == id)
-                    join q2 in _context.Items on q1.ItemNo equals q2.ItemNo
+                    join q2 in _context.WipInfos on q1.WipID equals q2.WipID
-                    join q3 in _context.RuleStations on q1.StationID equals q3.StationID
+                    join q3 in _context.Items on q1.ItemNo equals q3.ItemNo
-                    join q4 in _context.UserInfoes on q1.CreateUserID equals q4.UserID
+                    join q4 in _context.RuleStations on new { q2.FlowRuleID, q1.StationID } equals new { q4.FlowRuleID, q4.StationID }
+                    join q5 in _context.UserInfoes on q1.CreateUserID equals q5.UserID
                     select new BarcodeItemChangeDTO
                     {
                         BarcodeID = q1.BarcodeID,
                         WipID = q1.WipID,
                         PartNoOld = q1.PartNoOld,
                         KpItemNo = q1.KpItemNo,
-                        ItemNoName = q2.ItemName,
+                        ItemNoName = q3.ItemName,
-                        StationName = q3.StationDesc,
+                        StationName = q4.StationDesc,
                         StationID = q1.StationID,
-                        CreateUser = q4.UserName,
+                        CreateUser = q5.UserName,
                         CreateDate = q1.CreateDate,
                         ChangeType = q1.ChangeType
                     };

AMESCoreStudio.WebApi/Controllers/BLL/BarCodeCheckController.cs

@@ -485,6 +485,18 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                                 barCodeCheckDto.barcode = barcode.BarcodeNo;
                                 barCodeCheckDto.barcodeID = barcode.BarcodeID;
                                 barCodeCheckDto.extNo = barcode.ExtraBarcodeNo;
+                                barCodeCheckDto.flowRule = _context.WipInfos.Where(w => w.WipID == barcode.WipID).FirstOrDefault().FlowRuleID;
+
+                                var result_CUTableMsg = await CU_Tables(barCodeCheckDto, false);
+                                if (string.IsNullOrWhiteSpace(result_CUTableMsg))
+                                {
+                                    resultModel.Success = true;
+                                    resultModel.Msg = "FQC過站完成";
+                                }
+                                else
+                                {
+                                    resultModel.Msg = result_CUTableMsg;
+                                }
                             }
                         } // 條碼
                         else
@@ -497,7 +509,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                                 barCodeCheckDto.barcode = BarcodeNo.BarcodeNo;
                                 barCodeCheckDto.barcodeID = BarcodeNo.BarcodeID;
                                 barCodeCheckDto.extNo = BarcodeNo.ExtraBarcodeNo;
-                            }
+                                barCodeCheckDto.flowRule = _context.WipInfos.Where(w => w.WipID == BarcodeNo.WipID).FirstOrDefault().FlowRuleID;
                             }
 
                             var result_CUTableMsg = await CU_Tables(barCodeCheckDto, false);
@@ -512,6 +524,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                             }
                         }
                     }
+                }
                 else
                 {
                     resultModel.Msg = $"該筆工單號碼【{InhouseMaster.WipNo}】，無設定FQC站別";