From 9d6f25ca4a81cd7967c3089106e2419ee4bba988 Mon Sep 17 00:00:00 2001
From: cl <1442464845@qq.com>
Date: 星期一, 06 四月 2026 15:23:18 +0800
Subject: [PATCH] 打印显示
---
src/main/java/com/zy/asrs/task/handler/WorkErpReportHandler.java | 32 ++++++++++++++++++--------------
1 files changed, 18 insertions(+), 14 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 3cf7306..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("20"));
- 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())) {
@@ -194,17 +198,17 @@
return total;
}
- private Double sumWeight(List<WrkDetl> wrkDetls) {
- double total = 0D;
- for (WrkDetl wrkDetl : wrkDetls) {
- if (Cools.isEmpty(wrkDetl.getWeight())) {
- continue;
- }
- double qty = Cools.isEmpty(wrkDetl.getAnfme()) ? 1D : wrkDetl.getAnfme();
- total += wrkDetl.getWeight() * qty;
- }
- return total;
- }
+// private Double sumWeight(List<WrkDetl> wrkDetls) {
+// double total = 0D;
+// for (WrkDetl wrkDetl : wrkDetls) {
+// if (Cools.isEmpty(wrkDetl.getWeight())) {
+// continue;
+// }
+// double qty = Cools.isEmpty(wrkDetl.getAnfme()) ? 1D : wrkDetl.getAnfme();
+// total += wrkDetl.getWeight() * qty;
+// }
+// return total;
+// }
private Date resolveCreateTime(WrkMast wrkMast) {
if (!Cools.isEmpty(wrkMast.getCrnEndTime())) {
--
Gitblit v1.9.1