Merge branch 'master' of http://118.89.139.230:10101/r/~whyclxw/CadDrawManager

lxw

2022-09-07 6cde6bc12ebb814de85cd0e389ffc7e3869818fb

Merge branch 'master' of http://118.89.139.230:10101/r/~whyclxw/CadDrawManager

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

@@ -18,8 +18,8 @@
    private String parentCode;
    @ApiModelProperty("定制表单号")
    private String customCode;
    @ApiModelProperty("子件编码")
    private String subCode;
    @ApiModelProperty("子件物料id")
    private int subMaterialId;
    @ApiModelProperty("子件数量")
    private Integer quantity;
    @ApiModelProperty("关联类型:-1(移除),1(关联)")
@@ -64,12 +64,12 @@
        this.customCode = customCode;
    }

    public String getSubCode() {
        return subCode;
    public int getSubMaterialId() {
        return subMaterialId;
    }

    public void setSubCode(String subCode) {
        this.subCode = subCode;
    public void setSubMaterialId(int subMaterialId) {
        this.subMaterialId = subMaterialId;
    }

    public Integer getMainId() {

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

@@ -336,16 +336,18 @@
                        mpList = mphService.getListWithMaterialInfo(mpList);
                        List<String> newBomMaterialStrList = bomList.stream().map(bom -> bom.getSubCode() + "/" + bom.getSubModel()).collect(Collectors.toList());
                        mpList = mpList.stream().filter(mp -> newBomMaterialStrList.contains(mp.getSubMaterial().getSubCode() + "/" + mp.getSubMaterial().getSubModel())).collect(Collectors.toList());
                        if (latestProduct.getVersion().intValue() == enabledProduct.getVersion()) {
                            //最新版本生效,关联关系版本连着的
                            mphService.updateVersionBatch(mpList);
                        } else {
                            //旧版本生效,关联关系版本不连着
                            mpList.forEach(mp -> {
                                mp.setSVersion(nextVersion);
                                mp.setEVersion(nextVersion);
                            });
                            mphService.insertBatch(mpList);
                        if(mpList.size()!=0) {
                            if (latestProduct.getVersion().intValue() == enabledProduct.getVersion()) {
                                //最新版本生效,关联关系版本连着的
                                mphService.updateVersionBatch(mpList);
                            } else {
                                //旧版本生效,关联关系版本不连着
                                mpList.forEach(mp -> {
                                    mp.setSVersion(nextVersion);
                                    mp.setEVersion(nextVersion);
                                });
                                mphService.insertBatch(mpList);
                            }
                        }
                    }
                }
@@ -521,10 +523,11 @@

            //物料表中不存在的(依据:物料编码+物料型号),则添加到物料表中去(包含product这个物料)
            List<Material> materialExistList = mService.getListByCodeAndModelList2(bomList);
            List<String> subCodeList = materialExistList.stream().map(Material::getSubCode).collect(Collectors.toList());
            //List<String> subCodeList = materialExistList.stream().map(Material::getSubCode).collect(Collectors.toList());
            List<String> subCodeList = materialExistList.stream().map(material -> material.getSubCode()+"/"+material.getSubModel()).collect(Collectors.toList());
            List<Material> materialList = new LinkedList<>();
            bomList.forEach(bom -> {
                if (!subCodeList.contains(bom.getSubCode())) {
                if (!subCodeList.contains(bom.getSubCode()+"/"+bom.getSubModel())) {
                    Material material = new Material();
                    material.setCategory(bom.getCategory());
                    material.setCreateDate(bom.getCreateDate());

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

@@ -158,7 +158,7 @@
        file2Name = file2Name.substring(0,file2Name.lastIndexOf(".")) + "_" + dateUnion +file2Name.substring(file2Name.lastIndexOf("."));
        //存储路径
        String rootFile = CommonUtil.getRootFile();
        String softwareDir = rootFile + "software" + File.separator + software.getOwner() + File.separator + dateUnion;
        String softwareDir = rootFile + "software" + File.separator + software.getOwner();
        String softwareHttpUrl = softwareDir.substring(softwareDir.lastIndexOf("doc_file"+ File.separator + "software"));
        File softwareDirFile = new File(softwareDir);
        if(!softwareDirFile.exists()){

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

@@ -516,7 +516,7 @@
                            his.setCustomCode(approving.getCustomCode());
                            his.setSVersion(approving.getVersion());
                            his.setEVersion(approving.getVersion());
                            his.setSubCode(approving.getSubCode());
                            his.setSubMaterialId(approving.getSubMaterialId());
                            his.setQuantity(approving.getQuantity());
                            his.setMaterialId(approving.getMaterialId());
                            his.setCreateTime(new Date());