From 3cb931b3799846e1b8ef708da6c447bb9a9e0a0e Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期一, 15 十二月 2025 11:17:41 +0800
Subject: [PATCH] 并板出库功能优化
---
src/main/java/com/zy/asrs/entity/BasContainer.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/BasContainer.java b/src/main/java/com/zy/asrs/entity/BasContainer.java
index 5dc10ee..a374071 100644
--- a/src/main/java/com/zy/asrs/entity/BasContainer.java
+++ b/src/main/java/com/zy/asrs/entity/BasContainer.java
@@ -1,5 +1,6 @@
package com.zy.asrs.entity;
+import com.baomidou.mybatisplus.annotations.TableField;
import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.enums.IdType;
@@ -34,22 +35,26 @@
private String barcode;
@ApiModelProperty("瀹瑰櫒绫诲瀷")
- private String type;
+ private Long type;
@ApiModelProperty("鏄惁娣锋斁")
+ @TableField("flag_mix")
private Integer flagMix;
@ApiModelProperty("鏈�澶ф贩鏀剧绫�")
- private Integer mixMax;
+ @TableField("mix_max")
+ private Double mixMax;
@ApiModelProperty("鍒涘缓鏃堕棿")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @TableField("create_time")
private Date createTime;
@ApiModelProperty("淇敼鏃堕棿")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @TableField("update_time")
private Date updateTime;
public BasContainer() {}
@@ -57,7 +62,6 @@
public BasContainer(String barcode) {
this.barcode = barcode;
}
-
public String getType$() {
if (Cools.isEmpty(type)) {
@@ -69,6 +73,8 @@
return ContainerType.CONTAINER_TYPE_SALVER.desc;
} else if (type.equals(ContainerType.CONTAINER_TYPE_CAGE.type)) {
return ContainerType.CONTAINER_TYPE_CAGE.desc;
+ } else if (type.equals(ContainerType.CONTAINER_TYPE_CAR.type)) {
+ return ContainerType.CONTAINER_TYPE_CAR.desc;
}
return null;
}
@@ -81,7 +87,7 @@
return CommonEnum.COMMON_ENUM_N.desc;
} else if (flagMix.equals(CommonEnum.COMMON_ENUM_Y.type)) {
return CommonEnum.COMMON_ENUM_Y.desc;
- }
+ }
return null;
}
--
Gitblit v1.9.1