no message

skyouc

2025-08-07 d52bab61f91056e75e60ddeda76a72cd1bd63615

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/Order.java

@@ -1,251 +1,313 @@
package com.zy.asrs.wms.asrs.entity;

import com.baomidou.mybatisplus.annotation.*;

import java.text.SimpleDateFormat;
import java.util.Date;

import com.zy.asrs.wms.asrs.service.OrderSettleService;
import com.zy.asrs.wms.asrs.service.OrderTypeService;
import com.zy.asrs.wms.system.entity.Host;
import com.zy.asrs.wms.system.entity.User;
import org.springframework.format.annotation.DateTimeFormat;
import java.text.SimpleDateFormat;
import java.util.Date;

import com.baomidou.mybatisplus.annotation.TableLogic;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.SpringUtils;
import com.zy.asrs.wms.system.service.UserService;
import com.zy.asrs.wms.system.service.HostService;

import java.io.Serializable;
import java.util.Date;

@Data
@TableName("man_order")
public class Order implements Serializable {

    private static final long serialVersionUID = 1L;

    /**
     * ID
     */
    @ApiModelProperty(value= "ID")
    @TableId(value = "id", type = IdType.AUTO)
    private Long id;

    /**
     * 订单编号
     */
    @ApiModelProperty(value= "订单编号")
    private String orderNo;

    /**
     * 单据日期
     */
    @ApiModelProperty(value= "单据日期")
    private String orderTime;

    /**
     * 单据类型
     */
    @ApiModelProperty(value= "单据类型")
    private Long orderType;

    /**
     * 单据状态
     */
    @ApiModelProperty(value= "单据状态")
    private Long orderSettle;

    /**
     * 所属机构
     */
    @ApiModelProperty(value= "所属机构")
    private Long hostId;

    /**
     * 状态 1: 正常  0: 禁用  
     */
    @ApiModelProperty(value= "状态 1: 正常  0: 禁用  ")
    private Integer status;

    /**
     * 是否删除 1: 是  0: 否  
     */
    @ApiModelProperty(value= "是否删除 1: 是  0: 否  ")
    private Integer deleted;

    /**
     * 添加时间
     */
    @ApiModelProperty(value= "添加时间")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    private Date createTime;

    /**
     * 添加人员
     */
    @ApiModelProperty(value= "添加人员")
    private Long createBy;

    /**
     * 修改时间
     */
    @ApiModelProperty(value= "修改时间")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    private Date updateTime;

    /**
     * 修改人员
     */
    @ApiModelProperty(value= "修改人员")
    private Long updateBy;

    /**
     * 备注
     */
    @ApiModelProperty(value= "备注")
    private String memo;

    /**
     * 优先级
     */
    @ApiModelProperty(value= "优先级")
    private Integer ioPri;

    /**
     * 波次ID
     */
    @ApiModelProperty(value= "波次ID")
    @TableField(updateStrategy = FieldStrategy.IGNORED)
    private Long waveId;

    /**
     * 波次号
     */
    @ApiModelProperty(value= "波次号")
    @TableField(updateStrategy = FieldStrategy.IGNORED)
    private String waveNo;

    public Order() {}

    public Order(String orderNo,String orderTime,Long orderType,Long orderSettle,Long hostId,Integer status,Integer deleted,Date createTime,Long createBy,Date updateTime,Long updateBy,String memo) {
        this.orderNo = orderNo;
        this.orderTime = orderTime;
        this.orderType = orderType;
        this.orderSettle = orderSettle;
        this.hostId = hostId;
        this.status = status;
        this.deleted = deleted;
        this.createTime = createTime;
        this.createBy = createBy;
        this.updateTime = updateTime;
        this.updateBy = updateBy;
        this.memo = memo;
    }

//    Order order = new Order(
//            null,    // 订单编号
//            null,    // 单据日期
//            null,    // 单据类型
//            null,    // 单据状态
//            null,    // 所属机构
//            null,    // 状态
//            null,    // 是否删除
//            null,    // 添加时间
//            null,    // 添加人员
//            null,    // 修改时间
//            null,    // 修改人员
//            null    // 备注
//    );

    public String getOrderType$(){
        OrderTypeService service = SpringUtils.getBean(OrderTypeService.class);
        OrderType orderType = service.getById(this.orderType);
        if (!Cools.isEmpty(orderType)){
            return String.valueOf(orderType.getName());
        }
        return null;
    }

    public String getOrderSettle$(){
        OrderSettleService service = SpringUtils.getBean(OrderSettleService.class);
        OrderSettle orderSettle = service.getById(this.orderSettle);
        if (!Cools.isEmpty(orderSettle)){
            return String.valueOf(orderSettle.getName());
        }
        return null;
    }

