From 38501f5760daefd634e00099ebe7019fd7247731 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期四, 23 四月 2026 20:45:24 +0800
Subject: [PATCH] 入库上报erp照片
---
src/main/java/com/zy/asrs/task/handler/WorkErpReportHandler.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 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 61a6c66..bb6c85a 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkErpReportHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkErpReportHandler.java
@@ -163,14 +163,19 @@
param.setCreateTime(formatDate(resolveCreateTime(wrkMast)));
param.setBizNo(resolveBizNo(wrkDetls, waitPakin));
param.setStartTime(formatDate(resolveStartTime(wrkMast, waitPakin)));
+ param.setPhotos(wrkDetls.get(0).getPic());
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("20.8"));
+ // 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())) {
@@ -207,9 +212,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