From 6387253bbea607103d1d68464b848c6bd386bf0f Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期二, 18 三月 2025 11:14:31 +0800
Subject: [PATCH] 四期
---
src/main/resources/mapper/ViewStayTimeMapper.xml | 2 +-
src/main/java/com/zy/asrs/task/AutoMoveScheduler.java | 18 +++++++++++++++++-
src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java | 2 +-
src/main/java/com/zy/asrs/controller/ReportQueryController.java | 14 +++++++-------
4 files changed, 26 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ReportQueryController.java b/src/main/java/com/zy/asrs/controller/ReportQueryController.java
index 35099de..13acf80 100644
--- a/src/main/java/com/zy/asrs/controller/ReportQueryController.java
+++ b/src/main/java/com/zy/asrs/controller/ReportQueryController.java
@@ -90,24 +90,24 @@
bean.setLoc_no(locNo);
}
String lev1 = String.valueOf(param.get("lev1"));
- if (!Cools.isEmpty(locNo) && !locNo.equals("null")) {
+ if (!Cools.isEmpty(lev1) && !lev1.equals("null")) {
bean.setLev1(Integer.parseInt(lev1));
}
String floor = String.valueOf(param.get("floor"));
- if (!Cools.isEmpty(locNo) && !locNo.equals("null")) {
+ if (!Cools.isEmpty(floor) && !floor.equals("null")) {
bean.setFloor(Integer.parseInt(floor));
}
String matnr = String.valueOf(param.get("matnr"));
- if (!Cools.isEmpty(locNo) && !locNo.equals("null")) {
+ if (!Cools.isEmpty(matnr) && !matnr.equals("null")) {
bean.setMatnr(matnr);
}
String maktx = String.valueOf(param.get("maktx"));
- if (!Cools.isEmpty(locNo) && !locNo.equals("null")) {
+ if (!Cools.isEmpty(maktx) && !maktx.equals("null")) {
bean.setMaktx(maktx);
}
- String locType1 = String.valueOf(param.get("locType1"));
- if (!Cools.isEmpty(locNo) && !locNo.equals("null")) {
- bean.setMaktx(locType1);
+ String locType1 = String.valueOf(param.get("loc_type1"));
+ if (!Cools.isEmpty(locType1) && !locType1.equals("null")) {
+ bean.setLocType1(Integer.parseInt(locType1));
}
// List<ViewStayTimeBean> list = reportQueryMapper.queryViewStayTimeList(bean);
// int count = reportQueryMapper.getViewStayTimeCount(bean);
diff --git a/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java b/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java
index 07c5c74..579a71d 100644
--- a/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java
+++ b/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java
@@ -228,7 +228,7 @@
boolean flag = false;
if (config != null && !Cools.isEmpty(config.getValue())) {
try {
-
+
// 鍒ゆ柇鏄惁鍦ㄦ墽琛屾椂闂村唴
ProcesTimeData procesTimeData = JSONObject.parseObject(config.getValue(), ProcesTimeData.class);
if (procesTimeData != null && config.getStatus() == 1 && TimeUtils.between(procesTimeData)) {
@@ -266,6 +266,22 @@
// TODO 鍥涙湡
@Scheduled(cron = "0/30 * * * * ? ")
private void autoEmptyBackSiqi() {
+ Config config2 = configService.selectOne(new EntityWrapper<Config>().eq("code", "RETURN_6_EMPTY"));
+ //鍏堝垽鏂┖搴撲綅鏁颁簡
+ List<AgvLocMast> agvLocMasts = agvLocMastService.selectList(new EntityWrapper<AgvLocMast>().eq("loc_type1", 3).eq("floor", 1).eq("lev1", 2).eq("loc_sts", "O"));
+ int size = 0;
+ if (agvLocMasts != null) {
+ size = agvLocMasts.size();
+ }
+ if (config2 != null && config2.getStatus() == 1 && !Cools.isEmpty(config2.getValue())) {
+ if (size < Integer.parseInt(config2.getValue())) {
+ return;
+ }
+ } else {
+ if (size < 20) {
+ return;
+ }
+ }
// 鏌ヨ6绫诲瀷绌鸿揣鏋惰繑鍥炵殑鎵ц鏃堕棿鐐�
Config config = configService.selectOne(new EntityWrapper<Config>().eq("code", "RETURN_6_TIME"));
if (config != null && !Cools.isEmpty(config.getValue())) {
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 51ee874..3117e41 100644
--- a/src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java
@@ -428,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("barcode", "30").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",SqlLike.RIGHT).like("source_loc_no", floor).or().eq("io_type", 113));
if (agvWrkMasts.size() >= 5) {
//log.error("鏆傚仠鍥炴祦");
return FAIL;
diff --git a/src/main/resources/mapper/ViewStayTimeMapper.xml b/src/main/resources/mapper/ViewStayTimeMapper.xml
index 5965dc3..32ebd6d 100644
--- a/src/main/resources/mapper/ViewStayTimeMapper.xml
+++ b/src/main/resources/mapper/ViewStayTimeMapper.xml
@@ -44,7 +44,7 @@
<sql id="viewStayTimeConditionSql2">
<if test="loc_no!=null and loc_no!='' ">
- and asr_loc_mast.loc_no like '%' + #{loc_no} + '%'
+ and loc_no like '%' + #{loc_no} + '%'
</if>
<if test="floor!=null and floor!='' ">
and floor = #{floor}
--
Gitblit v1.9.1