diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/BarcodeStationController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/BarcodeStationController.cs index ab8cb5da..051383d6 100644 --- a/AMESCoreStudio.WebApi/Controllers/AMES/BarcodeStationController.cs +++ b/AMESCoreStudio.WebApi/Controllers/AMES/BarcodeStationController.cs @@ -83,6 +83,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES { var q = from q1 in _context.BarcodeStation.Where(w => w.BarcodeID == barcodeID) join q2 in _context.UserInfoes on q1.CreateUserID equals q2.UserID + join q3 in _context.RuleStations on q1.RuleStationID equals q3.RuleStationID select new BarcodeStation { BarcodeID = q1.BarcodeID, @@ -91,7 +92,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES RuleStatus = q1.RuleStatus, Systype = q1.Systype, CreateDate = q1.CreateDate, - GetRuleStation = q1.GetRuleStation, + GetRuleStation = q3, UserName = q2.UserName }; return await q.ToListAsync();