From 8cf7f84ccfbb8fe8e9c06b97671bd0dafd4b068f Mon Sep 17 00:00:00 2001
From: "DESKTOP-J7ED0MB\\yinjinlu" <411641505@qq.com>
Date: Thu, 3 Nov 2022 22:35:58 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E5=B7=A5=E5=8D=95=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E9=9C=80=E6=B1=82=E6=B8=85=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ProWorkorderController.java    | 25 ++++++++++++++-----
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/ktg-mes/src/main/java/com/ktg/mes/pro/controller/ProWorkorderController.java b/ktg-mes/src/main/java/com/ktg/mes/pro/controller/ProWorkorderController.java
index 83f104d..09bf6d0 100644
--- a/ktg-mes/src/main/java/com/ktg/mes/pro/controller/ProWorkorderController.java
+++ b/ktg-mes/src/main/java/com/ktg/mes/pro/controller/ProWorkorderController.java
@@ -17,6 +17,7 @@ import com.ktg.mes.pro.service.IProWorkorderBomService;
 import io.minio.messages.Item;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
@@ -198,22 +199,34 @@ public class ProWorkorderController extends BaseController
     @GetMapping("/listItems")
     public TableDataInfo listItemss(ProWorkorder proWorkorder)
     {
-        List<MdProductBom> list = getBoms(proWorkorder.getProductId(),proWorkorder.getQuantity());
-        return getDataTable(list);
+        List<MdProductBom> result = new ArrayList<MdProductBom>();
+        ProWorkorderBom param = new ProWorkorderBom();
+        param.setWorkorderId(proWorkorder.getWorkorderId());
+        List<ProWorkorderBom> boms = proWorkorderBomService.selectProWorkorderBomList(param);
+        if(!CollectionUtils.isEmpty(boms)){
+            for ( ProWorkorderBom bom: boms
+                 ) {
+                MdProductBom theBom = new MdProductBom();
+                theBom.setBomItemId(bom.getItemId());
+                result.addAll(getBoms(theBom,bom.getQuantity()));
+            }
+        }
+        return getDataTable(result);
     }
 
-    private List<MdProductBom> getBoms(Long itemId,BigDecimal quantity){
+    private List<MdProductBom> getBoms(MdProductBom item,BigDecimal quantity){
         MdProductBom param = new MdProductBom();
         List<MdProductBom> results = new ArrayList<MdProductBom>();
-        param.setItemId(itemId);
+        param.setItemId(item.getBomItemId());
         List<MdProductBom> boms = mdProductBomService.selectMdProductBomList(param);
         if(CollUtil.isNotEmpty(boms)){
             for (MdProductBom bomItem: boms
                  ) {
                 bomItem.setQuantity(quantity.multiply(bomItem.getQuantity()));
-                results.add(bomItem);
-                results.addAll(getBoms(bomItem.getBomItemId(),bomItem.getQuantity()));
+                results.addAll(getBoms(bomItem,bomItem.getQuantity()));
             }
+        }else{
+            results.add(item);
         }
         return results;
     }