From 8376b10e8758f4d9121ac1253a405179c75f0913 Mon Sep 17 00:00:00 2001
From: zyh <zyh@123>
Date: 星期一, 30 三月 2026 12:35:40 +0800
Subject: [PATCH] 将物料保质期字段改为寿命，并显示出来 新增物料同步的时候判断有无库存，无则修改有则返回
---
src/main/java/com/zy/asrs/entity/Task.java | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 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..17b831f 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;
@@ -333,6 +334,13 @@
@TableField("take_none")
private String takeNone;
+ /**
+ * 澶栭儴浠诲姟缂栧彿
+ */
+ @ApiModelProperty(value= "澶栭儴浠诲姟缂栧彿")
+ @TableField("task_no")
+ private String taskNo;
+
public Task() {}
public String getYmd$(){
@@ -387,7 +395,7 @@
public String getTaskType$(){
if (Cools.isEmpty(this.taskType)){return null;}
- if (taskType.equals("agv")) {
+ if (taskType.equals("AGV")) {
return "AGV浠诲姟";
} else {
return "鍫嗗灈鏈轰换鍔�";
@@ -396,8 +404,8 @@
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 +413,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