问题修复

whycxzp

2022-09-03 f40f45162d69d751628a8fa0c6784abb237d4eaa

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

@@ -13,7 +13,6 @@
import com.whyc.util.ActionUtil;
import org.apache.poi.hssf.usermodel.*;
import org.apache.poi.ss.usermodel.ClientAnchor;
import org.apache.poi.ss.usermodel.Row;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

@@ -22,10 +21,7 @@
import javax.servlet.http.HttpServletResponse;
import java.awt.image.BufferedImage;
import java.io.*;
import java.util.ArrayList;
import java.util.Date;
import java.util.LinkedList;
import java.util.List;
import java.util.*;
import java.util.stream.Collectors;

@Service
@@ -44,6 +40,10 @@

    @Autowired
    private ProductBomService bomService;

    @Autowired
    private ProductService productService;

    //根据子件名称和母料型号查询历史版本记录
    public Response getBomHistoryByPModelAndSName(String pmodel, String sname) {
        QueryWrapper wrapper=new QueryWrapper();
@@ -90,15 +90,17 @@
    }*/
  //历史产品信息查看（根据历史产品产品id和版本查询子件及其关联的物料信息）
  public Response getBomHistoryAndMaterial(int productId, int version) {
      List<ProductBomHistory> list=mapper.getBomHistoryAndMaterial(productId,version);
      //查询产品的软件
      List<ProductSoftware> listsoft=mapper.selectSoftware(productId);
      //将没有管理BOM的dwg文件

      QueryWrapper wrapper=new QueryWrapper();
      wrapper.eq("id",productId);
      wrapper.eq("version",version);
      wrapper.last("limit 1");
      ProductHistory pHistory=pHistoryMapper.selectOne(wrapper);

      List<ProductBomHistory> list=mapper.getBomHistoryAndMaterial(productId,pHistory.getSubVersionMax());
      //查询产品的软件
      List<ProductSoftware> listsoft=mapper.selectSoftware(productId);
      //将没有管理BOM的dwg文件
      String withOutDwg="doc_file/product"+File.separator+pHistory.getParentModel();
      if(pHistory.getCustomCode()!=null&&!pHistory.getCustomCode().isEmpty()){
          withOutDwg+=File.separator+pHistory.getCustomCode()+File.separator+version;
@@ -129,10 +131,11 @@
        wrapper.last("limit 1");
        ProductHistory pHistory=pHistoryMapper.selectOne(wrapper);
        //读取指定版本产品的子件和关联的物料信息
        List<ProductBomHistory> list=mapper.getBomHistoryAndMaterial(productId,version);
        List<ProductBomHistory> list=mapper.getBomHistoryAndMaterial(productId,pHistory.getSubVersionMax());
        //处理存在关联关系的物料
        List<ProductBomHistory> endList=new ArrayList<>();
        list.stream().forEach(bomHistory -> {
            bomHistory.setConnFlag(0);
            endList.add(bomHistory);
            if(bomHistory.getMaterials()!=null&&bomHistory.getMaterials().size()>0){
                for (Material m:bomHistory.getMaterials()) {
@@ -142,12 +145,6 @@
                }
            }
        });
        HSSFWorkbook wb = new HSSFWorkbook();
        //字体格式-加粗
        HSSFCellStyle cellStyle = wb.createCellStyle();
        HSSFFont font = wb.createFont();
        font.setBoldweight(HSSFFont.BOLDWEIGHT_BOLD);
        cellStyle.setFont(font);
        String withOutDwg="doc_file/product"+File.separator+pHistory.getParentModel();
        if(pHistory.getCustomCode()!=null&&!pHistory.getCustomCode().isEmpty()){
            withOutDwg+=File.separator+pHistory.getCustomCode()+File.separator+version;
@@ -155,7 +152,7 @@
            withOutDwg+=File.separator+"standard"+File.separator+version;
        }
        //生成excel并将dwg文件放在同一报下压缩
        creatBomHsitoryExcel(req,resp,pHistory,endList,wb,withOutDwg);
        creatBomHsitoryExcel(req,resp,pHistory,endList,withOutDwg);
        //记录日志
        DocUser docUser= ActionUtil.getUser();
        String operationDetail="具体产品为:"+pHistory.toString();
@@ -164,11 +161,21 @@
        logService.recordOperationLog(docUser.getId(),docUser.getName(), UserOperation.TYPE_DOWNLOAD.getType(),new Date(),terminalIp,opreationMsg,operationDetail);
    }
    //根据产品信息创建excel表格并存放在指定目录
    public void creatBomHsitoryExcel(HttpServletRequest req, HttpServletResponse resp,ProductHistory pHistory,List<ProductBomHistory> list, HSSFWorkbook wb,String withOutDwg){
    public void creatBomHsitoryExcel(HttpServletRequest req, HttpServletResponse resp,ProductHistory pHistory,List<ProductBomHistory> list,String withOutDwg){
        String fileDirName = FileDirPath.getFileDirName();
        String rootFace="";
        String excelName="";
        String[] titleNames=new String[]{"序列","母物料编码","母物料名称","母物料型号","类别","子件编码","子件名称","子件型号"
                ,"基本单位","子件数量","生产商","封装类型/材质","元件编号/料厚","表面处理/物料详情","备注","图片"};
        //创建单个sheet
        HSSFWorkbook wb = new HSSFWorkbook();
        //字体格式-加粗
        HSSFCellStyle cellStyle = wb.createCellStyle();
        HSSFFont font = wb.createFont();
        font.setBoldweight(HSSFFont.BOLDWEIGHT_BOLD);
        font.setColor(HSSFFont.COLOR_RED);
        cellStyle.setFont(font);

        HSSFSheet sheet = wb.createSheet("bom_"+pHistory.getVersion()+"信息");
        sheet.setColumnWidth(1,5000);
        sheet.setColumnWidth(2,5000);
@@ -182,24 +189,14 @@
        //图片元素
        HSSFPatriarch patriarch = sheet.createDrawingPatriarch();
        int rownum = 1;
        sheet.createRow(rownum);
        sheet.getRow(rownum).createCell(1).setCellValue("序列");
        sheet.getRow(rownum).createCell(2).setCellValue("母物料编码");
        sheet.getRow(rownum).createCell(3).setCellValue("母物料名称");
        sheet.getRow(rownum).createCell(4).setCellValue("母物料型号");
        sheet.getRow(rownum).createCell(5).setCellValue("类别");
        sheet.getRow(rownum).createCell(6).setCellValue("子件编码");
        sheet.getRow(rownum).createCell(7).setCellValue("子件名称");
        sheet.getRow(rownum).createCell(8).setCellValue("子件型号");
        sheet.getRow(rownum).createCell(9).setCellValue("基本单位");
        sheet.getRow(rownum).createCell(10).setCellValue("子件数量");
        sheet.getRow(rownum).createCell(11).setCellValue("生产商");
        sheet.getRow(rownum).createCell(12).setCellValue("封装类型/材质");
        sheet.getRow(rownum).createCell(13).setCellValue("元件编号/料厚");
        sheet.getRow(rownum).createCell(14).setCellValue("表面处理/物料详情");
        sheet.getRow(rownum).createCell(15).setCellValue("备注");
        sheet.getRow(rownum).createCell(16).setCellValue("图片");

        HSSFRow row=sheet.createRow(rownum);
        HSSFCell cell=row.createCell(0);
        if(titleNames.length>0){
            for (int i=0;i<titleNames.length;i++) {
                cell=row.createCell(i+1);
                cell.setCellValue(titleNames[i]);
            }
        }
        excelName=pHistory.getParentCode()+"_"+pHistory.getParentModel()+"_"+pHistory.getVersion();
        rootFace=fileDirName+ File.separator+excelName;
        File destfile = new File(rootFace);
@@ -219,23 +216,93 @@
                    File sourceFile=new File(fileDirName+ File.separator+dwgUrl);
                    bomService.copyFile(sourceFile,rootFace);
                }
                Row row=sheet.createRow(rownum+i+1);
                //row.setHeight((short)(1500));
                sheet.getRow(rownum+i+1).createCell(1).setCellValue(i+1);
                sheet.getRow(rownum+i+1).createCell(2).setCellValue(pHistory.getParentCode());
                sheet.getRow(rownum+i+1).createCell(3).setCellValue(pHistory.getParentName());
                sheet.getRow(rownum+i+1).createCell(4).setCellValue(pHistory.getParentModel());
                sheet.getRow(rownum+i+1).createCell(5).setCellValue(bomHistory.getCategory());
                sheet.getRow(rownum+i+1).createCell(6).setCellValue(bomHistory.getSubCode());
                sheet.getRow(rownum+i+1).createCell(7).setCellValue(bomHistory.getSubName());
                sheet.getRow(rownum+i+1).createCell(8).setCellValue(bomHistory.getSubModel());
                sheet.getRow(rownum+i+1).createCell(9).setCellValue(bomHistory.getUnit()==null?"":bomHistory.getUnit());
                sheet.getRow(rownum+i+1).createCell(10).setCellValue(bomHistory.getQuantity());
                sheet.getRow(rownum+i+1).createCell(11).setCellValue(bomHistory.getProducer()==null?"":bomHistory.getProducer());
                sheet.getRow(rownum+i+1).createCell(12).setCellValue(bomHistory.getMaterial());
                sheet.getRow(rownum+i+1).createCell(13).setCellValue(bomHistory.getThickness());
                sheet.getRow(rownum+i+1).createCell(14).setCellValue(bomHistory.getSurfaceDetail());
                sheet.getRow(rownum+i+1).createCell(15).setCellValue(bomHistory.getNotes());
                rownum=rownum+1;
                row=sheet.createRow(rownum);
                if(bomHistory.getConnFlag()==1){
                    cell=row.createCell(0);
                    cell.setCellValue("替换件");
                    cell.setCellStyle(cellStyle);

                    cell=row.createCell(1);
                    cell.setCellValue(i+1);
                    cell.setCellStyle(cellStyle);

                    cell=row.createCell(2);
                    cell.setCellValue(pHistory.getParentCode());
                    cell.setCellStyle(cellStyle);

                    cell=row.createCell(3);
                    cell.setCellValue(pHistory.getParentName());
                    cell.setCellStyle(cellStyle);

                    cell=row.createCell(4);
                    cell.setCellValue(pHistory.getParentModel());
                    cell.setCellStyle(cellStyle);

                    cell=row.createCell(5);
                    cell.setCellValue(bomHistory.getCategory());
                    cell.setCellStyle(cellStyle);

                    cell=row.createCell(6);
                    cell.setCellValue(bomHistory.getSubCode());
                    cell.setCellStyle(cellStyle);

                    cell=row.createCell(7);
                    cell.setCellValue(bomHistory.getSubName());
                    cell.setCellStyle(cellStyle);

                    cell=row.createCell(8);
                    cell.setCellValue(bomHistory.getSubModel());
                    cell.setCellStyle(cellStyle);

                    cell=row.createCell(9);
                    cell.setCellValue(bomHistory.getUnit()==null?"":bomHistory.getUnit());
                    cell.setCellStyle(cellStyle);

                    cell=row.createCell(10);
                    cell.setCellValue(bomHistory.getQuantity()==null?"": bomHistory.getQuantity().toString());
                    cell.setCellStyle(cellStyle);

                    cell=row.createCell(11);
                    cell.setCellValue(bomHistory.getProducer()==null?"":bomHistory.getProducer());
                    cell.setCellStyle(cellStyle);

                    cell=row.createCell(12);
                    cell.setCellValue(bomHistory.getMaterial());
                    cell.setCellStyle(cellStyle);

                    cell=row.createCell(12);
                    cell.setCellValue(bomHistory.getThickness());
                    cell.setCellStyle(cellStyle);

                    cell=row.createCell(13);
                    cell.setCellValue(bomHistory.getThickness());
                    cell.setCellStyle(cellStyle);

                    cell=row.createCell(14);
                    cell.setCellValue(bomHistory.getSurfaceDetail());
                    cell.setCellStyle(cellStyle);

                    cell=row.createCell(15);
                    cell.setCellValue(bomHistory.getNotes());
                    cell.setCellStyle(cellStyle);
                }else{
                    row.createCell(1).setCellValue(i+1);
                    row.createCell(2).setCellValue(pHistory.getParentCode());
                    row.createCell(3).setCellValue(pHistory.getParentName());
                    row.createCell(4).setCellValue(pHistory.getParentModel());
                    row.createCell(5).setCellValue(bomHistory.getCategory());
                    row.createCell(6).setCellValue(bomHistory.getSubCode());
                    row.createCell(7).setCellValue(bomHistory.getSubName());
                    row.createCell(8).setCellValue(bomHistory.getSubModel());
                    row.createCell(9).setCellValue(bomHistory.getUnit()==null?"":bomHistory.getUnit());
                    row.createCell(10).setCellValue(bomHistory.getQuantity()==null?"":bomHistory.getQuantity().toString());
                    row.createCell(11).setCellValue(bomHistory.getProducer()==null?"":bomHistory.getProducer());
                    row.createCell(12).setCellValue(bomHistory.getMaterial());
                    row.createCell(13).setCellValue(bomHistory.getThickness());
                    row.createCell(14).setCellValue(bomHistory.getSurfaceDetail());
                    row.createCell(15).setCellValue(bomHistory.getNotes());
                }
                if((bomHistory.getPictureUrl()!=null)&&(!bomHistory.getPictureUrl().isEmpty())){
                    ByteArrayOutputStream byteArrayOut = null;
                    try {
@@ -313,7 +380,6 @@
        bomHis.setSubName(m.getSubName());
        bomHis.setSubModel(m.getSubModel());
        bomHis.setUnit(m.getUnit());
        bomHis.setQuantity(m.getQuantity());
        bomHis.setProducer(m.getProducer());
        bomHis.setMaterial(m.getMaterial());
        bomHis.setThickness(m.getThickness());
@@ -323,6 +389,7 @@
        bomHis.setDwgUrl(m.getDwgUrl());
        bomHis.setFileUrl(m.getFileUrl());
        bomHis.setCreateDate(m.getCreateDate());
        bomHis.setConnFlag(1);
        return  bomHis;
    }

@@ -341,21 +408,23 @@
        List<ProductBomHistory> baseBomHistoryList = getLatestBomListByProductId(preProductId);
        List<ProductBomHistory> bomHistoryList = getLatestBomListByProductId(productId);

        //List<ProductBomHistory> diffList = new LinkedList<>();
        List<ProductBomHistory> diffList = new LinkedList<>();
        List<ProductBomHistory> addList = new LinkedList<>();
        List<ProductBomHistory> deleteList = new LinkedList<>();
        //通过物料编码定位,对比字段:物料型号/数量/材质/料厚/表面处理/生产商/备注,无法实现,物料没有历史记录
        /*baseBomHistoryList.forEach(baseBom->{
        //物料id,对比字段:数量
        baseBomHistoryList.forEach(baseBom->{
            bomHistoryList.forEach(bom->{
                if(bom.getSubCode().equals(baseBom.getSubCode())){
                    ProductBomHistory history = new ProductBomHistory();
                    if(!bom.getSubModel().equals(baseBom.getSubModel())){
                        String diffSubModel = "原物料型号:"+baseBom.getSubModel()+"/新物料型号:"+bom.getSubModel();
                        history.setSubModel(diffSubModel);
                if(bom.getMaterialId().equals(baseBom.getMaterialId())){
                    if(!bom.getQuantity().equals(baseBom.getQuantity())){
                        ProductBomHistory history = new ProductBomHistory();
                        String diffSubModel = "原数量:"+baseBom.getQuantity()+"/新数量:"+bom.getQuantity();
                        history.setNotes(diffSubModel);
                        history.setMaterialObj(bom.getMaterialObj());
                        diffList.add(history);
                    }
                }
            });
        });*/
        });
        List<Integer> baseCodeList = baseBomHistoryList.stream().map(ProductBomHistory::getMaterialId).collect(Collectors.toList());
        List<Integer> codeList = bomHistoryList.stream().map(ProductBomHistory::getMaterialId).collect(Collectors.toList());
        bomHistoryList.forEach(bom->{
@@ -369,7 +438,37 @@
                deleteList.add(baseBom);
            }
        });
        return new Response().setII(1,addList,deleteList,"对比完成");
        return new Response().setIII(1,diffList,addList,deleteList,"对比完成");
    }

    /**
     * @param baseProduct 基准产品为null,则直接找上传产品的最新标准版本
     * @param product 上传产品
     * @return
     */
    public Map<String, List> parseCompare(Product baseProduct, Product product) {
        List<ProductBom> bomList = product.getBomList();
        List<ProductBom> baseBomList = new LinkedList<>();
        ProductBom baseProductBom = null;

        Map<String,List> compareMap = new HashMap<>();
        List<ProductBomHistory> diffList = new LinkedList<>();
        List<ProductBomHistory> addList = new LinkedList<>();
        List<ProductBomHistory> deleteList = new LinkedList<>();

        //根据baseProduct的code和custom_code,查找到基准产品
        if(baseProduct == null){
            baseProductBom = bomService.getEnabledStandardBomListByParentCode(product.getParentCode());
        }else{

        }

        //对比:根据code+model定位,比较数量

        compareMap.put("diffList",diffList);
        compareMap.put("addList",addList);
        compareMap.put("deleteList",deleteList);
        return compareMap;
    }

    /**关联查询到具体的bom内物料信息*/