From 12d4bcc3e31ee19ba0aea18fcd874a291072ddf0 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期二, 14 一月 2025 14:57:06 +0800
Subject: [PATCH] 优化AGV告警字段及添加备注信息
---
src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | 47 ++++++++++++++++++++++++++++++++++++++---------
1 files changed, 38 insertions(+), 9 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 71cc66c..18d3fc3 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -3,17 +3,13 @@
import cn.hutool.core.util.NumberUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.exception.CoolException;
-import com.zy.asrs.entity.DocType;
-import com.zy.asrs.entity.Order;
-import com.zy.asrs.entity.OrderDetl;
+import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.ReportErpParam;
-import com.zy.asrs.service.ApiLogService;
-import com.zy.asrs.service.DocTypeService;
-import com.zy.asrs.service.OrderDetlService;
-import com.zy.asrs.service.OrderService;
+import com.zy.asrs.service.*;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
import com.zy.common.utils.HttpHandler;
@@ -45,6 +41,24 @@
private ApiLogService apiLogService;
@Autowired
private DocTypeService docTypeService;
+
+ @Autowired
+ private AgvWrkDetlLogService agvWrkDetlLogService;
+
+ @Autowired
+ private AgvWrkMastLogService agvWrkMastLogService;
+
+ @Autowired
+ private AgvLocMastService agvLocMastService;
+
+ @Autowired
+ private AgvWrkDetlLogService agvWrkDetlLogService;
+
+ @Autowired
+ private AgvWrkMastService agvWrkMastService;
+
+ @Autowired
+ private AgvLocMastService agvLocMastService;
@Value("${spring.profiles.active}")
private String active;
@@ -91,7 +105,8 @@
return;
}
- List<String> docNames = new ArrayList<>(Arrays.asList("閾跺骇閲囪喘鍏ュ簱鍗�", "閾跺骇濮斿鏉愭枡鍑哄簱鍗�", "閾跺骇鐢熶骇鏉愭枡鍑哄簱鍗�"));
+ List<String> docNames = new ArrayList<>(Arrays.asList("閾跺骇閲囪喘鍏ュ簱鍗�"));
+ //List<String> docNames = new ArrayList<>(Arrays.asList("閾跺骇閲囪喘鍏ュ簱鍗�", "閾跺骇濮斿鏉愭枡鍑哄簱鍗�", "閾跺骇鐢熶骇鏉愭枡鍑哄簱鍗�"));
DocType docType = docTypeService.selectById(order.getDocType());
if (docNames.contains(docType.getDocName())) {
@@ -103,7 +118,21 @@
}
}
if (Cools.isEmpty(order.getPltType())) {
- return;
+ 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;
+ }
}
if (Cools.isEmpty(order.getInTime())) {
order.setInTime(DateUtils.convert(new Date(), DateUtils.yyyyMMddHHmmsssss_F));
--
Gitblit v1.9.1