From fd4ceb219634c802a69828cdae2102278581ba9f Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期二, 14 一月 2025 14:58:02 +0800
Subject: [PATCH] 优化定时任务，添加自动接单（未完成，逻辑还不清楚），调整环境配置
---
src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | 86 ++++++++++++++++++++++---------------------
1 files changed, 44 insertions(+), 42 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
index d117f51..fe2ea84 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -104,57 +104,59 @@
if (!report) {
return;
}
-
+ if (order == null) {
+ return;
+ }
//List<String> docNames = new ArrayList<>(Arrays.asList("閾跺骇閲囪喘鍏ュ簱鍗�"));
//List<String> docNames = new ArrayList<>(Arrays.asList("閾跺骇閲囪喘鍏ュ簱鍗�", "閾跺骇濮斿鏉愭枡鍑哄簱鍗�", "閾跺骇鐢熶骇鏉愭枡鍑哄簱鍗�"));
//if (docNames.contains(docType.getDocName())) {
- List<OrderDetl> orderDetlList = orderDetlService.selectByOrderId(order.getId());
- List<OrderDetl> report = new ArrayList<>();
- for (OrderDetl orderDetl : orderDetlList) {
- if (orderDetl.getQty() > 0 && orderDetl.getQty() > (orderDetl.getReportQty() == null ? 0D : orderDetl.getReportQty())) {
- report.add(orderDetl);
+ List<OrderDetl> orderDetlList = orderDetlService.selectByOrderId(order.getId());
+ List<OrderDetl> report = new ArrayList<>();
+ for (OrderDetl orderDetl : orderDetlList) {
+ if (orderDetl.getQty() > 0 && orderDetl.getQty() > (orderDetl.getReportQty() == null ? 0D : orderDetl.getReportQty())) {
+ report.add(orderDetl);
+ }
+ }
+ if (Cools.isEmpty(order.getPltType())) {
+ List<AgvWrkDetlLog> agvWrkDetlLogs = agvWrkDetlLogService.selectList(new EntityWrapper<AgvWrkDetlLog>().eq("order_no", order.getOrderNo()).orderBy("appe_time", false));
+ if (!Cools.isEmpty(agvWrkDetlLogs)) {
+ AgvWrkDetlLog agvWrkDetlLog = agvWrkDetlLogs.get(0);
+ List<AgvWrkMastLog> agvWrkMastLogs = agvWrkMastLogService.selectList(new EntityWrapper<AgvWrkMastLog>().eq("wrk_no", agvWrkDetlLog.getWrkNo()).eq("io_type", 1).orderBy("appe_time", false));
+ if (!Cools.isEmpty(agvWrkMastLogs)) {
+ AgvLocMast agvLocMast = agvLocMastService.selectById(agvWrkMastLogs.get(0).getLocNo());
+ if (agvLocMast != null) {
+ log.info("琛ュ厖閫昏緫鐢熸晥锛歿}", order.getOrderNo());
+ order.setPltType(agvLocMast.getPltType());
+ }
}
}
if (Cools.isEmpty(order.getPltType())) {
- List<AgvWrkDetlLog> agvWrkDetlLogs = agvWrkDetlLogService.selectList(new EntityWrapper<AgvWrkDetlLog>().eq("order_no", order.getOrderNo()).orderBy("appe_time", false));
- if (!Cools.isEmpty(agvWrkDetlLogs)) {
- AgvWrkDetlLog agvWrkDetlLog = agvWrkDetlLogs.get(0);
- List<AgvWrkMastLog> agvWrkMastLogs = agvWrkMastLogService.selectList(new EntityWrapper<AgvWrkMastLog>().eq("wrk_no", agvWrkDetlLog.getWrkNo()).eq("io_type", 1).orderBy("appe_time", false));
- if (!Cools.isEmpty(agvWrkMastLogs)) {
- AgvLocMast agvLocMast = agvLocMastService.selectById(agvWrkMastLogs.get(0).getLocNo());
- if (agvLocMast != null) {
- log.info("琛ュ厖閫昏緫鐢熸晥锛歿}", order.getOrderNo());
- order.setPltType(agvLocMast.getPltType());
- }
- }
- }
- if (Cools.isEmpty(order.getPltType())) {
- return;
+ return;
+ }
+ }
+ if (Cools.isEmpty(order.getInTime())) {
+ order.setInTime(DateUtils.convert(new Date(), DateUtils.yyyyMMddHHmmsssss_F));
+ }
+ if (!Cools.isEmpty(report)) {
+ ReportErpParam param = new ReportErpParam();
+ mappingParam(order, param);
+ mappingParamChildren(report, param);
+ log.info(JSON.toJSONString(param));
+ int code = doHttpRequest(param, "鍗曟嵁瀹℃牳", url, orderReportPath, null, "127.0.0.1");
+ if (code == 0) {
+ Date date = new Date();
+ order.setInTime(DateUtils.convert(date, DateUtils.yyyyMMddHHmmsssss_F));
+ orderService.updateById(order);
+ for (OrderDetl orderDetl : report) {
+ log.info("{}鍗曟嵁瀹℃牳涓婃姤浜嗭細{}", order.getOrderNo(), orderDetl.getQty() - (orderDetl.getReportQty() == null ? 0D : orderDetl.getReportQty()));
+ orderDetl.setReportQty(orderDetl.getQty());
+ orderDetl.setUpdateTime(date);
+ orderDetlService.updateById(orderDetl);
}
}
- if (Cools.isEmpty(order.getInTime())) {
- order.setInTime(DateUtils.convert(new Date(), DateUtils.yyyyMMddHHmmsssss_F));
- }
- if (!Cools.isEmpty(report)) {
- ReportErpParam param = new ReportErpParam();
- mappingParam(order, param);
- mappingParamChildren(report, param);
- log.info(JSON.toJSONString(param));
- int code = doHttpRequest(param, "鍗曟嵁瀹℃牳", url, orderReportPath, null, "127.0.0.1");
- if (code == 0) {
- Date date = new Date();
- order.setInTime(DateUtils.convert(date, DateUtils.yyyyMMddHHmmsssss_F));
- orderService.updateById(order);
- for (OrderDetl orderDetl : report) {
- log.info("{}鍗曟嵁瀹℃牳涓婃姤浜嗭細{}", order.getOrderNo(), orderDetl.getQty() - (orderDetl.getReportQty() == null ? 0D : orderDetl.getReportQty()));
- orderDetl.setReportQty(orderDetl.getQty());
- orderDetl.setUpdateTime(date);
- orderDetlService.updateById(orderDetl);
- }
- }
- // }
+ // }
}
}
@@ -187,7 +189,7 @@
childInfo.setIrowno(orderDetl.getItemNum());
childInfo.setCInvCode(orderDetl.getMatnr());
childInfo.setIQuantity(orderDetl.getQty() - (orderDetl.getReportQty() == null ? 0D : orderDetl.getReportQty()) + "");
- String batch = orderDetl.getBatch();
+ String batch = orderDetl.getBrand();
if (Cools.isEmpty(batch)) {
childInfo.setCBatch("");
childInfo.setBFree1("");
--
Gitblit v1.9.1