From dd3b22bca22373c77843d5ecb96eaa7e7a382461 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 26 九月 2025 10:31:50 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/service/sd/BomDataService.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 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 0349e49..1d92a91 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
@@ -34,14 +34,21 @@
Object consume = object.get("consume");
Object price = object.get("price");
Integer type = (Integer) object.get("type");
-
+ String unit="";
+ if (type.equals(1)){
+ unit = "銕�";
+ } else if (type.equals(2)) {
+ unit = "m";
+ } else if (type.equals(3)) {
+ unit = "鐗�";
+ }
if (id!=null){
//鏌ヨ鐗╂枡缂栧彿鏄惁宸插瓨鍦�
Integer countId = bomDataMapper.getMaterialId(id);
if (countId == 0){
- bomDataMapper.saveMaterialBomDataMp(id,name,consume,price,type);
+ bomDataMapper.saveMaterialBomDataMp(id,name,consume,price,type,unit);
}else {
- bomDataMapper.updateMaterialBomDataMp(id,name,consume,price,type);
+ bomDataMapper.updateMaterialBomDataMp(id,name,consume,price,type,unit);
}
return true;
@@ -76,6 +83,8 @@
public Map<String, Object> getOrderBomDataSv(String orderId) {
Map<String, Object> map = new HashMap<>();
map.put("data", bomDataMapper.getOrderBomDataMp(orderId));
+ map.put("sumData", bomDataMapper.getOrderBomSumDataMp(orderId));
+ map.put("sumDataDatils", bomDataMapper.getOrderBomsumDataDatilsMp(orderId));
return map;
}
--
Gitblit v1.8.0