From c1c7cae9ebaa7f743e51660265c8dfa6ac52f10d Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期四, 09 十月 2025 16:07:42 +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 | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 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 c9a7c02..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,12 +83,14 @@
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;
}
public Map<String, Object> getBomDataProductSv(Map<String, Object> object) {
Map<String, Object> map = new HashMap<>();
- List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();//鏈�缁堢粨鏋�
+ List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();
List<OrderDetail> orderDetailsList = JSONArray.parseArray(JSONObject.toJSONString(object.get("productName")), OrderDetail.class);
if (!orderDetailsList.isEmpty()) {
for (OrderDetail od : orderDetailsList) {
--
Gitblit v1.8.0