From f4dd93e7fb94728cfacafec594a45e9223b4370b Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期五, 02 九月 2022 16:45:14 +0800
Subject: [PATCH] 下载
---
src/main/java/com/whyc/service/ProductBomHistoryService.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/whyc/service/ProductBomHistoryService.java b/src/main/java/com/whyc/service/ProductBomHistoryService.java
index 4b8eef5..364d0ee 100644
--- a/src/main/java/com/whyc/service/ProductBomHistoryService.java
+++ b/src/main/java/com/whyc/service/ProductBomHistoryService.java
@@ -90,15 +90,17 @@
}*/
//鍘嗗彶浜у搧淇℃伅鏌ョ湅锛堟牴鎹巻鍙蹭骇鍝佷骇鍝乮d鍜岀増鏈煡璇㈠瓙浠跺強鍏跺叧鑱旂殑鐗╂枡淇℃伅锛�
public Response getBomHistoryAndMaterial(int productId, int version) {
- List<ProductBomHistory> list=mapper.getBomHistoryAndMaterial(productId,version);
- //鏌ヨ浜у搧鐨勮蒋浠�
- List<ProductSoftware> listsoft=mapper.selectSoftware(productId);
- //灏嗘病鏈夌鐞咮OM鐨刣wg鏂囦欢
+
QueryWrapper wrapper=new QueryWrapper();
wrapper.eq("id",productId);
wrapper.eq("version",version);
wrapper.last("limit 1");
ProductHistory pHistory=pHistoryMapper.selectOne(wrapper);
+
+ List<ProductBomHistory> list=mapper.getBomHistoryAndMaterial(productId,pHistory.getSubVersionMax());
+ //鏌ヨ浜у搧鐨勮蒋浠�
+ List<ProductSoftware> listsoft=mapper.selectSoftware(productId);
+ //灏嗘病鏈夌鐞咮OM鐨刣wg鏂囦欢
String withOutDwg="doc_file/product"+File.separator+pHistory.getParentModel();
if(pHistory.getCustomCode()!=null&&!pHistory.getCustomCode().isEmpty()){
withOutDwg+=File.separator+pHistory.getCustomCode()+File.separator+version;
@@ -129,7 +131,7 @@
wrapper.last("limit 1");
ProductHistory pHistory=pHistoryMapper.selectOne(wrapper);
//璇诲彇鎸囧畾鐗堟湰浜у搧鐨勫瓙浠跺拰鍏宠仈鐨勭墿鏂欎俊鎭�
- List<ProductBomHistory> list=mapper.getBomHistoryAndMaterial(productId,version);
+ List<ProductBomHistory> list=mapper.getBomHistoryAndMaterial(productId,pHistory.getSubVersionMax());
//澶勭悊瀛樺湪鍏宠仈鍏崇郴鐨勭墿鏂�
List<ProductBomHistory> endList=new ArrayList<>();
list.stream().forEach(bomHistory -> {
--
Gitblit v1.9.1