From 17607bbc35c8db447e8610374b372905c227afa1 Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期六, 27 八月 2022 16:49:45 +0800
Subject: [PATCH] 历史版本查看需要加软件

---
 src/main/java/com/whyc/service/ProductBomHistoryService.java |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/whyc/service/ProductBomHistoryService.java b/src/main/java/com/whyc/service/ProductBomHistoryService.java
index e60df0c..0b39696 100644
--- a/src/main/java/com/whyc/service/ProductBomHistoryService.java
+++ b/src/main/java/com/whyc/service/ProductBomHistoryService.java
@@ -90,7 +90,9 @@
   //鍘嗗彶浜у搧淇℃伅鏌ョ湅锛堟牴鎹巻鍙蹭骇鍝佷骇鍝乮d鍜岀増鏈煡璇㈠瓙浠跺強鍏跺叧鑱旂殑鐗╂枡淇℃伅锛�
   public Response getBomHistoryAndMaterial(int productId, int version) {
       List<ProductBomHistory> list=mapper.getBomHistoryAndMaterial(productId,version);
-      return new Response().setII(1,list.size()>0?true:false,list,"杩斿洖鐗╂枡淇℃伅鍙婂叧鑱旂墿鏂�");
+      //鏌ヨ浜у搧鐨勮蒋浠�
+      List<ProductSoftware> listsoft=mapper.selectSoftware(productId);
+      return new Response().setIII(1,list.size()>0?true:false,list,listsoft,"杩斿洖鐗╂枡淇℃伅鍙婂叧鑱旂墿鏂�");
   }
     //鍘嗗彶浜у搧涓嬭浇(浜у搧id鍜岀増鏈�<涓嬭浇鐨勭増鏈�>)
     public void downloadProductHistory(HttpServletRequest req, HttpServletResponse resp, int productId, int version) {

--
Gitblit v1.9.1