From 1275eac767a6fe0b4dd68bab27e2b1fb78d55b51 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期四, 17 四月 2025 16: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/pp/GlassOptimizeService.java | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/GlassOptimizeService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/GlassOptimizeService.java
index 95fd066..81ffb3e 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/GlassOptimizeService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/GlassOptimizeService.java
@@ -45,10 +45,10 @@
// 鑾峰彇 computeData 鍜� cardData
- Object computeData = message.get("computeData");
- Object cardData = message.get("cardData");
+ /*Object computeData = message.get("computeData");
+ Object cardData = message.get("cardData");*/
- rabbitMQUtil.sendMessage("6");
+ rabbitMQUtil.sendMessage(message.toString());
System.out.println("send message: " + message);
String date = rabbitMQUtil.receiveMessages();
System.out.println("Received message: " + date);
@@ -157,14 +157,26 @@
}
//搴撳瓨淇℃伅
- public Map<String, Object> materialStoreSv(String thickness, String model, String projectNumber) {
+ public Map<String, Object> materialStoreSv(String thickness, String model, String projectNumber,Integer type) {
Map<String, Object> stringObjectMap = glassOptimizeMapper.selectProjectCount(projectNumber);
Map<String, Object> map = new HashMap<>();
if(Integer.parseInt(stringObjectMap.get("state").toString())<10){
- map.put("data", glassOptimizeMapper.materialStoreMp(thickness,model));
+ if(type==1){
+ map.put("data", glassOptimizeMapper.materialStoreMp(thickness,model));
+ }else if(type==2){
+ map.put("data", glassOptimizeMapper.surplusMaterialsMp(thickness,model));
+ }else{
+ map.put("data", glassOptimizeMapper.materialStoreSurplusMp(thickness,model));
+ }
map.put("edgeTrimming", glassOptimizeMapper.getEdgeTrimming());
}else if(Integer.parseInt(stringObjectMap.get("state").toString())==10){
- map.put("data", glassOptimizeMapper.materialStoreMp(thickness,model));
+ if(type==1){
+ map.put("data", glassOptimizeMapper.materialStoreMp(thickness,model));
+ }else if(type==2){
+ map.put("data", glassOptimizeMapper.surplusMaterialsMp(thickness,model));
+ }else{
+ map.put("data", glassOptimizeMapper.materialStoreSurplusMp(thickness,model));
+ }
map.put("edgeTrimming", glassOptimizeMapper.getEdgeTrimming());
}else{
map.put("data", glassOptimizeMapper.materialStoreOptimizeUse(projectNumber));
--
Gitblit v1.8.0