Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/resources/mapper/Tooling/ProjectToolingApplyMapper.xml
#	src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml

src/main/java/com/spring/modules/Tooling/data/PlmProjectToolApplyHeaderData.java

@@ -30,4 +30,9 @@ public class PlmProjectToolApplyHeaderData extends PlmProjectToolApplyHeader {
     private String tpName;
 
     private String purchaserName;
+    private String isReject;
+    private String nodeId;
+    private String nodeName;
+
+
 }

src/main/java/com/spring/modules/Tooling/service/impl/ProjectToolingApplyServiceImpl.java

@@ -38,6 +38,7 @@ import com.spring.modules.request.vo.PlmRequestDetailVo;
 import com.spring.modules.request.vo.PlmRequestHeaderVo;
 import com.spring.modules.sys.dao.SysUserDao;
 import com.spring.modules.sys.entity.SysUserEntity;
+import com.spring.modules.test.entity.TestSoBom;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -213,8 +214,8 @@ public class ProjectToolingApplyServiceImpl implements ProjectToolingApplyServic
             // 获取指定属性值
             if ("plm_project_tool_applyHeader".equals(nodeDetail.getPlmTable())) { // 主信息字段
                 String fieldValue = "";
-                fieldValue = (String) getPropertyValue(toolApplyHeaderData, nodeDetail.getPlmField());
                 if ("A".equals(nodeDetail.getFieldType())) { // 判断是否为人员
+                    fieldValue = (String) getPropertyValue(toolApplyHeaderData, nodeDetail.getPlmField());
                     // 判断是否有值
                     if (StringUtils.hasText(fieldValue)) {
                         String account = sysUserDao.selectOne(new QueryWrapper<SysUserEntity>().eq("username", fieldValue)).getDomainControlAccount();
@@ -225,7 +226,12 @@ public class ProjectToolingApplyServiceImpl implements ProjectToolingApplyServic
                         }
                         md.setFieldValue(oaIds.get(0).getId());
                     }
+                } else if ("C".equals(nodeDetail.getFieldType())) { // 判断是否为金额
+                    BigDecimal v = (BigDecimal) getPropertyValue(toolApplyHeaderData, nodeDetail.getPlmField());
+                    fieldValue = v == null ? "" : v.toString();
+                    md.setFieldValue(fieldValue);
                 } else {
+                    fieldValue = (String) getPropertyValue(toolApplyHeaderData, nodeDetail.getPlmField());
                     md.setFieldValue(fieldValue);
                 }
             }
@@ -328,8 +334,8 @@ public class ProjectToolingApplyServiceImpl implements ProjectToolingApplyServic
                 // 获取指定属性值
                 if ("plm_project_tool_applyHeader".equals(nodeDetail.getPlmTable())) { // 主信息字段
                     String fieldValue = "";
-                    fieldValue = (String) getPropertyValue(changeRequest, nodeDetail.getPlmField());
                     if ("A".equals(nodeDetail.getFieldType())) { // 判断是否为人员
+                        fieldValue = (String) getPropertyValue(changeRequest, nodeDetail.getPlmField());
                         // 判断是否有值
                         if (StringUtils.hasText(fieldValue)) {
                             String account = sysUserDao.selectOne(new LambdaQueryWrapper<SysUserEntity>().eq(SysUserEntity::getUsername, fieldValue)).getDomainControlAccount();
@@ -340,7 +346,12 @@ public class ProjectToolingApplyServiceImpl implements ProjectToolingApplyServic
                             }
                             md.setFieldValue(oaIds.get(0).getId());
                         }
+                    } else if ("C".equals(nodeDetail.getFieldType())) { // 判断是否为金额
+                        BigDecimal v = (BigDecimal) getPropertyValue(changeRequest, nodeDetail.getPlmField());
+                        fieldValue = v == null ? "" : v.toString();
+                        md.setFieldValue(fieldValue);
                     } else {
+                        fieldValue = (String) getPropertyValue(changeRequest, nodeDetail.getPlmField());
                         md.setFieldValue(fieldValue);
                     }
                     mainData.add(md);

src/main/java/com/spring/modules/sampleManagement/data/PlmTechnicalSpecificationSheetData.java

@@ -59,6 +59,10 @@ public class PlmTechnicalSpecificationSheetData extends PlmTechnicalSpecificatio
      */
     private String rejectOpinion;
 
