From cf9a5039e6db9d1d5963e3fe1a37d00169ec2ef7 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期三, 25 六月 2025 11:18:22 +0800
Subject: [PATCH] 验收报告修改
---
src/main/java/com/whyc/service/BOMFeedbakService.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/whyc/service/BOMFeedbakService.java b/src/main/java/com/whyc/service/BOMFeedbakService.java
index 9eb6469..b7767da 100644
--- a/src/main/java/com/whyc/service/BOMFeedbakService.java
+++ b/src/main/java/com/whyc/service/BOMFeedbakService.java
@@ -232,14 +232,17 @@
Integer productId = mapper.selectById(id).getProductId();
Product product = productService.getById(productId);
//瑙ｉ攣浜у搧鏃惰В閿侀攣瀹氭椂鐨勭増鏈彿
- int nowVersion=feedbackDB.getNowVersion();
+ QueryWrapper<BOMFeedback> query = Wrappers.query();
+ query.eq("id",id).last(" limit 1");
+ BOMFeedback feed = mapper.selectOne(query);
+ int nowVersion=feed.getNowVersion();
if(product!=null){
if(nowVersion!=-1){
phisService.setpHistoryEnable(product.getParentCode(),product.getCustomCode(),nowVersion,1,"闂鍙嶉鍚�"+ username +"纭涓嶉渶瑕佷慨鏀筨om,绯荤粺鎵ц浜у搧瑙ｉ攣",DateUtil.YYYY_MM_DD_HH_MM_SS.format(product.getVersionTime()));
}
}else{
ProductHistory phis = phisService.getById(productId);
- phisService.setpHistoryEnable(phis.getParentCode(),phis.getCustomCode(),nowVersion,1,"闂鍙嶉鍚�"+ username +"纭涓嶉渶瑕佷慨鏀筨om,绯荤粺鎵ц浜у搧瑙ｉ攣",DateUtil.YYYY_MM_DD_HH_MM_SS.format(phis.getVersionTime()));
+ phisService.setpHistoryEnable(phis.getParentCode(),phis.getCustomCode(),phis.getVersion(),1,"闂鍙嶉鍚�"+ username +"纭涓嶉渶瑕佷慨鏀筨om,绯荤粺鎵ц浜у搧瑙ｉ攣",DateUtil.YYYY_MM_DD_HH_MM_SS.format(phis.getVersionTime()));
}
}
}
--
Gitblit v1.9.1