From 1da002910c1d9d44cd195bd24d951b4942a4e29c Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期二, 14 一月 2025 14:58:02 +0800
Subject: [PATCH] 优化定时任务间隔及字段命名，调整环境配置
---
src/main/java/com/zy/asrs/controller/AgvWarnController.java | 6 +++---
src/main/java/com/zy/asrs/controller/AgvMobileController.java | 4 ++--
src/main/java/com/zy/asrs/entity/param/AgvWarnBody.java | 2 +-
src/main/java/com/zy/asrs/task/OrderSyncScheduler.java | 4 ++--
src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java | 2 +-
src/main/resources/application.yml | 2 +-
6 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvMobileController.java b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
index 43ea61c..4db9799 100644
--- a/src/main/java/com/zy/asrs/controller/AgvMobileController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
@@ -77,7 +77,7 @@
@RequestMapping("/pick/again/auth")
@ManagerAuth(memo = "鍐嶆鎷ｆ枡")
public R pickAgain(@RequestBody PickParam pickParams) {
- if (pickParams == null || Cools.isEmpty(pickParams.getLocNo()) || Cools.isEmpty(pickParams.getLocNo())) {
+ if (pickParams == null ) {
return R.error("缂哄皯鍙傛暟");
}
agvMobileService.pickAgain(pickParams, 1l);
@@ -553,7 +553,7 @@
// 鏇存柊璁㈠崟
OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("order_no", "DB" + agvLocDetl.getOrderNo()).eq("matnr", agvLocDetl.getMatnr()).eq("three_code", agvLocDetl.getThreeCode()));
if (orderDetl == null) {
- throw new CoolException("璁㈠崟鏄庣粏涓嶅瓨鍦�");
+ throw new CoolException("璋冩嫧鍗曟槑缁嗕笉瀛樺湪");
}
orderDetl.setQty(orderDetl.getQty() + agvLocDetl.getAnfme());
if (!orderDetlService.update(orderDetl, new EntityWrapper<OrderDetl>().eq("order_no", "DB" + agvLocDetl.getOrderNo()).eq("matnr", agvLocDetl.getMatnr()).eq("three_code", agvLocDetl.getThreeCode()))) {
diff --git a/src/main/java/com/zy/asrs/controller/AgvWarnController.java b/src/main/java/com/zy/asrs/controller/AgvWarnController.java
index 4d1a0e9..fb2a1fe 100644
--- a/src/main/java/com/zy/asrs/controller/AgvWarnController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvWarnController.java
@@ -69,13 +69,13 @@
List<AgvWarn> agvWarns = new ArrayList<>();
List<AgvWarn> updates = new ArrayList<>();
for (AgvWarnBody body : agvWarnBodies) {
- List<AgvWarn> agvWarnList = agvWarnService.selectList(new EntityWrapper<AgvWarn>().eq("robot_code", body.getRobotCode()).eq("begin_time", body.getBeginTime()).eq("warn_content", body.getWarnContent()));
+ List<AgvWarn> agvWarnList = agvWarnService.selectList(new EntityWrapper<AgvWarn>().eq("robot_code", body.getRobotCode()).eq("begin_time", body.getBeginDate()).eq("warn_content", body.getWarnContent()));
if (Cools.isEmpty(agvWarnList)) {
agvWarn = new AgvWarn();
- agvWarn.setBeginTime(body.getBeginTime());
+ agvWarn.setBeginTime(body.getBeginDate());
agvWarn.setAppeTime(new Date());
agvWarn.setTimes(0);
- agvWarn.setModiTime(DateUtils.convert(body.getBeginTime(), DateUtils.yyyyMMddHHmmss_F));
+ agvWarn.setModiTime(DateUtils.convert(body.getBeginDate(), DateUtils.yyyyMMddHHmmss_F));
agvWarn.setRobotCode(body.getRobotCode());
agvWarn.setWarnContent(body.getWarnContent());
if (body.getTaskCode() != null) {
diff --git a/src/main/java/com/zy/asrs/entity/param/AgvWarnBody.java b/src/main/java/com/zy/asrs/entity/param/AgvWarnBody.java
index 3625548..7e85a95 100644
--- a/src/main/java/com/zy/asrs/entity/param/AgvWarnBody.java
+++ b/src/main/java/com/zy/asrs/entity/param/AgvWarnBody.java
@@ -10,7 +10,7 @@
private String robotCode;
- private String beginTime;
+ private String beginDate;
private String warnContent;
diff --git a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
index c1b2029..e952ed2 100644
--- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -98,9 +98,9 @@
瀹氭椂鏌ヨ鐘舵�佷负2.浣滀笟涓殑鍗曟嵁锛屾鏌ユ槸鍚﹀畬鎴�
*/
//@Scheduled(cron = "0 */1 * * * ? ")
- @Scheduled(fixedDelay = 60000)
+ @Scheduled(fixedDelay = 300000)
public void completeOrder() {
- List<Order> orderList = orderService.selectList(new EntityWrapper<Order>().eq("settle", 2).isNotNull("plt_type"));
+ List<Order> orderList = orderService.selectList(new EntityWrapper<Order>().eq("settle", 2));
orderList.forEach(order -> {
orderService.checkComplete2(order.getOrderNo());
});
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 6a3020f..8f165ed 100644
--- a/src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java
@@ -408,7 +408,7 @@
}
List<AgvWrkMast> agvWrkMasts = agvWrkMastService.selectList(new EntityWrapper<AgvWrkMast>().eq("io_type", 109).like("source_loc_no", floor).or().eq("io_type", 113));
if (agvWrkMasts.size() >= 5) {
- log.error("鏆傚仠鍥炴祦");
+ //log.error("鏆傚仠鍥炴祦");
return FAIL;
//throw new CoolException("鏆傚仠鍥炴祦");
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 22524fb..f2026f2 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,4 +1,4 @@
spring:
profiles:
#dev loc prod
- active: loc
\ No newline at end of file
+ active: prod
\ No newline at end of file
--
Gitblit v1.9.1