From 9066a6e0d4d899d8ce86d3c3ecbb6ff37b00593e Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Fri, 24 Jan 2025 15:59:21 +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

---
 .../part/mapper/PartInformationMapper.java    |  2 +-
 .../MasterPartInformationServiceImpl.java     | 24 +++++++------------
 .../mapper/part/PartInformationMapper.xml     |  2 +-
 3 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/src/main/java/com/spring/modules/part/mapper/PartInformationMapper.java b/src/main/java/com/spring/modules/part/mapper/PartInformationMapper.java
index 905659fb..60c739c2 100644
--- a/src/main/java/com/spring/modules/part/mapper/PartInformationMapper.java
+++ b/src/main/java/com/spring/modules/part/mapper/PartInformationMapper.java
@@ -261,7 +261,7 @@ public interface PartInformationMapper extends BaseMapper<PartInformationEntity>
 
     TblBaseDataEntity getTblBaseData(@Param("firstType") String partCatalog);
 
-    List<PartIfsCatalogProperty> getMasterPartPropertyList(@Param("partNo") String partNo, @Param("codeNo") String codeNo, @Param("recordType") String ip);
+    List<PartIfsCatalogProperty> getMasterPartPropertyList(@Param("site") String site, @Param("partNo") String partNo, @Param("codeNo") String codeNo, @Param("recordType") String ip);
 
     String getNextPartNo2(PartInformationVo data);
 
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 245f8ab2..15f98cdd 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
@@ -621,25 +621,17 @@ public class MasterPartInformationServiceImpl extends ServiceImpl<MasterPartInfo
                     partIfsCatalogModel.setTechnicalSpecNo(technicalSpecNo);
                     partIfsCatalogModel.setTechnicalClass(ifsPart.getCodeNo()); // 模板编码
                     partIfsCatalogModel.setOkYesNo(okYesNo);
-                    TblBaseDataEntity baseData = partInformationMapper.getTblBaseData("part_catalog");
-                    if (baseData == null) {
-                        throw new RuntimeException("请在tbl_base_data中维护接口所需人员数据!");
-                    }
-                    partIfsCatalogModel.setOkSign(baseData.getBaseData());
+                    partIfsCatalogModel.setOkSign(ifsUser.getIfsUsername());
                     partIfsCatalogModel.setDtOk(DateUtils.getStringNow2());
-                    List<PartIfsCatalogProperty> propertyList = partInformationMapper.getMasterPartPropertyList(plmMasterPart.getPartNo(), plmMasterPart.getCodeNo(), "MP"); // 属性对象
-
-                    String addMasterPartModelURL = apiUrl + "/technical/class/syncTechnicalClass";
-                    ResponseData addMasterPartModelResponse = HttpClientUtil.doPostByRawWithPLM(addMasterPartModelURL, partIfsCatalogModel);
-                    if (!"200".equals(addMasterPartModelResponse.getCode())) {
-                        throw new RuntimeException("IFS物料件模板新增异常：" + addMasterPartModelResponse.getMsg());
+                    List<PartIfsCatalogProperty> propertyList = partInformationMapper.getMasterPartPropertyList("*", plmMasterPart.getPartNo(), plmMasterPart.getCodeNo(), "MP"); // 属性对象
+                    Map<String, String> addMasterPartModelResponse = technicalClassBean.syncTechnicalClass(srv, partIfsCatalogModel);
+                    if (!"200".equals(addMasterPartModelResponse.get("resultCode"))) {
+                        throw new RuntimeException("IFS 物料件模板新增异常：" + addMasterPartModelResponse.get("resultMsg"));
                     }
-
                     if (!propertyList.isEmpty()) {
-                        String addMasterPartPropertyURL = apiUrl + "/technical/class/modifyTechnicalClassAttributes";
-                        ResponseData addMasterPartPropertyResponse = HttpClientUtil.doPostByRawWithPLM(addMasterPartPropertyURL, propertyList);
-                        if (!"200".equals(addMasterPartPropertyResponse.getCode())) {
-                            throw new RuntimeException("IFS物料件属性新增异常：" + addMasterPartPropertyResponse.getMsg());
+                        Map<String, String> addMasterPartPropertyResponse = technicalClassBean.modifyTechnicalClassAttributes(srv, propertyList);
+                        if (!"200".equals(addMasterPartPropertyResponse.get("resultCode"))) {
+                            throw new RuntimeException("IFS 物料件属性新增异常：" + addMasterPartPropertyResponse.get("resultMsg"));
                         }
                     }
                 }
diff --git a/src/main/resources/mapper/part/PartInformationMapper.xml b/src/main/resources/mapper/part/PartInformationMapper.xml
index 82c934d0..3a99dfa1 100644
--- a/src/main/resources/mapper/part/PartInformationMapper.xml
+++ b/src/main/resources/mapper/part/PartInformationMapper.xml
@@ -1934,7 +1934,7 @@
             '' as info
         FROM PartSubPropertiesValue as a
         left join plm_properties_item as b on a.site = b.site and a.PropertiesItemNo = b.ItemNo and a.RecordType = b.ItemType
-        where a.RecordType = #{recordType} and a.PartNo = #{partNo} and a.CodeNo = #{codeNo}
+        where a.site = #{site} and a.PartNo = #{partNo} and a.CodeNo = #{codeNo} and a.RecordType = #{recordType}
     </select>
 
     <insert id="savePartModelHeaders">