From ced4eeb6c646f309a8c7b8c09c4312105c086e79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E6=AD=A3=E6=98=93?= Date: Thu, 22 May 2025 11:09:13 +0800 Subject: [PATCH] =?UTF-8?q?=E5=94=AF=E4=B8=80=E6=80=A7=E5=88=A4=E5=AE=9A?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ZR.Service/mes/qc/backend/QcBackEndService.cs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) 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() - .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 =