From a68bf17ab81df98882e19b79628e6876bb260468 Mon Sep 17 00:00:00 2001
From: zc <zc@123>
Date: 星期三, 18 六月 2025 10:04:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/fyxc_shuttle_wcs' into fyxc_shuttle_wcs
---
src/main/java/com/zy/asrs/task/WrkMastScheduler.java | 62 ++++++++++++++++++++++---------
1 files changed, 44 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/WrkMastScheduler.java b/src/main/java/com/zy/asrs/task/WrkMastScheduler.java
index ec24df3..aec69ad 100644
--- a/src/main/java/com/zy/asrs/task/WrkMastScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WrkMastScheduler.java
@@ -1,8 +1,8 @@
package com.zy.asrs.task;
import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.common.Cools;
import com.zy.asrs.domain.enums.NotifyMsgType;
import com.zy.asrs.entity.LocMast;
import com.zy.asrs.entity.WrkMast;
@@ -10,13 +10,9 @@
import com.zy.asrs.service.WrkMastLogService;
import com.zy.asrs.service.WrkMastService;
import com.zy.asrs.utils.NotifyUtils;
-import com.zy.common.utils.HttpHandler;
import com.zy.core.enums.LocStsType;
-import com.zy.core.enums.SlaveType;
import com.zy.core.enums.WrkIoType;
import com.zy.core.enums.WrkStsType;
-import com.zy.system.entity.Config;
-import com.zy.system.service.ConfigService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
@@ -42,7 +38,7 @@
@Scheduled(cron = "0/1 * * * * ? ")
@Transactional
- public void executeIn(){
+ public void executeIn() {
List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("wrk_sts", WrkStsType.COMPLETE_INBOUND.sts));
if (wrkMasts.isEmpty()) {
return;
@@ -79,13 +75,16 @@
}
//涓婃姤
- notifyUtils.notify("task", 1, String.valueOf(wrkMast.getWrkNo()), wrkMast.getWmsWrkNo(), NotifyMsgType.TASK_COMPLETE, JSON.toJSONString(wrkMast));
+ if (!Cools.isEmpty(wrkMast.getWmsWrkNo())) {
+ notifyUtils.notify("task", 1, String.valueOf(wrkMast.getWrkNo()), wrkMast.getWmsWrkNo(), NotifyMsgType.TASK_COMPLETE, JSON.toJSONString(wrkMast));
+
+ }
}
}
@Scheduled(cron = "0/1 * * * * ? ")
@Transactional
- public void executeOut(){
+ public void executeOut() {
List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("wrk_sts", WrkStsType.COMPLETE_OUTBOUND.sts));
if (wrkMasts.isEmpty()) {
return;
@@ -122,13 +121,15 @@
}
//涓婃姤
- notifyUtils.notify("task", 1, String.valueOf(wrkMast.getWrkNo()), wrkMast.getWmsWrkNo(), NotifyMsgType.TASK_COMPLETE, JSON.toJSONString(wrkMast));
+ if (!Cools.isEmpty(wrkMast.getWmsWrkNo())) {
+ notifyUtils.notify("task", 1, String.valueOf(wrkMast.getWrkNo()), wrkMast.getWmsWrkNo(), NotifyMsgType.TASK_COMPLETE, JSON.toJSONString(wrkMast));
+ }
}
}
@Scheduled(cron = "0/1 * * * * ? ")
@Transactional
- public void executeLocMove(){
+ public void executeLocMove() {
List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("wrk_sts", WrkStsType.COMPLETE_LOC_MOVE.sts));
if (wrkMasts.isEmpty()) {
return;
@@ -148,7 +149,7 @@
continue;
}
- LocMast sourceLocMast= locMastService.queryByLoc(sourceLocNo);
+ LocMast sourceLocMast = locMastService.queryByLoc(sourceLocNo);
if (sourceLocMast == null) {
log.info("[workNo={}]搴撲綅涓嶅瓨鍦�", wrkMast.getWrkNo());
continue;
@@ -185,24 +186,45 @@
}
//涓婃姤
- notifyUtils.notify("task", 1, String.valueOf(wrkMast.getWrkNo()), wrkMast.getWmsWrkNo(), NotifyMsgType.TASK_COMPLETE, JSON.toJSONString(wrkMast));
+ if (!Cools.isEmpty(wrkMast.getWmsWrkNo())) {
+ notifyUtils.notify("task", 1, String.valueOf(wrkMast.getWrkNo()), wrkMast.getWmsWrkNo(), NotifyMsgType.TASK_COMPLETE, JSON.toJSONString(wrkMast));
+ }
}
}
@Scheduled(cron = "0/1 * * * * ? ")
@Transactional
- public void executeMove(){
+ public void executeMove() {
List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
.in("wrk_sts"
, WrkStsType.COMPLETE_MOVE.sts
, WrkStsType.COMPLETE_MOVE_TRANSPORT_LIFT.sts
, WrkStsType.COMPLETE_MOVE_TRANSPORT_LIFT_OUT.sts
+ , WrkStsType.MOVE_IN_NO_LIFT_14.sts
+ , WrkStsType.MOVE_OUT_NO_LIFT_13.sts
));
if (wrkMasts.isEmpty()) {
return;
}
for (WrkMast wrkMast : wrkMasts) {
+ WrkMast main = wrkMastService.selectByWorkNo(wrkMast.getMainWrkNo());
+ if (main != null) {
+ if (main.getIoType() == WrkIoType.IN.id) {
+ main.setWrkSts(WrkStsType.COMPLETE_INBOUND.sts);
+ } else if (main.getIoType() == WrkIoType.OUT.id) {
+ main.setShuttleNo(wrkMast.getShuttleNo());
+ main.setWrkSts(WrkStsType.OUTBOUND_SHUTTLE_RUN_COMPLETE.sts);
+ //閭ｆ椂鍊欐墭鐩樺湪鎻愬崌鏈洪噷锛屽垯闇�瑕侀攣浣�
+ if (!(main.getStaNo() == 1013 || main.getStaNo() == 1024)) {
+ main.setLiftNo(1);
+ }
+ }
+ main.setModiTime(new Date());
+ if (!wrkMastService.updateById(main)) {
+ log.info("鏇存柊涓诲伐浣滄。[workNo={}]澶辫触", wrkMast.getWrkNo());
+ }
+ }
// 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
if (!wrkMastLogService.save(wrkMast.getWrkNo())) {
log.info("淇濆瓨宸ヤ綔鍘嗗彶妗workNo={}]澶辫触", wrkMast.getWrkNo());
@@ -216,7 +238,7 @@
@Scheduled(cron = "0/1 * * * * ? ")
@Transactional
- public void executeCharge(){
+ public void executeCharge() {
List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("wrk_sts", WrkStsType.COMPLETE_CHARGE.sts));
if (wrkMasts.isEmpty()) {
return;
@@ -233,13 +255,15 @@
}
//涓婃姤
- notifyUtils.notify("task", 1, String.valueOf(wrkMast.getWrkNo()), wrkMast.getWmsWrkNo(), NotifyMsgType.TASK_CHARGE_COMPLETE, JSON.toJSONString(wrkMast));
+ if (!Cools.isEmpty(wrkMast.getWmsWrkNo())) {
+ notifyUtils.notify("task", 1, String.valueOf(wrkMast.getWrkNo()), wrkMast.getWmsWrkNo(), NotifyMsgType.TASK_CHARGE_COMPLETE, JSON.toJSONString(wrkMast));
+ }
}
}
@Scheduled(cron = "0/1 * * * * ? ")
@Transactional
- public void executeCancelTask(){
+ public void executeCancelTask() {
List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("mk", "taskCancel"));
if (wrkMasts.isEmpty()) {
return;
@@ -262,7 +286,7 @@
locMastService.updateById(locMast);
} else if (wrkMast.getIoType() == WrkIoType.OUT.id) {
LocMast locMast = locMastService.queryByLoc(wrkMast.getSourceLocNo());
- locMast.setLocSts(String.valueOf(LocStsType.O));
+ locMast.setLocSts(String.valueOf(LocStsType.F));
locMast.setModiTime(new Date());
locMastService.updateById(locMast);
} else if (wrkMast.getIoType() == WrkIoType.LOC_MOVE.id) {
@@ -282,7 +306,9 @@
}
//涓婃姤
- notifyUtils.notify("task", 1, String.valueOf(wrkMast.getWrkNo()), wrkMast.getWmsWrkNo(), NotifyMsgType.TASK_CANCEL, JSON.toJSONString(wrkMast));
+ if (!Cools.isEmpty(wrkMast.getWmsWrkNo())) {
+ notifyUtils.notify("task", 1, String.valueOf(wrkMast.getWrkNo()), wrkMast.getWmsWrkNo(), NotifyMsgType.TASK_CANCEL, JSON.toJSONString(wrkMast));
+ }
}
}
--
Gitblit v1.9.1