注释物料正则校验

whycxzp

2023-06-08 5c5491cb9eaafa7324fbfc5a546f1e7dc0a97b62

注释物料正则校验

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

@@ -3,11 +3,10 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.whyc.dto.MaterialCheckDTO;
import com.whyc.dto.Response;
import com.whyc.mapper.MaterialApprovingMapper;
import com.whyc.pojo.MaterialApproving;
import com.whyc.pojo.DocUser;
import com.whyc.pojo.MaterialApproving;
import com.whyc.util.ActionUtil;
import com.whyc.util.CommonUtil;
import com.whyc.util.FileUtil;
@@ -25,7 +24,6 @@
import java.util.Date;
import java.util.LinkedList;
import java.util.List;
import java.util.stream.Collectors;

@Service
public class MaterialApprovingService {
@@ -138,8 +136,8 @@
                return response.set(1,false,"拒绝解析,excel文件中记录包含名称为空的记录");
            }
        }
        //追加物料规范校验
        List<MaterialCheckDTO> checkList = list.stream().map(bom->{
        //追加物料规范校验 暂时去除校验
        /*List<MaterialCheckDTO> checkList = list.stream().map(bom->{
            MaterialCheckDTO dto = new MaterialCheckDTO();
            dto.setNum(bom.getId());
            dto.setSubCode(bom.getSubCode());
@@ -150,7 +148,7 @@
        List<MaterialCheckDTO> irregularList = CommonUtil.checkFormat(checkList);
        if(irregularList.size()>0){
            return response.setII(1,false,irregularList,"名称或型号命名不规范");
        }
        }*/
        String nextTitle = originalFilename.substring(0,originalFilename.lastIndexOf("."));
        return response.setIII(1,true,list,nextTitle,filePath);
    }

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

@@ -5,7 +5,6 @@
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.whyc.dto.FileDirPath;
import com.whyc.dto.MaterialCheckDTO;
import com.whyc.dto.Response;
import com.whyc.mapper.MaterialMapper;
import com.whyc.pojo.DocUser;
@@ -309,8 +308,8 @@
                return response.set(1,false,"拒绝解析,excel文件中记录包含名称为空的记录");
            }
        }
        //追加物料规范校验
        List<MaterialCheckDTO> checkList = list.stream().map(material -> {
        //追加物料规范校验 暂时去除校验
        /*List<MaterialCheckDTO> checkList = list.stream().map(material -> {
            MaterialCheckDTO dto = new MaterialCheckDTO();
            dto.setNum(material.getId());
            dto.setSubCode(material.getSubCode());
@@ -321,7 +320,7 @@
        List<MaterialCheckDTO> irregularList = CommonUtil.checkFormat(checkList);
        if(irregularList.size()>0){
            return new Response().setII(1,false,irregularList,"名称或型号命名不规范");
        }
        }*/
        return response.setII(1,true,list,filePath);
    }
    //根据物料id查询返回附件文件夹下所有的文件列表

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

@@ -5,7 +5,6 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.pagehelper.PageInfo;
import com.whyc.dto.FileUrlDTO;
import com.whyc.dto.MaterialCheckDTO;
import com.whyc.dto.Response;
import com.whyc.mapper.ProductMapper;
import com.whyc.pojo.*;
@@ -289,8 +288,8 @@
                    }
                    bomList.add(bom);
                }
                //追加物料规范校验
                List<MaterialCheckDTO> checkList = bomList.stream().map(bom->{
                //追加物料规范校验 暂时去除这个功能
                /*List<MaterialCheckDTO> checkList = bomList.stream().map(bom->{
                    MaterialCheckDTO dto = new MaterialCheckDTO();
                    dto.setNum(bom.getId());
                    dto.setSubCode(bom.getSubCode());
@@ -301,7 +300,7 @@
                List<MaterialCheckDTO> irregularList = CommonUtil.checkFormat(checkList);
                if(irregularList.size()>0){
                    return response.setII(1,false,irregularList,"名称或型号命名不规范");
                }
                }*/
                product.setBomList(bomList);
            }
        }