From 1044d25ccaa5350b68fa259788246812139267b1 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期三, 05 三月 2025 12:06:27 +0800
Subject: [PATCH] 四期
---
src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 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 9b17b0a..51ee874 100644
--- a/src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java
@@ -1,6 +1,7 @@
package com.zy.asrs.task.handler;
+import com.baomidou.mybatisplus.enums.SqlLike;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.exception.CoolException;
@@ -155,7 +156,7 @@
//璐ф灦缂栫爜
mast.setBarcode(agvLocMast.getBarcode());
//璐ф灦绫诲瀷
- mast.setWhsType(Integer.parseInt(agvLocMast.getBarcode().substring(0,2)));
+ mast.setWhsType(Integer.parseInt(agvLocMast.getBarcode().substring(0, 2)));
// 鐩爣妤煎眰
mast.setPauseMk(agvLocMast.getLocType3().toString());
@@ -325,7 +326,7 @@
//璐ф灦缂栫爜
mast.setBarcode(agvLocMast.getBarcode());
//璐ф灦绫诲瀷
- mast.setWhsType(Integer.parseInt(agvLocMast.getBarcode().substring(0,2)));
+ mast.setWhsType(Integer.parseInt(agvLocMast.getBarcode().substring(0, 2)));
mast.setAppeUser(9527L);
@@ -427,7 +428,7 @@
} else if (agvLocMast.getFloor() == 1 && agvLocMast.getLev1() == 2) {
floor = "02F1";
}
- List<AgvWrkMast> agvWrkMasts = agvWrkMastService.selectList(new EntityWrapper<AgvWrkMast>().eq("io_type", 109).like("source_loc_no", floor).or().eq("io_type", 113));
+ List<AgvWrkMast> agvWrkMasts = agvWrkMastService.selectList(new EntityWrapper<AgvWrkMast>().eq("io_type", 109).like("barcode", "30").like("source_loc_no", floor).or().eq("io_type", 113));
if (agvWrkMasts.size() >= 5) {
//log.error("鏆傚仠鍥炴祦");
return FAIL;
@@ -463,7 +464,7 @@
//璐ф灦缂栫爜
mast.setBarcode(agvLocMast.getBarcode());
//璐ф灦绫诲瀷
- mast.setWhsType(Integer.parseInt(agvLocMast.getBarcode().substring(0,2)));
+ mast.setWhsType(Integer.parseInt(agvLocMast.getBarcode().substring(0, 2)));
mast.setAppeUser(9527L);
@@ -505,9 +506,9 @@
} else if (agvLocMast.getFloor() == 2) {
floor = "F2";
}
- List<AgvWrkMast> agvWrkMasts = agvWrkMastService.selectList(new EntityWrapper<AgvWrkMast>().eq("io_type", 109).like("source_loc_no", floor).or().eq("io_type", 113));
+ List<AgvWrkMast> agvWrkMasts = agvWrkMastService.selectList(new EntityWrapper<AgvWrkMast>().eq("io_type", 109).like("barcode", "31", SqlLike.RIGHT).like("source_loc_no", floor).or().eq("io_type", 113));
Config config = configService.selectOne(new EntityWrapper<Config>().eq("code", "RETURN_6_MAX"));
- if (config == null && !Cools.isEmpty(config.getValue())) {
+ if (config != null && !Cools.isEmpty(config.getValue())) {
if (agvWrkMasts.size() >= Integer.parseInt(config.getValue())) {
return FAIL;
}
@@ -548,14 +549,14 @@
//璐ф灦缂栫爜
mast.setBarcode(agvLocMast.getBarcode());
//璐ф灦绫诲瀷
- mast.setWhsType(Integer.parseInt(agvLocMast.getBarcode().substring(0,2)));
+ mast.setWhsType(Integer.parseInt(agvLocMast.getBarcode().substring(0, 2)));
mast.setAppeUser(9527L);
mast.setAppeTime(now);
mast.setModiUser(9527L);
mast.setModiTime(now);
- mast.setLogErrMemo("autoEmptyBack4");
+ mast.setLogErrMemo("autoEmptyBackSiqi");
if (!agvWrkMastService.insertByIncrease(mast)) {
throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
}
@@ -590,7 +591,7 @@
//璐ф灦缂栫爜
mast.setBarcode(agvBasDevp.getBarcode());
//璐ф灦绫诲瀷
- mast.setWhsType(Integer.parseInt(agvBasDevp.getBarcode().substring(0,2)));
+ mast.setWhsType(Integer.parseInt(agvBasDevp.getBarcode().substring(0, 2)));
mast.setAppeUser(9527L);
mast.setAppeTime(now);
@@ -648,7 +649,7 @@
//璐ф灦缂栫爜
mast.setBarcode(agvBasDevp.getBarcode());
//璐ф灦绫诲瀷
- mast.setWhsType(Integer.parseInt(agvBasDevp.getBarcode().substring(0,2)));
+ mast.setWhsType(Integer.parseInt(agvBasDevp.getBarcode().substring(0, 2)));
mast.setAppeUser(9527L);
mast.setAppeTime(now);
@@ -704,7 +705,7 @@
//璐ф灦缂栫爜
mast.setBarcode(agvLocMast.getBarcode());
//璐ф灦绫诲瀷
- mast.setWhsType(Integer.parseInt(agvLocMast.getBarcode().substring(0,2)));
+ mast.setWhsType(Integer.parseInt(agvLocMast.getBarcode().substring(0, 2)));
mast.setAppeUser(9527L);
@@ -787,7 +788,7 @@
//璐ф灦缂栫爜
mast.setBarcode(agvLocMast.getBarcode());
//璐ф灦绫诲瀷
- mast.setWhsType(Integer.parseInt(agvLocMast.getBarcode().substring(0,2)));
+ mast.setWhsType(Integer.parseInt(agvLocMast.getBarcode().substring(0, 2)));
mast.setAppeUser(9527L);
--
Gitblit v1.9.1