From 9a3526c10956ac724af89e9d44f0c5ffbd847a21 Mon Sep 17 00:00:00 2001
From: qiezi <15576055375@163.com>
Date: Fri, 17 Jan 2025 13:01:38 +0800
Subject: [PATCH] 2025-1-17

---
 .../service/impl/QuoteDetailRoutingServiceImpl.java | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/spring/modules/quote/service/impl/QuoteDetailRoutingServiceImpl.java b/src/main/java/com/spring/modules/quote/service/impl/QuoteDetailRoutingServiceImpl.java
index d5078b13..41a534f8 100644
--- a/src/main/java/com/spring/modules/quote/service/impl/QuoteDetailRoutingServiceImpl.java
+++ b/src/main/java/com/spring/modules/quote/service/impl/QuoteDetailRoutingServiceImpl.java
@@ -72,14 +72,13 @@ public class QuoteDetailRoutingServiceImpl extends ServiceImpl<QuoteDetailRoutin
             processingTime = qty;
         }else if ("小时/单位".equals(routing.getRunTimeDesc())){
             processingTime = BigDecimal.ONE.divide(qty,16,RoundingMode.HALF_UP);
+        }else {
+            processingTime = BigDecimal.ONE;
         }
         if (BigDecimal.ZERO.compareTo(qty)==0){
             return BigDecimal.ZERO;
         }
-        if (BigDecimal.ZERO.compareTo(processingTime) == 0){
-            return processingTime;
-        }
-        return processingTime.divide(qty,16,RoundingMode.HALF_UP);
+        return processingTime;
     }
 
     private BigDecimal laborCost(QuoteDetailRouting quoteDetailRouting,BigDecimal qty){
@@ -112,7 +111,7 @@ public class QuoteDetailRoutingServiceImpl extends ServiceImpl<QuoteDetailRoutin
         // 损耗
         BigDecimal shrinkageFactor = quoteDetailRouting.getShrinkageFactor();
         //人员等级成本/单位产出/效率/（1-损耗率）*人数
-
+        // 调机人员等级成本*调机人员数量*人员调机时间/moq+人员等级成本/单位产出/效率/（1-损耗率）*人数
         // 单位产出/效率/100
         BigDecimal num1 = laborCycleTime.divide(efficiencyFactor.divide(BigDecimal.valueOf(100), 16, RoundingMode.HALF_UP), 16, RoundingMode.HALF_UP);
         // 单位产出/效率/100/（1-损耗率/100）
@@ -169,8 +168,8 @@ public class QuoteDetailRoutingServiceImpl extends ServiceImpl<QuoteDetailRoutin
             BigDecimal efficiencyFactor = quoteDetailRouting.getEfficiencyFactor();
             // 损耗率
             BigDecimal shrinkageFactor = quoteDetailRouting.getShrinkageFactor();
-
-            // 加工中心成本/效率/单位产出/（1-损耗率）
+            // 加工中心成本*调机时间/moq+加工中心成本/效率/单位产出/(1-损耗率)
+            // 加工中心成本/效率/单位产出/(1-损耗率)
             // 加工中心成本/效率/100
             BigDecimal num1 = workCenterCost.divide(efficiencyFactor.divide(BigDecimal.valueOf(100), 16, RoundingMode.HALF_UP), 16, RoundingMode.HALF_UP);
             // 加工中心成本/效率/100/单位产出