From a9c9f1d16ff82f031a745dd88dd069a91262a356 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Sat, 27 Apr 2024 18:29:36 +0800 Subject: [PATCH] =?UTF-8?q?optimize:=20=E4=BC=98=E5=8C=96=E7=94=B5?= =?UTF-8?q?=E6=B0=94bom=E5=AF=BC=E5=85=A5sap=E8=BF=94=E5=9B=9E=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/nflg/product/bomnew/service/SapOpUtilService.java | 7 ++++--- .../com/nflg/product/bomnew/service/test/OtherTest.java | 8 ++++++++ 2 files changed, 12 insertions(+), 3 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 2f64f08b..75ccaaee 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 @@ -13,10 +13,11 @@ import com.nflg.product.bomnew.pojo.dto.sap.SapResult; import com.nflg.product.bomnew.pojo.dto.sap.impart2.ImportSapParam2DTO; import com.nflg.product.bomnew.pojo.dto.sap.impart2.ImportSapParamDTO; import com.nflg.product.bomnew.pojo.dto.sap.impart2.T1DTO; -import com.nflg.product.bomnew.pojo.vo.OperationErrorMsgBaseVO; +import com.nflg.product.bomnew.pojo.vo.OperationErrorMsgVO; import lombok.extern.slf4j.Slf4j; import nflg.product.common.constant.STATE; import nflg.product.common.vo.ResultVO; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; @@ -180,7 +181,7 @@ public class SapOpUtilService { if (CollUtil.isNotEmpty(list)) { //StringBuffer errBuf=new StringBuffer(); - List liError = new ArrayList<>(); + List liError = new ArrayList<>(); AtomicInteger errCount= new AtomicInteger(); AtomicInteger succCount= new AtomicInteger(); for (T1DTO item : list) { @@ -191,7 +192,7 @@ public class SapOpUtilService { if (item.getFLAG().equals("0")) { errCount.getAndIncrement(); //errBuf.append(item.getSTATUS() + ","); - liError.add(OperationErrorMsgBaseVO.create(item.getSTATUS())); + liError.add(OperationErrorMsgVO.create(StringUtils.stripStart(item.getIDNRK(), "0"), item.getSTATUS())); } else if (item.getFLAG().equals("1")) { succCount.getAndIncrement(); } diff --git a/nflg_project_dev/nflg-bom-new/src/test/java/com/nflg/product/bomnew/service/test/OtherTest.java b/nflg_project_dev/nflg-bom-new/src/test/java/com/nflg/product/bomnew/service/test/OtherTest.java index e0491328..b931f0ea 100644 --- a/nflg_project_dev/nflg-bom-new/src/test/java/com/nflg/product/bomnew/service/test/OtherTest.java +++ b/nflg_project_dev/nflg-bom-new/src/test/java/com/nflg/product/bomnew/service/test/OtherTest.java @@ -10,6 +10,7 @@ import com.nflg.product.bomnew.pojo.entity.BomNewLogEntity; import com.nflg.product.bomnew.util.BomUtil; import com.nflg.product.bomnew.util.StringUtil; import com.nflg.product.bomnew.util.VersionUtil; +import org.apache.commons.lang3.StringUtils; import org.junit.Assert; import org.junit.Test; @@ -148,4 +149,11 @@ public class OtherTest { public void test17() { System.out.println("T" + RandomUtil.randomNumbers(9)); } + + @Test + public void test18() { + String d1 = "2100724595"; + String d2 = StringUtils.stripStart("000000002100724595", "0"); + Assert.assertEquals(d1, d2); + } }