U8调整

ZR.Service/mes/qc/backend/QcBackEndService.cs

@@ -1,17 +1,18 @@
-using System;
-using System.Text.Json;
-using System.Text.RegularExpressions;
-using System.Threading.Tasks;
 using Infrastructure.Attribute;
 using Microsoft.Extensions.Logging;
 using MQTTnet.Protocol;
 using SqlSugar;
+using System;
+using System.Collections.Concurrent;
+using System.Text;
+using System.Text.Json;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
 using ZR.Common.MqttHelper;
 using ZR.Model.Business;
 using ZR.Model.Dto;
 using ZR.Model.MES.wms;
 using ZR.Service.Business.IBusinessService;
-using static System.Runtime.InteropServices.JavaScript.JSType;
 
 namespace ZR.Service.Business
 {
@@ -974,7 +975,8 @@ namespace ZR.Service.Business
                 );
 
                 var payload = JsonSerializer.Serialize(mqttEventDto);
-
+                // 添加打印记录
+                await AddBackendLabelPrintRecordAsync(mqttEventDto, newLabelScran.WorkOrder, maxPackage, specialPrintType);
                 // 保持原有PublishAsync调用方式
                 await _mqttService.PublishAsync(
                     topic,
@@ -985,8 +987,7 @@ namespace ZR.Service.Business
 
                 _logger.LogInformation($"发送后道外箱标签打印成功：{topic}");
 
-                // 添加打印记录
-                await AddBackendLabelPrintRecordAsync(mqttEventDto, newLabelScran.WorkOrder, maxPackage, specialPrintType);
+
             }
             catch (JsonException ex)
             {
@@ -1025,7 +1026,7 @@ namespace ZR.Service.Business
                     _logger.LogWarning(ex, "解析批次号失败");
                 }
                 // 上一个内标签流水号检查
-                int oldPackageLabelSort = 1;
+/*                int oldPackageLabelSort = 1;
                 QcBackendRecordLabelPrint lastPackagelabelInfo = Context
                     .Queryable<QcBackendRecordLabelPrint>()
                     .Where(it => it.PartNumber == labelScan.PartNumber)
@@ -1040,7 +1041,7 @@ namespace ZR.Service.Business
                 else
                 {
                     oldPackageLabelSort = lastPackagelabelInfo.SerialNumber.Value;
-                }
+                }*/
                 QcBackendRecordLabelPrint printRecord =
                     new()
                     {
@@ -1052,7 +1053,7 @@ namespace ZR.Service.Business
                         Description = description,
                         Team = labelScan.Team ?? "未知班组",
                         BatchCode = batchCode,
-                        SerialNumber = oldPackageLabelSort + 1,
+                        SerialNumber = labelScan.Sort,
                         PartNum = maxPackage,
                         LabelType = 1,
                         BoxMaxNum = maxPackage,