From 3d9e0ec1c1e457ed3fd2b334cf4c4dd66c10eead Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期二, 23 十二月 2025 11:09:46 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/service/sd/BomDataService.java | 6 ++++--
1 files changed, 4 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 caf15b6..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);
}
--
Gitblit v1.8.0