From 33664d7d7f8478fb961f8fbda44c885fd854bf3d Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 13 八月 2025 16:43:33 +0800
Subject: [PATCH] 保存一个版本
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java | 198 ++++++++++++++++++++++++++++++-------------------
1 files changed, 122 insertions(+), 76 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java
index 0370dc5..87ff4d9 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java
@@ -132,6 +132,8 @@
if (!busService.save(bus)) {
throw new BusinessException("Internal Server Error!");
}
+ Boolean locStaStatusCheck = configService.getVal("LOC_STA_STATUS_CHECK", Boolean.class, false);
+
// 淇濆瓨浠诲姟
for (Task task : taskList) {
@@ -149,7 +151,7 @@
switch (TaskTypeType.get(task.getTaskTypeEl())) {
case LOC_TO_LOC:
oriLoc = locService.getById(task.getOriLoc());
- if (!oriLoc.getLocSts().equals(LocStsType.STOCK.val())) {
+ if (locStaStatusCheck && !oriLoc.getLocSts().equals(LocStsType.STOCK.val())) {
throw new BusinessException("oriLoc锛�" + task.getOriLoc$() + " is not in STOCK status");
}
oriLoc.setLocSts(LocStsType.PAKOUT.val());
@@ -159,7 +161,7 @@
}
destLoc = locService.getById(task.getDestLoc());
- if (!destLoc.getLocSts().equals(LocStsType.IDLE.val())) {
+ if (locStaStatusCheck && !destLoc.getLocSts().equals(LocStsType.IDLE.val())) {
throw new BusinessException("destLoc锛�" + task.getDestLoc$() + " is not in IDLE status");
}
destLoc.setLocSts(LocStsType.PAKIN.val());
@@ -170,7 +172,7 @@
break;
case LOC_TO_STA:
oriLoc = locService.getById(task.getOriLoc());
- if (!oriLoc.getLocSts().equals(LocStsType.STOCK.val())) {
+ if (locStaStatusCheck && !oriLoc.getLocSts().equals(LocStsType.STOCK.val())) {
throw new BusinessException("oriLoc锛�" + task.getOriLoc$() + " is not in STOCK status");
}
oriLoc.setLocSts(LocStsType.PAKOUT.val());
@@ -180,7 +182,7 @@
}
destSta = staService.getById(task.getDestSta());
- if (!destSta.getStaSts().equals(StaStsType.IDLE.val())) {
+ if (locStaStatusCheck && !destSta.getStaSts().equals(StaStsType.IDLE.val())) {
throw new BusinessException("destSta锛�" + task.getDestSta$() + " is not in IDLE status");
}
destSta.setStaSts(StaStsType.READY_RELEASE.val());
@@ -191,7 +193,7 @@
break;
case STA_TO_LOC:
oriSta = staService.getById(task.getOriSta());
- if (!oriSta.getStaSts().equals(StaStsType.STOCK.val())) {
+ if (locStaStatusCheck && !oriSta.getStaSts().equals(StaStsType.STOCK.val())) {
throw new BusinessException("oriSta锛�" + task.getOriSta$() + " is not in STOCK status");
}
oriSta.setStaSts(StaStsType.READY_TAKE.val());
@@ -201,7 +203,7 @@
}
destLoc = locService.getById(task.getDestLoc());
- if (!destLoc.getLocSts().equals(LocStsType.IDLE.val())) {
+ if (locStaStatusCheck && !destLoc.getLocSts().equals(LocStsType.IDLE.val())) {
throw new BusinessException("destLoc锛�" + task.getDestLoc$() + " is not in IDLE status");
}
destLoc.setLocSts(LocStsType.PAKIN.val());
@@ -212,7 +214,7 @@
break;
case STA_TO_STA:
oriSta = staService.getById(task.getOriSta());
- if (!oriSta.getStaSts().equals(StaStsType.STOCK.val())) {
+ if (locStaStatusCheck && !oriSta.getStaSts().equals(StaStsType.STOCK.val())) {
throw new BusinessException("oriSta锛�" + task.getOriSta$() + " is not in STOCK status");
}
oriSta.setStaSts(StaStsType.READY_TAKE.val());
@@ -222,7 +224,7 @@
}
destSta = staService.getById(task.getDestSta());
- if (!destSta.getStaSts().equals(StaStsType.IDLE.val())) {
+ if (locStaStatusCheck && !destSta.getStaSts().equals(StaStsType.IDLE.val())) {
throw new BusinessException("destSta锛�" + task.getDestSta$() + " is not in IDLE status");
}
destSta.setStaSts(StaStsType.READY_RELEASE.val());
@@ -277,6 +279,7 @@
if (!taskService.updateById(task)) {
throw new BusinessException("seqNum: " + task.getSeqNum() + " failed to update");
}
+ report(task, TaskReportStsType.START);
}
} catch (Exception e) {
log.error("mainService.infuseAgvForTask", e);
@@ -1164,7 +1167,7 @@
runToWaitHeight = "800";
}
Double runToWaitHeightValue = configService.getVal("RunToWaitHeightValue", Double.class);
- if (Cools.isEmpty(runToWaitHeight) || runToWaitHeightValue == 0) {
+ if (runToWaitHeightValue == 0) {
runToWaitHeightValue = 1D;
}
// 淇绌烘寚閽堝紓甯革細妫�鏌astCode鏄惁涓簄ull
@@ -1255,6 +1258,7 @@
throw new RuntimeException("generateAction method caught an exception, rolling back transaction.", e);
}
}
+
@Transactional
public void publishAction(String actionGroupId) {
@@ -1432,32 +1436,39 @@
if (agv_11_up.getCompleteType().equals(AgvCompleteType.RELEASE_FROM_SHELVES_COMPLETE)) {
WebsocketServiceImpl.taskShelfBarcode = agv_11_up.getLocCode();
- Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getBarcode, String.valueOf(Integer.parseInt(agv_11_up.getLocCode()))));
- if (null == loc) {
- log.warn("Agv [{}] 涓婃姤寰�璐ф灦鏀捐揣瀹屾垚鏃讹紝搴撲綅鐮乕{}]鏃犳晥銆�", protocol.getAgvNo(), agv_11_up.getLocCode());
- } else {
- List<Long> taskIds = actionService.selectTaskIdsByGroupId(serialNo);
- for (Long taskId : taskIds) {
- Task task = taskService.getById(taskId);
- if (task.getDestLoc().equals(loc.getId())) {
+// Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getBarcode, String.valueOf(Integer.parseInt(agv_11_up.getLocCode()))));
+// if (null == loc) {
+// log.warn("Agv [{}] 涓婃姤寰�璐ф灦鏀捐揣瀹屾垚鏃讹紝搴撲綅鐮乕{}]鏃犳晥銆�", protocol.getAgvNo(), agv_11_up.getLocCode());
+// } else {
+// List<Long> taskIds = actionService.selectTaskIdsByGroupId(serialNo);
+// for (Long taskId : taskIds) {
+// Task task = taskService.getById(taskId);
+// if (task.getDestLoc().equals(loc.getId())) {
+//
+// Action action = actionService.getOne(new LambdaQueryWrapper<Action>()
+// .eq(Action::getTaskId, task.getId())
+// .eq(Action::getActionType, ActionTypeType.ReadyReleaseToShelvesLoc.val())
+// .eq(Action::getActionSts, ActionStsType.ISSUED.val())
+// );
+//
+// if (null != action) {
+// action.setActionSts(ActionStsType.FINISH.val());
+// action.setEndTime(now);
+// action.setUpdateTime(now);
+// if (!actionService.updateById(action)) {
+// log.error("Action [{}] 鏇存柊澶辫触 锛侊紒锛�", action.getPriority() + " - " + action.getName());
+// }
+// }
+// //鎻掑叆涓�鏉�
+// report(task, TaskReportStsType.END);
+// }
+// }
+// }
- Action action = actionService.getOne(new LambdaQueryWrapper<Action>()
- .eq(Action::getTaskId, task.getId())
- .eq(Action::getActionType, ActionTypeType.ReadyReleaseToShelvesLoc.val())
- .eq(Action::getActionSts, ActionStsType.ISSUED.val())
- );
-
- if (null != action) {
- action.setActionSts(ActionStsType.FINISH.val());
- action.setEndTime(now);
- action.setUpdateTime(now);
- if (!actionService.updateById(action)) {
- log.error("Action [{}] 鏇存柊澶辫触 锛侊紒锛�", action.getPriority() + " - " + action.getName());
- }
- }
-
- }
- }
+ List<Long> taskIds = actionService.selectTaskIdsByGroupId(serialNo);
+ for (Long taskId : taskIds) {
+ Task task = taskService.getById(taskId);
+ report(task, TaskReportStsType.END);
}
}
@@ -1465,31 +1476,56 @@
if (agv_11_up.getCompleteType().equals(AgvCompleteType.TAKE_FROM_SHELVES_COMPLETE)) {
WebsocketServiceImpl.taskShelfBarcode = agv_11_up.getLocCode();
- Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getBarcode, String.valueOf(Integer.parseInt(agv_11_up.getLocCode()))));
- if (null == loc) {
- log.warn("Agv [{}] 涓婃姤浠庤揣鏋跺彇璐у畬鎴愶紝搴撲綅鐮乕{}]鏃犳晥銆�", protocol.getAgvNo(), agv_11_up.getLocCode());
- } else {
+// Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getBarcode, String.valueOf(Integer.parseInt(agv_11_up.getLocCode()))));
+// if (null == loc) {
+// log.warn("Agv [{}] 涓婃姤浠庤揣鏋跺彇璐у畬鎴愶紝搴撲綅鐮乕{}]鏃犳晥銆�", protocol.getAgvNo(), agv_11_up.getLocCode());
+// } else {
+//
+// List<Long> taskIds = actionService.selectTaskIdsByGroupId(serialNo);
+// for (Long taskId : taskIds) {
+// Task task = taskService.getById(taskId);
+// if (task.getOriLoc().equals(loc.getId())) {
+//
+// Action action = actionService.getOne(new LambdaQueryWrapper<Action>()
+// .eq(Action::getTaskId, task.getId())
+// .eq(Action::getActionType, ActionTypeType.ReadyTakeFromShelvesLoc.val())
+// .eq(Action::getActionSts, ActionStsType.ISSUED.val())
+// );
+// if (null != action) {
+// action.setActionSts(ActionStsType.FINISH.val());
+// action.setEndTime(now);
+// action.setUpdateTime(now);
+// if (!actionService.updateById(action)) {
+// log.error("Action [{}] 鏇存柊澶辫触 锛侊紒锛�", action.getPriority() + " - " + action.getName());
+// }
+// }
+// report(task, TaskReportStsType.OTBIN);
+// }
+// }
+// }
+ List<Long> taskIds = actionService.selectTaskIdsByGroupId(serialNo);
+ for (Long taskId : taskIds) {
+ Task task = taskService.getById(taskId);
+ report(task, TaskReportStsType.OTBIN);
+ }
- List<Long> taskIds = actionService.selectTaskIdsByGroupId(serialNo);
- for (Long taskId : taskIds) {
- Task task = taskService.getById(taskId);
- if (task.getOriLoc().equals(loc.getId())) {
-
- Action action = actionService.getOne(new LambdaQueryWrapper<Action>()
- .eq(Action::getTaskId, task.getId())
- .eq(Action::getActionType, ActionTypeType.ReadyTakeFromShelvesLoc.val())
- .eq(Action::getActionSts, ActionStsType.ISSUED.val())
- );
- if (null != action) {
- action.setActionSts(ActionStsType.FINISH.val());
- action.setEndTime(now);
- action.setUpdateTime(now);
- if (!actionService.updateById(action)) {
- log.error("Action [{}] 鏇存柊澶辫触 锛侊紒锛�", action.getPriority() + " - " + action.getName());
- }
- }
- }
- }
+ }
+ //浠庤緭閫佺嚎鍙栬揣瀹屾垚
+ if (agv_11_up.getCompleteType().equals(AgvCompleteType.TAKE_FROM_STA_COMPLETE)) {
+ WebsocketServiceImpl.taskShelfBarcode = agv_11_up.getLocCode();
+ List<Long> taskIds = actionService.selectTaskIdsByGroupId(serialNo);
+ for (Long taskId : taskIds) {
+ Task task = taskService.getById(taskId);
+ report(task, TaskReportStsType.OTBIN);
+ }
+ }
+ //寰�杈撻�佺嚎鏀捐揣瀹屾垚
+ if (agv_11_up.getCompleteType().equals(AgvCompleteType.RELEASE_FROM_STA_COMPLETE)) {
+ WebsocketServiceImpl.taskShelfBarcode = agv_11_up.getLocCode();
+ List<Long> taskIds = actionService.selectTaskIdsByGroupId(serialNo);
+ for (Long taskId : taskIds) {
+ Task task = taskService.getById(taskId);
+ report(task, TaskReportStsType.END);
}
}
@@ -1519,6 +1555,7 @@
log.info("Agv [{}] 鏂欎粨淇℃伅鍖� ===>> {}", protocol.getAgvNo(), JSON.toJSONString(agv_70_up));
}
}
+
@Transactional
public void settleSegmentList(List<Segment> segmentList, String serialNo) {
@@ -1568,25 +1605,7 @@
task.setUpdateTime(now);
if (!taskService.updateById(task)) {
log.error("Task [{}] 鏇存柊澶辫触 锛侊紒锛�", task.getSeqNum());
- } else {
- log.info("Task [{}] 浣滀笟瀹屾瘯 ==========>> ", task.getSeqNum());
- // TODO 鎻掑叆涓�鏉′笂鎶ヨ褰�
- TaskReport taskReport = new TaskReport();
- taskReport.setAgvId(task.getAgvId());
- taskReport.setBusNo(task.getBusId$());
- taskReport.setCreateTime(new Date());
- taskReport.setDestLoc(task.getDestLoc());
- taskReport.setDestSta(task.getDestSta());
- taskReport.setSeqNum(task.getSeqNum());
- taskReport.setTaskSts(task.getTaskSts());
- taskReport.setOriLoc(task.getOriLoc());
- taskReport.setOriSta(task.getOriSta());
- taskReport.setZpallet(task.getZpallet());
- if (!taskReportService.save(taskReport)) {
- log.info("TaskReport [{}] 鎻掑叆澶辫触 ==========>> ", JSON.toJSONString(taskReport));
- }
}
-
}
}
@@ -1619,4 +1638,31 @@
segmentService.processNext(segmentList);
}
+ /**
+ * 涓婃姤缁欎笂娓哥郴缁燂紝灏辨槸鎻掑叆涓�鏉℃暟鎹埌涓婃姤琛�
+ */
+ private void report(Task task, TaskReportStsType taskReportStsType) {
+ // TODO 鎻掑叆涓�鏉′笂鎶ヨ褰�
+ if (task.getBusId() == null) {
+ return;
+ }
+ List<TaskReport> list = taskReportService.list(new LambdaQueryWrapper<TaskReport>().eq(TaskReport::getSeqNum, task.getSeqNum()).eq(TaskReport::getBusNo, task.getBusId$()).eq(TaskReport::getTaskSts, taskReportStsType.status));
+ if (!Cools.isEmpty(list)) {
+ log.info("TaskReport [{}] 宸查噸澶嶏紝涓嶅啀鎻掑叆 ==========>> ", JSON.toJSONString(task));
+ return;
+ }
+ TaskReport taskReport = new TaskReport();
+ taskReport.setAgvId(task.getAgvId());
+ taskReport.setBusNo(task.getBusId$());
+ taskReport.setCreateTime(new Date());
+ taskReport.setReportTimes(0);
+ taskReport.setTaskSts(taskReportStsType.status);
+ taskReport.setSeqNum(task.getSeqNum());
+ taskReport.setZpallet(task.getZpallet());
+ if (!taskReportService.save(taskReport)) {
+ log.info("TaskReport [{}] 鎻掑叆澶辫触 ==========>> ", JSON.toJSONString(taskReport));
+ } else {
+ log.info("Task [{}] 鐘舵�佽褰曟彃鍏ユ暟鎹簱 ==========>> ", task.getSeqNum());
+ }
+ }
}
--
Gitblit v1.9.1