first

src/main/java/com/spring/modules/quotation/service/impl/QuotationInformationServiceImpl.java

@@ -272,8 +272,9 @@ public class QuotationInformationServiceImpl extends ServiceImpl<QuotationInform
         BufferedInputStream bis = null;
         FileOutputStream fos = null;
         BufferedOutputStream bos = null;
+        String encodedFileName =new String(getFileData.getFileName().getBytes("gbk"), "iso8859-1");
         response.setContentType("application/force-download;charset=utf-8");
-        response.setHeader("Content-disposition", "attachment; filename=" + new String(getFileData.getFileName().getBytes("gbk"), "iso8859-1"));
+        response.setHeader("Content-disposition", "attachment; filename=" + encodedFileName );
         try {
             //读取文件
             fis = new FileInputStream(file);

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

@@ -4,9 +4,11 @@ package com.spring.modules.sampleManagement.controller;
 
 import com.spring.common.utils.PageUtils;
 import com.spring.common.utils.R;
+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.data.PlmBmBomData;
 import com.spring.modules.sampleManagement.data.PlmBmPackageInfoData;
 import com.spring.modules.sampleManagement.data.PlmTechnicalSpecificationSheetData;
 import com.spring.modules.sampleManagement.data.PlmTechnicalSpecificationTeamData;
@@ -224,4 +226,48 @@ public class TechnicalSpecificationController {
         technicalSpecificationService.updateBMPackageInfo(data);
         return R.ok();
     }
+    /**
+     * @Description TODO
+     * @Title searchPartDataForSelect
+      * @param data
+     * @author rq
+     * @date 2023/11/22 17:00
+     * @return R
+     * @throw
+     */
+    @PostMapping(value="/searchPartDataForSelect")
+    @ResponseBody
+    public R searchPartDataForSelect(@RequestBody PartInformationVo data){
+        List<PartInformationVo> rows= technicalSpecificationService.searchPartDataForSelect(data);
+        return R.ok().put("rows", rows);
+    }
+
+    /**
+     *
+     * @param data
+     * @return
+     */
+    @PostMapping(value="/saveBMBom")
+    @ResponseBody
+    public R saveBMBom(@RequestBody PlmBmBomData data){
+        technicalSpecificationService.saveBMBom(data);
+        return R.ok();
+    }
+    /**
+     * @Description 查询BOM
+     * @Title searchBMBom
+      * @param data
+     * @author rq
+     * @date 2023/11/22 18:02
+     * @return R
+     * @throw
+     */
+    @PostMapping(value="/searchBMBom")
+    @ResponseBody
+    public R searchBMBom(@RequestBody PlmBmBomData data){
+        List<PlmBmBomData> rows= technicalSpecificationService.searchBMBom(data);
+        return R.ok().put("rows", rows);
+    }
+
+
 }

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

@@ -2,9 +2,11 @@ package com.spring.modules.sampleManagement.dao;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+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.data.PlmBmBomData;
 import com.spring.modules.sampleManagement.data.PlmBmPackageInfoData;
 import com.spring.modules.sampleManagement.data.PlmTechnicalSpecificationSheetData;
 import com.spring.modules.sampleManagement.data.PlmTechnicalSpecificationTeamData;
@@ -188,4 +190,48 @@ public interface TechnicalSpecificationMapper {
      * @throw
      */
     void updateBMPackageInfo(PlmBmPackageInfoData data);
+
+    /**
+     * @Description TODO
+     * @Title searchBMPackageInfo
+     * @param data
+     * @author rq
+     * @date 2023/11/17 17:51
+     * @return List<PlmBmPackageInfoData>
+     * @throw
+     */
+    List<PartInformationVo> searchPartDataForSelect (PartInformationVo data);
+
+
+    /**
+     * @Description 保存bom
+     * @Title saveBMBom
+     * @param
+     * @author rq
+     * @date 2023/11/22 17:47
+     * @return void
+     * @throw
+     */
+    void saveBMBom(PlmBmBomData inData);
+    /**
+     * @Description 更新bom
+     * @Title saveBMBom
+     * @param
+     * @author rq
+     * @date 2023/11/22 17:47
+     * @return void
+     * @throw
+     */
+    void updateBMBom(PlmBmBomData inData);
+
+    /**
+     * @Description TODO
+     * @Title searchBMBom
+     * @param inData
+     * @author rq
+     * @date 2023/11/22 18:02
+     * @return List<PlmBmBomData>
+     * @throw
+     */
+    List<PlmBmBomData> searchBMBom(PlmBmBomData inData);
 }

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

@@ -0,0 +1,20 @@
+package com.spring.modules.sampleManagement.data;
+
+import com.spring.modules.sampleManagement.entity.PlmBmBom;
+import io.swagger.models.auth.In;
+import lombok.Data;
+import org.apache.ibatis.type.Alias;
+
+import java.math.BigDecimal;
+import java.util.Date;
+@Data
+@Alias("PlmBmBomData")
+public class PlmBmBomData extends PlmBmBom {
+    private Integer addId;
+    private String familyId;
+    private String familyName;
+    private String familyDesc;
+    private String spec;
+    private String username;
+}
+

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

