From 5460c97d61ecea5818b97a6c6c59334b9dd1c49f Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期五, 22 十二月 2023 15:35:28 +0800
Subject: [PATCH] 0108、0109开头的物料BOM清单上传的时候覆盖之前相同编码的物料，保留之前的附件及附件状态
---
src/main/java/com/whyc/service/MaterialService.java | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/whyc/service/MaterialService.java b/src/main/java/com/whyc/service/MaterialService.java
index 4c96633..b8b49e1 100644
--- a/src/main/java/com/whyc/service/MaterialService.java
+++ b/src/main/java/com/whyc/service/MaterialService.java
@@ -8,10 +8,7 @@
import com.whyc.dto.MaterialCheckDTO;
import com.whyc.dto.Response;
import com.whyc.mapper.MaterialMapper;
-import com.whyc.pojo.DocUser;
-import com.whyc.pojo.Material;
-import com.whyc.pojo.MaterialHistory;
-import com.whyc.pojo.ProductBom;
+import com.whyc.pojo.*;
import com.whyc.util.DateUtil;
import com.whyc.util.*;
import org.apache.commons.codec.binary.Base64;
@@ -38,6 +35,9 @@
@Autowired
private MaterialHistoryService mhService;
+
+ @Autowired
+ private AttachLockService attachLockService;
//鏌ヨ鎵�鏈夌殑鏁ｈ浠朵俊鎭姞璁剧疆浜嗘浛鎹㈠叧绯荤殑瀛愪欢淇℃伅
/*public Response getAllMaterial(String category,String subCode,String subName,String subModel,int pageCurr,int pageSize) {
@@ -493,33 +493,33 @@
/**
* 杞Щ 琚鍒剁殑闄勪欢,鍒版柊鐨勭墿鏂�
- * @param fileUrlDir 琚鍒剁殑闄勪欢璺緞,渚嬪:doc_file\material\8468-0109000512-SHIDA-2455-OLD-ZX_A01
+ * @param materialDB .fileUrl 琚鍒剁殑闄勪欢璺緞,渚嬪:doc_file\material\8468-0109000512-SHIDA-2455-OLD-ZX_A01
* @param material 鏂扮殑鐗╂枡
* @return 杩斿洖琚拷鍔犳枃浠剁殑鏂囦欢澶硅矾寰�
*/
@Transactional
- public Response transferCopiedAttachment(String fileUrlDir, Material material) throws IOException {
+ public Response transferCopiedAttachment(Material materialDB, Material material) throws IOException {
+ String fileUrlDir = materialDB.getFileUrl();
String subModel = material.getSubModel();
subModel = MaterialSpecialCharUtil.transfer(subModel);
String dirPathDB = "doc_file" + File.separator + "material" + File.separator + material.getId() + "-"+ material.getSubCode() + "-" + subModel;
String dirPath = CommonUtil.getRootFile() + "material" + File.separator + material.getId() + "-"+ material.getSubCode() + "-" + subModel;
File dirFile = new File(dirPath);
- boolean dirFileExist = true;
if(!dirFile.exists()){
dirFile.mkdirs();
- dirFileExist = false;
}
FileUtil.copyDirectory(new File(CommonUtil.getProjectDir() + File.separator + fileUrlDir),dirFile);
- if(!dirFileExist){
- //璺緞涓嶅瓨鍦�,璇存槑鏄娆′笂浼�,璁剧疆鐗╂枡瀵瑰簲鐨刦ileUrl
- Material temp = new Material();
- temp.setId(material.getId());
- temp.setFileUrl(dirPathDB);
- mapper.updateById(temp);
- }
+ //璁剧疆鐗╂枡瀵瑰簲鐨刦ileUrl鍙婄墿鏂欑姸鎬�
+ Material temp = new Material();
+ temp.setId(material.getId());
+ temp.setFileUrl(dirPathDB);
+ mapper.updateById(temp);
+
+ attachLockService.getAndInsert(materialDB.getId(),material.getId());
+
return new Response().set(1,true,"涓婁紶瀹屾垚");
}
--
Gitblit v1.9.1