From 66f7630551557e8ecf789ae315eaa4bd9a4dbc80 Mon Sep 17 00:00:00 2001
From: fyxc <fyxc@qq.com>
Date: 星期三, 09 四月 2025 17:25:36 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/WorkMastScheduler.java | 133 +++++++++++++++++++++++++++++---------------
1 files changed, 88 insertions(+), 45 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/WorkMastScheduler.java b/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
index 373ebf2..ec2cfee 100644
--- a/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
@@ -7,6 +7,7 @@
import com.core.exception.CoolException;
import com.zy.asrs.entity.LocMast;
import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.entity.param.ShuttleMoveTask;
import com.zy.asrs.entity.param.ShuttleOutTask;
import com.zy.asrs.entity.param.ShuttleTask;
import com.zy.asrs.service.WrkMastService;
@@ -62,51 +63,51 @@
}
}
- @Scheduled(cron = "0/3 * * * * ? ") //鍏ュ簱浠诲姟涓嬪彂
- private void ShuttleInTaskSend(){
- List<WrkMast> wrkMasts1 = wrkMastService.selectList(new EntityWrapper<WrkMast>()
- .in("io_type", 101,110,103,104,107)
- .eq("wrk_sts", 105).eq("crn_no",7));
- if (!Cools.isEmpty(wrkMasts1)){
- return;
- }
- List<WrkMast> wrkMasts = wrkMastService.selectToShuttleTask();
- if (wrkMasts.isEmpty()) {
- return;
- }
- try {
- for (WrkMast wrkMast : wrkMasts) {
- LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", wrkMast.getLocNo()));
- if (locMast == null) {
- throw new CoolException("涓嬪彂鍥涘悜杞cs浠诲姟澶辫触");
- }
- String loc = (locMast.getRow1()-16)+"-"+locMast.getBay1()+"-"+locMast.getLev1();
- ShuttleTask param = new ShuttleTask();
- param.setTaskNo(wrkMast.getWrkNo().toString());
- param.setDestLoc(loc);
- param.setOriginSite("31002");
- param.setBarcode(wrkMast.getBarcode());
- param.setPriority("11");
- String response = new HttpHandler.Builder()
- .setUri(shuttleWcsUrl)
- .setPath("/openapi/createInTask")
- .setJson(JSON.toJSONString(param))
- .build()
- .doPost();
- JSONObject jsonObject = JSON.parseObject(response);
- Integer code = jsonObject.getInteger("code");
- if (code.equals(200)) {
- wrkMast.setWrkSts(105L);
- if (!wrkMastService.updateById(wrkMast)) {
- log.error("宸ヤ綔妗workNo={}]鏍囪寰呭鐞嗗け璐�", wrkMast.getWrkNo());
- }
- }
- }
- }catch (Exception e){
- throw new CoolException("涓嬪彂鍥涘悜杞cs浠诲姟澶辫触");
- }
-
- }
+// @Scheduled(cron = "0/3 * * * * ? ") //鍏ュ簱浠诲姟涓嬪彂
+// private void ShuttleInTaskSend(){
+// List<WrkMast> wrkMasts1 = wrkMastService.selectList(new EntityWrapper<WrkMast>()
+// .in("io_type", 101,110,103,104,107)
+// .eq("wrk_sts", 105).eq("crn_no",7));
+// if (!Cools.isEmpty(wrkMasts1)){
+// return;
+// }
+// List<WrkMast> wrkMasts = wrkMastService.selectToShuttleTask();
+// if (wrkMasts.isEmpty()) {
+// return;
+// }
+// try {
+// for (WrkMast wrkMast : wrkMasts) {
+// LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", wrkMast.getLocNo()));
+// if (locMast == null) {
+// throw new CoolException("涓嬪彂鍥涘悜杞cs浠诲姟澶辫触");
+// }
+// String loc = (locMast.getRow1()-16)+"-"+locMast.getBay1()+"-"+locMast.getLev1();
+// ShuttleTask param = new ShuttleTask();
+// param.setTaskNo(wrkMast.getWrkNo().toString());
+// param.setDestLoc(loc);
+// param.setOriginSite("31002");
+// param.setBarcode(wrkMast.getBarcode());
+// param.setPriority("11");
+// String response = new HttpHandler.Builder()
+// .setUri(shuttleWcsUrl)
+// .setPath("/openapi/createInTask")
+// .setJson(JSON.toJSONString(param))
+// .build()
+// .doPost();
+// JSONObject jsonObject = JSON.parseObject(response);
+// Integer code = jsonObject.getInteger("code");
+// if (code.equals(200)) {
+// wrkMast.setWrkSts(105L);
+// if (!wrkMastService.updateById(wrkMast)) {
+// log.error("宸ヤ綔妗workNo={}]鏍囪寰呭鐞嗗け璐�", wrkMast.getWrkNo());
+// }
+// }
+// }
+// }catch (Exception e){
+// throw new CoolException("涓嬪彂鍥涘悜杞cs浠诲姟澶辫触");
+// }
+//
+// }
@Scheduled(cron = "0/3 * * * * ? ") //鍑哄簱搴撲换鍔′笅鍙�
private void ShuttleOutTaskSend(){
@@ -153,6 +154,48 @@
}
+// @Scheduled(cron = "0/3 * * * * ? ") //绉诲簱浠诲姟涓嬪彂
+ private void ShuttleMoveTaskSend(){
+ List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("wrk_sts", 11).eq("io_type",11));
+ if (wrkMasts.isEmpty()) {
+ return;
+ }
+ try {
+ for (WrkMast wrkMast : wrkMasts) {
+ LocMast destLoc = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", wrkMast.getLocNo()));
+ LocMast originLoc = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", wrkMast.getSourceLocNo()));
+ if (originLoc == null || destLoc == null) {
+ throw new CoolException("涓嬪彂鍥涘悜杞cs浠诲姟澶辫触");
+ }
+ String originLoc1 = (originLoc.getRow1()-16)+"-"+originLoc.getBay1()+"-"+originLoc.getLev1();
+ String destLoc1 = (destLoc.getRow1()-16)+"-"+destLoc.getBay1()+"-"+destLoc.getLev1();
+ ShuttleMoveTask param = new ShuttleMoveTask();
+ param.setTaskNo(wrkMast.getWrkNo().toString());
+ param.setOriginLoc(originLoc1);
+ param.setDestLoc(destLoc1);
+ param.setRecord(true);
+ param.setPriority("11");
+ String response = new HttpHandler.Builder()
+ .setUri(shuttleWcsUrl)
+ .setPath("/openapi/createLadenMoveTakeTask")
+ .setJson(JSON.toJSONString(param))
+ .build()
+ .doPost();
+ JSONObject jsonObject = JSON.parseObject(response);
+ Integer code = jsonObject.getInteger("code");
+ if (code.equals(200)) {
+ wrkMast.setWrkSts(105L);
+ if (!wrkMastService.updateById(wrkMast)) {
+ log.error("宸ヤ綔妗workNo={}]鏍囪寰呭鐞嗗け璐�", wrkMast.getWrkNo());
+ }
+ }
+ }
+ }catch (Exception e){
+ throw new CoolException("涓嬪彂鍥涘悜杞cs浠诲姟澶辫触");
+ }
+
+ }
+
}
--
Gitblit v1.9.1