From 284b5d41c1284dc6da25bb062de10c6d4998f186 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 21 二月 2025 10:44:12 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java
index 93140dc..c41cd09 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java
@@ -1061,7 +1061,7 @@
Float shelfThickness = Float.parseFloat(object.get("shelfThickness").toString())*1000;
Float spacerThickness = Float.parseFloat(object.get("spacerThickness").toString());
*/
- Integer inMaxQuantity = 30;
+ Integer inMaxQuantity = 1;
Float inWeight = 100.0f;
Float shelfThickness = 2000.0f;
/*鍨墖鍘氬害*/
@@ -1100,10 +1100,11 @@
double flowCardWeight = 0.0;
for (OrderDetail orderDetail1 : orderDetailList) {
if (orderDetail1.getFlowCardId().equals(FlowCardId)) {
- flowCardWeight = orderDetail1.getHeight()*orderDetail1.getQuantity()* orderDetail1.getWidth()* glassThickness* 2.5 / 1000000;
+ flowCardWeight += orderDetail1.getHeight()*orderDetail1.getQuantity()* orderDetail1.getWidth()* glassThickness* 2.5 / 1000000;
}
}
if(flowCardWeight>0){
+ //System.out.println(inWeight+","+flowCardWeight);
flowCardWeight = inWeight - flowCardWeight;
shelfQuantity = (int) (flowCardWeight /
(orderDetail.getHeight()
@@ -1112,6 +1113,7 @@
* 2.5 / 1000000));
if (shelfQuantity == 0) {
shelfQuantity = shelfQuantityByWeight;
+ flowCardNo += 1;
}
}
--
Gitblit v1.8.0