From 1ef2c116b1fe63971e2f979622350f1650e9d22b Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期四, 07 十一月 2024 14:53:08 +0800
Subject: [PATCH] 更新
---
src/main/java/com/whyc/service/ProductBomHistoryService.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/whyc/service/ProductBomHistoryService.java b/src/main/java/com/whyc/service/ProductBomHistoryService.java
index f22a37a..96b2634 100644
--- a/src/main/java/com/whyc/service/ProductBomHistoryService.java
+++ b/src/main/java/com/whyc/service/ProductBomHistoryService.java
@@ -15,7 +15,6 @@
import com.whyc.pojo.*;
import com.whyc.util.ActionUtil;
import com.whyc.util.CommonUtil;
-import com.whyc.util.DwgToPngUtil;
import com.whyc.util.ImageDiff;
import org.apache.poi.hssf.usermodel.*;
import org.apache.poi.ss.usermodel.ClientAnchor;
@@ -672,11 +671,11 @@
//濡傛灉鐗╂枡涓�鑷达紝鍒欒繘琛屽姣�
String dwgUrlInDB = materialInDB.getDwgUrl();
String dwgUrl = material.getDwgUrl();
- //鐗╂枡鍥剧焊杞寲涓簆ng鍥剧墖杩涜瀵规瘮
+ //鐗╂枡鍥剧焊杞寲涓簆ng鍥剧墖杩涜瀵规瘮(寮冪敤)
String dwgFileStr = CommonUtil.getProjectDir() + File.separator + dwgUrlInDB;
String dwgFileStr2 = CommonUtil.getProjectDir() + File.separator + dwgUrl;
- String absoluteDwgPngPath = dwgFileStr.substring(0, dwgFileStr.lastIndexOf(".")) + "-dwg.png";
+ /*String absoluteDwgPngPath = dwgFileStr.substring(0, dwgFileStr.lastIndexOf(".")) + "-dwg.png";
String absoluteDwgPngPath2 = dwgFileStr2.substring(0, dwgFileStr2.lastIndexOf(".")) + "-dwg.png";
if (!new File(absoluteDwgPngPath).exists()) {
@@ -684,10 +683,11 @@
}
if (!new File(absoluteDwgPngPath2).exists()) {
DwgToPngUtil.dwg2png(new File(dwgFileStr2));
- }
- boolean sameImage = ImageDiff.compareImagesCheck(absoluteDwgPngPath, absoluteDwgPngPath2);
+ }*/
+ boolean sameImage = ImageDiff.compareImagesCheck(dwgFileStr, dwgFileStr2);
if (!sameImage) { //鍥剧焊涓嶅悓
- material.setNotes(absoluteDwgPngPath.replace(CommonUtil.getProjectDir()+ File.separator, "") + separator + absoluteDwgPngPath2.replace(CommonUtil.getProjectDir()+ File.separator, ""));
+ //material.setNotes(absoluteDwgPngPath.replace(CommonUtil.getProjectDir()+ File.separator, "") + separator + absoluteDwgPngPath2.replace(CommonUtil.getProjectDir()+ File.separator, ""));
+ material.setNotes(dwgUrlInDB);
diffDwgList.add(material);
}
--
Gitblit v1.9.1