~whyclxw/CadDrawManager.git

			@@ -144,12 +144,30 @@
			String parentModel = productApproving.getParentModel();
			String parentCode = productApproving.getParentCode();
			String customCode = productApproving.getCustomCode();
			Product product = productService.getVersion(parentCode, customCode);
			ProductHistory latestProduct = phService.getLatestVersion(parentCode, customCode);
			ProductHistory enabledProduct = phService.getEnabledByParentCodeAndCustomCode(parentCode, customCode);
			int currentVersion = 0;
			if (product != null) {
			currentVersion = product.getVersion();
			if (latestProduct != null) {
			currentVersion = latestProduct.getVersion();
			}
			Integer nextVersion = currentVersion + 1;
			//产品物料关系迁移
			//查询生效版本的关联关系
			if(latestProduct!=null &&enabledProduct!=null) {
			List<MaterialProductHistory> mpList = mphService.getListByParentCodeAndCustomCodeAndVersion(parentCode, customCode, enabledProduct.getVersion());
			if (latestProduct.getVersion().intValue() == enabledProduct.getVersion()) {
			//最新版本生效,关联关系版本连着的
			mphService.updateVersionBatch(mpList);
			} else {
			//旧版本生效,关联关系版本不连着
			mpList.forEach(mp -> {
			mp.setSVersion(nextVersion);
			mp.setEVersion(nextVersion);
			});
			mphService.insertBatch(mpList);
			}
			}

			//将产品文件复制至正式路径
			//文件转移,未跟子件挂钩的所有图纸图片转移到产品版本下:doc_file/product/{产品型号}/standard或者{customCode}}/{version}/
			//跟子件挂钩的转移到子件图纸下:doc_file/material/
			@@ -182,7 +200,7 @@

			Material temp = new Material();
			temp.setSubModel(approving.getSubModel());
			temp.setNotes(CommonUtil.getProjectDir() + File.separator + "doc_file" + File.separator + "material"
			temp.setNotes("doc_file" + File.separator + "material"
			+ File.separator + fileFullName);
			materialDwgUrlNameList.add(temp);
			break;
			@@ -199,7 +217,7 @@
			String filename = picUrl.substring(picUrl.lastIndexOf(File.separator) + 1, picUrl.length() - 4);
			String fileFullName = picUrl.substring(picUrl.lastIndexOf(File.separator) + 1);
			if(approving.getSubModel().toUpperCase().equals(filename.toUpperCase())){
			approving.setPictureUrl(CommonUtil.getProjectDir() + File.separator + "doc_file" + File.separator + "material"
			approving.setPictureUrl("doc_file" + File.separator + "material"
			+ File.separator + fileFullName);
			break;
			}
			@@ -211,10 +229,10 @@
			//doc_file/product/{产品型号}/standard或者{customCode}}/{version}/
			//跟子件挂钩的转移到子件图纸下:doc_file/material/
			String customCodeString = null;
			if(customCode==null) {
			customCodeString = "standard";
			}else{
			if(customCode!=null && !customCode.equals("")) {
			customCodeString = customCode;
			}else{
			customCodeString = "standard";
			}
			String productDir = projectDir + File.separator + "doc_file" + File.separator + "product" + File.separator + parentModel
			+ File.separator + customCodeString + File.separator +nextVersion;
			@@ -246,21 +264,40 @@
			}
			});

			picUrlList.forEach(picUrl->{
			String picFullName = picUrl.substring(picUrl.lastIndexOf(File.separator) + 1);
			try {
			FileCopyUtils.copy(new File(picUrl),new File(materialDir+File.separator+picFullName));
			} catch (IOException e) {
			e.printStackTrace();
			}
			});


			//转移审批表数据到历史表/最新版本表 product_history/product_bom_history/product/product_bom
			ProductHistory productHistory = new ProductHistory();
			productHistory.setParentCode(parentCode);
			productHistory.setParentName(productApproving.getParentName());
			productApproving.setParentModel(parentModel);
			productHistory.setParentModel(parentModel);
			productHistory.setNotes(productApproving.getNotes());
			productHistory.setCustomCode(customCode);
			productHistory.setCreateTime(new Date());
			productHistory.setVersion(nextVersion);
			productHistory.setEnabled(1);

			Product productNew = new Product();
			productNew.setParentCode(parentCode);
			productNew.setParentName(productApproving.getParentName());
			productNew.setParentModel(parentModel);
			productNew.setNotes(productApproving.getNotes());
			productNew.setCustomCode(customCode);
			productNew.setCreateTime(new Date());
			productNew.setVersion(nextVersion);

			//实际生效的只有insert,因为状态设置为未启用已经在提交审批时变更了
			phService.insertAndUpdateEnabled(productHistory);
			int productId = productService.updateVersion(parentCode,customCode,nextVersion);

			productService.insert(productNew);

			List<ProductBomHistory> productBomHistoryList = new LinkedList<>();
			List<ProductBom> productBomList = new LinkedList<>();
			@@ -268,7 +305,7 @@
			ProductBomHistory bomHistory = new ProductBomHistory();
			ProductBom bom = new ProductBom();

			bom.setProductId(productId);
			bom.setProductId(productNew.getId());
			bom.setCategory(approving.getCategory());
			bom.setCreateDate(new Date());
			bom.setDwgUrl(approving.getDwgUrl());
			@@ -341,10 +378,13 @@
			materialList.add(temp);
			}
			});
			mService.insertBatch(materialList);

			if(materialList.size()!=0) {
			mService.insertBatch(materialList);
			}
			//将dwg图纸,全部更新到对应的记录url中
			mService.updateDwgUrl(materialDwgUrlNameList);
			if(materialDwgUrlNameList.size()!=0) {
			mService.updateDwgUrl(materialDwgUrlNameList);
			}
			/*List<ProductBomApproving> fileBomApprovingList = approvingList.stream()
			.filter(productBomApproving ->
			productBomApproving.getPictureUrl() != null \|\| productBomApproving.getDwgUrl() != null
			@@ -387,6 +427,48 @@
			//区分是新增还是删除
			Integer materialId = approvingList.get(0).getMaterialId();
			if(materialId==null) { //新增
			String fileUrl = approvingList.get(0).getFileUrl();
			File file = new File(fileUrl);

			List<String> fileUrlList = new LinkedList<>();
			List<String> dwgUrlList = null;
			List<String> materialUrlList = new LinkedList<>();
			List<Material> materialDwgUrlNameList = new LinkedList<>();

			fileUrlList = FileUtil.getStaticFilePath(file,fileUrlList);
			dwgUrlList = fileUrlList.stream().filter(url->url.contains(".dwg")).collect(Collectors.toList());
			//图纸与物料model对应,则图纸需要保留并转移到正式文件夹
			//同时,保留图纸对应的物料model和正式文件夹中的http url
			dwgUrlList.forEach(dwgUrl-> {
			approvingList.forEach(approving -> {
			String filename = dwgUrl.substring(dwgUrl.lastIndexOf(File.separator) + 1, dwgUrl.length() - 4);
			String fileFullName = dwgUrl.substring(dwgUrl.lastIndexOf(File.separator) + 1);
			if (approving.getSubModel().toUpperCase().equals(filename.toUpperCase())) {
			materialUrlList.add(dwgUrl);

			Material temp = new Material();
			temp.setSubModel(approving.getSubModel());
			temp.setNotes("doc_file" + File.separator + "material"
			+ File.separator + fileFullName);
			materialDwgUrlNameList.add(temp);
			}
			});
			});
			String projectDir = CommonUtil.getProjectDir();
			String materialDir = projectDir + File.separator + "doc_file" + File.separator + "material";
			File materialFile = new File(materialDir);
			if(!materialFile.exists()){
			materialFile.mkdirs();
			}

			materialUrlList.forEach(materialUrl->{
			String dwgName = materialUrl.substring(materialUrl.lastIndexOf(File.separator) + 1, materialUrl.length() - 4);
			try {
			FileCopyUtils.copy(new File(materialUrl),new File(materialDir+File.separator+dwgName+".dwg"));
			} catch (IOException e) {
			e.printStackTrace();
			}
			});
			//将物料从审批表中转移到正式表
			approvingList.forEach(approve -> {
			Material material = new Material();
			@@ -400,6 +482,11 @@
			material.setNotes(approve.getNotes());
			material.setCreateDate(new Date());
			material.setStatus(1);
			materialDwgUrlNameList.forEach(materialDwgUrlName->{
			if(materialDwgUrlName.getSubModel().equals(approve.getSubModel())){
			material.setDwgUrl(materialDwgUrlName.getDwgUrl());
			}
			});
			materialList.add(material);
			});
			mService.insertBatch(materialList);
			@@ -439,9 +526,13 @@
			}
			});
			//新增关联
			mphService.insertBatch(addedList);
			if(addedList.size()!=0) {
			mphService.insertBatch(addedList);
			}
			//移除关联
			mphService.updateVersionSubtractBatch(removedList);
			if(removedList.size()!=0) {
			mphService.updateVersionSubtractBatch(removedList);
			}
			}
			else if(type.intValue() == EnumWorksheetType.ProductSoftware.getType()){ //软件下载
			//转移记录到正式表