wilson
/
ccl-plm-java
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

2025-04-24

master
qiezi 1 year ago
parent
4ebad3c137
commit
887b2c77b8
6 changed files with 115 additions and 1370 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      src/main/java/com/spring/modules/base/controller/LaborClassController.java
  2. 2
      src/main/java/com/spring/modules/sampleManagement/dao/TechnicalSpecificationMapper.java
  3. 9
      src/main/java/com/spring/modules/sampleManagement/data/PlmTechnicalSpecificationSheetData.java
  4. 18
      src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java
  5. 138
      src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml
  6. 1315
      src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapperTest.xml

3
src/main/java/com/spring/modules/base/controller/LaborClassController.java
View File

@ -1,7 +1,6 @@
package com.spring.modules.base.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.api.ApiController;
import com.spring.common.utils.R;
import com.spring.modules.base.entity.LaborClass;
import com.spring.modules.base.service.LaborClassService;
@ -17,7 +16,7 @@ import javax.annotation.Resource;
*/
@RestController
@RequestMapping("/labor/class")
public class LaborClassController extends ApiController {
public class LaborClassController {
/**
* 服务对象
*/

2
src/main/java/com/spring/modules/sampleManagement/dao/TechnicalSpecificationMapper.java
View File

@ -11,7 +11,6 @@ import com.spring.modules.part.entity.RoutingDetailEntity;
import com.spring.modules.part.entity.RoutingHeaderEntity;
import com.spring.modules.part.vo.*;
import com.spring.modules.project.data.PlmOperatorData;
import com.spring.modules.project.data.PlmProjectInfoData;
import com.spring.modules.project.data.PlmProjectPartData;
import com.spring.modules.project.data.TechnicalCustomerInfoData;
import com.spring.modules.quotation.entity.QuotationHeader;
@ -20,7 +19,6 @@ import com.spring.modules.sampleManagement.data.*;
import com.spring.modules.sampleManagement.entity.PlmTechnicalSpecificationSheet;
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;

9
src/main/java/com/spring/modules/sampleManagement/data/PlmTechnicalSpecificationSheetData.java
View File

@ -70,6 +70,15 @@ public class PlmTechnicalSpecificationSheetData extends PlmTechnicalSpecificatio
private String cutterNumber;
private String plmPartNo;
private String partSpec;
public String getPartSpec() {
return partSpec;
}
public void setPartSpec(String partSpec) {
this.partSpec = partSpec;
}
public String getPlmPartNo() {
return plmPartNo;

18
src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java
View File

@ -1,15 +1,10 @@
package com.spring.modules.sampleManagement.service.Impl;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.TypeReference;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.spring.common.exception.XJException;
import com.spring.common.utils.Constant;
import com.spring.common.utils.DateUtils;
import com.spring.common.utils.PageUtils;
import com.spring.datasource.config.AESUtil;
import com.spring.modules.base.data.*;
import com.spring.modules.base.entity.*;
import com.spring.modules.base.service.TransNoControlService;
@ -19,26 +14,19 @@ import com.spring.modules.change.entity.*;
import com.spring.modules.change.entity.APIEntity.*;
import com.spring.modules.change.mapper.ChangeManagementMapper;
import com.spring.modules.change.service.impl.ChangeManagementServiceImpl;
import com.spring.modules.change.vo.ChangeCostImpactVo;
import com.spring.modules.change.vo.ChangeExecutionInfoVo;
import com.spring.modules.change.vo.ChangeRequestVo;
import com.spring.modules.part.entity.*;
import com.spring.modules.part.mapper.BomManagementMapper;
import com.spring.modules.part.mapper.MasterPartInformationMapper;
import com.spring.modules.part.mapper.PartInformationMapper;
import com.spring.modules.part.vo.*;
import com.spring.modules.project.dao.ProjectDao;
import com.spring.modules.project.data.*;
import com.spring.modules.project.entity.PlmProjectInfo;
import com.spring.modules.project.entity.PlmProjectTeam;
import com.spring.modules.quotation.entity.QuotationHeader;
import com.spring.modules.quotation.entity.QuotationInformationEntity;
import com.spring.modules.quotation.mapper.QuotationInformationMapper;
import com.spring.modules.quotation.vo.QuotationDetailVo;
import com.spring.modules.report.dao.ProcedureDao;
import com.spring.modules.request.service.RequestManageService;
import com.spring.modules.request.vo.PlmRequestDetailVo;
import com.spring.modules.request.vo.PlmRequestHeaderVo;
import com.spring.modules.sampleManagement.dao.TechnicalSpecificationMapper;
import com.spring.modules.sampleManagement.dao.UpBMRevNoData;
import com.spring.modules.sampleManagement.data.*;
@ -46,24 +34,20 @@ import com.spring.modules.sampleManagement.entity.PlmTechnicalSpecificationSheet
import com.spring.modules.sampleManagement.service.TechnicalSpecificationService;
import com.spring.modules.sys.dao.SysUserDao;
import com.spring.modules.sys.entity.SysUserEntity;
import com.spring.modules.test.entity.TestInformationEntity;
import com.spring.modules.test.entity.TestSoBom;
import oracle.net.aso.s;
import org.apache.shiro.SecurityUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.StringUtils;
import sun.security.krb5.internal.AuthorizationData;
import java.math.BigDecimal;
import java.util.*;
import java.util.stream.Collectors;
import static com.spring.modules.base.utils.CommonUtils.convertToInt;
import static com.spring.modules.base.utils.CommonUtils.getPropertyValue;
@Service

138
src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml
View File

@ -2,7 +2,75 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.spring.modules.sampleManagement.dao.TechnicalSpecificationMapper">
<select id="technicalSpecificationListSearch" parameterType="PlmTechnicalSpecificationSheetData" resultType="PlmTechnicalSpecificationSheetData">
<resultMap id="getTechnicalSpecificationSheetData" type="PlmTechnicalSpecificationSheetData">
<result column="id" property="id"/>
<result column="site" property="site"/>
<result column="code_no" property="codeNo"/>
<result column="project_id" property="projectId"/>
<result column="test_part_no" property="testPartNo"/>
<result column="status" property="status"/>
<result column="rev_no" property="revNo"/>
<result column="work_center_no" property="workCenterNo"/>
<result column="ECN_flag" property="ecnFlag"/>
<result column="ECN_no" property="ecnNo"/>
<result column="ori_code_no" property="oriCodeNo"/>
<result column="ECN_address" property="ecnAddress"/>
<result column="remark" property="remark"/>
<result column="create_date" property="createDate"/>
<result column="create_by" property="createBy"/>
<result column="update_date" property="updateDate"/>
<result column="update_by" property="updateBy"/>
<result column="final_part_no" property="finalPartNo"/>
<result column="partTypeDesc" property="partTypeDesc"/>
<result column="partType" property="partType"/>
<result column="part_name" property="partName"/>
<result column="part_desc" property="partDesc"/>
<result column="part_spec" property="partSpec"/>
<result column="statusDesc" property="statusDesc"/>
<result column="proofing_no" property="proofingNo"/>
<result column="bu_no" property="buNo"/>
<result column="buDesc" property="buDesc"/>
<result column="engineer" property="engineer"/>
<result column="technician" property="technician"/>
<result column="process" property="process"/>
<result column="quotationOfficer" property="quotationOfficer"/>
<result column="engineerNo" property="engineerNo"/>
<result column="technicianNo" property="technicianNo"/>
<result column="customer_Id" property="customerId"/>
<result column="picture_addess" property="pictureAddess"/>
<result column="customerPictureChangeRemark" property="customerPictureChangeRemark"/>
<result column="productionFileComments" property="productionFileComments"/>
<result column="bom_type" property="bomType"/>
<result column="eng_chg_level" property="engChgLevel"/>
<result column="bom_alternative_no" property="bomAlternativeNo"/>
<result column="routing_type" property="routingType"/>
<result column="routing_revision" property="routingRevision"/>
<result column="routing_alternative_no" property="routingAlternativeNo"/>
<result column="pod" property="pod"/>
<result column="mpOperator" property="mpOperator"/>
<result column="mpOperatorName" property="mpOperatorName"/>
<result column="cqcOperator" property="cqcOperator"/>
<result column="cqcOperatorName" property="cqcOperatorName"/>
<result column="faiOperator" property="faiOperator"/>
<result column="faiOperatorName" property="faiOperatorName"/>
<result column="peOperater" property="peOperater"/>
<result column="peOperaterName" property="peOperaterName"/>
<result column="csOperater" property="csOperater"/>
<result column="dccOperater" property="dccOperater"/>
<result column="dccOperaterName" property="dccOperaterName"/>
<result column="is_reject" property="isReject"/>
<result column="node_id" property="nodeId"/>
<result column="node_name" property="nodeName"/>
<result column="customer_part_no" property="customerPartNo"/>
<result column="sp" property="sp"/>
<result column="remarkPage" property="remarkPage"/>
<result column="rev" property="rev"/>
<result column="customer_rev" property="customerRev"/>
<result column="plm_part_no" property="plmPartNo"/>
<result column="project_name" property="projectName"/>
</resultMap>
<select id="technicalSpecificationListSearch" resultMap="getTechnicalSpecificationSheetData" resultType="PlmTechnicalSpecificationSheetData">
SELECT a.id,
a.site,
a.code_no,
@ -21,21 +89,21 @@
a.update_date,
a.update_by,
b.final_part_no,
b.part_type partTypeDesc,
b.part_type partTypeDesc,
b.part_type,
b.part_name,
b.part_desc,
b.part_spec,
dbo.plm_get_technicalBaseDesc(a.status, 'status') statusDesc,
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,
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,
dbo.get_technicalSpecificationTeamNo(a.site, a.code_no, 'engineer') engineerNo,
dbo.get_technicalSpecificationTeamNo(a.site, a.code_no, 'technician') technicianNo,
dbo.get_technicalSpecificationTeamName(a.site, a.code_no, 'quotationOfficer') quotationOfficer,
dbo.get_technicalSpecificationTeamNo(a.site, a.code_no, 'engineer') engineerNo,
dbo.get_technicalSpecificationTeamNo(a.site, a.code_no, 'technician') technicianNo,
c.customer_Id,
a.picture_addess,
a.customerPictureChangeRemark,
@ -48,17 +116,17 @@
a.routing_alternative_no,
a.pod,
a.mpOperator,
dbo.get_userDisPlay(a.mpOperator) mpOperatorName,
dbo.get_userDisPlay(a.mpOperator) mpOperatorName,
a.cqcOperator,
dbo.get_userDisPlay(a.cqcOperator) cqcOperatorName,
dbo.get_userDisPlay(a.cqcOperator) cqcOperatorName,
a.faiOperator,
dbo.get_userDisPlay(a.faiOperator) faiOperatorName,
dbo.get_userDisPlay(a.faiOperator) faiOperatorName,
a.peOperater,
dbo.get_userDisPlay(a.peOperater) peOperaterName,
dbo.get_userDisPlay(a.peOperater) peOperaterName,
a.csOperater,
dbo.get_userDisPlay(a.csOperater) csOperaterName,
dbo.get_technicalSpecificationTeamNo(a.site, a.code_no, 'dcc') dccOperater,
dbo.get_technicalSpecificationTeamNames(a.site, a.code_no, 'dcc') dccOperaterName,
dbo.get_userDisPlay(a.csOperater) csOperaterName,
dbo.get_technicalSpecificationTeamNo(a.site, a.code_no, 'dcc') as dccOperater,
dbo.get_technicalSpecificationTeamNames(a.site, a.code_no, 'dcc') as dccOperaterName,
d.is_reject,
d.node_id,
d.node_name,
@ -70,17 +138,19 @@
b.plm_part_no,
c.project_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 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
left join plm_customer_part_info pcpi
on a.site = pcpi.site and a.test_part_no = pcpi.part_no and c.customer_id = pcpi.customer_no
<if test="query.cutterNumber != null and query.cutterNumber != ''">
inner join plm_bm_prepress pbp on pbp.Site = a.site and pbp.code_no = a.code_no and (plateNo like #{query.cutterNumber} or cutterNumber like #{query.cutterNumber})
</if>
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
left join plm_customer_part_info pcpi
on a.site = pcpi.site and a.test_part_no = pcpi.part_no and c.customer_id = pcpi.customer_no
<if test="query.cutterNumber != null and query.cutterNumber != ''">
inner join plm_bm_prepress pbp on pbp.Site = a.site and pbp.code_no = a.code_no and
(plateNo like #{query.cutterNumber} or
cutterNumber like #{query.cutterNumber})
</if>
<where>
<if test="query.id != null">
AND a.id = #{query.id}
@ -102,17 +172,17 @@
</if>
<if test="query.testPartNo != null and query.testPartNo != ''">
AND (
a.test_part_no like #{query.testPartNo} or
b.final_part_no like #{query.testPartNo} or
a.relevance_part_no like #{query.testPartNo} or
pcpi.customer_part_no like #{query.testPartNo}
)
a.test_part_no like #{query.testPartNo} or
b.final_part_no like #{query.testPartNo} or
a.relevance_part_no like #{query.testPartNo} or
pcpi.customer_part_no like #{query.testPartNo}
)
</if>
<if test="query.customerDesc != null and query.customerDesc != ''">
AND (
dbo.plm_get_customer_desc(c.site, c.customer_id) like #{query.customerDesc} or
dbo.plm_get_customer_desc(c.site, c.customer_id) like #{query.customerDesc} or
dbo.plm_get_dictDataLabel('finalCustomer', c.final_customer_id, c.site) like #{query.customerDesc}
)
)
</if>
<if test="query.statusDesc != null and query.statusDesc != ''">
AND dbo.plm_get_technicalBaseDesc(a.status, 'status') like #{query.statusDesc}

1315
src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapperTest.xml
File diff suppressed because it is too large
View File

Write Preview
Loading…
Cancel
Save