diff --git a/ZR.Service/mes/qc/backend/QcBackEndService.cs b/ZR.Service/mes/qc/backend/QcBackEndService.cs
index 43b4bc4c..cb201cb1 100644
--- a/ZR.Service/mes/qc/backend/QcBackEndService.cs
+++ b/ZR.Service/mes/qc/backend/QcBackEndService.cs
@@ -959,11 +959,18 @@ namespace ZR.Service.Business
             int maxPackage
         )
         {
+            // 解析产品批次号，如果没有，则生成最新批次号
+            string batchCode = DoAnalyzeBatchCode(newLabelScran.Label);
+            if (string.IsNullOrEmpty(batchCode))
+            {
+                batchCode = DateTime.Now.ToString("yyMMdd") + "000";
+            }
             // 提取箱流水号
             int packageSort = 0;
             QcBackEndRecordLabelScan packagelabelScan = Context
                 .Queryable<QcBackEndRecordLabelScan>()
-                .Where(it => it.WorkOrder == newLabelScran.WorkOrder)
+                .Where(it => it.PartNumber == newLabelScran.PartNumber)
+                .Where(it => it.Label.Contains(batchCode))
                 .Where(it => it.LabelType == 1)
                 .OrderByDescending(it => it.LabelSort)
                 .First();
@@ -978,13 +985,6 @@ namespace ZR.Service.Business
                 .Where(it => it.Type == 1)
                 .Where(it => it.Status == 1)
                 .First();
-
-            // 解析产品批次号，如果没有，则生成最新批次号
-            string batchCode = DoAnalyzeBatchCode(newLabelScran.Label);
-            if (string.IsNullOrEmpty(batchCode))
-            {
-                batchCode = DateTime.Now.ToString("yyMMdd") + "000";
-            }
             // 生成工单号
             string workOrder = $"{batchCode}_{packageSort}";
             string newLabelCode =