+
+    private String nodeId;
+    private String nodeName;
+
     public String getRejectOpinion() {
         return rejectOpinion;
     }
@@ -397,4 +401,20 @@ public class PlmTechnicalSpecificationSheetData extends PlmTechnicalSpecificatio
     public void setFinalCustomerId(String finalCustomerId) {
         this.finalCustomerId = finalCustomerId;
     }
+
+    public String getNodeId() {
+        return nodeId;
+    }
+
+    public void setNodeId(String nodeId) {
+        this.nodeId = nodeId;
+    }
+
+    public String getNodeName() {
+        return nodeName;
+    }
+
+    public void setNodeName(String nodeName) {
+        this.nodeName = nodeName;
+    }
 }

src/main/resources/mapper/Tooling/ProjectToolingApplyMapper.xml

@@ -127,50 +127,30 @@
     </update>
 
     <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
-             , step_id
-             , reject_flag
-             , reject_step_id
-             , totalCost
-        FROM plm_project_tool_applyHeader
+        SELECT a.site,a.apply_no,a.apply_by,a.status_code,a.status,a.apply_date,a.applySumQty,a.applyReason,a.remark,a.create_by,a.create_date,a.update_by,
+        a.update_date,a.prNo,a.remark1,a.poNo,a.allCost,a.remark2,a.supplierName,a.department,dbo.plm_get_dictDataLabel('tool_application_department',a.department,a.site) departmentDesc
+        ,a.tp,dbo.get_userDisPlay(a.tp) tpName   ,a.quoter,dbo.get_userDisPlay(a.quoter) quoterName   ,a.purchaser,dbo.get_userDisPlay(a.purchaser) purchaserName,a.step_id
+        ,a.reject_flag    ,a.reject_step_id,a.totalCost,
+         d.is_reject,
+               d.node_id,
+               d.node_name
+        FROM plm_project_tool_applyHeader a
+        left join plm_request_header as prh on a.site = prh.site and prh.menu_id = '106002'
+left join plm_request_node as d on a.site = d.site and prh.classification_no = d.classification_no and
+                                   prh.workflow_id = d.workflow_id and a.step_id = d.step_id
         <where>
+
             <if test="query.site != null and query.site != ''">
-                AND site = #{query.site}
+                AND a.site = #{query.site}
             </if>
             <if test="query.applyNo != null and query.applyNo != ''">
-                AND apply_no like #{query.applyNo}
+                AND a.apply_no like #{query.applyNo}
             </if>
             <if test="query.startDate != null ">
-                AND apply_date >= #{query.startDate}
+                AND a.apply_date >= #{query.startDate}
             </if>
              <if test="query.endDate != null ">
-                AND #{query.endDate} >= apply_date
+                AND  #{query.endDate} >= a.apply_date
             </if>
 
             <!--            <if test="query.projectOwnerName != null and query.projectOwnerName != ''">-->
@@ -218,7 +198,8 @@
     </select>
 
     <select id="checkToolApplyHeaderData" resultType="PlmProjectToolApplyHeaderData">
-        select site,
+        select
+            site,
             apply_no,
             apply_by,
             status_code,
@@ -240,16 +221,9 @@
             step_id,
             reject_flag,
             reject_step_id
-                ,
-               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,totalCost
             FROM plm_project_tool_applyHeader
-        where site = #{site}
-          and apply_no = #{applyNo}
+            where site = #{site} and apply_no = #{applyNo}
     </select>
 
     <update id="comfirmToolApply">

src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml

@@ -3,71 +3,30 @@
 <mapper namespace="com.spring.modules.sampleManagement.dao.TechnicalSpecificationMapper">
 
 <select id="technicalSpecificationListSearch"  parameterType="PlmTechnicalSpecificationSheetData" resultType="PlmTechnicalSpecificationSheetData">
