From e0b305d53c2d34bf8b818f2964da0f6055be7320 Mon Sep 17 00:00:00 2001
From: whycxzp <perryhsu@163.com>
Date: 星期五, 24 二月 2023 17:29:45 +0800
Subject: [PATCH] 修复产品定制新增接口问题

---
 src/main/java/com/whyc/service/ProductService.java |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/whyc/service/ProductService.java b/src/main/java/com/whyc/service/ProductService.java
index e820b46..f184bf2 100644
--- a/src/main/java/com/whyc/service/ProductService.java
+++ b/src/main/java/com/whyc/service/ProductService.java
@@ -311,6 +311,13 @@
         return list;
     }
 
+    /**
+     * 杩欎釜鎺ュ彛鏄繘琛屼骇鍝佹柊澧�,浜у搧bom鏂板鐨勬帴鍙�.
+     * 鏂板鏂瑰紡鏈夊緢澶�,鏈夌洿鎺ヤ粠zip瑙f瀽鏂板浜у搧,涔熷彲浠ュ熀浜庡師鏈変骇鍝佸鍒惰繘琛屽畾鍒剁瓑.闇�瑕佹敞鎰忓吋瀹�!
+     * @param product 浜у搧鏂板,bom鏂板,浜у搧鐗堟湰鏇存柊
+     * @return
+     * @throws IOException
+     */
     @Transactional
     public Response add(Product product) throws IOException {
         String parentCode = product.getParentCode();
@@ -318,7 +325,6 @@
         String parentModel = product.getParentModel();
         List<ProductBom> bomList = product.getBomList();
         String zipFilePath = product.getFileUrl();
-        String fileUrl = zipFilePath.substring(0,zipFilePath.lastIndexOf(File.separator));
         Date date = new Date();
         boolean isCopyCustom = false;
         Product relatedProduct = null;
@@ -331,6 +337,11 @@
                 relatedProduct = getById(product.getId());
             }
         }
+        //涓嶆槸鍩轰簬浜у搧澶嶅埗,鍒欏繀瀹氬瓨鍦▃ip鍖�,蹇呯劧瀛樺湪璺緞
+        String fileUrl = null;
+        if(!isCopyCustom) {
+            fileUrl = zipFilePath.substring(0, zipFilePath.lastIndexOf(File.separator));
+        }
         //鏌ヨ鏂板浜у搧鏈�鏂扮殑鐗堟湰鍙�
         ProductHistory latestProduct = phService.getLatestVersion(parentCode, customCode);
         ProductHistory enabledProduct = phService.getEnabledByParentCodeAndCustomCode(parentCode, customCode);

--
Gitblit v1.9.1