From f14bb52ddab40bf589304b6b43331ddaccea69f6 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期六, 27 十二月 2025 16:03:36 +0800
Subject: [PATCH] 1.完善AGV任务创建和下发 2.完善数据孪生 3.新增拍照获取照片 4.新增PDA配盘出库单立即出库 5.新增PDA配盘入库单下拉框获取订单号
---
src/main/java/com/zy/asrs/task/AGVTaskReportScheduler.java | 28 ++++++++++++++++++----------
1 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/AGVTaskReportScheduler.java b/src/main/java/com/zy/asrs/task/AGVTaskReportScheduler.java
index 2c0a156..6f7c6b0 100644
--- a/src/main/java/com/zy/asrs/task/AGVTaskReportScheduler.java
+++ b/src/main/java/com/zy/asrs/task/AGVTaskReportScheduler.java
@@ -67,7 +67,7 @@
// 淇濆瓨宸ヤ綔妗�
Task task = new Task();
Date date = new Date();
- String TaskNo = wrkMast.getWrkNo() + "-" + date.getTime();
+ String TaskNo = wrkMast.getWrkNo() + "aa" + date.getTime();
task.setWrkNo(wrkMast.getWrkNo())
.setTaskNo(TaskNo)
.setIoTime(date)
@@ -78,8 +78,8 @@
.setFullPlt("Y") // 婊℃澘锛歒
.setPicking("N") // 鎷ｆ枡
.setExitMk("N")// 閫�鍑�
- .setStaNo(stnNo)
- .setSourceStaNo(wrkMast.getSourceStaNo())//绌烘枡鏋剁紦瀛樺尯E1
+ .setStaNo(wrkMast.getMemo())
+ .setSourceStaNo("Z-"+wrkMast.getSourceStaNo())
.setEmptyMk("N")// 绌烘澘
.setBarcode(wrkMast.getBarcode())// 鎵樼洏鐮�
.setLinkMis("N")
@@ -123,7 +123,7 @@
//濡傛灉鏄帴椹崇珯鐐瑰垯闇�瑕佸垽鏂帴椹崇珯鐐规槸鍚︽湁绌烘枡鏋�
//濡傛灉鏈夌┖鏂欐灦闇�瑕佸垽鏂槸鍚︽湁鍑哄簱浠诲姟
//鏈夊嚭搴撲换鍔″垯绂佹涓嬪彂鏈鎼繍浠诲姟
- if (task.getStaNo().equals("401") || task.getStaNo().equals("402") || task.getStaNo().equals("307")) {
+ if (task.getStaNo().equals("Z-401") || task.getStaNo().equals("Z-402") || task.getStaNo().equals("Z-307")) {
BasDevp basDevp = basDevpService.checkSiteStatus(Integer.parseInt(task.getStaNo()));
if (basDevp != null && !Cools.isEmpty(basDevp.getInreq1()) && basDevp.getInreq1().equals("Y")) {
List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
@@ -139,13 +139,13 @@
//鐢熸垚AGV鎼繍鍑哄簱浠诲姟
// 淇濆瓨宸ヤ綔妗�
String SourceStaNo = "";
- if (task.getStaNo().equals("401")) {
+ if (task.getStaNo().equals("Z-401")) {
//澶ф枡鏋剁紦鍐插尯
- SourceStaNo = "E3";
- }else if (task.getStaNo().equals("402")) {
- SourceStaNo = "E2";
- }else if (task.getStaNo().equals("307")) {
- SourceStaNo = "E1";
+ SourceStaNo = "Q-E3";
+ }else if (task.getStaNo().equals("Z-402")) {
+ SourceStaNo = "Q-E2";
+ }else if (task.getStaNo().equals("Z-307")) {
+ SourceStaNo = "Q-E1";
}
Task task3 = new Task();
Date date = new Date();
@@ -183,10 +183,18 @@
if (!start.isSuccess()) {
task.setUpdMk("X");
task.setErrorMemo(start.getMsg());
+ task.setCtnType(task.getCtnType()+1);//涓嬪彂浠诲姟璁℃暟
task.setModiTime(new Date());
if (!taskService.updateById(task)) {
log.error("宸ヤ綔妗workNo={}]鏍囪寰呭鐞嗗け璐�", task.getWrkNo());
}
+ }else {
+ task.setCtnType(task.getCtnType()+1);
+ task.setModiTime(new Date());
+ task.setWrkSts(302L);//浠诲姟鎵ц涓�
+ if (!taskService.updateById(task)) {
+ log.error("宸ヤ綔妗workNo={}]鏍囪寰呭鐞嗗け璐�", task.getWrkNo());
+ }
}
}
--
Gitblit v1.9.1