From 2a2d6b0c071bf744a777991efb35f5503b68598a Mon Sep 17 00:00:00 2001
From: cp <513960435@qq.com>
Date: 星期五, 13 九月 2024 12:35:34 +0800
Subject: [PATCH] #
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/task/handler/WorkLogHandler.java | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/task/handler/WorkLogHandler.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/task/handler/WorkLogHandler.java
index 5ef3ebb..2e6e52e 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/task/handler/WorkLogHandler.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/task/handler/WorkLogHandler.java
@@ -118,14 +118,14 @@
}
}
- if (wrkMast.getIoType() == 1 || wrkMast.getIoType() == 53 || wrkMast.getWrkSts() == 200) {
+ if (!wrkDetlsKeyOrder.isEmpty()) {
//涓婃姤蹇靛垵ERP 銆� 涓婃姤涓夋柟骞冲彴 銆�
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd");
String nowFormat = dateFormat.format(new Date());
ArrayList<LinkedHashMap<String, Object>> mats = new ArrayList<>();
String orderNo = "";
- for (WrkDetl wrkDetl : wrkDetls) {
+ for (WrkDetl wrkDetl : wrkDetlsKeyOrder) {
orderNo = wrkDetl.getOrderNo();
LinkedHashMap<String, Object> mat = new LinkedHashMap<>();
mat.put("GoodsCode", wrkDetl.getMatnr());
@@ -148,12 +148,12 @@
if (order != null) {
LinkedHashMap<String, Object> param = new LinkedHashMap<>();
param.put("Login", ERP_LOGIN);
- param.put("DanType", order.getDocType$());
+ param.put("DanType", order.getDocType$()+"SH");
param.put("Date", nowFormat);
- param.put("FromDanCode", orderNo);
+ param.put("DanCode", orderNo);
param.put("Data", mats);
- String response = null;
+ String response = "";
try {
response = new HttpHandler.Builder()
.setUri(ERP_URL)
@@ -182,7 +182,19 @@
operateLog.setResponse(response);
operateLog.setCreateTime(new Date());
operateLog.setSystem("WMS");
+ operateLog.setUserId(9527L);
+ operateLog.setIp("127.0.0.1");
operateLogService.save(operateLog);
+ //璁板綍涓婃姤鏁版嵁
+ OperateLog operateLog1 = new OperateLog();
+ operateLog1.setAction("涓婃姤ERP," + ERP_URL + ERP_REPORT);
+ operateLog1.setRequest(param.toString());
+ operateLog1.setResponse(response);
+ operateLog1.setCreateTime(new Date());
+ operateLog1.setSystem("WMS");
+ operateLog1.setUserId(9527L);
+ operateLog1.setIp("127.0.0.1");
+ operateLogService.save(operateLog1);
}
}
}
--
Gitblit v1.9.1