From ebf0db91e09be33fcbfe97ed5b91965dc2e61dfd Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期四, 01 八月 2024 10:54:26 +0800
Subject: [PATCH] 1. 托盘管理 2. 入库通知档导入功能 3. 工作档明细 新增来源单据类型及单据编号 4. 库存明细统计表 增加一栏ERP数量（需跟ERP确认接口实现方式）。 5. 存货档案、单据管理、库存管理可以支持模糊搜索（各个单据界面）。
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/task/handler/WorkLogHandler.java | 12 +++++++-----
1 files changed, 7 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..4232215 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());
@@ -150,10 +150,10 @@
param.put("Login", ERP_LOGIN);
param.put("DanType", order.getDocType$());
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)
@@ -173,7 +173,7 @@
} catch (Exception e) {
e.printStackTrace();
//寮傚父涓婃姤澶辫触
- exceptionHandle("涓婃姤ERP寮傚父澶辫触[workNo={0}]澶辫触", wrkMast.getWrkNo());
+// exceptionHandle("涓婃姤ERP寮傚父澶辫触[workNo={0}]澶辫触", wrkMast.getWrkNo());
} finally {
//璁板綍涓婃姤鏁版嵁
OperateLog operateLog = new OperateLog();
@@ -182,6 +182,8 @@
operateLog.setResponse(response);
operateLog.setCreateTime(new Date());
operateLog.setSystem("WMS");
+ operateLog.setUserId(9527L);
+ operateLog.setIp("127.0.0.1");
operateLogService.save(operateLog);
}
}
--
Gitblit v1.9.1