From 131029608a6b3703e02ef8f931a494fc6a40bd3c Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期六, 04 一月 2025 10:22:35 +0800
Subject: [PATCH] 优化MES库存同步逻辑及AGV告警字段
---
src/main/java/com/zy/asrs/task/handler/ReportDataHandler.java | 13 +++++++++++++
src/main/java/com/zy/asrs/controller/AgvWarnController.java | 2 +-
2 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvWarnController.java b/src/main/java/com/zy/asrs/controller/AgvWarnController.java
index 676e4d4..518fc41 100644
--- a/src/main/java/com/zy/asrs/controller/AgvWarnController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvWarnController.java
@@ -63,7 +63,7 @@
List<AgvWarn> agvWarns = new ArrayList<>();
List<AgvWarn> updates = new ArrayList<>();
for (AgvWarnBody body : data) {
- List<AgvWarn> agvWarnList = agvWarnService.selectList(new EntityWrapper<AgvWarn>().eq("robot_code", body.getRobotCode()).eq("begin_time", body.getBeginTime()));
+ List<AgvWarn> agvWarnList = agvWarnService.selectList(new EntityWrapper<AgvWarn>().eq("robot_code", body.getRobotCode()).eq("begin_time", body.getBeginTime()).eq("warn_content", body.getWarnContent()));
if (Cools.isEmpty(agvWarnList)) {
agvWarn = new AgvWarn();
agvWarn.setBeginTime(body.getBeginTime());
diff --git a/src/main/java/com/zy/asrs/task/handler/ReportDataHandler.java b/src/main/java/com/zy/asrs/task/handler/ReportDataHandler.java
index 0dd0a41..468925c 100644
--- a/src/main/java/com/zy/asrs/task/handler/ReportDataHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/ReportDataHandler.java
@@ -2,9 +2,11 @@
import cn.hutool.core.bean.BeanUtil;
import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.core.common.Cools;
import com.core.exception.CoolException;
+import com.zy.asrs.entity.MesLocDetl;
import com.zy.asrs.entity.ReportData;
import com.zy.asrs.entity.ReportDataLog;
import com.zy.asrs.service.ApiLogService;
@@ -121,6 +123,17 @@
@Transactional
public ReturnT<String> stock(Map<String, Object> mesTokenInfo) {
String result = doHttpRequest("{}", mesTokenInfo, "鍚屾MES搴撳瓨", url, stock, null, "127.0.0.1");
+ JSONObject jsonObject = JSONObject.parseObject(result);
+ Object o = jsonObject.get("data");
+ if (o != null) {
+ JSONObject jsonObject1 = JSONObject.parseObject(o.toString());
+ Object o1 = jsonObject1.get("list");
+ if (o1 != null) {
+ JSONArray jsonArray = JSONArray.parseArray(o1.toString());
+ //jsonArray.
+ }
+ }
+ MesLocDetl mesLocDetl=new MesLocDetl();
return SUCCESS;
}
--
Gitblit v1.9.1