diff --git a/ZR.Admin.WebApi/Controllers/mes/wms/WmOneTimeInventoryController.cs b/ZR.Admin.WebApi/Controllers/mes/wms/WmOneTimeInventoryController.cs index bffeecf3..eef02823 100644 --- a/ZR.Admin.WebApi/Controllers/mes/wms/WmOneTimeInventoryController.cs +++ b/ZR.Admin.WebApi/Controllers/mes/wms/WmOneTimeInventoryController.cs @@ -170,7 +170,6 @@ namespace ZR.Admin.WebApi.Controllers /// /// 查询毛坯库存零件数 /// - /// /// [HttpGet("getPartNumber")] public IActionResult GetPartNumber() @@ -232,7 +231,6 @@ namespace ZR.Admin.WebApi.Controllers /// /// 一次合格品仓库数据导出 /// - /// /// [HttpGet("ErrorCheck")] [AllowAnonymous] diff --git a/ZR.Admin.WebApi/Controllers/mes/wms/WmOutOrderController.cs b/ZR.Admin.WebApi/Controllers/mes/wms/WmOutOrderController.cs index 7ff1faff..71525bf0 100644 --- a/ZR.Admin.WebApi/Controllers/mes/wms/WmOutOrderController.cs +++ b/ZR.Admin.WebApi/Controllers/mes/wms/WmOutOrderController.cs @@ -276,7 +276,7 @@ namespace ZR.Admin.WebApi.Controllers /// /// 6 出库单完成 /// - /// + /// /// [HttpGet("over_outorderplan")] public IActionResult OverOutorderplan(string shipmentNum) @@ -295,6 +295,7 @@ namespace ZR.Admin.WebApi.Controllers /// /// 扫码结果 /// 出库单号 + /// 零件号匹配 /// [HttpGet("checkProductionOut")] public IActionResult CheckProductionOut( diff --git a/ZR.Service/mes/wms/WmOneTimeRecordService.cs b/ZR.Service/mes/wms/WmOneTimeRecordService.cs index f93dbcce..7f6dd0fd 100644 --- a/ZR.Service/mes/wms/WmOneTimeRecordService.cs +++ b/ZR.Service/mes/wms/WmOneTimeRecordService.cs @@ -427,7 +427,7 @@ namespace ZR.Service.mes.wms Context.Ado.CommitTran(); return result; // 返回插入的记录数 } - catch (Exception ex) + catch (Exception) { Context.Ado.RollbackTran(); return -1; diff --git a/ZR.Service/mes/wms/WmOutOrderService.cs b/ZR.Service/mes/wms/WmOutOrderService.cs index f87a96b8..27545d60 100644 --- a/ZR.Service/mes/wms/WmOutOrderService.cs +++ b/ZR.Service/mes/wms/WmOutOrderService.cs @@ -1,6 +1,7 @@ using System; using System.Data; using System.Linq; +using System.Text.RegularExpressions; using Infrastructure.Attribute; using Mapster; using SqlSugar; @@ -161,7 +162,7 @@ namespace ZR.Service.mes.wms return Context.Insertable(wmOutOrder).ExecuteReturnEntity(); } - catch (Exception ex) + catch (Exception) { return null; } @@ -702,7 +703,7 @@ namespace ZR.Service.mes.wms } return result; } - catch (Exception ex) + catch (Exception) { return null; } @@ -748,7 +749,16 @@ namespace ZR.Service.mes.wms return "标签解析异常!请检查标签"; } //3 判断箱子是否配置零件号 - if (parnumber != resultionPackage.PartNumner) + string checkPartnumber = resultionPackage.PartNumner; + // 使用正则表达式匹配并移除特殊后缀 + string processedPartnumber = Regex.Replace( + checkPartnumber, + @"-(FL|FR|RR|RL)$", + "", + RegexOptions.IgnoreCase + ); + + if (parnumber != processedPartnumber) { return "此箱子不是选择的物料号"; } @@ -837,7 +847,7 @@ namespace ZR.Service.mes.wms // 6 .还差一个 数量超过要出库的箱子 return "此箱标签不可出库,批次号不在出库单计划内!请检查出库单计划!"; } - catch (Exception ex) + catch (Exception) { return "此箱标签存在异常不可出库!"; }