From f92c6bf13a51ebec77407970cf5e822538dd709d Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期四, 09 一月 2025 08:01:23 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/BasJarMast.java | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/BasJarMast.java b/src/main/java/com/zy/asrs/entity/BasJarMast.java
index cda425b..1c5a082 100644
--- a/src/main/java/com/zy/asrs/entity/BasJarMast.java
+++ b/src/main/java/com/zy/asrs/entity/BasJarMast.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;
@@ -234,11 +235,20 @@
public String getStatus$(){
BasJarMastStatusService service = SpringUtils.getBean(BasJarMastStatusService.class);
- BasJarMastStatus basJarMastStatus = service.selectById(this.status);
+ BasJarMastStatus basJarMastStatus = service.selectOne(new EntityWrapper<BasJarMastStatus>().eq("box_type",this.status.toString()));
if (!Cools.isEmpty(basJarMastStatus)){
- return String.valueOf(basJarMastStatus.getId());
+ return String.valueOf(basJarMastStatus.getBoxSpecs());
}
return null;
+ }
+
+// public String getStatus$(){
+// BasJarMastStatusService service = SpringUtils.getBean(BasJarMastStatusService.class);
+// BasJarMastStatus basJarMastStatus = service.selectById(this.status);
+// if (!Cools.isEmpty(basJarMastStatus)){
+// return String.valueOf(basJarMastStatus.getId());
+// }
+// return null;
/*
default:
@@ -288,7 +298,7 @@
statusList.add(14);//灏忚溅鍒拌揪鍐峰嵈妲�
}
* */
- }
+// }
public String getIoTime$(){
if (Cools.isEmpty(this.ioTime)){
@@ -331,9 +341,12 @@
case 5:
return 4;
case 6:
- return 10;
+ if (this.status == 11) {
+ return 10;
+ }
+ return 11;
case 9:
- return 16;
+ return 17;
}
return this.status+1;
}
--
Gitblit v1.9.1