From b594ca8056afd5e91d06610beb954834c96d0816 Mon Sep 17 00:00:00 2001
From: cl <1442464845@qq.com>
Date: 星期一, 06 四月 2026 14:46:00 +0800
Subject: [PATCH] 重量优化

---
 src/main/java/com/zy/asrs/task/handler/WorkErpReportHandler.java |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/handler/WorkErpReportHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkErpReportHandler.java
index 0187666..f3e2302 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkErpReportHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkErpReportHandler.java
@@ -166,11 +166,15 @@
         return param;
     }
 
-    /** 涓婃姤 ERP 閲嶉噺锛氱О閲嶅噺鍥哄畾鍊硷紝璐熷垯鎸� 0 */
+    /** 涓婃姤 ERP 閲嶉噺锛氣墹20 浼� 0锛�>20 鍑� 10 */
     private static BigDecimal adjustErpReportWeight(BigDecimal scWeight) {
         BigDecimal base = scWeight == null ? BigDecimal.ZERO : scWeight;
-        BigDecimal v = base.subtract(new BigDecimal("10"));
-        return v.compareTo(BigDecimal.ZERO) < 0 ? BigDecimal.ZERO : v;
+        if (base.compareTo(new BigDecimal("20")) <= 0) {
+            return BigDecimal.ZERO;
+        }
+        return base.subtract(new BigDecimal("10"));
+        // BigDecimal v = base.subtract(new BigDecimal("10"));
+        // return v.compareTo(BigDecimal.ZERO) < 0 ? BigDecimal.ZERO : v;
     }
     private String resolvePalletId(WrkMast wrkMast, List<WrkDetl> wrkDetls) {
         if (!Cools.isEmpty(wrkMast.getBarcode())) {

--
Gitblit v1.9.1