From fcc71e5d0f0eba3f192c581fad184cee0a43ce99 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期五, 10 四月 2026 16:37:18 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/timer/WcsStationTimer.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/timer/WcsStationTimer.java b/src/main/java/com/zy/asrs/timer/WcsStationTimer.java
index bdaeee3..8fd6f48 100644
--- a/src/main/java/com/zy/asrs/timer/WcsStationTimer.java
+++ b/src/main/java/com/zy/asrs/timer/WcsStationTimer.java
@@ -3,7 +3,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.zy.asrs.entity.BasStation;
import com.zy.asrs.entity.dto.WcsStationDto;
import com.zy.asrs.service.BasStationService;
@@ -34,7 +34,7 @@
@Scheduled(cron = "0/3 * * * * ? ")
public synchronized void execute() {
- Config wcsStationUrlConfig = configService.selectOne(new EntityWrapper<Config>().eq("code", "wcsStationUrl"));
+ Config wcsStationUrlConfig = configService.getOne(new QueryWrapper<Config>().eq("code", "wcsStationUrl"));
if (wcsStationUrlConfig == null) {
return;
}
@@ -46,7 +46,7 @@
HashMap<String, Object> requestParam = new HashMap<>();
List<Integer> list = new ArrayList<>();
- List<BasStation> basStations = basStationService.selectList(new EntityWrapper<>());
+ List<BasStation> basStations = basStationService.list(new QueryWrapper<>());
for (BasStation basStation : basStations) {
list.add(basStation.getStationId());
}
@@ -72,12 +72,17 @@
}
wcsStationDto.setStationId(stationId);
- wcsStationDto.setTaskNo(object.getString("superTaskNo"));
+ wcsStationDto.setTaskNo(object.getString("taskNo"));
wcsStationDto.setAuto(object.getBoolean("autoing") ? 1 : 0);
wcsStationDto.setLoading(object.getBoolean("loading") ? 1 : 0);
wcsStationDto.setBarcode(object.getString("barcode"));
wcsStationDto.setErrorMsg(object.getString("errorMsg"));
wcsStationDto.setSystemWarning(object.getString("systemWarning"));
+
+ if (wcsStationDto.getLoading() == 0 || wcsStationDto.getTaskNo().equals("0")) {
+ wcsStationDto.setWrkDetls(null);
+ }
+
stationUtils.stationMap.put(stationId, wcsStationDto);
}
}
--
Gitblit v1.9.1