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/WorkOutErpReportHandler.java | 10 +++++++---
1 files changed, 7 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 062c901..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());
@@ -68,6 +72,9 @@
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 = "";
@@ -143,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