From a1bd307a2b69690ecc70aa79eb493851ec2197d8 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Fri, 24 Jan 2025 11:10:02 +0800
Subject: [PATCH] =?UTF-8?q?2025-01-24=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MasterPartInformationServiceImpl.java     | 27 +++++++------------
 .../impl/PartInformationServiceImpl.java      |  6 ++---
 2 files changed, 12 insertions(+), 21 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 c5a77985..123ee248 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
@@ -368,7 +368,7 @@ public class MasterPartInformationServiceImpl extends ServiceImpl<MasterPartInfo
                 valueData.setItemNo((double) itemNo++);
                 valueData.setPropertiesItemNo(item.getAttribute());
                 if ("Numeric".equals(item.getAttributeType())) {
-                    valueData.setNumValue(Double.valueOf(item.getValueNo()));
+                    valueData.setNumValue(StringUtils.isNotBlank(item.getValueNo()) ? Double.valueOf(item.getValueNo()) : null);
                 } else {
                     valueData.setTextValue(item.getValueText() == null ? "" : item.getValueText());
                 }
@@ -484,15 +484,6 @@ public class MasterPartInformationServiceImpl extends ServiceImpl<MasterPartInfo
                 ifsProperty.add(property);
             }
         }
-        // 同步IFS
-//        if (dataUrl && "Y".equals(partData.getOfficialFlag())) {
-//            if (!ifsProperty.isEmpty()) {
-//                Map<String, String> addMasterPartPropertyResponse = technicalClassBean.syncTechnicalClass(srv, ifsProperty);
-//                if (!"200".equals(addMasterPartPropertyResponse.get("resultCode"))) {
-//                    throw new RuntimeException("IFS物料属性新增异常：" + addMasterPartPropertyResponse.get("resultMsg"));
-//                }
-//            }
-//        }
     }
 
     /**
@@ -517,14 +508,14 @@ public class MasterPartInformationServiceImpl extends ServiceImpl<MasterPartInfo
             }
         }
         // 同步IFS
-//        if (dataUrl && "Y".equals(partData.getOfficialFlag())) {
-//            if (!ifsProperty.isEmpty()) {
-//                Map<String, String> deleteMasterPartPropertyResponse = technicalClassBean.removeTechnicalClass(srv, ifsProperty);
-//                if (!"200".equals(deleteMasterPartPropertyResponse.get("resultCode"))) {
-//                    throw new RuntimeException("IFS物料属性删除异常：" + deleteMasterPartPropertyResponse.get("resultMsg"));
-//                }
-//            }
-//        }
+        if (dataUrl && "Y".equals(partData.getOfficialFlag())) {
+            if (!ifsProperty.isEmpty()) {
+                Map<String, String> deleteMasterPartPropertyResponse = technicalClassBean.removeTechnicalClassAttributes(srv, ifsProperty);
+                if (!"200".equals(deleteMasterPartPropertyResponse.get("resultCode"))) {
+                    throw new RuntimeException("IFS物料属性删除异常：" + deleteMasterPartPropertyResponse.get("resultMsg"));
+                }
+            }
+        }
     }
 
     /**
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 5b308ac7..d16bfa3c 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
@@ -3719,7 +3719,7 @@ public class PartInformationServiceImpl extends ServiceImpl<PartInformationMappe
             partItem.setItemNo((double) count++);
             partItem.setPropertiesItemNo(ifsInventoryItem.getAttribute());
             partItem.setTextValue(ifsInventoryItem.getValueText());
-            partItem.setNumValue(Double.valueOf(ifsInventoryItem.getValueNo()));
+            partItem.setNumValue(org.apache.commons.lang3.StringUtils.isNotBlank(ifsInventoryItem.getValueNo()) ? Double.valueOf(ifsInventoryItem.getValueNo()) : null);
             partItem.setRecordType("MP");
             partItemList.add(partItem);
         }
@@ -3868,8 +3868,8 @@ public class PartInformationServiceImpl extends ServiceImpl<PartInformationMappe
             partItem.setSubCodeSeqNo(Double.valueOf("1"));
             partItem.setItemNo((double) count++);
             partItem.setPropertiesItemNo(ifsInventoryItem.getCharacteristicCode());
-            partItem.setTextValue(ifsInventoryItem.getAttrValueAlpha());
-            partItem.setNumValue(Double.valueOf(ifsInventoryItem.getAttrValueNumeric()));
+            partItem.setTextValue(org.apache.commons.lang3.StringUtils.isNotBlank(ifsInventoryItem.getAttrValueAlpha()) ? ifsInventoryItem.getAttrValueAlpha() : "");
+            partItem.setNumValue(org.apache.commons.lang3.StringUtils.isNotBlank(ifsInventoryItem.getAttrValueNumeric()) ? Double.valueOf(ifsInventoryItem.getAttrValueNumeric()) : null);
             partItem.setRecordType("IP");
             partItemList.add(partItem);
         }