From af7b9db27bf72c92108329815ec771fb46e5b877 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期五, 31 十月 2025 16:09:20 +0800
Subject: [PATCH] Merge branch 'jsxswms' into integrationWms

---
 src/main/java/com/zy/asrs/entity/BasContainer.java |   90 +++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 90 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/BasContainer.java b/src/main/java/com/zy/asrs/entity/BasContainer.java
new file mode 100644
index 0000000..71aa45d
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/BasContainer.java
@@ -0,0 +1,90 @@
+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;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.zy.asrs.enums.CommonEnum;
+import com.zy.asrs.enums.ContainerType;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import com.baomidou.mybatisplus.annotations.TableName;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@Accessors(chain = true)
+@TableName("asr_bas_container")
+public class BasContainer implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+    /**
+     * 涓婚敭
+     */
+    @ApiModelProperty(value= "涓婚敭")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+    /**
+     * 瀹瑰櫒缂栫爜
+     */
+    @ApiModelProperty(value= "瀹瑰櫒缂栫爜")
+    private String barcode;
+
+    @ApiModelProperty("瀹瑰櫒绫诲瀷")
+    private Long type;
+
+    @ApiModelProperty("鏄惁娣锋斁")
+    @TableField("flag_mix")
+    private Integer flagMix;
+
+    @ApiModelProperty("鏈�澶ф贩鏀剧绫�")
+    private Integer mixMax;
+
+    @ApiModelProperty("鍒涘缓鏃堕棿")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    @ApiModelProperty("淇敼鏃堕棿")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
+    public BasContainer() {}
+
+    public BasContainer(String barcode) {
+        this.barcode = barcode;
+    }
+
+
+    public String getType$() {
+        if (Cools.isEmpty(type)) {
+            return "鏂欑";
+        }
+        if (type.equals(ContainerType.CONTAINER_TYPE_BOX.type)) {
+            return ContainerType.CONTAINER_TYPE_BOX.desc;
+        } else if (type.equals(ContainerType.CONTAINER_TYPE_SALVER.type)) {
+            return ContainerType.CONTAINER_TYPE_SALVER.desc;
+        } else if (type.equals(ContainerType.CONTAINER_TYPE_CAGE.type)) {
+            return ContainerType.CONTAINER_TYPE_CAGE.desc;
+        }
+        return null;
+    }
+
+    public String getFlagMix$() {
+        if (Cools.isEmpty(flagMix)) {
+            return null;
+        }
+        if (flagMix.equals(CommonEnum.COMMON_ENUM_N.type)) {
+            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