From b0ab8fff6cda5e52d77d55f98dcb3f4b126830bc Mon Sep 17 00:00:00 2001 From: ruanqi Date: Wed, 27 Sep 2023 13:06:28 +0800 Subject: [PATCH] first --- .../TechnicalSpecificationController.java | 35 ++++++++++ .../dao/TechnicalSpecificationMapper.java | 39 +++++++++++ .../PlmTechnicalSpecificationTeamData.java | 9 +++ .../entity/PlmTechnicalSpecificationTeam.java | 69 ++++++++++++++++++ .../TechnicalSpecificationServiceImpl.java | 70 +++++++++++++++++++ .../TechnicalSpecificationService.java | 24 +++++++ .../TechnicalSpecificationMapper.xml | 25 ++++++- 7 files changed, 270 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/spring/modules/sampleManagement/data/PlmTechnicalSpecificationTeamData.java create mode 100644 src/main/java/com/spring/modules/sampleManagement/entity/PlmTechnicalSpecificationTeam.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 156505c3..825586fa 100644 --- a/src/main/java/com/spring/modules/sampleManagement/controller/TechnicalSpecificationController.java +++ b/src/main/java/com/spring/modules/sampleManagement/controller/TechnicalSpecificationController.java @@ -6,6 +6,7 @@ import com.spring.common.utils.PageUtils; import com.spring.common.utils.R; import com.spring.modules.project.data.PlmProjectInfoData; import com.spring.modules.sampleManagement.data.PlmTechnicalSpecificationSheetData; +import com.spring.modules.sampleManagement.data.PlmTechnicalSpecificationTeamData; import com.spring.modules.sampleManagement.service.TechnicalSpecificationService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -15,6 +16,8 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; +import java.util.List; + @RequestMapping("/technicalSpecification") @Controller @@ -30,4 +33,36 @@ public class TechnicalSpecificationController { return R.ok().put("page", page); } + /** + * @Description TODO + * @Title saveTechnicalSpecificationSheet + * @param data + * @author rq + * @date 2023/9/27 9:33 + * @return R + * @throw + */ + @PostMapping(value="/saveTechnicalSpecificationSheet") + @ResponseBody + public R saveTechnicalSpecificationSheet(@RequestBody PlmTechnicalSpecificationSheetData data){ + technicalSpecificationService.saveTechnicalSpecificationSheet(data); + return R.ok(); + } + /** + * @Description 工具条件查询人员 + * @Title searchTechnicalSpecificationTeamStr + * @param data + * @author rq + * @date 2023/9/27 11:05 + * @return R + * @throw + */ + @PostMapping(value="/searchTechnicalSpecificationTeamStr") + @ResponseBody + public R searchTechnicalSpecificationTeamStr(@RequestBody PlmTechnicalSpecificationTeamData data){ + List list = technicalSpecificationService.searchTechnicalSpecificationTeamStr(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 a0dd83d8..62e74a49 100644 --- a/src/main/java/com/spring/modules/sampleManagement/dao/TechnicalSpecificationMapper.java +++ b/src/main/java/com/spring/modules/sampleManagement/dao/TechnicalSpecificationMapper.java @@ -4,11 +4,14 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.spring.modules.project.data.PlmProjectInfoData; import com.spring.modules.sampleManagement.data.PlmTechnicalSpecificationSheetData; +import com.spring.modules.sampleManagement.data.PlmTechnicalSpecificationTeamData; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Repository; +import java.util.List; + @Mapper @Repository public interface TechnicalSpecificationMapper { @@ -24,4 +27,40 @@ public interface TechnicalSpecificationMapper { * @throw */ IPage technicalSpecificationListSearch(Page page, @Param("query") PlmTechnicalSpecificationSheetData inData); + + /** + * @Description TODO + * @Title saveTechnicalSpecificationSheet + * @param inData + * @author rq + * @date 2023/9/27 9:49 + * @return void + * @throw + */ + void saveTechnicalSpecificationSheet(PlmTechnicalSpecificationSheetData inData); + + void saveTechnicalSpecificationTeams(PlmTechnicalSpecificationTeamData inData); + + void updateTechnicalSpecificationSheet(PlmTechnicalSpecificationSheetData inData); + /** + * @Description 删除 + * @Title deleteTechnicalSpecificationTeams + * @param inData + * @author rq + * @date 2023/9/27 10:26 + * @return void + * @throw + */ + void deleteTechnicalSpecificationTeams(PlmTechnicalSpecificationSheetData inData); + + /** + * @Description TODO + * @Title searchTechnicalSpecificationTeamStr + * @param data + * @author rq + * @date 2023/9/27 11:13 + * @return List + * @throw + */ + List searchTechnicalSpecificationTeamStr(PlmTechnicalSpecificationTeamData data); } diff --git a/src/main/java/com/spring/modules/sampleManagement/data/PlmTechnicalSpecificationTeamData.java b/src/main/java/com/spring/modules/sampleManagement/data/PlmTechnicalSpecificationTeamData.java new file mode 100644 index 00000000..c1807219 --- /dev/null +++ b/src/main/java/com/spring/modules/sampleManagement/data/PlmTechnicalSpecificationTeamData.java @@ -0,0 +1,9 @@ +package com.spring.modules.sampleManagement.data; + +import com.spring.modules.sampleManagement.entity.PlmTechnicalSpecificationTeam; +import org.apache.ibatis.type.Alias; + +@Alias("PlmTechnicalSpecificationTeamData") +public class PlmTechnicalSpecificationTeamData extends PlmTechnicalSpecificationTeam { + +} diff --git a/src/main/java/com/spring/modules/sampleManagement/entity/PlmTechnicalSpecificationTeam.java b/src/main/java/com/spring/modules/sampleManagement/entity/PlmTechnicalSpecificationTeam.java new file mode 100644 index 00000000..6dbddd0c --- /dev/null +++ b/src/main/java/com/spring/modules/sampleManagement/entity/PlmTechnicalSpecificationTeam.java @@ -0,0 +1,69 @@ +package com.spring.modules.sampleManagement.entity; + +public class PlmTechnicalSpecificationTeam { + /** + * 工厂编码 + */ + private String site; + + /** + * 参数卡编码 + */ + private String codeNo; + + /** + * 员工编码 + */ + private String operatorId; + + /** + * 角色 + */ + private String type; + + /** + * + */ + private Integer id; + + public String getSite() { + return site; + } + + public void setSite(String site) { + this.site = site; + } + + public String getCodeNo() { + return codeNo; + } + + public void setCodeNo(String codeNo) { + this.codeNo = codeNo; + } + + public String getOperatorId() { + return operatorId; + } + + public void setOperatorId(String operatorId) { + this.operatorId = operatorId; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } +} + 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 bc7ff2aa..b125ec70 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 @@ -3,12 +3,23 @@ package com.spring.modules.sampleManagement.service.Impl; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.spring.common.utils.PageUtils; +import com.spring.modules.base.service.TransNoControlService; +import com.spring.modules.project.data.PlmProjectContactData; import com.spring.modules.project.data.PlmProjectInfoData; +import com.spring.modules.project.data.PlmUserRoleData; +import com.spring.modules.project.entity.PlmProjectTeam; import com.spring.modules.sampleManagement.dao.TechnicalSpecificationMapper; import com.spring.modules.sampleManagement.data.PlmTechnicalSpecificationSheetData; +import com.spring.modules.sampleManagement.data.PlmTechnicalSpecificationTeamData; import com.spring.modules.sampleManagement.service.TechnicalSpecificationService; +import com.spring.modules.sys.entity.SysUserEntity; +import org.apache.shiro.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.ArrayList; +import java.util.List; @Service public class TechnicalSpecificationServiceImpl implements TechnicalSpecificationService { @@ -21,4 +32,63 @@ public class TechnicalSpecificationServiceImpl implements TechnicalSpecification new Page(inData.getPage(), inData.getLimit()), inData); return new PageUtils(resultList); } + @Autowired + private TransNoControlService transNoControlService; + + @Override + @Transactional + public void saveTechnicalSpecificationSheet(PlmTechnicalSpecificationSheetData inData){ + SysUserEntity sysUserEntity = (SysUserEntity) SecurityUtils.getSubject().getPrincipal(); + List plmTechnicalSpecificationTeams=new ArrayList<>(); + if(inData.getId()==0){ + String codeId=transNoControlService.transNo("1","technical_specification"); + inData.setCodeNo(codeId); + inData.setCreateBy(sysUserEntity.getUsername()); + inData.setStatus("cg"); + technicalSpecificationMapper.saveTechnicalSpecificationSheet(inData); + }else { + // PlmProjectInfoData checkPlmProjectInfoData=projectDao.checkPlmProjectInfoData(inData); + // if(!checkPlmProjectInfoData.getCustomerId().equals(inData.getCustomerId())){ + // PlmProjectContactData projectContactData=new PlmProjectContactData(); + // projectContactData.setSite(checkPlmProjectInfoData.getSite()); + // projectContactData.setProjectId(checkPlmProjectInfoData.getProjectId()); + // projectDao.deleteProjectContact(projectContactData); + // } + technicalSpecificationMapper.updateTechnicalSpecificationSheet(inData); + technicalSpecificationMapper.deleteTechnicalSpecificationTeams(inData); + } + for (int i = 0; i searchTechnicalSpecificationTeamStr(PlmTechnicalSpecificationTeamData data){ + return technicalSpecificationMapper.searchTechnicalSpecificationTeamStr(data); + } + } 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 cb713734..4bd68c34 100644 --- a/src/main/java/com/spring/modules/sampleManagement/service/TechnicalSpecificationService.java +++ b/src/main/java/com/spring/modules/sampleManagement/service/TechnicalSpecificationService.java @@ -3,6 +3,9 @@ package com.spring.modules.sampleManagement.service; import com.spring.common.utils.PageUtils; import com.spring.modules.project.data.PlmProjectInfoData; import com.spring.modules.sampleManagement.data.PlmTechnicalSpecificationSheetData; +import com.spring.modules.sampleManagement.data.PlmTechnicalSpecificationTeamData; + +import java.util.List; public interface TechnicalSpecificationService { @@ -17,4 +20,25 @@ public interface TechnicalSpecificationService { */ PageUtils technicalSpecificationListSearch(PlmTechnicalSpecificationSheetData inData); + /** + * @Description TODO + * @Title saveTechnicalSpecificationSheet + * @param data + * @author rq + * @date 2023/9/27 9:33 + * @return void + * @throw + */ + void saveTechnicalSpecificationSheet(PlmTechnicalSpecificationSheetData data); + + /** + * @Description TODO + * @Title searchTechnicalSpecificationTeamStr + * @param data + * @author rq + * @date 2023/9/27 11:13 + * @return List + * @throw + */ + List searchTechnicalSpecificationTeamStr(PlmTechnicalSpecificationTeamData data); } diff --git a/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml b/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml index 7027fbe2..0191102c 100644 --- a/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml +++ b/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml @@ -8,9 +8,10 @@ b.part_type,b.part_name,b.part_desc,b.part_spec,dbo.plm_get_technicalBaseDesc(a.status,'status') statusDesc, dbo.get_technicalSpecificationTeamName(a.site,a.code_no,'engineer') engineer, dbo.get_technicalSpecificationTeamName(a.site,a.code_no,'technician') technician, - dbo.get_technicalSpecificationTeamName(a.site,a.code_no,'customerId') customerId + dbo.get_technicalSpecificationTeamName(a.site,a.code_no,'quotationOfficer') quotationOfficer,c.customer_Id FROM plm_technical_specification_sheet a left join plm_project_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 AND a.id = #{query.id} @@ -30,6 +31,28 @@ + + insert into plm_technical_specification_sheet(site,code_no,proofing_no,project_id,test_part_no,status,rev_no,ECN_flag,ECN_no,ECN_address,remark, +create_date,create_by) values (#{site},#{codeNo},#{proofingNo},#{projectId},#{testPartNo},#{status},#{revNo},#{ecnFlag},#{ecnNo},#{ecnAddress} +,#{remark},GetDate(),#{createBy}) + + + insert into plm_technicalSpecification_team (site,code_no,operator_id,type) + values (#{site},#{codeNo},#{operatorId},#{type}) + + + + update plm_technical_specification_sheet set proofing_no=#{proofingNo},project_id=#{projectId},test_part_no=#{testPartNo},status=#{status} + ,rev_no=#{revNo},ECN_no=#{ecnNo},ECN_flag=#{ecnFlag},ECN_address=#{ecnAddress},remark=#{remark} where id=#{id} + + + + delete from plm_technicalSpecification_team where site=#{site} and code_no=#{codeNo} + + + \ No newline at end of file