产品修改丝印锁定

lxw

2022-09-14 dca2b2714a7d52ab2d8f171b7ddb734998ae9f7c

产品修改丝印锁定

 src/main/java/com/whyc/dto/FIleSilkLock.java

New file
@@ -0,0 +1,24 @@
package com.whyc.dto;

import com.baomidou.mybatisplus.annotation.TableField;
import com.whyc.pojo.AttachLock;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;

import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;

@Data
@AllArgsConstructor
public class FIleSilkLock implements Serializable {
    private String[] files;
    private List<AttachLock> attachLocks;

    public FIleSilkLock() {
        files=new String[]{};
        attachLocks=new ArrayList<>();
    }
}

 src/main/java/com/whyc/mapper/ProductBomHistoryMapper.java

@@ -1,6 +1,7 @@
package com.whyc.mapper;


import com.whyc.pojo.AttachLock;
import com.whyc.pojo.ProductBomHistory;
import com.whyc.pojo.Software;

@@ -14,4 +15,7 @@
    List<Software> selectSoftware(String parentCode);

    List<ProductBomHistory> getBomListByProductIdAndSubVersion(int productId, Integer subVersion);

    //查询产品丝印锁定状态
    List<AttachLock> selectInAttachLock(int productId);
}

 src/main/java/com/whyc/pojo/ProductBomHistory.java

@@ -113,9 +113,6 @@
    @ApiModelProperty(value = "是否是bom的管理，excel导出有用，0：原件，1：关联件")
    private Integer connFlag;

    @TableField(exist = false)
    @ApiModelProperty(value = "丝印锁定信息")
    private List<AttachLock> attachLocks;

    public Integer getId() {
        return id;
@@ -339,13 +336,5 @@

    public void setConnFlag(Integer connFlag) {
        this.connFlag = connFlag;
    }

    public List<AttachLock> getAttachLocks() {
        return attachLocks;
    }

    public void setAttachLocks(List<AttachLock> attachLocks) {
        this.attachLocks = attachLocks;
    }
}

 src/main/java/com/whyc/service/ProductBomHistoryService.java

@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.whyc.constant.UserOperation;
import com.whyc.dto.FIleSilkLock;
import com.whyc.dto.FileDirPath;
import com.whyc.dto.Response;
import com.whyc.dto.ZipUtils;
@@ -114,16 +115,20 @@
      //将没有管理BOM的dwg文件(丝印)拷贝下载
      fileDirName=fileDirName+File.separator+withOutDwg;
      File start = new File(fileDirName);
      FIleSilkLock fIleSilkLock=new FIleSilkLock();
      String[] files =new String[]{};
      if(start.exists()) {
          files= start.list();//获取该文件夹下的所有文件名字
          if(files.length>=0){
              for(int i=0;i<files.length;i++) {
                  files[i]=withOutDwg+File.separator+files[i];
                  fIleSilkLock.setFiles(files);
              }
          }
      }
      return new Response().setIIII(1,list.size()>0,list,listsoft,files,"返回物料信息及关联物料");
      List<AttachLock> attachLocks=mapper.selectInAttachLock(productId);
      fIleSilkLock.setAttachLocks(attachLocks);
      return new Response().setIIII(1,list.size()>0,list,listsoft,fIleSilkLock,"返回物料信息及关联物料");
  }
    //历史产品下载(产品id和版本<下载的版本>)
    public void downloadProductHistory(HttpServletRequest req, HttpServletResponse resp, int productId, int version) {

 src/main/resources/mapper/ProductBomHistoryMapper.xml

@@ -60,8 +60,6 @@
        </collection>
        <collection property="softwares" javaType="java.util.ArrayList" ofType="com.whyc.pojo.Software" column="{subCode=sub_code}" select="selectSoftWares">
        </collection>
        <collection property="attachLocks" javaType="java.util.ArrayList" ofType="com.whyc.pojo.AttachLock" column="{productId=product_id}" select="selectInAttachLock">
        </collection>
    </resultMap>
    <select id="getBomHistoryAndMaterial" resultMap="BomHistoryList">
        select distinct tb_product_bom_history.*