From 901a789da512dfa174bcb201411b2804e01d269f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor@qq.com>
Date: Thu, 18 Jul 2024 10:31:18 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=AF=BC=E5=85=A5SAP=E7=BB=93=E6=9E=9C?=
 =?UTF-8?q?=EF=BC=8C=E2=80=9C=E4=BF=AE=E6=94=B9=E5=A4=B1=E8=B4=A5=E8=AE=A1?=
 =?UTF-8?q?=E9=87=8F=E5=8D=95=E4=BD=8D=E2=80=9D=E9=94=99=E8=AF=AF=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E7=89=B9=E6=AE=8A=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../product/bomnew/service/SapOpUtilService.java | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/SapOpUtilService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/SapOpUtilService.java
index 9eaee740..073b0d0b 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/SapOpUtilService.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/SapOpUtilService.java
@@ -197,13 +197,17 @@ public class SapOpUtilService {
         list.stream()
                 .filter(f -> f.getFLAG().equals("0"))
                 .forEach(it -> {
-                    Matcher matcher = PATTERN.matcher(it.getSTATUS());
-                    if (matcher.find()) {
-                        if (errorMsgVOS.stream().noneMatch(f -> StrUtil.equals(f.getPrimaryKey(), matcher.group()))) {
-                            errorMsgVOS.add(OperationErrorMsgVO.create(matcher.group(), it.getSTATUS()));
-                        }
+                    if (it.getSTATUS().contains("修改失败计量单位")) {
+                        errorMsgVOS.add(OperationErrorMsgVO.create(it.getMATNR(), it.getSTATUS()));
                     } else {
-                        errorMsgVOS.add(OperationErrorMsgVO.create(buildErrCol1(it), it.getSTATUS()));
+                        Matcher matcher = PATTERN.matcher(it.getSTATUS());
+                        if (matcher.find()) {
+                            if (errorMsgVOS.stream().noneMatch(f -> StrUtil.equals(f.getPrimaryKey(), matcher.group()))) {
+                                errorMsgVOS.add(OperationErrorMsgVO.create(matcher.group(), it.getSTATUS()));
+                            }
+                        } else {
+                            errorMsgVOS.add(OperationErrorMsgVO.create(buildErrCol1(it), it.getSTATUS()));
+                        }
                     }
                 });