From c37f47777e4f90e192822ec3b7d0c15b40c8b0fa Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Sat, 12 Oct 2024 17:26:48 +0800
Subject: [PATCH 1/2] =?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

---
 .../modules/part/service/impl/PartInformationServiceImpl.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 5a4fde4c..56632711 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
@@ -2261,7 +2261,7 @@ public class PartInformationServiceImpl extends ServiceImpl<PartInformationMappe
             String deleteInventoryPartURL = apiUrl + "/part/ifs/removeInventoryPartToIfs";
             ResponseData deleteInventoryPartResponse = HttpClientUtil.doPostByRawWithPLM(deleteInventoryPartURL, partIfsInventory);
             if (!"200".equals(deleteInventoryPartResponse.getCode())) {
-                throw new RuntimeException("IFS库存件删除异常：" + deleteInventoryPartResponse.getMsg());
+                throw new RuntimeException(e.getMessage() + "; IFS库存件删除异常：" + deleteInventoryPartResponse.getMsg());
             }
             throw new RuntimeException(e.getMessage());
         }

From 17e04a52b6b18e0898bf15af44db9d524906322d Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Sat, 12 Oct 2024 18:03:43 +0800
Subject: [PATCH 2/2] 1127

---
 .../resources/mapper/Tooling/ProjectToolingApplyMapper.xml     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/resources/mapper/Tooling/ProjectToolingApplyMapper.xml b/src/main/resources/mapper/Tooling/ProjectToolingApplyMapper.xml
index dd6365b5..317e6f4f 100644
--- a/src/main/resources/mapper/Tooling/ProjectToolingApplyMapper.xml
+++ b/src/main/resources/mapper/Tooling/ProjectToolingApplyMapper.xml
@@ -80,7 +80,8 @@
     <select id="searchToolApplyHeader" resultType="PlmProjectToolApplyHeaderData">
         SELECT site,apply_no,apply_by,status_code,status,apply_date,applySumQty,applyReason,remark,create_by,create_date,update_by,
         update_date,prNo,remark1,poNo,allCost,remark2,supplierName,department,dbo.plm_get_dictDataLabel('tool_application_department',department,site) departmentDesc
-        ,tp,dbo.get_userDisPlay(tp) tpName   ,quoter,dbo.get_userDisPlay(quoter) quoterName   ,purchaser,dbo.get_userDisPlay(purchaser) purchaserName
+        ,tp,dbo.get_userDisPlay(tp) tpName   ,quoter,dbo.get_userDisPlay(quoter) quoterName   ,purchaser,dbo.get_userDisPlay(purchaser) purchaserName,step_id
+        ,reject_flag    ,reject_step_id
         FROM plm_project_tool_applyHeader
         <where>