From efd4457e40781e57f56c56dc9b4cddbf03e3ec68 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Tue, 5 Nov 2024 17:19:52 +0800
Subject: [PATCH] =?UTF-8?q?2024-11-05=20=E5=BA=93=E5=AD=98=E4=BB=B6?=
 =?UTF-8?q?=E5=92=8C=E7=89=A9=E6=96=99=E4=BB=B6=E6=8E=A5=E5=8F=A3=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MasterPartInformationServiceImpl.java     | 11 ++++++----
 .../impl/PartInformationServiceImpl.java      | 21 ++++++++++++-------
 .../mapper/part/PartInformationMapper.xml     |  7 ++++---
 3 files changed, 24 insertions(+), 15 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 241eec58..aad89d0b 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
@@ -498,10 +498,13 @@ public class MasterPartInformationServiceImpl extends ServiceImpl<MasterPartInfo
                     if (!"200".equals(addMasterPartModelResponse.getCode())) {
                         throw new RuntimeException("IFS物料件模板新增异常：" + addMasterPartModelResponse.getMsg());
                     }
-                    String addMasterPartPropertyURL = apiUrl + "/technical/class/modifyTechnicalClassAttributes";
-                    ResponseData addMasterPartPropertyResponse = HttpClientUtil.doPostByRawWithPLM(addMasterPartPropertyURL, propertyList);
-                    if (!"200".equals(addMasterPartPropertyResponse.getCode())) {
-                        throw new RuntimeException("IFS物料件属性新增异常：" + addMasterPartPropertyResponse.getMsg());
+
+                    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());
+                        }
                     }
                 }
             }
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 d8a58ac3..9047fe63 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
@@ -1984,16 +1984,21 @@ public class PartInformationServiceImpl extends ServiceImpl<PartInformationMappe
                         }
                     }
                 }
+
                 // 1.6 同步库存件的模板和属性
-                String addInventoryPartModelURL = apiUrl + "/part/ifs/modifyInventoryPartCharacteristicTemplate";
-                ResponseData addInventoryPartModelResponse = HttpClientUtil.doPostByRawWithPLM(addInventoryPartModelURL, partIfsInventoryModel);
-                if (!"200".equals(addInventoryPartModelResponse.getCode())) {
-                    throw new RuntimeException("IFS库存件模板新增异常：" + addInventoryPartModelResponse.getMsg());
+                if (partIfsInventoryModel.getEngAttribute() != null && !partIfsInventoryModel.getEngAttribute().isEmpty()) {
+                    String addInventoryPartModelURL = apiUrl + "/part/ifs/modifyInventoryPartCharacteristicTemplate";
+                    ResponseData addInventoryPartModelResponse = HttpClientUtil.doPostByRawWithPLM(addInventoryPartModelURL, partIfsInventoryModel);
+                    if (!"200".equals(addInventoryPartModelResponse.getCode())) {
+                        throw new RuntimeException("IFS库存件模板新增异常：" + addInventoryPartModelResponse.getMsg());
+                    }
                 }
-                String addInventoryPartPropertyURL = apiUrl + "/part/ifs/syncInventoryPartCharacteristics";
-                ResponseData addInventoryPartPropertyResponse = HttpClientUtil.doPostByRawWithPLM(addInventoryPartPropertyURL, propertyList);
-                if (!"200".equals(addInventoryPartPropertyResponse.getCode())) {
-                    throw new RuntimeException("IFS库存件属性新增异常：" + addInventoryPartPropertyResponse.getMsg());
+                if (!propertyList.isEmpty()) {
+                    String addInventoryPartPropertyURL = apiUrl + "/part/ifs/syncInventoryPartCharacteristics";
+                    ResponseData addInventoryPartPropertyResponse = HttpClientUtil.doPostByRawWithPLM(addInventoryPartPropertyURL, propertyList);
+                    if (!"200".equals(addInventoryPartPropertyResponse.getCode())) {
+                        throw new RuntimeException("IFS库存件属性新增异常：" + addInventoryPartPropertyResponse.getMsg());
+                    }
                 }
 
             }
diff --git a/src/main/resources/mapper/part/PartInformationMapper.xml b/src/main/resources/mapper/part/PartInformationMapper.xml
index 52825049..2e5b7908 100644
--- a/src/main/resources/mapper/part/PartInformationMapper.xml
+++ b/src/main/resources/mapper/part/PartInformationMapper.xml
@@ -120,10 +120,10 @@
                 AND spec like #{query.spec}
             </if>
             <if test="query.startDate != null ">
-                AND required_completion_date >= #{query.startDate}
+                AND create_date >= #{query.startDate}
             </if>
             <if test="query.endDate != null ">
-                AND #{query.endDate} >= required_completion_date
+                AND #{query.endDate} >= create_date
             </if>
         </where>
     </select>
@@ -1802,7 +1802,8 @@
             a.PropertiesItemNo as characteristicCode,
             isnull(a.TextValue, '') as attrValueAlpha,
             ISNULL(CONVERT(VARCHAR(20), a.NumValue, 1), '') as attrValueNumeric,
-            case when b.ValueType_DB = 'T' then 'Alpha' when b.ValueType_DB = 'N' then 'Numeric' else '' end as characteristicType
+            case when b.ValueType_DB = 'T' then 'Alpha' when b.ValueType_DB = 'N' then 'Numeric' else '' end as characteristicType,
+            '' as unitMeas
         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.site = #{site} and a.RecordType = #{recordType} and a.PartNo = #{partNo} and a.CodeNo = #{codeNo}