Browse Source

2025/6/5

master
Aoi_Tori 1 year ago
parent
commit
7faea03955
  1. 8
      src/main/java/com/spring/modules/sampleManagement/controller/TechnicalSpecificationController.java
  2. 3
      src/main/java/com/spring/modules/sampleManagement/dao/TechnicalSpecificationMapper.java
  3. 10
      src/main/java/com/spring/modules/sampleManagement/data/PlmTechnicalSpecificationSheetData.java
  4. 10
      src/main/java/com/spring/modules/sampleManagement/entity/NodeVo.java
  5. 7
      src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java
  6. 3
      src/main/java/com/spring/modules/sampleManagement/service/TechnicalSpecificationService.java
  7. 29
      src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml

8
src/main/java/com/spring/modules/sampleManagement/controller/TechnicalSpecificationController.java

@ -17,6 +17,7 @@ import com.spring.modules.quotation.entity.QuotationHeader;
import com.spring.modules.quotation.vo.QuotationDetailVo;
import com.spring.modules.sampleManagement.dao.UpBMRevNoData;
import com.spring.modules.sampleManagement.data.*;
import com.spring.modules.sampleManagement.entity.NodeVo;
import com.spring.modules.sampleManagement.service.TechnicalSpecificationService;
import com.spring.modules.sampleManagement.service.TechnicalSpecificationSheetService;
import com.spring.modules.sys.dao.SysMenuDao;
@ -1280,4 +1281,11 @@ public class TechnicalSpecificationController {
technicalSpecificationService.bmStatusToFinish(data);
return R.ok();
}
@PostMapping(value = "/node/list")
@ResponseBody
public R nodeList(@RequestBody PlmTechnicalSpecificationSheetData data) {
List<NodeVo> list = technicalSpecificationService.nodeList(data);
return R.ok().put("rows",list);
}
}

3
src/main/java/com/spring/modules/sampleManagement/dao/TechnicalSpecificationMapper.java

@ -17,6 +17,7 @@ import com.spring.modules.project.data.TechnicalCustomerInfoData;
import com.spring.modules.quotation.entity.QuotationHeader;
import com.spring.modules.quotation.vo.QuotationDetailVo;
import com.spring.modules.sampleManagement.data.*;
import com.spring.modules.sampleManagement.entity.NodeVo;
import com.spring.modules.sampleManagement.entity.PlmTechnicalSpecificationSheet;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@ -1182,4 +1183,6 @@ public interface TechnicalSpecificationMapper {
void updateBMStepId(PlmTechnicalSpecificationSheetData data);
void updateBMIsRemark(PlmTechnicalSpecificationSheetData data);
List<NodeVo> nodeList(PlmTechnicalSpecificationSheetData data);
}

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

@ -82,6 +82,16 @@ public class PlmTechnicalSpecificationSheetData extends PlmTechnicalSpecificatio
*/
private List<String> faiOperatorList;
private String documentSource;
public String getDocumentSource() {
return documentSource;
}
public void setDocumentSource(String documentSource) {
this.documentSource = documentSource;
}
public List<String> getCqcOperatorList() {
return cqcOperatorList;
}

10
src/main/java/com/spring/modules/sampleManagement/entity/NodeVo.java

@ -0,0 +1,10 @@
package com.spring.modules.sampleManagement.entity;
import lombok.Data;
import lombok.NoArgsConstructor;
@Data
public class NodeVo {
private String nodeId;
private String nodeName;
}

7
src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java

@ -33,6 +33,7 @@ import com.spring.modules.request.vo.PlmRequestDetailVo;
import com.spring.modules.sampleManagement.dao.TechnicalSpecificationMapper;
import com.spring.modules.sampleManagement.dao.UpBMRevNoData;
import com.spring.modules.sampleManagement.data.*;
import com.spring.modules.sampleManagement.entity.NodeVo;
import com.spring.modules.sampleManagement.entity.PlmTechnicalSpecificationSheet;
import com.spring.modules.sampleManagement.service.TechnicalSpecificationService;
import com.spring.modules.sys.dao.SysUserDao;
@ -1753,4 +1754,10 @@ public class TechnicalSpecificationServiceImpl implements TechnicalSpecification
data.setStepId(null);
technicalSpecificationMapper.updateBMStepId(data);
}
@Override
public List<NodeVo> nodeList(PlmTechnicalSpecificationSheetData data) {
List<NodeVo> list = technicalSpecificationMapper.nodeList(data);
return list;
}
}

3
src/main/java/com/spring/modules/sampleManagement/service/TechnicalSpecificationService.java

@ -16,6 +16,7 @@ import com.spring.modules.quotation.entity.QuotationHeader;
import com.spring.modules.quotation.vo.QuotationDetailVo;
import com.spring.modules.sampleManagement.dao.UpBMRevNoData;
import com.spring.modules.sampleManagement.data.*;
import com.spring.modules.sampleManagement.entity.NodeVo;
import org.springframework.web.bind.annotation.RequestBody;
import java.util.List;
@ -987,4 +988,6 @@ public interface TechnicalSpecificationService {
void bmStatusToCg(PlmTechnicalSpecificationSheetData data);
void bmStatusToFinish(PlmTechnicalSpecificationSheetData data);
List<NodeVo> nodeList(PlmTechnicalSpecificationSheetData data);
}

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

@ -2390,7 +2390,8 @@
a.rev,
a.customer_rev as customerRev,
b.plm_part_no as plmPartNo,
c.project_name as projectName
c.project_name as projectName,
a.document_source as documentSource
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
@ -2449,6 +2450,15 @@
<if test="buNo != null and buNo != ''">
AND b.bu_no like #{buNo}
</if>
<if test="nodeId != null and nodeId != ''">
AND d.node_id like #{nodeId}
</if>
<if test="sp != null and sp != ''">
AND dbo.get_plm_Approval_username(a.site, prh.workflow_id, d.node_id, a.code_no) like #{sp}
</if>
<if test="documentSource != null and documentSource != ''">
AND a.document_source = #{documentSource}
</if>
</where>
order by a.ori_code_no desc, a.rev_no desc
</select>
@ -2640,4 +2650,21 @@
set is_remark = 1
where site = #{site} and document_no = #{codeNo} and document_type = 'BM' and is_remark = 0
</update>
<select id="nodeList" resultType="com.spring.modules.sampleManagement.entity.NodeVo"
parameterType="com.spring.modules.sampleManagement.data.PlmTechnicalSpecificationSheetData">
SELECT distinct
d.node_id AS nodeId,
d.node_name AS nodeName
FROM
plm_technical_specification_sheet AS a
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
d.site = #{ site }
</select>
</mapper>
Loading…
Cancel
Save