1.修改生产进度查询

AMESCoreStudio.Web/Controllers/QRSController.cs

@@ -5627,8 +5627,6 @@ namespace AMESCoreStudio.Web.Controllers
             return Json(query.FPYDatas);
         }
 
-        
-
         public async Task<IActionResult> QRS014AAsync(string unitNo, string werksNo, string itemNO, string wipNO, string dateStart, string dateEnd, string modelNO, string dateType)
         {
             if (werksNo == "*")

AMESCoreStudio.WebApi/Controllers/AMES/BarcodeInfoesController.cs

@@ -103,7 +103,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
             var q = from q1 in _context.BarcodeInfoes
                     join q2 in _context.WipInfos on q1.WipID equals q2.WipID
                     join q3 in _context.LineInfoes on q2.LineID equals q3.LineID
-                    join q5 in _context.BarcodeStation on q1.BarcodeID equals q5.BarcodeID
+                    join q5 in _context.BarcodeStation on new { q1.BarcodeID, q1.WipID, q1.StationID } equals new { q5.BarcodeID, q5.WipID, q5.StationID }
                     join q4 in _context.UserInfoes on q5.CreateUserID equals q4.UserID
                     select new
                     {