下载加&&

lxw

2022-09-15 671c15d828414effb772820ac71ba33ee91c0a6a

下载加&&

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

@@ -116,7 +116,7 @@
                  qwrapper.last("limit 1");
                  AttachLock attachLock=attachLockMapper.selectOne(qwrapper);
                  if(attachLock!=null){
                      bomH.setDwgUrl("");
                      bomH.setDwgUrl("&&");
                  }
              }
          });
@@ -162,6 +162,17 @@
        //处理存在关联关系的物料
        List<ProductBomHistory> endList=new ArrayList<>();
        list.stream().forEach(bomHistory -> {
            if(bomHistory.getDwgUrl()!=null){
                QueryWrapper qwrapper=new QueryWrapper();
                qwrapper.eq("material_id",bomHistory.getMaterialId());
                qwrapper.eq("attach_name",bomHistory.getDwgUrl().substring(bomHistory.getDwgUrl().lastIndexOf("\\")+1));
                qwrapper.eq("lock_flag",1);
                qwrapper.last("limit 1");
                AttachLock attachLock=attachLockMapper.selectOne(qwrapper);
                if(attachLock!=null){
                    bomHistory.setDwgUrl("&&");
                }
            }
            bomHistory.setConnFlag(0);
            endList.add(bomHistory);
            if(bomHistory.getMaterials()!=null&&bomHistory.getMaterials().size()>0){
@@ -241,7 +252,7 @@
                ProductBomHistory bomHistory= (ProductBomHistory) list.get(i);
                String dwgUrl=bomHistory.getDwgUrl();

                if((dwgUrl!=null)&&(!dwgUrl.isEmpty())){
                if((dwgUrl!=null)&&(!dwgUrl.isEmpty())&&(!dwgUrl.equals("&&"))){
                    File sourceFile=new File(fileDirName+ File.separator+dwgUrl);
                    bomService.copyFile(sourceFile,rootFace);
                }

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

@@ -266,7 +266,7 @@
                qwrapper.last("limit 1");
                AttachLock attachLock=attachLockMapper.selectOne(qwrapper);
                if(attachLock!=null){
                    bom.setDwgUrl("");
                    bom.setDwgUrl("&&");
                }
            }
            endList.add(bom);
@@ -349,7 +349,7 @@
            for (int i=0;i<list.size();i++) {
                ProductBom bom= (ProductBom) list.get(i);
                String dwgUrl=bom.getDwgUrl();
                if((dwgUrl!=null)&&(!dwgUrl.isEmpty())){
                if((dwgUrl!=null)&&(!dwgUrl.isEmpty())&&(!dwgUrl.equals("&&"))){
                    File sourceFile=new File(fileDirName+ File.separator+dwgUrl);
                    copyFile(sourceFile,rootFace);
                }
@@ -548,7 +548,7 @@
                    wrapper.last("limit 1");
                    AttachLock attachLock=attachLockMapper.selectOne(wrapper);
                    if(attachLock!=null){
                        bom.setDwgUrl("");
                        bom.setDwgUrl("&&");
                    }
                }
            });