From bafb86306b03d36a8c192253b3f3f1d14db02eac Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期五, 11 四月 2025 13:43:49 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/task/WrkMastScheduler.java | 46 ++++++++++++++++++++++++++++++++++++++++------
1 files changed, 40 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/WrkMastScheduler.java b/src/main/java/com/zy/asrs/task/WrkMastScheduler.java
index 7ef9d9b..4a78f50 100644
--- a/src/main/java/com/zy/asrs/task/WrkMastScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WrkMastScheduler.java
@@ -11,7 +11,9 @@
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;
@@ -77,7 +79,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));
}
}
@@ -120,7 +122,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));
}
}
@@ -183,14 +185,20 @@
}
//涓婃姤
- 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));
}
}
@Scheduled(cron = "0/1 * * * * ? ")
@Transactional
public void executeMove(){
- List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("wrk_sts", WrkStsType.COMPLETE_MOVE.sts));
+ 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_13.sts
+ ));
if (wrkMasts.isEmpty()) {
return;
}
@@ -226,7 +234,7 @@
}
//涓婃姤
- 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_CHARGE_COMPLETE, JSON.toJSONString(wrkMast));
}
}
@@ -248,8 +256,34 @@
log.info("鍒犻櫎宸ヤ綔涓绘。[workNo={}]澶辫触", wrkMast.getWrkNo());
}
+ if (wrkMast.getIoType() == WrkIoType.IN.id) {
+ LocMast locMast = locMastService.queryByLoc(wrkMast.getLocNo());
+ locMast.setLocSts(String.valueOf(LocStsType.O));
+ locMast.setModiTime(new Date());
+ locMastService.updateById(locMast);
+ } else if (wrkMast.getIoType() == WrkIoType.OUT.id) {
+ LocMast locMast = locMastService.queryByLoc(wrkMast.getSourceLocNo());
+ locMast.setLocSts(String.valueOf(LocStsType.O));
+ locMast.setModiTime(new Date());
+ locMastService.updateById(locMast);
+ } else if (wrkMast.getIoType() == WrkIoType.LOC_MOVE.id) {
+ LocMast sourceLocMast = locMastService.queryByLoc(wrkMast.getSourceLocNo());
+ LocMast locMast = locMastService.queryByLoc(wrkMast.getLocNo());
+ if (sourceLocMast.getLocSts().equals(String.valueOf(LocStsType.R))) {
+ sourceLocMast.setLocSts(String.valueOf(LocStsType.F));
+ sourceLocMast.setModiTime(new Date());
+ locMastService.updateById(sourceLocMast);
+ }
+
+ if (locMast.getLocSts().equals(String.valueOf(LocStsType.S))) {
+ locMast.setLocSts(String.valueOf(LocStsType.O));
+ locMast.setModiTime(new Date());
+ locMastService.updateById(locMast);
+ }
+ }
+
//涓婃姤
- 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