From 6a763b74fb0bb7f9ffe306010fc74de2fe2450a4 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期四, 20 二月 2025 14:14:26 +0800
Subject: [PATCH] 提交 智能分架功能

---
 north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java |    7 +++++--
 1 files changed, 5 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..813cc03 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
@@ -1062,7 +1062,7 @@
         Float spacerThickness =  Float.parseFloat(object.get("spacerThickness").toString());
         */
         Integer inMaxQuantity = 30;
-        Float inWeight = 100.0f;
+        Float inWeight = 50.0f;
         Float shelfThickness = 2000.0f;
         /*鍨墖鍘氬害*/
         Float spacerThickness = 0.0f;
@@ -1100,10 +1100,12 @@
                 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 +1114,7 @@
                                     * 2.5 / 1000000));
                     if (shelfQuantity == 0) {
                         shelfQuantity = shelfQuantityByWeight;
+                        flowCardNo += 1;
                     }
                 }
 

--
Gitblit v1.8.0