From ec18157276bdbd51cfff5df9330726f0e666a196 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor@qq.com>
Date: Tue, 28 May 2024 14:59:15 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A6=82=E6=9E=9C=E7=89=A9=E6=96=99?=
 =?UTF-8?q?=E5=8D=95=E4=BD=8D=E4=B8=BAST=EF=BC=8C=E5=88=99=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BAPC=EF=BC=8C=E5=9B=A0=E4=B8=BA=E5=AF=BC=E5=85=A5SAP?=
 =?UTF-8?q?=E6=97=B6=E4=B8=8D=E6=94=AF=E6=8C=81ST?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/nflg/product/bomnew/service/EBomImportService.java    | 4 ++++
 .../com/nflg/product/bomnew/service/SapOpUtilService.java     | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/EBomImportService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/EBomImportService.java
index 4e91295a..9920902d 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/EBomImportService.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/EBomImportService.java
@@ -223,6 +223,10 @@ public class EBomImportService {
 
         dto.setRowNum(rowNum.get());
 
+        if (StrUtil.equals("ST", dto.getUnit(), true)) {
+            dto.setUnit("PC");
+        }
+
         if (StrUtil.equals(dto.getProjectType(), BomConstant.PROJECT_TYPE_TEMPORARY, true)) {
             String id = RandomUtil.randomNumbers(9);
             dto.setMaterialNo(BomConstant.PROJECT_TYPE_TEMPORARY + id);
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 3d9811b0..cc4a830e 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
@@ -162,6 +162,10 @@ public class SapOpUtilService {
             if (StrUtil.equals(t.getPOSTP(), "Z", true)) {
                 t.setPOSTP("L");
             }
+            //如果单位是ST，则改为PC
+            if (StrUtil.equals("ST", t.getMEINS(), true)) {
+                t.setMEINS("PC");
+            }
             childMapList.add(Convert.convert(new TypeReference<Map<String, String>>() {
             }, t));
         });