From f6e17ebcf5e66b590391e13595968b7e05a7f966 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 28 十月 2025 19:08:22 +0800
Subject: [PATCH] *待判接口开发
---
src/main/java/com/zy/asrs/entity/WaitPakinLog.java | 28 +++++++++++++++++++++++++---
1 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WaitPakinLog.java b/src/main/java/com/zy/asrs/entity/WaitPakinLog.java
index 34cade8..d4abcb9 100644
--- a/src/main/java/com/zy/asrs/entity/WaitPakinLog.java
+++ b/src/main/java/com/zy/asrs/entity/WaitPakinLog.java
@@ -2,13 +2,17 @@
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.BasBoxTypeService;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.text.SimpleDateFormat;
import java.util.Date;
+import java.util.List;
@Data
@TableName("cust_wait_pakin_log")
@@ -32,7 +36,7 @@
@ApiModelProperty(value= "鍟嗗搧鍚嶇О")
private String maktx;
- @ApiModelProperty(value= "搴忓垪鐮�")
+ @ApiModelProperty(value= "鎵瑰彿")
private String batch;
@ApiModelProperty(value= "鍗曟嵁缂栧彿")
@@ -151,6 +155,13 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
+ /**
+ * 鍗蜂俊鎭疘D
+ */
+ @ApiModelProperty(value= "鍗蜂俊鎭疘D")
+ @TableField("roll_up")
+ private Long rollUp;
+
public String getBeBatch$(){
if (null == this.beBatch){ return null; }
switch (this.beBatch){
@@ -193,9 +204,11 @@
if (null == this.danger){ return null; }
switch (this.danger){
case 1:
- return "鏄�";
+ return "鍚堟牸";
+ case 2:
+ return "涓嶅悎鏍�";
case 0:
- return "鍚�";
+ return "寰呭垽";
default:
return String.valueOf(this.danger);
}
@@ -215,4 +228,13 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
}
+ public String getBrand$(){
+ BasBoxTypeService basBoxTypeService = SpringUtils.getBean(BasBoxTypeService.class);
+ List<BasBoxType> basBoxTypes = basBoxTypeService.selectList(new EntityWrapper<BasBoxType>().eq("box_type", this.brand).orderBy("id", true));
+ for (BasBoxType basBoxType:basBoxTypes){
+ return String.valueOf(basBoxType.getBoxSpecs());
+ }
+ return this.brand;
+ }
+
}
--
Gitblit v1.9.1