From 10778ff6207c31641187acb487d4b67c0de59b24 Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期一, 02 二月 2026 10:38:51 +0800
Subject: [PATCH] agv增加一个新单号防重复 ，增加一个手动呼叫agv
---
src/main/java/com/zy/asrs/entity/TaskLog.java | 30 ++++++++++++++++++------------
1 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/TaskLog.java b/src/main/java/com/zy/asrs/entity/TaskLog.java
index 2f69175..d705aad 100644
--- a/src/main/java/com/zy/asrs/entity/TaskLog.java
+++ b/src/main/java/com/zy/asrs/entity/TaskLog.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.asrs.service.*;
@@ -23,6 +24,13 @@
@ApiModelProperty(value = "")
private Long id;
+
+ /**
+ * 浠诲姟绫诲瀷锛� agv , crn
+ */
+ @ApiModelProperty(value = "浠诲姟绫诲瀷锛� agv , crn")
+ @TableField("task_type")
+ private String taskType;
/**
* 宸ヤ綔鍙�
@@ -266,6 +274,14 @@
@ApiModelProperty(value = "")
@TableField("error_memo")
private String errorMemo;
+ @ApiModelProperty(value = "")
+ @TableField(value = "error_time2",exist = false)
+ private Date errorTime2;
+
+ @ApiModelProperty(value = "")
+ @TableField(value = "error_memo2",exist = false)
+ private String errorMemo2;
+
@ApiModelProperty(value = "")
@TableField("ctn_kind")
@@ -457,21 +473,11 @@
}
public String getStaNo$() {
- BasDevpService service = SpringUtils.getBean(BasDevpService.class);
- BasDevp basDevp = service.selectById(this.staNo);
- if (!Cools.isEmpty(basDevp)) {
- return String.valueOf(basDevp.getDevNo());
- }
- return null;
+ return this.staNo;
}
public String getSourceStaNo$() {
- BasDevpService service = SpringUtils.getBean(BasDevpService.class);
- BasDevp basDevp = service.selectById(this.sourceStaNo);
- if (!Cools.isEmpty(basDevp)) {
- return String.valueOf(basDevp.getDevNo());
- }
- return null;
+ return this.sourceStaNo;
}
public String getSourceLocNo$() {
--
Gitblit v1.9.1