From 94c0a729da1b88ab4a0067f1e14a00264e0447cf Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 15 十二月 2025 17:04:05 +0800
Subject: [PATCH] bom管理中空胶计算调整

---
 north-glass-erp/src/main/java/com/example/erp/service/sd/BomDataService.java |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/north-glass-erp/src/main/java/com/example/erp/service/sd/BomDataService.java b/north-glass-erp/src/main/java/com/example/erp/service/sd/BomDataService.java
index 1d92a91..77427d6 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/sd/BomDataService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/sd/BomDataService.java
@@ -71,8 +71,10 @@
                     Object produceId = row.get("produceId");
                     Object tabId = row.get("tabId");
                     Object layer = row.get("layer");
+                    if (tabId!=null){
+                        bomDataMapper.saveProductBOMMp(produceId,tabId,layer);
+                    }
 
-                    bomDataMapper.saveProductBOMMp(produceId,tabId,layer);
                 }
             }
         }
@@ -95,7 +97,7 @@
         if (!orderDetailsList.isEmpty()) {
             for (OrderDetail od : orderDetailsList) {
                 Map<String, Object> itemmap = new HashMap<>();
-                itemmap.put("data", bomDataMapper.getBOMDetails(od.getProductId()));
+                itemmap.put("data", bomDataMapper.getBOMDetails(od.getProductId(),od.getOrderId()));
                 list.add(itemmap);
 
             }
@@ -103,4 +105,10 @@
         map.put("data", list);
         return map;
     }
+
+    public Map<String, Object> editProductBOMSv(String produceId) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("data", bomDataMapper.getEditProductBOMSv(produceId));
+        return map;
+    }
 }

--
Gitblit v1.8.0