2025-04-24

src/main/java/com/spring/modules/base/controller/LaborClassController.java

@@ -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 {
     /**
      * 服务对象
      */

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

@@ -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;

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

@@ -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;

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

@@ -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

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

@@ -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,
@@ -57,8 +125,8 @@
            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_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,
@@ -79,7 +147,9 @@
         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})
+        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">