yangyang
2025-07-03 5408d461787ce97a546d6f24740a9247a3d9db86
no message
5个文件已删除
1个文件已修改
1个文件已添加
211 ■■■■ 已修改文件
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/ContainerController.java 106 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/Container.java 45 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/param/ContainerParams.java 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/ContainerMapper.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/ContainerService.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/ContainerServiceImpl.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-wms/src/main/resources/mapper/asrs/ContainerMapper.xml 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/ContainerController.java
File was deleted
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/Container.java
@@ -3,6 +3,7 @@
import java.text.SimpleDateFormat;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.zy.asrs.wms.system.entity.User;
import org.springframework.format.annotation.DateTimeFormat;
import com.baomidou.mybatisplus.annotation.TableLogic;
@@ -118,7 +119,7 @@
     * 租户
     */
    @ApiModelProperty(value= "租户")
    private Integer tenantId;
    private Integer hostId;
    /**
     * 添加人员
@@ -131,6 +132,7 @@
     */
    @ApiModelProperty(value= "添加时间")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date createTime;
    /**
@@ -144,6 +146,7 @@
     */
    @ApiModelProperty(value= "修改时间")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date updateTime;
    /**
@@ -167,7 +170,7 @@
        this.flagLogic = flagLogic;
        this.status = status;
        this.deleted = deleted;
        this.tenantId = tenantId;
        this.hostId = tenantId;
        this.createBy = createBy;
        this.createTime = createTime;
        this.updateBy = updateBy;
@@ -175,27 +178,23 @@
        this.memo = memo;
    }
//    Container container = new Container(
//            null,    // 名称
//            null,    // 容器编码[非空]
//            null,    // 容器类型[非空]
//            null,    // 使用次数[非空]
//            null,    // 长度
//            null,    // 宽度
//            null,    // 高度
//            null,    // 有效期
//            null,    // 是否回收[非空]
//            null,    // 是否虚拟[非空]
//            null,    // 状态[非空]
//            null,    // 是否删除[非空]
//            null,    // 租户
//            null,    // 添加人员
//            null,    // 添加时间[非空]
//            null,    // 修改人员
//            null,    // 修改时间[非空]
//            null    // 备注
//    );
    public String getType$(){
        if (null == this.type){ return null; }
        switch (this.type){
            case "1":
                return " 钢托盘";
            case  "2":
                return " 木托盘";
            case  "3":
                return " 塑料料框";
            case  "4":
                return "托盘笼箱";
            case  "5":
                return "钢料架";
            default:
                return String.valueOf(this.type);
        }
    }
    public String getVaildTime$(){
        if (Cools.isEmpty(this.vaildTime)){
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/param/ContainerParams.java
New file
@@ -0,0 +1,23 @@
package com.zy.asrs.wms.asrs.entity.param;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
import java.io.Serializable;
@Data
@Accessors(chain = true)
@ApiModel(value = "ContainerParams", description = "容器初始化参数")
public class ContainerParams implements Serializable {
    private static final long serialVersionUID = 1L;
    @ApiModelProperty("起始数值")
    private Integer startNum;
    @ApiModelProperty("终止数值")
    private Integer endNum;
}
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/ContainerMapper.java
File was deleted
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/ContainerService.java
File was deleted
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/ContainerServiceImpl.java
File was deleted
zy-asrs-wms/src/main/resources/mapper/asrs/ContainerMapper.xml
File was deleted