From b187814d7cfa5ace1ed9c203372524c69fe56553 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 31 十二月 2025 08:11:44 +0800
Subject: [PATCH] 1.完善AGV任务任务下发 2.拣料回库数据更新维护
---
src/main/java/com/zy/asrs/entity/Task.java | 53 +++++++++++++++++++++++++++++++++++------------------
1 files changed, 35 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/Task.java b/src/main/java/com/zy/asrs/entity/Task.java
index 51fff6b..cd8db31 100644
--- a/src/main/java/com/zy/asrs/entity/Task.java
+++ b/src/main/java/com/zy/asrs/entity/Task.java
@@ -1,5 +1,6 @@
package com.zy.asrs.entity;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.enums.IdType;
import com.baomidou.mybatisplus.annotations.TableField;
@@ -65,6 +66,9 @@
/**
* 鍏ュ嚭搴撶被鍨�
+ * 3.绔欏埌绔�
+ * 4.绔欏埌鍖哄煙
+ * 5.鍖哄煙鍒扮珯
*/
@ApiModelProperty(value= "鍏ュ嚭搴撶被鍨�")
@TableField("io_type")
@@ -124,6 +128,17 @@
@TableField("loc_sts")
private String locSts;
+ @ApiModelProperty(value= "1.娴峰悍AGV 2.鍗庢檽AGV 榛樿鏄�1.娴峰悍")
+ @TableField("plt_type")
+ private Integer pltType=1;
+
+ @ApiModelProperty(value= "鏂欐灦鍙�")
+ private String packed;
+
+ @ApiModelProperty(value= "涓嬪彂AGV浠诲姟璁℃暟")
+ @TableField("ctn_type")
+ private Integer ctnType=0;
+
/**
* 鎷ｆ枡
*/
@@ -138,7 +153,7 @@
@TableField("online_yn")
private String onlineYn;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value= "鏄惁浠诲姟鎶ラ敊")
@TableField("upd_mk")
private String updMk;
@@ -148,10 +163,6 @@
@ApiModelProperty(value= "閫�鍑�")
@TableField("exit_mk")
private String exitMk;
-
- @ApiModelProperty(value= "")
- @TableField("plt_type")
- private Integer pltType;
/**
* 绌烘澘
@@ -166,13 +177,6 @@
@ApiModelProperty(value= "宸ヤ綔鏃堕棿")
@TableField("io_time")
private Date ioTime;
-
- @ApiModelProperty(value= "")
- @TableField("ctn_type")
- private Integer ctnType;
-
- @ApiModelProperty(value= "")
- private String packed;
@ApiModelProperty(value= "")
@TableField("ove_mk")
@@ -333,6 +337,13 @@
@TableField("take_none")
private String takeNone;
+ /**
+ * 澶栭儴浠诲姟缂栧彿
+ */
+ @ApiModelProperty(value= "澶栭儴浠诲姟缂栧彿")
+ @TableField("task_no")
+ private String taskNo;
+
public Task() {}
public String getYmd$(){
@@ -387,17 +398,23 @@
public String getTaskType$(){
if (Cools.isEmpty(this.taskType)){return null;}
- if (taskType.equals("agv")) {
+ if (taskType.equals("AGV") || taskType.equals("agv")) {
return "AGV浠诲姟";
+ }if(taskType.equals("AGV琛ョ┖鏂欐灦")){
+ return "AGV琛ョ┖鏂欐灦浠诲姟";
+ }if(taskType.equals("AGV绌烘枡鏋跺洖缂撳瓨鍖�")){
+ return "AGV绌烘枡鏋跺洖缂撳瓨鍖轰换鍔�";
+ }if(taskType.equals("ZX-AGV")){
+ return "杞簭鎼繍浠诲姟";
} else {
- return "鍫嗗灈鏈轰换鍔�";
+ return "鍏朵粬鎼繍浠诲姟";
}
}
public String getStaNo$(){
- BasDevpService service = SpringUtils.getBean(BasDevpService.class);
- BasDevp basDevp = service.selectById(this.staNo);
+ BasStationService service = SpringUtils.getBean(BasStationService.class);
+ BasStation basDevp = service.selectOne(new EntityWrapper<BasStation>().eq("dev_no", this.staNo));
if (!Cools.isEmpty(basDevp)){
return String.valueOf(basDevp.getDevNo());
}
@@ -405,8 +422,8 @@
}
public String getSourceStaNo$(){
- BasDevpService service = SpringUtils.getBean(BasDevpService.class);
- BasDevp basDevp = service.selectById(this.sourceStaNo);
+ BasStationService service = SpringUtils.getBean(BasStationService.class);
+ BasStation basDevp = service.selectOne(new EntityWrapper<BasStation>().eq("dev_no", this.sourceStaNo));
if (!Cools.isEmpty(basDevp)){
return String.valueOf(basDevp.getDevNo());
}
--
Gitblit v1.9.1