From 1443d5a84a4df99d9a86ac04c904554e91ae8271 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期日, 12 四月 2026 15:35:06 +0800
Subject: [PATCH] 1.针对7.3接口文档，新增了几个字段需要加入到组托档中，不额外加字段 2.针对7.11接口文档，对outOrder方法进行重写，batchSeq在wrkMast表中新增一个字段放，entryWmsCode、outDoorNo这两个在wrkDetl中找两个字段存放 3.针对7.7接口文档，上报时加上orderId出库单号 4.针对7.9接口文档，wcs会先请求wms，只需要palletId托盘码，errorMsg错误信息；wms转发给加上orderId出库单号转发给ERP 5.针对7.10接口文档，ERP先按照这个文档发给wms，wms再发给wcs，发给wcs这块先不写
---
src/main/java/com/zy/ai/utils/AiUtils.java | 49 +++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 41 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/ai/utils/AiUtils.java b/src/main/java/com/zy/ai/utils/AiUtils.java
index 3c456d7..d14083a 100644
--- a/src/main/java/com/zy/ai/utils/AiUtils.java
+++ b/src/main/java/com/zy/ai/utils/AiUtils.java
@@ -2,18 +2,19 @@
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.zy.ai.entity.DeviceConfigsData;
import com.zy.ai.entity.DeviceRealTimeData;
import com.zy.ai.entity.WcsDiagnosisRequest;
import com.zy.ai.entity.enums.RedisKeyType;
import com.zy.ai.log.AiLogAppender;
import com.zy.asrs.entity.ApiLog;
-import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.entity.BasCrnp;
+import com.zy.asrs.entity.BasDevp;
+import com.zy.asrs.entity.BasRgv;
import com.zy.asrs.service.ApiLogService;
-import com.zy.asrs.service.WrkMastService;
+import com.zy.asrs.service.BasCrnpService;
+import com.zy.asrs.service.BasDevpService;
+import com.zy.asrs.service.BasRgvService;
import com.zy.common.utils.RedisUtil;
-import com.zy.system.entity.Config;
-import com.zy.system.service.ConfigService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -24,13 +25,15 @@
public class AiUtils {
@Autowired
- private WrkMastService wrkMastService;
- @Autowired
- private ConfigService configService;
+ private BasCrnpService basCrnpService;
@Autowired
private RedisUtil redisUtil;
@Autowired
private ApiLogService apiLogService;
+ @Autowired
+ private BasDevpService basDevpService;
+ @Autowired
+ private BasRgvService basRgvService;
public WcsDiagnosisRequest makeAiRequest(int logLimit, String alarmMessage) {
WcsDiagnosisRequest request = new WcsDiagnosisRequest();
@@ -41,6 +44,36 @@
List<ApiLog> latestData = apiLogService.getLatestData(200);
request.setApiLogs(latestData);
+
+ List<DeviceRealTimeData> deviceRealTimeDataList = new ArrayList<>();
+ request.setDeviceRealtimeData(deviceRealTimeDataList);
+
+ List<BasCrnp> basCrnps = basCrnpService.selectList(new EntityWrapper<>());
+ for (BasCrnp basCrnp : basCrnps) {
+ DeviceRealTimeData deviceRealTimeData = new DeviceRealTimeData();
+ deviceRealTimeData.setDeviceNo(basCrnp.getCrnNo());
+ deviceRealTimeData.setDeviceType("鍫嗗灈鏈�");
+ deviceRealTimeData.setDeviceData(JSON.toJSONString(basCrnp));
+ deviceRealTimeDataList.add(deviceRealTimeData);
+ }
+
+ List<BasDevp> basDevps = basDevpService.selectList(new EntityWrapper<>());
+ for (BasDevp basDevp : basDevps) {
+ DeviceRealTimeData deviceRealTimeData = new DeviceRealTimeData();
+ deviceRealTimeData.setDeviceNo(basDevp.getDevNo());
+ deviceRealTimeData.setDeviceType("杈撻�佺珯鐐�");
+ deviceRealTimeData.setDeviceData(JSON.toJSONString(basDevp));
+ deviceRealTimeDataList.add(deviceRealTimeData);
+ }
+
+ List<BasRgv> basRgvs = basRgvService.selectList(new EntityWrapper<>());
+ for (BasRgv basRgv : basRgvs) {
+ DeviceRealTimeData deviceRealTimeData = new DeviceRealTimeData();
+ deviceRealTimeData.setDeviceNo(basRgv.getRgvNo());
+ deviceRealTimeData.setDeviceType("RGV灏忚溅");
+ deviceRealTimeData.setDeviceData(JSON.toJSONString(basRgv));
+ deviceRealTimeDataList.add(deviceRealTimeData);
+ }
return request;
}
--
Gitblit v1.9.1