From 59f9996bbe38057c5e4d42a5c5bdbdbd49090e2b Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Tue, 1 Jul 2025 15:16:37 +0800
Subject: [PATCH] 2025-07-01

---
 .../MasterPartInformationServiceImpl.java     | 16 +++++++++++----
 .../impl/PartInformationServiceImpl.java      | 20 +++++++++++++++++--
 2 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/spring/modules/part/service/impl/MasterPartInformationServiceImpl.java b/src/main/java/com/spring/modules/part/service/impl/MasterPartInformationServiceImpl.java
index 2a59ea13..6b79fbbc 100644
--- a/src/main/java/com/spring/modules/part/service/impl/MasterPartInformationServiceImpl.java
+++ b/src/main/java/com/spring/modules/part/service/impl/MasterPartInformationServiceImpl.java
@@ -121,11 +121,19 @@ public class MasterPartInformationServiceImpl extends ServiceImpl<MasterPartInfo
         partIfsCatalog.setPartNo(data.getPartNo()); // 物料编码
         partIfsCatalog.setPartDesc(data.getPartDesc()); // 物料名称
         //处理PCS.含有.的问题
-        String umId = data.getUmId() == null ? "" : data.getUmId();
-        if ("PCS.".equalsIgnoreCase(umId)){
-            umId = "PCS";
+//        String umId = data.getUmId() == null ? "" : data.getUmId();
+//        if ("PCS.".equalsIgnoreCase(umId)){
+//            umId = "PCS";
+//        }
+        String unitMeas = "";
+        if (data.getUmId() != null) {
+            if (data.getUmId().contains("PCS")) {
+                unitMeas = "PCS.".equals(data.getUmId()) ? "PCS" : "pcs";
+            } else {
+                unitMeas = data.getUmId();
+            }
         }
-        partIfsCatalog.setUnitCode(umId); // 计量单位
+        partIfsCatalog.setUnitCode(unitMeas); // 计量单位
         partIfsCatalog.setPartMainGroup(data.getPartMainGroup() == null ? "" : data.getPartMainGroup()); // 物料分组
         partIfsCatalog.setWeightNet(data.getWeightNet() == null ? "" : data.getWeightNet().toString()); // 净重
         partIfsCatalog.setUomForWeightNet(data.getUomForWeightNet() == null ? "" : data.getUomForWeightNet()); // 净重单位
diff --git a/src/main/java/com/spring/modules/part/service/impl/PartInformationServiceImpl.java b/src/main/java/com/spring/modules/part/service/impl/PartInformationServiceImpl.java
index 360e8d62..1813454a 100644
--- a/src/main/java/com/spring/modules/part/service/impl/PartInformationServiceImpl.java
+++ b/src/main/java/com/spring/modules/part/service/impl/PartInformationServiceImpl.java
@@ -184,7 +184,15 @@ public class PartInformationServiceImpl extends ServiceImpl<PartInformationMappe
         partIfsCatalog.setPartDesc(data.getPartDesc()); // 物料名称
         // 2025-04-24 PLM pcs. 对应 IFS PCS
         // 2025-05-28 PLM PCS. 对应 IFS PCS
-        partIfsCatalog.setUnitCode(data.getUmId() == null ? "" : "PCS.".equals(data.getUmId()) ? "PCS" : "pcs"); // 计量单位
+        String unitMeas = "";
+        if (data.getUmId() != null) {
+            if (data.getUmId().contains("PCS")) {
+                unitMeas = "PCS.".equals(data.getUmId()) ? "PCS" : "pcs";
+            } else {
+                unitMeas = data.getUmId();
+            }
+        }
+        partIfsCatalog.setUnitCode(unitMeas); // 计量单位
         partIfsCatalog.setPartMainGroup(data.getPartMainGroup() == null ? "" : data.getPartMainGroup()); // 物料分组
         partIfsCatalog.setWeightNet(data.getWeightNet() == null ? "" : data.getWeightNet().toString()); // 净重
         partIfsCatalog.setUomForWeightNet(data.getUomForWeightNet() == null ? "" : data.getUomForWeightNet()); // 净重单位
@@ -220,7 +228,15 @@ public class PartInformationServiceImpl extends ServiceImpl<PartInformationMappe
         partIfsInventory.setPlannerBuyer(data.getProductGroupId4() == null ? "" : data.getProductGroupId4()); // 计划员
         // 2025-04-24 PLM pcs. 对应 IFS PCS
         // 2025-05-28 PLM PCS. 对应 IFS PCS
-        partIfsInventory.setUnitMeas(data.getUmId() == null ? "" : "PCS.".equals(data.getUmId()) ? "PCS" : "pcs"); // 计量单位
+        String unitMeas = "";
+        if (data.getUmId() != null) {
+            if (data.getUmId().contains("PCS")) {
+                unitMeas = "PCS.".equals(data.getUmId()) ? "PCS" : "pcs";
+            } else {
+                unitMeas = data.getUmId();
+            }
+        }
+        partIfsInventory.setUnitMeas(unitMeas); // 计量单位
         partIfsInventory.setPrimeCommodity(data.getProductGroupId1() == null ? "" : data.getProductGroupId1()); // 商品组1
         partIfsInventory.setSecondCommodity(data.getProductGroupId2() == null ? "" : data.getProductGroupId2()); // 商品组2
         partIfsInventory.setAssetClass(data.getAssetClass() == null ? "" : data.getAssetClass()); // 资产等级