    public String getHostId$(){
        HostService service = SpringUtils.getBean(HostService.class);
        Host host = service.getById(this.hostId);
        if (!Cools.isEmpty(host)){
            return String.valueOf(host.getName());
        }
        return null;
    }

    public String getStatus$(){
        if (null == this.status){ return null; }
        switch (this.status){
            case 1:
                return "正常";
            case 0:
                return "禁用";
            default:
                return String.valueOf(this.status);
        }
    }

    public String getDeleted$(){
        if (null == this.deleted){ return null; }
        switch (this.deleted){
            case 1:
                return "是";
            case 0:
                return "否";
            default:
                return String.valueOf(this.deleted);
        }
    }

    public String getCreateTime$(){
        if (Cools.isEmpty(this.createTime)){
            return "";
        }
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
    }

    public String getCreateBy$(){
        UserService service = SpringUtils.getBean(UserService.class);
        User user = service.getById(this.createBy);
        if (!Cools.isEmpty(user)){
            return String.valueOf(user.getNickname());
        }
        return null;
    }

    public String getUpdateTime$(){
        if (Cools.isEmpty(this.updateTime)){
            return "";
        }
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
    }

    public String getUpdateBy$(){
        UserService service = SpringUtils.getBean(UserService.class);
        User user = service.getById(this.updateBy);
        if (!Cools.isEmpty(user)){
            return String.valueOf(user.getNickname());
        }
        return null;
    }


}
package com.zy.asrs.wms.asrs.entity;



import com.baomidou.mybatisplus.annotation.*;



import java.text.SimpleDateFormat;

import java.util.Date;



import com.fasterxml.jackson.annotation.JsonFormat;

import com.zy.asrs.wms.asrs.service.OrderSettleService;

import com.zy.asrs.wms.asrs.service.OrderTypeService;

import com.zy.asrs.wms.asrs.service.WaveService;

import com.zy.asrs.wms.system.entity.Host;

import com.zy.asrs.wms.system.entity.User;

import io.swagger.models.auth.In;

import org.springframework.format.annotation.DateTimeFormat;

import java.text.SimpleDateFormat;

import java.util.Date;



import com.baomidou.mybatisplus.annotation.TableLogic;

import io.swagger.annotations.ApiModel;

import io.swagger.annotations.ApiModelProperty;

import lombok.Data;

import com.zy.asrs.framework.common.Cools;

import com.zy.asrs.framework.common.SpringUtils;

import com.zy.asrs.wms.system.service.UserService;

import com.zy.asrs.wms.system.service.HostService;



import java.io.Serializable;

import java.util.Date;

import java.util.Objects;



@Data

@TableName("man_order")

public class Order implements Serializable {



    private static final long serialVersionUID = 1L;



    /**

     * ID

     */

    @ApiModelProperty(value= "ID")

    @TableId(value = "id", type = IdType.AUTO)

    private Long id;



    /**

     * 订单编号

     */

    @ApiModelProperty(value= "订单编号")

    private String orderNo;



    /**

     * 单据日期

     */

    @ApiModelProperty(value= "单据日期")

    @DateTimeFormat(pattern = "yyyy-MM-dd")

    @JsonFormat(pattern = "yyyy-MM-dd")

    private String orderTime;



    /**

     * 单据类型

     */

    @ApiModelProperty(value= "单据类型")

    private Long orderType;



    /**

     * 单据状态

     */

    @ApiModelProperty(value= "单据状态")

    private Long orderSettle;



    @ApiModelProperty("客户名称")

    private String customer;



    @ApiModelProperty("物流名称")

    private String logisticsName;



    @ApiModelProperty("收货地址")

    private String address;



    @ApiModelProperty("联系电话")

    private String phone;



    @ApiModelProperty("快递单号")

    private String logistics;



    @ApiModelProperty("订单数量")

    @TableField(exist = false)

    private Double waitQty;

    /**

     * 所属机构

     */

    @ApiModelProperty(value= "所属机构")

    private Long hostId;



    /**

     * 状态 1: 正常  0: 禁用  
     */

    @ApiModelProperty(value= "状态 1: 正常  0: 禁用  ")

    private Integer status;



    /**

     * 是否删除 1: 是  0: 否  
     */

    @ApiModelProperty(value= "是否删除 1: 是  0: 否  ")

    private Integer deleted;



    /**

     * 添加时间

     */

    @ApiModelProperty(value= "添加时间")

    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

    private Date createTime;



    /**

     * 添加人员

     */

    @ApiModelProperty(value= "添加人员")

    private Long createBy;



    /**

     * 修改时间

     */

