From 7faea0395523f812cb48d7b4b2a316560f9d284d Mon Sep 17 00:00:00 2001 From: Aoi_Tori <2547614904@qq.com> Date: Thu, 5 Jun 2025 16:04:15 +0800 Subject: [PATCH] 2025/6/5 --- .../TechnicalSpecificationController.java | 8 +++++ .../dao/TechnicalSpecificationMapper.java | 3 ++ .../PlmTechnicalSpecificationSheetData.java | 10 +++++++ .../sampleManagement/entity/NodeVo.java | 10 +++++++ .../TechnicalSpecificationServiceImpl.java | 7 +++++ .../TechnicalSpecificationService.java | 3 ++ .../TechnicalSpecificationMapper.xml | 29 ++++++++++++++++++- 7 files changed, 69 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/spring/modules/sampleManagement/entity/NodeVo.java diff --git a/src/main/java/com/spring/modules/sampleManagement/controller/TechnicalSpecificationController.java b/src/main/java/com/spring/modules/sampleManagement/controller/TechnicalSpecificationController.java index fb670748..142f0f30 100644 --- a/src/main/java/com/spring/modules/sampleManagement/controller/TechnicalSpecificationController.java +++ b/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 list = technicalSpecificationService.nodeList(data); + return R.ok().put("rows",list); + } } diff --git a/src/main/java/com/spring/modules/sampleManagement/dao/TechnicalSpecificationMapper.java b/src/main/java/com/spring/modules/sampleManagement/dao/TechnicalSpecificationMapper.java index 7b7c6646..5893c2d6 100644 --- a/src/main/java/com/spring/modules/sampleManagement/dao/TechnicalSpecificationMapper.java +++ b/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 nodeList(PlmTechnicalSpecificationSheetData data); } diff --git a/src/main/java/com/spring/modules/sampleManagement/data/PlmTechnicalSpecificationSheetData.java b/src/main/java/com/spring/modules/sampleManagement/data/PlmTechnicalSpecificationSheetData.java index 8d12d7a7..837db70c 100644 --- a/src/main/java/com/spring/modules/sampleManagement/data/PlmTechnicalSpecificationSheetData.java +++ b/src/main/java/com/spring/modules/sampleManagement/data/PlmTechnicalSpecificationSheetData.java @@ -82,6 +82,16 @@ public class PlmTechnicalSpecificationSheetData extends PlmTechnicalSpecificatio */ private List faiOperatorList; + private String documentSource; + + public String getDocumentSource() { + return documentSource; + } + + public void setDocumentSource(String documentSource) { + this.documentSource = documentSource; + } + public List getCqcOperatorList() { return cqcOperatorList; } diff --git a/src/main/java/com/spring/modules/sampleManagement/entity/NodeVo.java b/src/main/java/com/spring/modules/sampleManagement/entity/NodeVo.java new file mode 100644 index 00000000..fcad6a2a --- /dev/null +++ b/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; +} diff --git a/src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java b/src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java index a9d14b99..fb327f7b 100644 --- a/src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java +++ b/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 nodeList(PlmTechnicalSpecificationSheetData data) { + List list = technicalSpecificationMapper.nodeList(data); + return list; + } } diff --git a/src/main/java/com/spring/modules/sampleManagement/service/TechnicalSpecificationService.java b/src/main/java/com/spring/modules/sampleManagement/service/TechnicalSpecificationService.java index 26cd5d70..c81b3382 100644 --- a/src/main/java/com/spring/modules/sampleManagement/service/TechnicalSpecificationService.java +++ b/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 nodeList(PlmTechnicalSpecificationSheetData data); } diff --git a/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml b/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml index c2cc6e89..ca347b83 100644 --- a/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml +++ b/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 @@ AND b.bu_no like #{buNo} + + AND d.node_id like #{nodeId} + + + AND dbo.get_plm_Approval_username(a.site, prh.workflow_id, d.node_id, a.code_no) like #{sp} + + + AND a.document_source = #{documentSource} + order by a.ori_code_no desc, a.rev_no desc @@ -2640,4 +2650,21 @@ set is_remark = 1 where site = #{site} and document_no = #{codeNo} and document_type = 'BM' and is_remark = 0 + + \ No newline at end of file