From a4f07b2a0ddb6c210e05afbbb491feeb466203e7 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 09 三月 2026 19:15:50 +0800
Subject: [PATCH] #V3重大更新，升级JDK17，升级SpirngBoot3.5.1
---
src/main/java/com/zy/core/utils/StationOperateProcessUtils.java | 36 ++++++++++++++++++------------------
1 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/zy/core/utils/StationOperateProcessUtils.java b/src/main/java/com/zy/core/utils/StationOperateProcessUtils.java
index 72d192f..f31ab82 100644
--- a/src/main/java/com/zy/core/utils/StationOperateProcessUtils.java
+++ b/src/main/java/com/zy/core/utils/StationOperateProcessUtils.java
@@ -3,7 +3,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.serializer.SerializerFeature;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.core.common.Cools;
import com.core.exception.CoolException;
import com.zy.asrs.domain.enums.NotifyMsgType;
@@ -64,7 +64,7 @@
int[] currentStationTaskCountRef = new int[]{countCurrentStationTask()};
LoadGuardState loadGuardState = buildLoadGuardState(limitConfig);
- List<BasDevp> basDevps = basDevpService.selectList(new EntityWrapper<>());
+ List<BasDevp> basDevps = basDevpService.list(new QueryWrapper<>());
for (BasDevp basDevp : basDevps) {
StationThread stationThread = (StationThread) SlaveConnection.get(SlaveType.Devp, basDevp.getDevpNo());
if (stationThread == null) {
@@ -96,7 +96,7 @@
&& stationProtocol.getTaskNo() > 0
) {
//妫�娴嬩换鍔℃槸鍚︾敓鎴�
- WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("barcode", stationProtocol.getBarcode()));
+ WrkMast wrkMast = wrkMastService.getOne(new QueryWrapper<WrkMast>().eq("barcode", stationProtocol.getBarcode()));
if (wrkMast == null) {
continue;
}
@@ -157,7 +157,7 @@
int[] currentStationTaskCountRef = new int[]{countCurrentStationTask()};
LoadGuardState loadGuardState = buildLoadGuardState(limitConfig);
- List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
+ List<WrkMast> wrkMasts = wrkMastService.list(new QueryWrapper<WrkMast>()
.eq("wrk_sts", WrkStsType.OUTBOUND_RUN_COMPLETE.sts)
.isNotNull("crn_no")
);
@@ -243,7 +243,7 @@
//鎵ц鍙屽伐浣嶅爢鍨涙満杈撻�佺珯鐐瑰嚭搴撲换鍔�
public synchronized void dualCrnStationOutExecute() {
try {
- List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
+ List<WrkMast> wrkMasts = wrkMastService.list(new QueryWrapper<WrkMast>()
.eq("wrk_sts", WrkStsType.OUTBOUND_RUN_COMPLETE.sts)
.isNotNull("dual_crn_no")
);
@@ -302,13 +302,13 @@
//妫�娴嬭緭閫佺珯鐐瑰嚭搴撲换鍔℃墽琛屽畬鎴�
public synchronized void stationOutExecuteFinish() {
try {
- List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("wrk_sts", WrkStsType.STATION_RUN.sts));
+ List<WrkMast> wrkMasts = wrkMastService.list(new QueryWrapper<WrkMast>().eq("wrk_sts", WrkStsType.STATION_RUN.sts));
for (WrkMast wrkMast : wrkMasts) {
Integer wrkNo = wrkMast.getWrkNo();
Integer targetStaNo = wrkMast.getStaNo();
boolean complete = false;
- BasStation basStation = basStationService.selectOne(new EntityWrapper<BasStation>().eq("station_id", targetStaNo));
+ BasStation basStation = basStationService.getOne(new QueryWrapper<BasStation>().eq("station_id", targetStaNo));
if (basStation == null) {
continue;
}
@@ -344,7 +344,7 @@
// 妫�娴嬩换鍔¤浆瀹屾垚
public synchronized void checkTaskToComplete() {
try {
- List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("wrk_sts", WrkStsType.STATION_RUN_COMPLETE.sts));
+ List<WrkMast> wrkMasts = wrkMastService.list(new QueryWrapper<WrkMast>().eq("wrk_sts", WrkStsType.STATION_RUN_COMPLETE.sts));
for (WrkMast wrkMast : wrkMasts) {
Integer wrkNo = wrkMast.getWrkNo();
Integer targetStaNo = wrkMast.getStaNo();
@@ -355,7 +355,7 @@
}
boolean complete = false;
- BasStation basStation = basStationService.selectOne(new EntityWrapper<BasStation>().eq("station_id", targetStaNo));
+ BasStation basStation = basStationService.getOne(new QueryWrapper<BasStation>().eq("station_id", targetStaNo));
if (basStation == null) {
continue;
}
@@ -389,7 +389,7 @@
//妫�娴嬭緭閫佺珯鐐规槸鍚﹁繍琛屽牭濉�
public synchronized void checkStationRunBlock() {
try {
- List<BasDevp> basDevps = basDevpService.selectList(new EntityWrapper<>());
+ List<BasDevp> basDevps = basDevpService.list(new QueryWrapper<>());
for (BasDevp basDevp : basDevps) {
StationThread stationThread = (StationThread) SlaveConnection.get(SlaveType.Devp, basDevp.getDevpNo());
if (stationThread == null) {
@@ -424,7 +424,7 @@
//绔欑偣澶勪簬閲嶆柊鍒嗛厤搴撲綅鍖哄煙
//杩愯鍫靛锛岄噸鏂扮敵璇蜂换鍔�
String response = wmsOperateUtils.applyReassignTaskLocNo(wrkMast.getWrkNo(), stationProtocol.getStationId());
- if (response == null) {
+ if (Cools.isEmpty(response)) {
News.taskError(wrkMast.getWrkNo(), "璇锋眰WMS閲嶆柊鍒嗛厤搴撲綅鎺ュ彛澶辫触锛屾帴鍙ｆ湭鍝嶅簲锛侊紒锛乺esponse锛歿}", response);
continue;
}
@@ -530,7 +530,7 @@
// 妫�娴嬪嚭搴撴帓搴�
public synchronized void checkStationOutOrder() {
- List<BasDevp> basDevps = basDevpService.selectList(new EntityWrapper<BasDevp>());
+ List<BasDevp> basDevps = basDevpService.list(new QueryWrapper<BasDevp>());
for (BasDevp basDevp : basDevps) {
StationThread stationThread = (StationThread) SlaveConnection.get(SlaveType.Devp, basDevp.getId());
if (stationThread == null) {
@@ -573,10 +573,10 @@
continue;
}
- List<WrkMast> batchWrkList = wrkMastService.selectList(new EntityWrapper<WrkMast>()
+ List<WrkMast> batchWrkList = wrkMastService.list(new QueryWrapper<WrkMast>()
.notIn("wrk_sts", WrkStsType.STATION_RUN_COMPLETE.sts, WrkStsType.COMPLETE_OUTBOUND.sts)
.eq("batch", wrkMast.getBatch())
- .orderBy("batch")
+ .orderBy(true, true, "batch")
);
if (batchWrkList.isEmpty()) {
continue;
@@ -650,7 +650,7 @@
// 鐩戞帶缁曞湀绔欑偣
public synchronized void watchCircleStation() {
- List<BasDevp> basDevps = basDevpService.selectList(new EntityWrapper<BasDevp>());
+ List<BasDevp> basDevps = basDevpService.list(new QueryWrapper<BasDevp>());
for (BasDevp basDevp : basDevps) {
StationThread stationThread = (StationThread) SlaveConnection.get(SlaveType.Devp, basDevp.getId());
if (stationThread == null) {
@@ -716,7 +716,7 @@
public List<Integer> getAllOutOrderList() {
List<Integer> list = new ArrayList<>();
- List<BasDevp> basDevps = basDevpService.selectList(new EntityWrapper<BasDevp>());
+ List<BasDevp> basDevps = basDevpService.list(new QueryWrapper<BasDevp>());
for (BasDevp basDevp : basDevps) {
List<Integer> orderList = basDevp.getOutOrderIntList();
list.addAll(orderList);
@@ -741,7 +741,7 @@
HashMap<String, Integer> batchMap = new HashMap<>();
for (Integer station : checkList) {
- BasStation basStation = basStationService.selectOne(new EntityWrapper<BasStation>().eq("station_id", station));
+ BasStation basStation = basStationService.getOne(new QueryWrapper<BasStation>().eq("station_id", station));
if (basStation == null) {
continue;
}
@@ -773,7 +773,7 @@
private int countCurrentStationTask() {
int currentStationTaskCount = 0;
- List<BasDevp> basDevps = basDevpService.selectList(new EntityWrapper<BasDevp>());
+ List<BasDevp> basDevps = basDevpService.list(new QueryWrapper<BasDevp>());
for (BasDevp basDevp : basDevps) {
StationThread stationThread = (StationThread) SlaveConnection.get(SlaveType.Devp, basDevp.getDevpNo());
if (stationThread == null) {
--
Gitblit v1.9.1