From 517966d4dbed6ef6e5d591720b971af427e6b63a Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期四, 04 十二月 2025 15:25:47 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/WrkMastScheduler.java | 60 +++++++-----------------------------------------------------
1 files changed, 7 insertions(+), 53 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/WrkMastScheduler.java b/src/main/java/com/zy/asrs/task/WrkMastScheduler.java
index 7b5a025..649b2f4 100644
--- a/src/main/java/com/zy/asrs/task/WrkMastScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WrkMastScheduler.java
@@ -1,7 +1,6 @@
package com.zy.asrs.task;
import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.zy.asrs.domain.enums.NotifyMsgType;
import com.zy.asrs.entity.LocMast;
@@ -10,13 +9,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;
@@ -62,6 +57,7 @@
}
locMast.setLocSts("F");
+ locMast.setBarcode(wrkMast.getBarcode());
locMast.setModiTime(new Date());
boolean result = locMastService.updateById(locMast);
if (!result) {
@@ -79,7 +75,7 @@
}
//涓婃姤
- notifyUtils.notify("task", 1, String.valueOf(wrkMast.getWrkNo()), NotifyMsgType.TASK_COMPLETE, JSON.toJSONString(wrkMast));
+ notifyUtils.notify("task", 1, String.valueOf(wrkMast.getWrkNo()), wrkMast.getWmsWrkNo(), NotifyMsgType.TASK_COMPLETE, JSON.toJSONString(wrkMast));
}
}
@@ -105,6 +101,7 @@
}
locMast.setLocSts("O");
+ locMast.setBarcode("");
locMast.setModiTime(new Date());
boolean result = locMastService.updateById(locMast);
if (!result) {
@@ -122,7 +119,7 @@
}
//涓婃姤
- notifyUtils.notify("task", 1, String.valueOf(wrkMast.getWrkNo()), NotifyMsgType.TASK_COMPLETE, JSON.toJSONString(wrkMast));
+ notifyUtils.notify("task", 1, String.valueOf(wrkMast.getWrkNo()), wrkMast.getWmsWrkNo(), NotifyMsgType.TASK_COMPLETE, JSON.toJSONString(wrkMast));
}
}
@@ -185,50 +182,7 @@
}
//涓婃姤
- notifyUtils.notify("task", 1, String.valueOf(wrkMast.getWrkNo()), NotifyMsgType.TASK_COMPLETE, JSON.toJSONString(wrkMast));
- }
- }
-
- @Scheduled(cron = "0/1 * * * * ? ")
- @Transactional
- public void executeMove(){
- List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("wrk_sts", WrkStsType.COMPLETE_MOVE.sts));
- if (wrkMasts.isEmpty()) {
- return;
- }
-
- for (WrkMast wrkMast : wrkMasts) {
- // 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
- if (!wrkMastLogService.save(wrkMast.getWrkNo())) {
- log.info("淇濆瓨宸ヤ綔鍘嗗彶妗workNo={}]澶辫触", wrkMast.getWrkNo());
- }
- // 鍒犻櫎宸ヤ綔涓绘。
- if (!wrkMastService.deleteById(wrkMast)) {
- log.info("鍒犻櫎宸ヤ綔涓绘。[workNo={}]澶辫触", wrkMast.getWrkNo());
- }
- }
- }
-
- @Scheduled(cron = "0/1 * * * * ? ")
- @Transactional
- public void executeCharge(){
- List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("wrk_sts", WrkStsType.COMPLETE_CHARGE.sts));
- if (wrkMasts.isEmpty()) {
- return;
- }
-
- for (WrkMast wrkMast : wrkMasts) {
- // 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
- if (!wrkMastLogService.save(wrkMast.getWrkNo())) {
- log.info("淇濆瓨宸ヤ綔鍘嗗彶妗workNo={}]澶辫触", wrkMast.getWrkNo());
- }
- // 鍒犻櫎宸ヤ綔涓绘。
- if (!wrkMastService.deleteById(wrkMast)) {
- log.info("鍒犻櫎宸ヤ綔涓绘。[workNo={}]澶辫触", wrkMast.getWrkNo());
- }
-
- //涓婃姤
- notifyUtils.notify("task", 1, String.valueOf(wrkMast.getWrkNo()), NotifyMsgType.TASK_CHARGE_COMPLETE, JSON.toJSONString(wrkMast));
+ notifyUtils.notify("task", 1, String.valueOf(wrkMast.getWrkNo()), wrkMast.getWmsWrkNo(), NotifyMsgType.TASK_COMPLETE, JSON.toJSONString(wrkMast));
}
}
@@ -257,7 +211,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) {
@@ -277,7 +231,7 @@
}
//涓婃姤
- notifyUtils.notify("task", 1, String.valueOf(wrkMast.getWrkNo()), NotifyMsgType.TASK_CANCEL, JSON.toJSONString(wrkMast));
+ notifyUtils.notify("task", 1, String.valueOf(wrkMast.getWrkNo()), wrkMast.getWmsWrkNo(), NotifyMsgType.TASK_CANCEL, JSON.toJSONString(wrkMast));
}
}
--
Gitblit v1.9.1