From 7503d9bea2be11af68d1046c79386c3aa73ac177 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Sat, 12 Oct 2024 22:08:20 +0800
Subject: [PATCH] =?UTF-8?q?2024-10-12=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ChangeManagementServiceImpl.java  |  8 ++++----
 .../service/impl/PartInformationServiceImpl.java   | 14 ++------------
 .../mapper/change/ChangeManagementMapper.xml       |  2 +-
 .../resources/mapper/part/BomManagementMapper.xml  |  4 ++--
 .../mapper/part/PartInformationMapper.xml          |  1 +
 5 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java b/src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java
index 0bfd108b..d97b9d5f 100644
--- a/src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java
+++ b/src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java
@@ -1563,7 +1563,7 @@ public class ChangeManagementServiceImpl extends ServiceImpl<ChangeManagementMap
         changeManagementMapper.updateProcessForm2(paramData);
 
         // 修改单据的节点结论和驳回意见
-        changeManagementMapper.updateProcessNode(paramData.getSite(), paramData.getBu(), paramData.getRequestId(), paramData.getClassificationNo(), paramData.getNodeId(), paramData.getNodeConclusion(), paramData.getRejectOpinion());
+        changeManagementMapper.updateProcessNode(paramData.getSite(), paramData.getBu() == null ? "" : paramData.getBu(), paramData.getRequestId(), paramData.getClassificationNo(), paramData.getNodeId(), paramData.getNodeConclusion(), paramData.getRejectOpinion());
 
         if (isRemarks.isEmpty()) { // 已结束
             // 反刷单据状态为 "已完成"
@@ -1702,8 +1702,8 @@ public class ChangeManagementServiceImpl extends ServiceImpl<ChangeManagementMap
         changeManagementMapper.updateChangeReject2(paramData);
 
         // 修改当前流程记录的退回标记为Y，并记录当前节点
-        changeManagementMapper.updateProcessReject(paramData.getSite(), paramData.getBu(), paramData.getRequestId(), paramData.getDomainControlAccount());
-        List<ProcessFormEntity> processFormList = changeManagementMapper.getProcessNodeId(paramData.getSite(), paramData.getBu(), paramData.getRequestId(), paramData.getDomainControlAccount());
+        changeManagementMapper.updateProcessReject(paramData.getSite(), paramData.getBu() == null ? "" : paramData.getBu(), paramData.getRequestId(), paramData.getDomainControlAccount());
+        List<ProcessFormEntity> processFormList = changeManagementMapper.getProcessNodeId(paramData.getSite(), paramData.getBu() == null ? "" : paramData.getBu(), paramData.getRequestId(), paramData.getDomainControlAccount());
         ProcessFormEntity processForm = processFormList.get(0);
 
         // 获取流程流转信息
@@ -1726,7 +1726,7 @@ public class ChangeManagementServiceImpl extends ServiceImpl<ChangeManagementMap
         changeManagementMapper.updateProcessForm2(paramData);
 
         // 修改单据的节点结论和驳回意见
-        changeManagementMapper.updateProcessNode(paramData.getSite(), paramData.getBu(), paramData.getRequestId(), paramData.getClassificationNo(), paramData.getNodeId(), paramData.getNodeConclusion(), paramData.getRejectOpinion());
+        changeManagementMapper.updateProcessNode(paramData.getSite(), paramData.getBu() == null ? "" : paramData.getBu(), paramData.getRequestId(), paramData.getClassificationNo(), paramData.getNodeId(), paramData.getNodeConclusion(), paramData.getRejectOpinion());
 
         if (isRemarks.isEmpty()) { // 已结束
             // 反刷单据状态为 "已完成"
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 56632711..a5de1b3e 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
@@ -1866,17 +1866,6 @@ public class PartInformationServiceImpl extends ServiceImpl<PartInformationMappe
                             throw new RuntimeException("IFS库存件版本新增异常：" + savePartRevisionResponse.getMsg());
                         }
                     } else {
-//                        // 删除再新增
-//                        String deletePartRevisionURL = apiUrl + "/part/ifs/removeInventoryPartRevisionToIfs";
-//                        ResponseData deletePartRevisionResponse = HttpClientUtil.doPostByRawWithPLM(deletePartRevisionURL, revision);
-//                        if (!"200".equals(deletePartRevisionResponse.getCode())) {
-//                            throw new RuntimeException("IFS库存件版本删除异常：" + deletePartRevisionResponse.getMsg());
-//                        }
-//                        String savePartRevisionURL = apiUrl + "/part/ifs/syncInventoryPartRevisionToIfs";
-//                        ResponseData savePartRevisionResponse = HttpClientUtil.doPostByRawWithPLM(savePartRevisionURL, revision);
-//                        if (!"200".equals(savePartRevisionResponse.getCode())) {
-//                            throw new RuntimeException("IFS库存件版本新增异常：" + savePartRevisionResponse.getMsg());
-//                        }
                         // 修改
                         String updatePartRevisionURL = apiUrl + "/part/ifs/modifyInventoryPartRevisionToIfs";
                         ResponseData updatePartRevisionResponse = HttpClientUtil.doPostByRawWithPLM(updatePartRevisionURL, revision);
@@ -1905,6 +1894,7 @@ public class PartInformationServiceImpl extends ServiceImpl<PartInformationMappe
                             bomHeader.setBomType("Purchase");
                         }
                         bomHeader.setEffPhaseInDate(bomDetailVo.getEffPhaseInDate());
