From 88cce66441b6878c230d30757aaf926b03ef37af Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期五, 30 一月 2026 16:44:16 +0800
Subject: [PATCH] #
---
version/db/new.sql | 7 ++
zy-acs-manager/src/main/java/com/zy/acs/manager/core/integrate/wms/TaskReportService.java | 10 +++
version/doc/RCS开发进度表.xlsx | 0
zy-acs-flow/src/i18n/en.js | 1
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Task.java | 102 +---------------------------------
zy-acs-flow/src/i18n/zh.js | 1
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/enums/TaskUplinkStateType.java | 28 +++++++++
7 files changed, 50 insertions(+), 99 deletions(-)
diff --git a/version/db/new.sql b/version/db/new.sql
index df955d1..1d792ab 100644
--- a/version/db/new.sql
+++ b/version/db/new.sql
@@ -29,3 +29,10 @@
alter table man_sta
add outbound_wait int null comment '杩炵画鍑哄簱绛夊緟' after inbound_wait;
+
+
+alter table man_task
+ add uplink_sts varchar(64) null comment '涓婅鐘舵��' after empty_mk;
+
+alter table man_task_log
+ add uplink_sts varchar(64) null comment '涓婅鐘舵��' after empty_mk;
diff --git "a/version/doc/RCS\345\274\200\345\217\221\350\277\233\345\272\246\350\241\250.xlsx" "b/version/doc/RCS\345\274\200\345\217\221\350\277\233\345\272\246\350\241\250.xlsx"
index 510f983..949a629 100644
--- "a/version/doc/RCS\345\274\200\345\217\221\350\277\233\345\272\246\350\241\250.xlsx"
+++ "b/version/doc/RCS\345\274\200\345\217\221\350\277\233\345\272\246\350\241\250.xlsx"
Binary files differ
diff --git a/zy-acs-flow/src/i18n/en.js b/zy-acs-flow/src/i18n/en.js
index a01ba94..61aff65 100644
--- a/zy-acs-flow/src/i18n/en.js
+++ b/zy-acs-flow/src/i18n/en.js
@@ -485,6 +485,7 @@
destLoc: "dest loc",
destCode: "dest code",
emptyMk: "empty mk",
+ uplinkSts: "uplink status",
zpallet: "zpallet",
phase: "ideal path",
errDesc: "error",
diff --git a/zy-acs-flow/src/i18n/zh.js b/zy-acs-flow/src/i18n/zh.js
index 8ea789e..e1df707 100644
--- a/zy-acs-flow/src/i18n/zh.js
+++ b/zy-acs-flow/src/i18n/zh.js
@@ -485,6 +485,7 @@
destLoc: "鐩爣搴撲綅",
destCode: "鐩爣鍦伴潰鐮�",
emptyMk: "绌烘枡绠�",
+ uplinkSts: "涓婅鐘舵��",
zpallet: "鏂欑鐮�",
phase: "鐞嗘兂璺緞",
errDesc: "寮傚父鎻忚堪",
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/integrate/wms/TaskReportService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/integrate/wms/TaskReportService.java
index b6b52fb..e6eaaee 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/integrate/wms/TaskReportService.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/integrate/wms/TaskReportService.java
@@ -9,6 +9,8 @@
import com.zy.acs.manager.core.integrate.dto.HttpResult;
import com.zy.acs.manager.core.service.ThreadPoolRegulator;
import com.zy.acs.manager.manager.entity.Task;
+import com.zy.acs.manager.manager.enums.TaskStsType;
+import com.zy.acs.manager.manager.enums.TaskUplinkStateType;
import com.zy.acs.manager.manager.service.TaskService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -51,6 +53,14 @@
if (!uplinkProperties.getEnabled()) {
return false;
}
+ if (!task.getTaskSts().equals(TaskStsType.COMPLETE.val())) {
+ return false;
+ }
+ TaskUplinkStateType uplinkStateType = TaskUplinkStateType.of(task.getUplinkSts());
+ if (!uplinkStateType.equals(TaskUplinkStateType.PENDING) && !uplinkStateType.equals(TaskUplinkStateType.FAILED)) {
+ return false;
+ }
+
// block
// Future<R> future = threadPoolRegulator.getInstance().submit(() -> {
// mapDataDispatcher.modifyDynamicMatrix(null, null, param.getAgvNo(), true);
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Task.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Task.java
index af1c34c..9a49997 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Task.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Task.java
@@ -18,202 +18,106 @@
private static final long serialVersionUID = 1L;
- /**
- * ID
- */
@ApiModelProperty(value= "ID")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
- /**
- * 缂栧彿
- */
@ApiModelProperty(value= "缂栧彿")
private String uuid;
- /**
- * 鎬荤嚎
- */
@ApiModelProperty(value= "鎬荤嚎")
private Long busId;
- /**
- * 浠诲姟鍙�
- */
@ApiModelProperty(value= "浠诲姟鍙�")
private String seqNum;
- /**
- * 浼樺厛绾�
- */
@ApiModelProperty(value= "浼樺厛绾�")
private Integer priority;
- /**
- * 鍚嶇О
- */
@ApiModelProperty(value= "鍚嶇О")
private String name;
- /**
- * 浠诲姟杩涘害
- */
@ApiModelProperty(value= "浠诲姟杩涘害")
private Long taskSts;
- /**
- * 浠诲姟绫诲瀷
- */
@ApiModelProperty(value= "浠诲姟绫诲瀷")
private Long taskType;
- /**
- * AGV
- */
@ApiModelProperty(value= "AGV")
private Long agvId;
- /**
- * 宸ヤ綔鏃堕棿
- */
@ApiModelProperty(value= "宸ヤ綔鏃堕棿")
private Date ioTime;
- /**
- * 寮�濮嬫椂闂�
- */
@ApiModelProperty(value= "寮�濮嬫椂闂�")
private Date startTime;
- /**
- * 缁撴潫鏃堕棿
- */
@ApiModelProperty(value= "缁撴潫鏃堕棿")
private Date endTime;
- /**
- * 寮傚父鏃堕棿
- */
@ApiModelProperty(value= "寮傚父鏃堕棿")
private Date errTime;
- /**
- * 璧峰绔�
- */
@ApiModelProperty(value= "璧峰绔�")
private Long oriSta;
- /**
- * 璧峰搴撲綅
- */
@ApiModelProperty(value= "璧峰搴撲綅")
private Long oriLoc;
- /**
- * 璧峰鐮�
- */
@ApiModelProperty(value= "璧峰鐮�")
private Long oriCode;
- /**
- * 璧峰宸烽亾鍝堝笇
- */
@ApiModelProperty(value= "璧峰宸烽亾鍝堝笇")
private String oriLaneHash;
- /**
- * 鐩爣绔�
- */
@ApiModelProperty(value= "鐩爣绔�")
private Long destSta;
- /**
- * 鐩爣搴撲綅
- */
@ApiModelProperty(value= "鐩爣搴撲綅")
private Long destLoc;
- /**
- * 鐩爣鐮�
- */
@ApiModelProperty(value= "鐩爣鐮�")
private Long destCode;
- /**
- * 鐩爣宸烽亾鍝堝笇
- */
@ApiModelProperty(value= "鐩爣宸烽亾鍝堝笇")
private String destLaneHash;
- /**
- * 绌烘澘
- */
@ApiModelProperty(value= "绌烘澘")
private String emptyMk;
- /**
- * 鎵樼洏鐮�
- */
+ @ApiModelProperty(value= "涓婅鐘舵��")
+ private String uplinkSts;
+
@ApiModelProperty(value= "鎵樼洏鐮�")
private String zpallet;
- /**
- * 鐜妭
- */
@ApiModelProperty(value= "鐜妭")
private String phase;
- /**
- * 寮傚父鎻忚堪
- */
@ApiModelProperty(value= "寮傚父鎻忚堪")
private String errDesc;
- /**
- * 鐘舵�� 1: 姝ｅ父 0: 鍐荤粨
- */
@ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 鍐荤粨 ")
private Integer status;
- /**
- * 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
- */
@ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
private Integer deleted;
- /**
- * 绉熸埛
- */
@ApiModelProperty(value= "绉熸埛")
private Long tenantId;
- /**
- * 娣诲姞浜哄憳
- */
@ApiModelProperty(value= "娣诲姞浜哄憳")
private Long createBy;
- /**
- * 娣诲姞鏃堕棿
- */
@ApiModelProperty(value= "娣诲姞鏃堕棿")
private Date createTime;
- /**
- * 淇敼浜哄憳
- */
@ApiModelProperty(value= "淇敼浜哄憳")
private Long updateBy;
- /**
- * 淇敼鏃堕棿
- */
@ApiModelProperty(value= "淇敼鏃堕棿")
private Date updateTime;
- /**
- * 澶囨敞
- */
@ApiModelProperty(value= "澶囨敞")
private String memo;
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/enums/TaskUplinkStateType.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/enums/TaskUplinkStateType.java
new file mode 100644
index 0000000..d70d920
--- /dev/null
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/enums/TaskUplinkStateType.java
@@ -0,0 +1,28 @@
+package com.zy.acs.manager.manager.enums;
+
+import com.zy.acs.framework.common.Cools;
+
+public enum TaskUplinkStateType {
+
+ NONE, // 鏈煡
+ PENDING, // 寰呬笂鎶�
+ SENDING, // 涓婃姤涓�
+ SUCCESS, // 鎴愬姛
+ FAILED, // 澶辫触
+
+ SKIPPED, // 璺宠繃
+ ;
+
+ public static TaskUplinkStateType of(String state) {
+ if (Cools.isEmpty(state)) {
+ return NONE;
+ }
+ for (TaskUplinkStateType type : TaskUplinkStateType.values()) {
+ if (type.toString().equals(state)) {
+ return type;
+ }
+ }
+ return NONE;
+ }
+
+}
--
Gitblit v1.9.1