From ad8a07437e2371818e5bfa80661ad99dc9478125 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E6=AD=A3=E6=98=93?= Date: Tue, 3 Jun 2025 14:48:47 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=B0=E5=BD=95=E8=87=AA=E5=8A=A8=E7=94=9F?= =?UTF-8?q?=E6=88=90=E6=97=B6=EF=BC=8C=E8=BF=87=E6=BB=A4-FL=E9=9B=B6?= =?UTF-8?q?=E4=BB=B6=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ZR.Service/mes/wms/WmOneTimeRecordService.cs | 45 ++++++++++++++++++-- ZR.Service/mes/wms/WmPolishRecordService.cs | 45 ++++++++++++++++++-- 2 files changed, 82 insertions(+), 8 deletions(-) diff --git a/ZR.Service/mes/wms/WmOneTimeRecordService.cs b/ZR.Service/mes/wms/WmOneTimeRecordService.cs index 7f6dd0fd..0992f9c4 100644 --- a/ZR.Service/mes/wms/WmOneTimeRecordService.cs +++ b/ZR.Service/mes/wms/WmOneTimeRecordService.cs @@ -9,6 +9,7 @@ using ZR.Model.MES.wms; using ZR.Model.MES.wms.Dto; using ZR.Repository; using ZR.Service.mes.wms.IService; +using System.Text.RegularExpressions; namespace ZR.Service.mes.wms { @@ -334,13 +335,22 @@ namespace ZR.Service.mes.wms foreach (var item in qcQualityStatisticsFirsts) { + // TODO 零件号二次处理 + string partNumber = item.FinishedPartNumber; + // 使用正则表达式匹配并移除特殊后缀 + string processedPartnumber = Regex.Replace( + partNumber, + @"-(FL|FR|RR|RL)$", + "", + RegexOptions.IgnoreCase + ); wmOneTimeRecords.Add( new WmOneTimeRecord { Id = SnowFlakeSingle.Instance.NextId().ToString(), FkInventoryId = item.Id, Code = "自动", - Partnumber = item.FinishedPartNumber, + Partnumber = processedPartnumber, ChangeType = 1, ChangeQuantity = item.QualifiedNumber, ActionTime = item.StartTime, @@ -352,13 +362,22 @@ namespace ZR.Service.mes.wms foreach (var item in wmPolishWorkQualityStatistics) { + // TODO 零件号二次处理 + string partNumber = item.Partnumber; + // 使用正则表达式匹配并移除特殊后缀 + string processedPartnumber = Regex.Replace( + partNumber, + @"-(FL|FR|RR|RL)$", + "", + RegexOptions.IgnoreCase + ); wmOneTimeRecords.Add( new WmOneTimeRecord { Id = SnowFlakeSingle.Instance.NextId().ToString(), FkInventoryId = item.Id, Code = "自动", - Partnumber = item.Partnumber, + Partnumber = processedPartnumber, ChangeType = 1, ChangeQuantity = item.QualifiedNumber, ActionTime = item.StartTime, @@ -370,13 +389,22 @@ namespace ZR.Service.mes.wms foreach (var item in qcGp12ServiceStatistics) { + // TODO 零件号二次处理 + string partNumber = item.PartNumber; + // 使用正则表达式匹配并移除特殊后缀 + string processedPartnumber = Regex.Replace( + partNumber, + @"-(FL|FR|RR|RL)$", + "", + RegexOptions.IgnoreCase + ); wmOneTimeRecords.Add( new WmOneTimeRecord { Id = SnowFlakeSingle.Instance.NextId().ToString(), FkInventoryId = item.Id, Code = "自动", - Partnumber = item.PartNumber, + Partnumber = processedPartnumber, ChangeType = 2, ChangeQuantity = item.RequireNumber, ActionTime = item.StartTime, @@ -388,13 +416,22 @@ namespace ZR.Service.mes.wms foreach (var item in qcBackEndQualityStatistics) { + // TODO 零件号二次处理 + string partNumber = item.PartNumber; + // 使用正则表达式匹配并移除特殊后缀 + string processedPartnumber = Regex.Replace( + partNumber, + @"-(FL|FR|RR|RL)$", + "", + RegexOptions.IgnoreCase + ); wmOneTimeRecords.Add( new WmOneTimeRecord { Id = SnowFlakeSingle.Instance.NextId().ToString(), FkInventoryId = item.Id, Code = "自动", - Partnumber = item.PartNumber, + Partnumber = processedPartnumber, ChangeType = 2, ChangeQuantity = item.RequireNumber, ActionTime = item.StartTime, diff --git a/ZR.Service/mes/wms/WmPolishRecordService.cs b/ZR.Service/mes/wms/WmPolishRecordService.cs index 05a846bf..b35d8ae8 100644 --- a/ZR.Service/mes/wms/WmPolishRecordService.cs +++ b/ZR.Service/mes/wms/WmPolishRecordService.cs @@ -1,5 +1,6 @@ using System; using System.Linq; +using System.Text.RegularExpressions; using Infrastructure.Attribute; using Infrastructure.Extensions; using SqlSugar; @@ -375,13 +376,22 @@ namespace ZR.Service.mes.wms foreach (var item in qcQualityStatisticsFirsts) { + // TODO 零件号二次处理 + string partNumber = item.FinishedPartNumber; + // 使用正则表达式匹配并移除特殊后缀 + string processedPartnumber = Regex.Replace( + partNumber, + @"-(FL|FR|RR|RL)$", + "", + RegexOptions.IgnoreCase + ); wmPolishRecords.Add( new WmPolishRecord { Id = SnowFlakeSingle.Instance.NextId().ToString(), FkInventoryId = item.Id, Code = "自动", - Partnumber = item.FinishedPartNumber, + Partnumber = processedPartnumber, ChangeType = 1, ChangeQuantity = item.PaoguangTotal, ActionTime = item.StartTime, @@ -393,13 +403,22 @@ namespace ZR.Service.mes.wms foreach (var item in qcBackEndQualityStatistics) { + // TODO 零件号二次处理 + string partNumber = item.PartNumber; + // 使用正则表达式匹配并移除特殊后缀 + string processedPartnumber = Regex.Replace( + partNumber, + @"-(FL|FR|RR|RL)$", + "", + RegexOptions.IgnoreCase + ); wmPolishRecords.Add( new WmPolishRecord { Id = SnowFlakeSingle.Instance.NextId().ToString(), FkInventoryId = item.Id, Code = "自动", - Partnumber = item.PartNumber, + Partnumber = processedPartnumber, ChangeType = 1, ChangeQuantity = item.PolishNumber, ActionTime = item.StartTime, @@ -411,13 +430,22 @@ namespace ZR.Service.mes.wms foreach (var item in qcGp12ServiceStatistics) { + // TODO 零件号二次处理 + string partNumber = item.PartNumber; + // 使用正则表达式匹配并移除特殊后缀 + string processedPartnumber = Regex.Replace( + partNumber, + @"-(FL|FR|RR|RL)$", + "", + RegexOptions.IgnoreCase + ); wmPolishRecords.Add( new WmPolishRecord { Id = SnowFlakeSingle.Instance.NextId().ToString(), FkInventoryId = item.Id, Code = "自动", - Partnumber = item.PartNumber, + Partnumber = processedPartnumber, ChangeType = 1, ChangeQuantity = item.PolishNumber, ActionTime = item.StartTime, @@ -429,13 +457,22 @@ namespace ZR.Service.mes.wms foreach (var item in wmPolishWorkQualityStatistics) { + // TODO 零件号二次处理 + string partNumber = item.Partnumber; + // 使用正则表达式匹配并移除特殊后缀 + string processedPartnumber = Regex.Replace( + partNumber, + @"-(FL|FR|RR|RL)$", + "", + RegexOptions.IgnoreCase + ); wmPolishRecords.Add( new WmPolishRecord { Id = SnowFlakeSingle.Instance.NextId().ToString(), FkInventoryId = item.Id, Code = "自动", - Partnumber = item.Partnumber, + Partnumber = processedPartnumber, ChangeType = 2, ChangeQuantity = item.RequireNumber, ActionTime = item.StartTime,