@@ -0,0 +1,124 @@
+package com.spring.modules.sampleManagement.entity;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class PlmBmBom {
+    /**
+     * 工厂编码
+     */
+    private String site;
+
+    /**
+     * 技术参数卡编码
+     */
+    private String codeNo;
+
+    /**
+     * 800料号
+     */
+    private String erpPartNo;
+
+    /**
+     * 数量
+     */
+    private BigDecimal quantity;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     *
+     */
+    private String createBy;
+
+    /**
+     *
+     */
+    private Date createDate;
+
+    /**
+     *
+     */
+    private String updateBy;
+
+    /**
+     *
+     */
+    private Date updateDate;
+
+    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 getErpPartNo() {
+        return erpPartNo;
+    }
+
+    public void setErpPartNo(String erpPartNo) {
+        this.erpPartNo = erpPartNo;
+    }
+
+    public BigDecimal getQuantity() {
+        return quantity;
+    }
+
+    public void setQuantity(BigDecimal quantity) {
+        this.quantity = quantity;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public String getCreateBy() {
+        return createBy;
+    }
+
+    public void setCreateBy(String createBy) {
+        this.createBy = createBy;
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+
+    public String getUpdateBy() {
+        return updateBy;
+    }
+
+    public void setUpdateBy(String updateBy) {
+        this.updateBy = updateBy;
+    }
+
+    public Date getUpdateDate() {
+        return updateDate;
+    }
+
+    public void setUpdateDate(Date updateDate) {
+        this.updateDate = updateDate;
+    }
+}
+

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

@@ -4,9 +4,11 @@ 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.part.vo.PartInformationVo;
 import com.spring.modules.project.data.*;
 import com.spring.modules.project.entity.PlmProjectTeam;
 import com.spring.modules.sampleManagement.dao.TechnicalSpecificationMapper;
+import com.spring.modules.sampleManagement.data.PlmBmBomData;
 import com.spring.modules.sampleManagement.data.PlmBmPackageInfoData;
 import com.spring.modules.sampleManagement.data.PlmTechnicalSpecificationSheetData;
 import com.spring.modules.sampleManagement.data.PlmTechnicalSpecificationTeamData;
@@ -177,4 +179,24 @@ public class TechnicalSpecificationServiceImpl implements TechnicalSpecification
     public void updateBMPackageInfo(PlmBmPackageInfoData data){
         technicalSpecificationMapper.updateBMPackageInfo(data);
     }
+
+    @Override
+    public List<PartInformationVo> searchPartDataForSelect (PartInformationVo data){
+        return technicalSpecificationMapper.searchPartDataForSelect(data);
+    }
+
+    @Override
+    public void saveBMBom(PlmBmBomData inData){
+        if(inData.getAddId()==0){
+            technicalSpecificationMapper.saveBMBom(inData);
+        }else {
+            technicalSpecificationMapper.updateBMBom(inData);
+        }
+
+    }
+
+    @Override
+    public List<PlmBmBomData> searchBMBom(PlmBmBomData inData){
+        return technicalSpecificationMapper.searchBMBom(inData);
+    }
 }

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

@@ -1,9 +1,11 @@
 package com.spring.modules.sampleManagement.service;
 
 import com.spring.common.utils.PageUtils;
+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.data.PlmBmBomData;
 import com.spring.modules.sampleManagement.data.PlmBmPackageInfoData;
 import com.spring.modules.sampleManagement.data.PlmTechnicalSpecificationSheetData;
 import com.spring.modules.sampleManagement.data.PlmTechnicalSpecificationTeamData;
@@ -164,4 +166,37 @@ public interface TechnicalSpecificationService {
      * @throw
      */
     void updateBMPackageInfo(PlmBmPackageInfoData data);
+
+    /**
+     * @Description TODO
+     * @Title searchBMPackageInfo
+     * @param data
+     * @author rq
+     * @date 2023/11/17 17:51
+     * @return List<PlmBmPackageInfoData>
+     * @throw
+     */
+    List<PartInformationVo> searchPartDataForSelect (PartInformationVo data);
+
+    /**
+     * @Description TODO
+     * @Title saveBMBom
+      * @param
+     * @author rq
+     * @date 2023/11/22 17:47
+     * @return void
+     * @throw
+     */
+    void saveBMBom(PlmBmBomData inData);
+
+    /**
+     * @Description TODO
+     * @Title searchBMBom
+      * @param inData
+     * @author rq
+     * @date 2023/11/22 18:02
+     * @return List<PlmBmBomData>
+     * @throw
+     */
+    List<PlmBmBomData> searchBMBom(PlmBmBomData inData);
 }

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

@@ -105,7 +105,7 @@
      and site=#{site}
      AND project_id in ( select project_id from AccessProject where site=#{site} and username=#{username} and searchFlag='Y' )
      <if test="proofingNo!= null and proofingNo != ''">
-                AND proofing_no = #{proofingNo}
+                AND proofing_no like #{proofingNo}
       </if>
      </where>
 </select>
@@ -133,7 +133,7 @@
 </update>
 
 <select id="searchBMPackageInfo" resultType="PlmBmPackageInfoData">
-    select site,code_no,matrixStripped,appliedType,finalFormat,rowCount,columnCount,missingAllowedFlag,rollPerQty,addingFilmFlag,
+    select site,code_no,matrixStripped,appliedType,finalFormat,[rowCount],columnCount,missingAllowedFlag,rollPerQty,addingFilmFlag,
     packageRequest,coreType,coreDiameter,joinAllowedFlag,coreWidth,specialPositiorFlag,copyPosition,overprintingFlag,
     otherRequirement from plm_bm_packageInfo
     where site=#{site} and code_no=#{codeNo}
@@ -141,11 +141,55 @@
 
 <update id="updateBMPackageInfo">
     update plm_bm_packageInfo set
-    matrixStripped=#{matrixStripped},appliedType=#{appliedType},finalFormat=#{finalFormat},rowCount=#{rowCount},columnCount=#{columnCount},
-    missingAllowedFlag=#{missingAllowedFlag},rollPerQty=#{rollPerQty},addingFilmFlag=#{addingFilmFlag},
-    packageRequest=#{packageRequest},coreType=#{coreType},coreDiameter=#{coreDiameter},joinAllowedFlag=#{joinAllowedFlag},coreWidth=#{coreWidth},
+    matrixStripped=#{matrixStripped},appliedType=#{appliedType},finalFormat=#{finalFormat},[rowCount]=#{rowCount,jdbcType=INTEGER},columnCount=#{columnCount,jdbcType=INTEGER},
+    missingAllowedFlag=#{missingAllowedFlag},rollPerQty=#{rollPerQty,jdbcType=DECIMAL},addingFilmFlag=#{addingFilmFlag},
+    packageRequest=#{packageRequest},coreType=#{coreType},coreDiameter=#{coreDiameter},joinAllowedFlag=#{joinAllowedFlag},coreWidth=#{coreWidth,jdbcType=DECIMAL},
     specialPositiorFlag=#{specialPositiorFlag},copyPosition=#{copyPosition},overprintingFlag=#{overprintingFlag},
     otherRequirement=#{otherRequirement} where site=#{site} and code_no=#{codeNo}
 </update>
 
+<select id="searchPartDataForSelect" resultType="com.spring.modules.part.vo.PartInformationVo">
+    select top 100 a.erp_part_no ,a.part_desc,a.family_id,a.spec,family_name
+     from part a left join part_family b on a.site=b.site and a.family_id=b.family_id
+      <where>
+        and a.site=#{site}
+         <if test="erpPartNo!= null and erpPartNo != ''">
+            AND a.erp_part_no like #{erpPartNo}
+         </if>
+         <if test="familyId!= null and familyId != ''">
+            AND a.family_id like #{familyId}
+         </if>
+          <if test="partDesc!= null and partDesc != ''">
+            AND a.part_desc like #{partDesc}
+         </if>
+         and a.erp_part_no is not null and a.erp_part_no!=''
+     </where>
+</select>
+
+<insert id="saveBMBom" >
+    insert into plm_bm_bom (Site,code_no,erp_part_no,quantity,remark,create_by,create_date)
+    values(#{site},#{codeNo},#{erpPartNo},#{quantity},#{remark},#{username},GetDate())
+</insert>
+
+<update id="updateBMBom" >
+   update plm_bm_bom set quantity=#{quantity,jdbcType=DECIMAL} ,remark=#{remark},update_by=#{username},
+   update_date=GetDate() where Site=#{site} and code_no=#{codeNo} and erp_part_no=#{erpPartNo}
+</update>
+
+<select id="searchBMBom" resultType="PlmBmBomData">
+    select a.Site,a.code_no,a.erp_part_no,a.quantity,a.remark,b.part_desc,b.spec,b.family_id,c.family_name
+    from plm_bm_bom a
+    left join part b on a.erp_part_no=b.erp_part_no and a.site=b.site
+    left join part_family on b.family_id=c.family_id and b.site=c.site
+    <where>
+     and a.site=#{site}
+         <if test="erpPartNo!= null and erpPartNo != ''">
+            AND a.erp_part_no like #{erpPartNo}
+         </if>
+           <if test="codeNo!= null and codeNo != ''">
+            AND a.code_no like #{codeNo}
+         </if>
+    </where>
+</select>
+
 </mapper>