From 4521e55b7ce2840dcb91340c17f3159892bcc14d Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 24 十二月 2025 13:32:29 +0800
Subject: [PATCH] 修改订单金额时，根据情况是否调用发货单修改金额
---
north-glass-erp/src/main/java/com/example/erp/service/sd/BomDataService.java | 29 +++++++++++++++++++++++------
1 files changed, 23 insertions(+), 6 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..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
@@ -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;
@@ -64,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);
}
}
}
@@ -76,17 +85,19 @@
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) {
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);
}
@@ -94,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