Merge remote-tracking branch 'origin/master'

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());
         }

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>