    @ApiModelProperty(value= "修改时间")

    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

    private Date updateTime;



    /**

     * 修改人员

     */

    @ApiModelProperty(value= "修改人员")

    private Long updateBy;



    /**

     * 备注

     */

    @ApiModelProperty(value= "备注")

    private String memo;



    /**

     * 优先级

     */

    @ApiModelProperty(value= "优先级")

    private Integer ioPri;



    /**

     * 波次ID

     */

    @ApiModelProperty(value= "波次ID")

    @TableField(updateStrategy = FieldStrategy.IGNORED)

    private Long waveId;



    /**

     * 波次号

     */

    @ApiModelProperty(value= "波次号")

    @TableField(updateStrategy = FieldStrategy.IGNORED)

    private String waveNo;



    /**

     * 是否生成波次 1: 是  0: 否

     */

    @ApiModelProperty(value= "是否生成波次 1: 是  0: 否  ")

    private Integer hasWave;



    /**

     * 订单状态

     * 1. 已完成

     * 0. 未完成

     * 2. 部分完成

     */

    @TableField(exist = false)

    private String orderStatus;



    @TableField(exist = false)

    private String site;



    /**

     * 订单状态

     * 1. 已完成

     * 0. 未完成

     * 2. 部分完成

     */

    private Integer pickStatus;



    public Order() {}



    public Order(String orderNo,String orderTime,Long orderType,Long orderSettle,Long hostId,Integer status,Integer deleted,Date createTime,Long createBy,Date updateTime,Long updateBy,String memo) {

        this.orderNo = orderNo;

        this.orderTime = orderTime;

        this.orderType = orderType;

        this.orderSettle = orderSettle;

        this.hostId = hostId;

        this.status = status;

        this.deleted = deleted;

        this.createTime = createTime;

        this.createBy = createBy;

        this.updateTime = updateTime;

        this.updateBy = updateBy;

        this.memo = memo;

    }



//    Order order = new Order(

//            null,    // 订单编号

//            null,    // 单据日期

//            null,    // 单据类型

//            null,    // 单据状态

//            null,    // 所属机构

//            null,    // 状态

//            null,    // 是否删除

//            null,    // 添加时间

//            null,    // 添加人员

//            null,    // 修改时间

//            null,    // 修改人员

//            null    // 备注

//    );



    public String getOrderType$(){

        OrderTypeService service = SpringUtils.getBean(OrderTypeService.class);

        OrderType orderType = service.getById(this.orderType);

        if (!Cools.isEmpty(orderType)){

            return String.valueOf(orderType.getName());

        }

        return null;

    }



    public String getOrderSettle$(){

        OrderSettleService service = SpringUtils.getBean(OrderSettleService.class);

        OrderSettle orderSettle = service.getById(this.orderSettle);

        if (!Cools.isEmpty(orderSettle)){

            return String.valueOf(orderSettle.getName());

        }

        return null;

    }



    public String getHostId$(){

        HostService service = SpringUtils.getBean(HostService.class);

        Host host = service.getById(this.hostId);

        if (!Cools.isEmpty(host)){

            return String.valueOf(host.getName());

        }

        return null;

    }



    public String getStatus$(){

        if (null == this.status){ return null; }

        switch (this.status){

            case 1:

                return "正常";

            case 0:

                return "禁用";

            default:

                return String.valueOf(this.status);

        }

    }



    public String getDeleted$(){

        if (null == this.deleted){ return null; }

        switch (this.deleted){

            case 1:

                return "是";

            case 0:

                return "否";

            default:

                return String.valueOf(this.deleted);

        }

    }



    public String getCreateTime$(){

        if (Cools.isEmpty(this.createTime)){

            return "";

        }

        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);

    }



    public String getCreateBy$(){

        UserService service = SpringUtils.getBean(UserService.class);

        User user = service.getById(this.createBy);

        if (!Cools.isEmpty(user)){

            return String.valueOf(user.getNickname());

        }

        return null;

    }



    public String getSite() {

        if (!Cools.isEmpty(this.waveId)){

            WaveService waveService = SpringUtils.getBean(WaveService.class);

            Wave wave = waveService.getById(this.waveId);

            if (!Cools.isEmpty(wave)){

                return wave.getSite();

            }

        }

        return null;

    }





    public String getUpdateTime$(){

        if (Cools.isEmpty(this.updateTime)){

            return "";

        }

        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);

    }



    public String getUpdateBy$(){

        UserService service = SpringUtils.getBean(UserService.class);

        User user = service.getById(this.updateBy);

        if (!Cools.isEmpty(user)){

            return String.valueOf(user.getNickname());

        }

        return null;

    }





}