From a0405ebb882c25a777d76ebf86f905522117837d Mon Sep 17 00:00:00 2001
From: 18516761980 <4761516tqsxp>
Date: 星期一, 16 五月 2022 08:38:52 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java b/src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java
index c30b1bd..4673d24 100644
--- a/src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java
@@ -2,7 +2,6 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
-import com.core.common.R;
import com.zy.asrs.entity.LocMast;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.service.LocMastService;
@@ -30,7 +29,7 @@
* 鍏堣幏鍙栨墍鏈夌涓�鎺掑拰绗簩鎺掑湪搴撶姸鎬佺殑搴撲綅
*/
List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
- .where("(row1 = 1 or row1 = 2) and loc_sts = 'F'"));
+ .where("(row1 = 1 or row1 = 2) and loc_sts = 'F'").orderBy("row1",false));
/**
* 鎸ㄤ釜鐢熸垚绉昏浇宸ヤ綔妗�
*/
@@ -40,12 +39,11 @@
*/
List<WrkMast> moveMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
.eq("io_type", "11"));
- if (Cools.isEmpty(moveMasts) || moveMasts.size() >= 2) {
+ if (Cools.isEmpty(moveMasts) || moveMasts.size() >= 1) {
break;
}
LocMast targetLocNo = locMastService.selectOne(new EntityWrapper<LocMast>()
.eq("loc_sts", "O")
- .and()
.eq("row1", "3"));
/**
* 濡傛灉绗笁鎺掓病鏈夌┖搴撲綅锛岀洿鎺reak
--
Gitblit v1.9.1