From 0c57f51c98c6635ebd4e4d880cf6bb7adf7f880f Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期一, 21 四月 2025 09:41:07 +0800
Subject: [PATCH] 解锁产品时解锁锁定时的版本号
---
src/main/java/com/whyc/service/BOMFeedbakService.java | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/whyc/service/BOMFeedbakService.java b/src/main/java/com/whyc/service/BOMFeedbakService.java
index cfbfd35..9eb6469 100644
--- a/src/main/java/com/whyc/service/BOMFeedbakService.java
+++ b/src/main/java/com/whyc/service/BOMFeedbakService.java
@@ -231,14 +231,15 @@
//瑙ｉ攣浜у搧
Integer productId = mapper.selectById(id).getProductId();
Product product = productService.getById(productId);
+ //瑙ｉ攣浜у搧鏃惰В閿侀攣瀹氭椂鐨勭増鏈彿
+ int nowVersion=feedbackDB.getNowVersion();
if(product!=null){
- int version=product.getVersion();
- if(version!=-1){
- phisService.setpHistoryEnable(product.getParentCode(),product.getCustomCode(),version,1,"闂鍙嶉鍚�"+ username +"纭涓嶉渶瑕佷慨鏀筨om,绯荤粺鎵ц浜у搧瑙ｉ攣",DateUtil.YYYY_MM_DD_HH_MM_SS.format(product.getVersionTime()));
+ if(nowVersion!=-1){
+ phisService.setpHistoryEnable(product.getParentCode(),product.getCustomCode(),nowVersion,1,"闂鍙嶉鍚�"+ username +"纭涓嶉渶瑕佷慨鏀筨om,绯荤粺鎵ц浜у搧瑙ｉ攣",DateUtil.YYYY_MM_DD_HH_MM_SS.format(product.getVersionTime()));
}
- }else{
+ }else{
ProductHistory phis = phisService.getById(productId);
- phisService.setpHistoryEnable(phis.getParentCode(),phis.getCustomCode(),phis.getVersion(),1,"闂鍙嶉鍚�"+ username +"纭涓嶉渶瑕佷慨鏀筨om,绯荤粺鎵ц浜у搧瑙ｉ攣",DateUtil.YYYY_MM_DD_HH_MM_SS.format(phis.getVersionTime()));
+ phisService.setpHistoryEnable(phis.getParentCode(),phis.getCustomCode(),nowVersion,1,"闂鍙嶉鍚�"+ username +"纭涓嶉渶瑕佷慨鏀筨om,绯荤粺鎵ц浜у搧瑙ｉ攣",DateUtil.YYYY_MM_DD_HH_MM_SS.format(phis.getVersionTime()));
}
}
}
@@ -289,9 +290,16 @@
//for (File file : fileList) {
// file.delete();
//}
+
+ //鏌ヨ浜у搧鐨勪俊鎭�
+ QueryWrapper hisWrapper=new QueryWrapper();
+ hisWrapper.eq("id",feedback.getProductId());
+ hisWrapper.last("limit 1");
+ ProductHistory phis=phisMapper.selectOne(hisWrapper);
//淇濆瓨
feedback.setCreateTime(date);
feedback.setConfirmStatus(0);
+ feedback.setNowVersion(phis.getVersion());
mapper.insert(feedback);
//鍙戦�侀偖浠�
String receiverIds = feedback.getReceiverIds();
@@ -334,11 +342,6 @@
mailService.sendMail(mailDTO);
//mailUtil.sendMailBatch(senderName,receiverMailList,subject,content);
//鍙嶉鏃剁洿鎺ユ牴鎹畃roductid鐩存帴閿佸畾
- //鏌ヨ浜у搧鐨勪俊鎭�
- QueryWrapper hisWrapper=new QueryWrapper();
- hisWrapper.eq("id",feedback.getProductId());
- hisWrapper.last("limit 1");
- ProductHistory phis=phisMapper.selectOne(hisWrapper);
phisService.setpHistoryEnable(phis.getParentCode(),phis.getCustomCode(),phis.getVersion(),0,feedback.getContent(),ActionUtil.sdfwithALL.format(phis.getVersionTime()));
return new Response().set(1,true,"鍙嶉瀹屾垚");
}
--
Gitblit v1.9.1