From fc80e4040d6bf39b8657f94df1f957732bae26fe Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 22 四月 2026 22:02:31 +0800
Subject: [PATCH] 电视机入库出库显示耗时、托数功能修改： 1.入库耗时改成当前订单第一托入库任务创建时间到后续入库的创建时间相减转换成分钟 2.出库耗时改成当前订订单任务创建时间减去到达出库口的耗时时间 3.入库托数改成当前入库订单号累计入库数量
---
src/main/java/com/zy/asrs/task/handler/WorkOutErpReportHandler.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkOutErpReportHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkOutErpReportHandler.java
index 433efdb..7963832 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkOutErpReportHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkOutErpReportHandler.java
@@ -52,6 +52,10 @@
@Value("${erp.address.Outaddress}")
private String erpOutAddress;
+ /**
+ * 7.7 鍑哄簱瀹屾垚鏇存柊銆�
+ * WMS 鍦ㄥ嚭搴撳畬鎴愬悗鍚� ERP 涓婃姤 palletId銆乧reateTime銆乻tartTime銆乷rderId銆�
+ */
@Transactional(rollbackFor = Exception.class)
public ReturnT<String> start(WrkMast source) {
WrkMast wrkMast = wrkMastService.selectById(source.getWrkNo());
@@ -65,6 +69,13 @@
}
ErpPakoutReportParam param = buildParam(wrkMast);
+ List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
+ if (wrkDetls != null && wrkDetls.size() > 0) {
+ param.setOrderId(wrkDetls.get(0).getOrderNo());
+ }
+ if (Cools.isEmpty(param.getOrderId())) {
+ param.setOrderId(wrkMast.getUserNo());
+ }
String request = JSON.toJSONString(param);
String response = "";
boolean success = false;
@@ -139,9 +150,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