Teams/shgx_tz_mes_backend_sync
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

重要：代码全局优化与添加一次合格，抛光仓库的截止日期数据查询功能

Browse Source
This commit is contained in:
赵正易
2025-07-28 15:40:59 +08:00
parent 89c113e5e1
commit 42de49629b
162 changed files with 3335 additions and 3604 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
ZR.Service/mes/qc/backend/QcBackEndService.cs
View File

@@ -3,8 +3,6 @@ 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;
@@ -916,7 +914,7 @@ namespace ZR.Service.Business
// 是否需要扫箱标签
bool needScanPackageLabel = packageLabelCount * maxPackageNum < innerLabelCount;
// TODO额外附加标签
/* Console.WriteLine($"======= CheckPackageIsFullAndNeedScanPackageLabel,maxPackageNum:{maxPackageNum},innerLabelCount:{innerLabelCount},packageLabelCount:{packageLabelCount},isFull:{isFull},needScanPackageLabel:{needScanPackageLabel}");*/
/* Console.WriteLine($"======= CheckPackageIsFullAndNeedScanPackageLabel,maxPackageNum:{maxPackageNum},innerLabelCount:{innerLabelCount},packageLabelCount:{packageLabelCount},isFull:{isFull},needScanPackageLabel:{needScanPackageLabel}");*/
neeedScan = isFull && needScanPackageLabel;
return neeedScan;
}
@@ -1030,22 +1028,22 @@ namespace ZR.Service.Business
_logger.LogWarning(ex, "解析批次号失败");
}
// 上一个内标签流水号检查
/* int oldPackageLabelSort = 1;
QcBackendRecordLabelPrint lastPackagelabelInfo = Context
.Queryable<QcBackendRecordLabelPrint>()
.Where(it => it.PartNumber == labelScan.PartNumber)
.Where(it => it.BatchCode.Contains(batchCode))
.Where(it => it.LabelType == 1)
.OrderByDescending(it => it.SerialNumber)
.First();
if (lastPackagelabelInfo == null)
{
oldPackageLabelSort = 1;
}
else
{
oldPackageLabelSort = lastPackagelabelInfo.SerialNumber.Value;
}*/
/* int oldPackageLabelSort = 1;
QcBackendRecordLabelPrint lastPackagelabelInfo = Context
.Queryable<QcBackendRecordLabelPrint>()
.Where(it => it.PartNumber == labelScan.PartNumber)
.Where(it => it.BatchCode.Contains(batchCode))
.Where(it => it.LabelType == 1)
.OrderByDescending(it => it.SerialNumber)
.First();
if (lastPackagelabelInfo == null)
{
oldPackageLabelSort = 1;
}
else
{
oldPackageLabelSort = lastPackagelabelInfo.SerialNumber.Value;
}*/
QcBackendRecordLabelPrint printRecord =
new()
{