From ac225bd66eb7c21b5af1d8533dc59376ea53da6c Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 12 十二月 2025 12:29:42 +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 | 74 +++++++++++++++++++++++++++++++++---
1 files changed, 67 insertions(+), 7 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 5cc9599..7d10a9d 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
@@ -1,11 +1,11 @@
package com.example.erp.service.sd;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.example.erp.entity.sd.BasicData;
-import com.example.erp.entity.sd.BasicOtherMoney;
-import com.example.erp.entity.sd.BomBase;
-import com.example.erp.entity.sd.Customer;
+import com.example.erp.entity.pp.FlowCard;
+import com.example.erp.entity.sd.*;
import com.example.erp.mapper.sd.BomDataMapper;
import com.example.erp.mapper.sd.BasicOtherMoneyMapper;
import com.example.erp.mapper.sd.CustomerMapper;
@@ -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;
@@ -49,4 +56,57 @@
return false;
}
}
+
+ public Object saveProductBOMSv(Map<String, Object> object) {
+ // 閬嶅巻姣忎釜浜у搧
+ for (Map.Entry<String, Object> entry : object.entrySet()) {
+ String productName = entry.getKey();
+ Object value = entry.getValue();
+
+ if (value instanceof List) {
+ List<Map<String, Object>> rows = (List<Map<String, Object>>) value;
+
+ for (Map<String, Object> row : rows) {
+ // 鍙栨瘡鏉℃暟鎹�
+ Object produceId = row.get("produceId");
+ Object tabId = row.get("tabId");
+ Object layer = row.get("layer");
+
+ bomDataMapper.saveProductBOMMp(produceId,tabId,layer);
+ }
+ }
+ }
+
+ return true;
+ }
+
+ 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<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(),od.getOrderId()));
+ list.add(itemmap);
+
+ }
+ }
+ 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