+                        bomHeader.setEffPhaseOutDate(bomDetailVo.getEffPhaseOutDate());
                         bomHeader.setEngChgLevel(bomDetailVo.getEngChgLevel());
                         bomHeader.setNoteText(bomDetailVo.getBomHeaderNoteText());
                         bomHeader.setEngRevision(bomDetailVo.getEngRevision());
@@ -1921,7 +1911,7 @@ public class PartInformationServiceImpl extends ServiceImpl<PartInformationMappe
                             bomIfsHeader.setEngChgLevel(bomHeader.getEngChgLevel().toString());
                             bomIfsHeader.setBomType(bomHeader.getBomType());
                             bomIfsHeader.setEffPhaseInDate(DateUtils.format(bomHeader.getEffPhaseInDate()));
-                            bomIfsHeader.setEffPhaseOutDate(bomIfsHeader.getEffPhaseOutDate() == null ? "" : DateUtils.format(bomHeader.getEffPhaseOutDate()));
+                            bomIfsHeader.setEffPhaseOutDate(bomHeader.getEffPhaseOutDate() == null ? "" : DateUtils.format(bomHeader.getEffPhaseOutDate()));
                             bomIfsHeader.setNoteText(bomHeader.getNoteText());
                             String getBomHeaderURL = apiUrl + "/bom/ifs/getBomHeader";
                             ResponseData getBomHeaderResponse = HttpClientUtil.doPostByRawWithPLM(getBomHeaderURL, bomIfsHeader);
diff --git a/src/main/resources/mapper/change/ChangeManagementMapper.xml b/src/main/resources/mapper/change/ChangeManagementMapper.xml
index dacbc518..f66302a0 100644
--- a/src/main/resources/mapper/change/ChangeManagementMapper.xml
+++ b/src/main/resources/mapper/change/ChangeManagementMapper.xml
@@ -854,7 +854,7 @@
     <!-- 编辑流程记录的驳回标识 -->
     <update id="updateProcessReject" parameterType="string">
         update plm_process_form
-        set reject_flag = 'Y',
+        set reject_flag = 'Y'
         where site = #{site} and bu = #{bu} and request_id = #{requestId} and domain_control_account = #{domainControlAccount} and is_remark = 0
     </update>
 
diff --git a/src/main/resources/mapper/part/BomManagementMapper.xml b/src/main/resources/mapper/part/BomManagementMapper.xml
index 09adfb3b..38db5005 100644
--- a/src/main/resources/mapper/part/BomManagementMapper.xml
+++ b/src/main/resources/mapper/part/BomManagementMapper.xml
@@ -528,9 +528,9 @@
             bom_type,
             alternative_no,
             status,
-            offical_flag
+            official_flag
         FROM plm_bom_detail
-        WHERE site = #{site} and part_no = #{partNo} and eng_chg_level = #{engChgLevel} and bom_type = #{bomType} and offical_flag = 'Y'
+        WHERE site = #{site} and part_no = #{partNo} and eng_chg_level = #{engChgLevel} and bom_type = #{bomType} and official_flag = 'Y'
     </select>
 
     <!-- 判断 BOM 是否存在子料 -->
diff --git a/src/main/resources/mapper/part/PartInformationMapper.xml b/src/main/resources/mapper/part/PartInformationMapper.xml
index e3edc37d..d5ff1162 100644
--- a/src/main/resources/mapper/part/PartInformationMapper.xml
+++ b/src/main/resources/mapper/part/PartInformationMapper.xml
@@ -1412,6 +1412,7 @@
             a.status,
             a.official_flag,
             b.eff_phase_in_date,
+            b.eff_phase_out_date,
             b.note_text as bomHeaderNoteText,
             b.eng_revision
         FROM plm_bom_detail as a