From 25b1530e5adf0d3e1ed5bf9a3d56cccb1e2ce94f Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期六, 23 十一月 2024 16:03:01 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/BasJarMast.java | 39 ++++++++++++++++++++++++++++++++++++---
1 files changed, 36 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/BasJarMast.java b/src/main/java/com/zy/asrs/entity/BasJarMast.java
index f81d3cb..432037d 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)){
@@ -315,5 +325,28 @@
return this.status+1;
}
+ /**
+ * ioType浠诲姟绫诲瀷
+ * 0: 鏈煡 1: 寮�杩涙枡闂� 2: 鍏宠繘鏂欓棬 3: 寮�鍑烘枡闂� 4: 鍏冲嚭鏂欓棬 5: 鍏ョ～鍖栫綈 6: 鍏ュ喎鍗存Ы
+ * 7: 绌挎杞﹁繘鍐峰嵈妲� B=>C 8: 绌挎杞︾寮�鍐峰嵈妲� C=>B 9: 鍑哄喎鍗存Ы 10锛欰=>B 11:B=>A
+ */
+ public Integer getStatusComplete(Integer ioType){
+ switch (ioType){
+ case 1:
+ return 2;
+ case 3:
+ return 8;
+ case 2:
+ return 5;
+ case 5:
+ return 4;
+ case 6:
+ return 10;
+ case 9:
+ return 17;
+ }
+ return this.status+1;
+ }
+
}
--
Gitblit v1.9.1