From 5a07bb3f4e4846ac5425b5ec73d4017e2b7c57dd Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期四, 16 四月 2026 12:44:40 +0800
Subject: [PATCH] erp上报完成时间修复

---
 src/main/java/com/zy/asrs/task/handler/WorkErpReportHandler.java |    5 +----
 1 files changed, 1 insertions(+), 4 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 f3e2302..f0698dd 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkErpReportHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkErpReportHandler.java
@@ -172,7 +172,7 @@
         if (base.compareTo(new BigDecimal("20")) <= 0) {
             return BigDecimal.ZERO;
         }
-        return base.subtract(new BigDecimal("10"));
+        return base.subtract(new BigDecimal("20.8"));
         // BigDecimal v = base.subtract(new BigDecimal("10"));
         // return v.compareTo(BigDecimal.ZERO) < 0 ? BigDecimal.ZERO : v;
     }
@@ -211,9 +211,6 @@
 //    }
 
     private Date resolveCreateTime(WrkMast wrkMast) {
-        if (!Cools.isEmpty(wrkMast.getCrnEndTime())) {
-            return wrkMast.getCrnEndTime();
-        }
         if (!Cools.isEmpty(wrkMast.getModiTime())) {
             return wrkMast.getModiTime();
         }

--
Gitblit v1.9.1