PDA出库零件号剔除-FL

ZR.Admin.WebApi/Controllers/mes/wms/WmOneTimeInventoryController.cs

@@ -170,7 +170,6 @@ namespace ZR.Admin.WebApi.Controllers
         /// <summary>
         /// 查询毛坯库存零件数
         /// </summary>
-        /// <param name="parm"></param>
         /// <returns></returns>
         [HttpGet("getPartNumber")]
         public IActionResult GetPartNumber()
@@ -232,7 +231,6 @@ namespace ZR.Admin.WebApi.Controllers
         /// <summary>
         /// 一次合格品仓库数据导出
         /// </summary>
-        /// <param name="parm"></param>
         /// <returns></returns>
         [HttpGet("ErrorCheck")]
         [AllowAnonymous]

ZR.Admin.WebApi/Controllers/mes/wms/WmOutOrderController.cs

@@ -276,7 +276,7 @@ namespace ZR.Admin.WebApi.Controllers
         /// <summary>
         /// 6 出库单完成
         /// </summary>
-        /// <param name="shipment_num"></param>
+        /// <param name="shipmentNum"></param>
         /// <returns></returns>
         [HttpGet("over_outorderplan")]
         public IActionResult OverOutorderplan(string shipmentNum)
@@ -295,6 +295,7 @@ namespace ZR.Admin.WebApi.Controllers
         /// </summary>
         /// <param name="production_packcode">扫码结果</param>
         /// <param name="shipment_num">出库单号</param>
+        /// <param name="partnumber">零件号匹配</param>
         /// <returns></returns>
         [HttpGet("checkProductionOut")]
         public IActionResult CheckProductionOut(

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;

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 "此箱标签存在异常不可出库！";
             }