From f6200ebe355ac91ca2e1a261dd6d2237f3d046b6 Mon Sep 17 00:00:00 2001
From: cl <1442464845@qq.com>
Date: 星期一, 06 四月 2026 16:06:11 +0800
Subject: [PATCH] 托盘报错增加显示
---
src/main/java/com/zy/asrs/task/handler/WorkErpReportHandler.java | 38 ++++++++++++++++++++++++--------------
1 files changed, 24 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 c0ac56b..f3e2302 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkErpReportHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkErpReportHandler.java
@@ -22,6 +22,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
@@ -92,8 +93,6 @@
}
String newLocId = row + "-" + col + "-" + lev;
param.setLocId(newLocId);
- // TODO锛氭ā鎿姝婚噸閲�1000KG锛岄渶寰岀簩鍒櫎
- param.setWeight(1000.0);
String request = JSON.toJSONString(param);
String response = "";
@@ -159,13 +158,24 @@
param.setPalletId(resolvePalletId(wrkMast, wrkDetls));
param.setAnfme(sumAnfme(wrkDetls));
param.setLocId(wrkMast.getLocNo());
- param.setWeight(sumWeight(wrkDetls));
+// param.setWeight(sumWeight(wrkDetls));
+ param.setWeight(adjustErpReportWeight(wrkMast.getScWeight()));
param.setCreateTime(formatDate(resolveCreateTime(wrkMast)));
param.setBizNo(resolveBizNo(wrkDetls, waitPakin));
param.setStartTime(formatDate(resolveStartTime(wrkMast, waitPakin)));
return param;
}
+ /** 涓婃姤 ERP 閲嶉噺锛氣墹20 浼� 0锛�>20 鍑� 10 */
+ private static BigDecimal adjustErpReportWeight(BigDecimal scWeight) {
+ BigDecimal base = scWeight == null ? BigDecimal.ZERO : scWeight;
+ 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())) {
return wrkMast.getBarcode();
@@ -188,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