-    SELECT a.id,
-           a.site,
-           a.code_no,
-           a.project_id,
-           a.test_part_no,
-           a.status,
-           a.rev_no,
-           a.work_center_no,
-           a.ECN_flag,
-           a.ECN_no,
-           a.ori_code_no,
-           a.ECN_address,
-           a.remark,
-           a.create_date,
-           a.create_by,
-           a.update_date,
-           a.update_by,
-           b.final_part_no,
-           b.part_type                                                                   partTypeDesc,
-           b.part_type,
-           b.part_name,
-           b.part_desc,
-           b.part_spec,
-           dbo.plm_get_technicalBaseDesc(a.status, 'status')                             statusDesc,
-           a.proofing_no,
-           b.bu_no,
-           dbo.plm_get_bu_desc(a.site, b.bu_no)                                          buDesc,
+        SELECT a.id,a.site,a.code_no,a.project_id,a.test_part_no,a.status,a.rev_no,a.work_center_no,a.ECN_flag,a.ECN_no,a.ori_code_no,
+        a.ECN_address,a.remark,a.create_date,a.create_by,a.update_date,a.update_by,b.final_part_no,b.part_type partTypeDesc,
+        b.part_type,b.part_name,b.part_desc,b.part_spec,dbo.plm_get_technicalBaseDesc(a.status,'status') statusDesc,a.proofing_no,b.bu_no,dbo.plm_get_bu_desc(a.site,b.bu_no) buDesc,
         dbo.get_technicalSpecificationTeamName(a.site,a.code_no,'engineer') engineer,
-           dbo.get_technicalSpecificationTeamName(a.site, a.code_no, 'technician')       technician,
-           process,
-           dbo.get_technicalSpecificationTeamName(a.site, a.code_no, 'quotationOfficer') quotationOfficer,
-           c.customer_Id
-            ,
-           a.picture_addess,
-           a.customerPictureChangeRemark,
-           a.productionFileComments,
-           a.bom_type,
-           a.eng_chg_level,
-           a.bom_alternative_no,
-           a.routing_type,
-           a.routing_revision,
-           a.routing_alternative_no,
-           a.pod,
-           a.mpOperator,
-           dbo.get_userDisPlay(a.mpOperator)                                             mpOperatorName
-            ,
-           a.cqcOperator,
-           dbo.get_userDisPlay(a.cqcOperator)                                            cqcOperatorName
-            ,
-           a.faiOperator,
-           dbo.get_userDisPlay(a.faiOperator)                                            faiOperatorName
-            ,
-           a.peOperater,
-           dbo.get_userDisPlay(a.peOperater)                                             peOperaterName
-            ,
-           a.csOperater,
-           dbo.get_userDisPlay(a.csOperater)                                             csOperaterName
-            ,
-           a.dccOperater,
-           dbo.get_userDisPlay(a.dccOperater)                                            dccOperaterName
+        dbo.get_technicalSpecificationTeamName(a.site,a.code_no,'technician') technician,process,
+        dbo.get_technicalSpecificationTeamName(a.site,a.code_no,'quotationOfficer') quotationOfficer,c.customer_Id
+        ,a.picture_addess,a.customerPictureChangeRemark,a.productionFileComments,a.bom_type,a.eng_chg_level,a.bom_alternative_no,a.routing_type,a.routing_revision,
+        a.routing_alternative_no,a.pod,
+        a.mpOperator,dbo.get_userDisPlay(a.mpOperator) mpOperatorName
+        , a.cqcOperator,dbo.get_userDisPlay(a.cqcOperator) cqcOperatorName
+        , a.faiOperator,dbo.get_userDisPlay(a.faiOperator) faiOperatorName
+            ,a.peOperater,dbo.get_userDisPlay(a.peOperater) peOperaterName
+        ,a.csOperater,dbo.get_userDisPlay(a.csOperater) csOperaterName
+        ,a.dccOperater,dbo.get_userDisPlay(a.dccOperater) dccOperaterName,
+         d.is_reject,
+               d.node_id,
+               d.node_name
 
         FROM plm_technical_specification_sheet a
-             left join view_Project_final_Part b
-                       on a.site = b.site and a.project_id = b.project_id and a.test_part_no = b.test_part_no
+        left join view_Project_final_Part b on a.site=b.site and a.project_id=b.project_id and a.test_part_no=b.test_part_no
         left join plm_project_info c on a.site=c.site and a.project_id=c.project_id
+                left join plm_request_header as prh on a.site = prh.site and prh.menu_id = '103002'
+left join plm_request_node as d on a.site = d.site and prh.classification_no = d.classification_no and
+                                   prh.workflow_id = d.workflow_id and a.step_id = d.step_id
         <where>
             <if test="query.id != null">
                 AND a.id = #{query.id}