Parcourir la source

合同生产文件改传obs

yzc il y a 1 an
Parent
commit
b6aaa22404

+ 6 - 0
hx-sale/src/main/java/com/fjhx/sale/entity/contract/dto/ContractProductDto.java

@@ -1,5 +1,6 @@
 package com.fjhx.sale.entity.contract.dto;
 
+import com.fjhx.file.entity.ObsFile;
 import com.fjhx.sale.entity.contract.po.ContractProduct;
 import com.fjhx.sale.entity.contract.po.ContractProductBom;
 import lombok.Getter;
@@ -19,4 +20,9 @@ public class ContractProductDto extends ContractProduct {
 
     List<ContractProductBom> contractProductBomList;
 
+    /**
+     * 生产文件
+     */
+    private List<ObsFile> prodFilePath;
+
 }

+ 7 - 6
hx-sale/src/main/java/com/fjhx/sale/flow/ContractFlow.java

@@ -146,12 +146,13 @@ public class ContractFlow extends FlowDelegate {
             //保存设计稿图
             ObsFileUtil.editFile(cp.getFileList(), cp.getId());
             //保存生产源文件
-            String prodFilePath = cp.getProdFilePath();
-            if (ObjectUtil.isNotEmpty(prodFilePath) && prodFilePath.startsWith("/temp")) {
-                String targetFolderPath = String.format("/contractProduct/%s", cp.getId());
-                com.alibaba.fastjson2.JSONObject prodFile = ftpFileService.moveFolder(prodFilePath, targetFolderPath);
-                cp.setProdFilePath(prodFile.getString("path"));
-            }
+            ObsFileUtil.editFile(cp.getProdFilePath(), cp.getId(), 1);
+//            String prodFilePath = cp.getProdFilePath();
+//            if (ObjectUtil.isNotEmpty(prodFilePath) && prodFilePath.startsWith("/temp")) {
+//                String targetFolderPath = String.format("/contractProduct/%s", cp.getId());
+//                com.alibaba.fastjson2.JSONObject prodFile = ftpFileService.moveFolder(prodFilePath, targetFolderPath);
+//                cp.setProdFilePath(prodFile.getString("path"));
+//            }
 
             //赋值产品BOM信息
             List<ContractProductBom> contractProductBomList = cp.getContractProductBomList();