1127

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

@@ -9,6 +9,7 @@ import com.spring.modules.base.data.PlmBmPropertiesValueData;
 import com.spring.modules.part.vo.PartInformationVo;
 import com.spring.modules.project.data.PlmProjectPartData;
 import com.spring.modules.project.data.TechnicalCustomerInfoData;
+import com.spring.modules.sampleManagement.dao.UpBMRevNoData;
 import com.spring.modules.sampleManagement.data.*;
 import com.spring.modules.sampleManagement.service.TechnicalSpecificationService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -988,4 +989,11 @@ public class TechnicalSpecificationController {
         technicalSpecificationService.deleteBMPrintingColor(data);
         return R.ok();
     }
+
+    @PostMapping(value="/upBMRevNo")
+    @ResponseBody
+    public R upBMRevNo(@RequestBody UpBMRevNoData data){
+        technicalSpecificationService.upBMRevNo(data);
+        return R.ok();
+    }
 }

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

@@ -0,0 +1,58 @@
+package com.spring.modules.sampleManagement.dao;
+
+public class UpBMRevNoData {
+    private String site;
+    private String oriCodeNo;
+    private String oldCodeNo;
+    private String oldRevNo;
+    private String revNo;
+    private String testPartNo;
+
+    public String getSite() {
+        return site;
+    }
+
+    public void setSite(String site) {
+        this.site = site;
+    }
+
+    public String getOriCodeNo() {
+        return oriCodeNo;
+    }
+
+    public void setOriCodeNo(String oriCodeNo) {
+        this.oriCodeNo = oriCodeNo;
+    }
+
+    public String getOldCodeNo() {
+        return oldCodeNo;
+    }
+
+    public void setOldCodeNo(String oldCodeNo) {
+        this.oldCodeNo = oldCodeNo;
+    }
+
+    public String getOldRevNo() {
+        return oldRevNo;
+    }
+
+    public void setOldRevNo(String oldRevNo) {
+        this.oldRevNo = oldRevNo;
+    }
+
+    public String getRevNo() {
+        return revNo;
+    }
+
+    public void setRevNo(String revNo) {
+        this.revNo = revNo;
+    }
+
+    public String getTestPartNo() {
+        return testPartNo;
+    }
+
+    public void setTestPartNo(String testPartNo) {
+        this.testPartNo = testPartNo;
+    }
+}

src/main/java/com/spring/modules/sampleManagement/entity/PlmTechnicalSpecificationSheet.java

