From 5ffe3528a8cb4c2d2154b76893d6ac55949968af Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期六, 14 六月 2025 14:18:46 +0800
Subject: [PATCH] 产品验收管理上传和查询

---
 src/main/java/com/whyc/service/BomAcceptanceService.java |   20 +++++++++++++++++---
 1 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/whyc/service/BomAcceptanceService.java b/src/main/java/com/whyc/service/BomAcceptanceService.java
index c82fffc..0b09f56 100644
--- a/src/main/java/com/whyc/service/BomAcceptanceService.java
+++ b/src/main/java/com/whyc/service/BomAcceptanceService.java
@@ -27,7 +27,8 @@
     private BomAcceptanceMapper mapper;
 
     //涓婁紶浜у搧楠屾敹淇℃伅
-    public Response uploadBomAcceptance(MultipartFile fileLeft, MultipartFile fileRight, MultipartFile fileFront, MultipartFile fileBack, List<MultipartFile> multipartFileList, BomAcceptance bomAcceptance) throws IOException {
+    public Response uploadBomAcceptance(MultipartFile fileLeft, MultipartFile fileRight, MultipartFile fileFront, MultipartFile fileBack
+            ,MultipartFile Agreement, List<MultipartFile> multipartFileList, BomAcceptance bomAcceptance) throws IOException {
         Date date = new Date();
         long time = date.getTime();
         String rootFile = CommonUtil.getRootFile();
@@ -86,7 +87,7 @@
             fileFront.transferTo(new File(path));
             bomAcceptance.setDevPicfront("doc_file" + File.separator + devDirSuffix+originalFilename);
         }
-        //宸﹁鍥�
+        //鍚庨潰鍥�
         if(fileBack!=null){
             //瀛樺偍鏂囦欢
             String originalFilename = fileBack.getOriginalFilename();
@@ -96,6 +97,19 @@
             createFilefolderIFNotExist(path);
             fileBack.transferTo(new File(path));
             bomAcceptance.setDevPicback("doc_file" + File.separator + devDirSuffix+originalFilename);
+        }
+        String agreeDirSuffix = "acceptance_bom" + File.separator + time + File.separator+ "agree" + File.separator;
+        String agreeDir = rootFile + agreeDirSuffix;
+        //鍗忚
+        if(Agreement!=null){
+            //瀛樺偍鏂囦欢
+            String originalFilename = Agreement.getOriginalFilename();
+            String fileName = originalFilename.substring(0, originalFilename.lastIndexOf("."));
+            String suffix = originalFilename.substring(originalFilename.lastIndexOf("."));
+            String path = agreeDir + fileName + suffix;
+            createFilefolderIFNotExist(path);
+            Agreement.transferTo(new File(path));
+            bomAcceptance.setBomAgreement("doc_file" + File.separator + agreeDirSuffix+originalFilename);
         }
         mapper.insert(bomAcceptance);
         return new Response().set(1,true,"涓婁紶鎴愬姛");
@@ -123,8 +137,8 @@
         String rootFile = CommonUtil.getRootFile();//涓昏矾寰�
         if(list!=null&&list.size()>0){
             for (BomAcceptance acceptance:list) {
-                acceptance.setSparePicpart("doc_file"+File.separator+acceptance.getSparePicpart());
                 String filePath=rootFile+acceptance.getSparePicpart();
+                acceptance.setSparePicpart("doc_file"+File.separator+acceptance.getSparePicpart());
                 //鑾峰彇鏂囦欢澶逛笅鎵�鏈夌殑鍥剧墖鍚�
                 acceptance.setNameList(FileUtil.getFileNameWithOutDirectory(filePath));
             }

--
Gitblit v1.9.1