From 46168fbb7c925b0ec04def176095e967720e684a Mon Sep 17 00:00:00 2001
From: chen.llin <1442464845@qq.comm>
Date: 星期五, 16 一月 2026 15:22:07 +0800
Subject: [PATCH] agv查询修复
---
src/main/java/com/zy/asrs/entity/InventoryReserve.java | 82 ++++++++++++++++++++++++++++++++++++++---
1 files changed, 76 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/InventoryReserve.java b/src/main/java/com/zy/asrs/entity/InventoryReserve.java
index 1fe0007..120ea02 100644
--- a/src/main/java/com/zy/asrs/entity/InventoryReserve.java
+++ b/src/main/java/com/zy/asrs/entity/InventoryReserve.java
@@ -7,6 +7,10 @@
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.Date;
+
+import com.core.common.SpringUtils;
+import com.zy.system.entity.User;
+import com.zy.system.service.UserService;
import org.springframework.format.annotation.DateTimeFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
@@ -66,9 +70,9 @@
* 杩囨湡鏃堕棿
*/
@ApiModelProperty(value= "杩囨湡鏃堕棿")
- @TableField("expice_time")
+ @TableField("expire_time")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date expiceTime;
+ private Date expireTime;
/**
* 閮ㄩ棬ID
@@ -107,6 +111,48 @@
@TableField("update_by")
private Long updateBy;
+ @ApiModelProperty(value = "鍝佺墝")
+ private String brand;
+
+ /**
+ * 澶囩敤1
+ */
+ @ApiModelProperty(value = "澶囩敤1")
+ private String standby1 = "";
+
+ /**
+ * 澶囩敤2
+ */
+ @ApiModelProperty(value = "澶囩敤2")
+ private String standby2 = "";
+
+ /**
+ * 澶囩敤3
+ */
+ @ApiModelProperty(value = "澶囩敤3")
+ private String standby3 = "";
+
+ /**
+ * 澶囩敤1
+ */
+ @ApiModelProperty(value = "澶囩敤1")
+ @TableField("box_type1")
+ private String boxType1 = "1";
+
+ /**
+ * 澶囩敤2
+ */
+ @ApiModelProperty(value = "澶囩敤2")
+ @TableField("box_type2")
+ private String boxType2 = "1";
+
+ /**
+ * 澶囩敤3
+ */
+ @ApiModelProperty(value = "澶囩敤3")
+ @TableField("box_type3")
+ private String boxType3 = "1";
+
public InventoryReserve() {}
public InventoryReserve(String matnr,String maktx,String orderNo,String batch,BigDecimal quantity,Date expiceTime,Long deptId,Date createTime,Long createBy,Date updateTime,Long updateBy) {
@@ -115,7 +161,7 @@
this.orderNo = orderNo;
this.batch = batch;
this.quantity = quantity;
- this.expiceTime = expiceTime;
+ this.expireTime = expiceTime;
this.deptId = deptId;
this.createTime = createTime;
this.createBy = createBy;
@@ -137,11 +183,11 @@
// null // 鏇存柊浜哄憳
// );
- public String getExpiceTime$(){
- if (Cools.isEmpty(this.expiceTime)){
+ public String getExpireTime$(){
+ if (Cools.isEmpty(this.expireTime)){
return "";
}
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.expiceTime);
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.expireTime);
}
public String getCreateTime$(){
@@ -158,5 +204,29 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
}
+ public String getCreateBy$() {
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.selectById(this.createBy);
+ if (!Cools.isEmpty(user)) {
+ return String.valueOf(user.getUsername());
+ }
+ if (this.createBy == 9527){
+ return "super";
+ }
+ return null;
+ }
+
+ public String getUpdateBy$() {
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.selectById(this.updateBy);
+ if (!Cools.isEmpty(user)) {
+ return String.valueOf(user.getUsername());
+ }
+ if (this.createBy == 9527){
+ return "super";
+ }
+ return null;
+ }
+
}
--
Gitblit v1.9.1