@@ -98,6 +98,7 @@ public class PlmTechnicalSpecificationSheet extends QueryPage {
     private String pictureAddess;
     private String customerPictureChangeRemark;
     private String productionFileComments;
+    private String oriCodeNo;
 
     public Integer getId() {
         return id;
@@ -258,5 +259,13 @@ public class PlmTechnicalSpecificationSheet extends QueryPage {
     public void setProductionFileComments(String productionFileComments) {
         this.productionFileComments = productionFileComments;
     }
+
+    public String getOriCodeNo() {
+        return oriCodeNo;
+    }
+
+    public void setOriCodeNo(String oriCodeNo) {
+        this.oriCodeNo = oriCodeNo;
+    }
 }
 

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

@@ -18,6 +18,7 @@ import com.spring.modules.project.data.*;
 import com.spring.modules.project.entity.PlmProjectTeam;
 import com.spring.modules.report.dao.ProcedureDao;
 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.service.TechnicalSpecificationService;
 import com.spring.modules.sys.entity.SysUserEntity;
@@ -26,6 +27,7 @@ import org.apache.shiro.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import sun.security.krb5.internal.AuthorizationData;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -54,6 +56,7 @@ public class TechnicalSpecificationServiceImpl implements TechnicalSpecification
         if(inData.getId()==0){
             String codeId=transNoControlService.transNo("1","technical_specification");
             inData.setCodeNo(codeId);
+            inData.setOriCodeNo(codeId);
             inData.setCreateBy(sysUserEntity.getUsername());
             inData.setStatus("cg");
             technicalSpecificationMapper.saveTechnicalSpecificationSheet(inData);
@@ -816,4 +819,26 @@ public class TechnicalSpecificationServiceImpl implements TechnicalSpecification
         technicalSpecificationMapper.deleteBMPrintingColor(data);
 
     }
+
+    @Override
+    public void upBMRevNo(UpBMRevNoData data){
+        SysUserEntity sysUserEntity = (SysUserEntity) SecurityUtils.getSubject().getPrincipal();
+
+        List<Object> params = new ArrayList<>();
+        params.add(data.getSite());
+        params.add(data.getOldCodeNo());
+        params.add(data.getOldRevNo());
+        params.add(data.getOriCodeNo());
+        params.add(data.getRevNo());
+        params.add(sysUserEntity.getUsername());
+        //执行方法
+        List<Map<String, Object>> resultList = procedureDao.getProcedureData("plm_bm_upRevNo", params);
+        //判断是否成功
+        String code = String.valueOf(resultList.get(0).get("resultCode"));
+        if ("400".equalsIgnoreCase(code)) {
+            String msg = String.valueOf(resultList.get(0).get("resultMsg"));
+            throw new RuntimeException(msg);
+        }
+
+    }
 }

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

@@ -8,6 +8,7 @@ import com.spring.modules.part.vo.PartInformationVo;
 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.sampleManagement.dao.UpBMRevNoData;
 import com.spring.modules.sampleManagement.data.*;
 
 import java.util.List;
@@ -871,4 +872,15 @@ public interface TechnicalSpecificationService {
      * @throw
      */
     void updateBMPrintingDetail(PlmBmPrintingData data);
+
+    /**
+     * @Description 升版
+     * @Title upBMRevNo
+      * @param data
+     * @author rq
+     * @date 2024/2/19 15:58
+     * @return void
+     * @throw
+     */
+    void upBMRevNo(UpBMRevNoData data);
 }

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

@@ -3,7 +3,7 @@
 <mapper namespace="com.spring.modules.sampleManagement.dao.TechnicalSpecificationMapper">
 
 <select id="technicalSpecificationListSearch"  parameterType="PlmTechnicalSpecificationSheetData" resultType="PlmTechnicalSpecificationSheetData">
-        SELECT a.id,a.site,a.code_no,a.project_id,a.test_part_no,a.status,a.rev_no,a.work_center_no,a.ECN_flag,a.ECN_no,
+        SELECT a.id,a.site,a.code_no,a.project_id,a.test_part_no,a.status,a.rev_no,a.work_center_no,a.ECN_flag,a.ECN_no,a.ori_code_no,
         a.ECN_address,a.remark,a.create_date,a.create_by,a.update_date,a.update_by,b.final_part_no,dbo.plm_get_projectBaseDesc(b.part_type,'part_type') partTypeDesc,
         b.part_type,b.part_name,b.part_desc,b.part_spec,dbo.plm_get_technicalBaseDesc(a.status,'status') statusDesc,a.proofing_no,c.bu_no,dbo.plm_get_bu_desc(a.site,c.bu_no) buDesc,
         dbo.get_technicalSpecificationTeamName(a.site,a.code_no,'engineer') engineer,
@@ -29,12 +29,13 @@
                 AND a.test_part_no like #{query.testPartNo}
             </if>
         </where>
+        order by a.code_no desc
 </select>
 
 <insert id="saveTechnicalSpecificationSheet">
     insert into plm_technical_specification_sheet(site,code_no,project_id,test_part_no,status,rev_no,ECN_flag,ECN_no,ECN_address,remark,
-    create_date,create_by,proofing_no) values (#{site},#{codeNo},#{projectId},#{testPartNo},#{status},#{revNo},#{ecnFlag},#{ecnNo},#{ecnAddress}
-    ,#{remark},GetDate(),#{createBy},#{proofingNo})
+    create_date,create_by,proofing_no,ori_code_no) values (#{site},#{codeNo},#{projectId},#{testPartNo},#{status},#{revNo},#{ecnFlag},#{ecnNo},#{ecnAddress}
+    ,#{remark},GetDate(),#{createBy},#{proofingNo},#{oriCodeNo})
 </insert>
 
 <insert id="saveTechnicalSpecificationTeams">
@@ -71,7 +72,7 @@
         b.part_type,b.part_name,b.part_desc,b.part_spec,dbo.plm_get_technicalBaseDesc(a.status,'status') statusDesc,a.proofing_no,
         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,'quotationOfficer') quotationOfficer,c.customer_Id
+        dbo.get_technicalSpecificationTeamName(a.site,a.code_no,'quotationOfficer') quotationOfficer,c.customer_Id,a.ori_code_no
         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
@@ -94,7 +95,7 @@
         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,'quotationOfficer') quotationOfficer,c.customer_Id,
-        a.proofing_no
+        a.proofing_no,a.ori_code_no
         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
@@ -122,7 +123,7 @@
     select a.site,a.code_no,a.picture_addess,a.customerPictureChangeRemark,a.productionFileComments,
     b.customer_id finalCustomerNo,dbo.plm_get_customer_desc(a.site,b.customer_id) finalCustomerDesc,
     a.test_part_no as part_no,c.part_desc,c.material_number,c.part_type as part_family,b.customer_remark,
-    b.remark projectRemark,a.remark
+    b.remark projectRemark,a.remark,a.ori_code_no
     from plm_technical_specification_sheet a
     left join plm_project_info b on a.site=b.site and a.project_id=b.project_id
     left join plm_project_part c on a.site=c.site and a.test_part_no=c.test_part_no
@@ -720,4 +721,5 @@ id
 </select>
 
 
+
 </mapper>