#

Junjie

5 天以前 995aeeda06e8e06a8880eb2e04e239cf03fada7c

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

@@ -78,7 +78,6 @@
    private String allotItemId;



    /**
     * 初始票据号，入库仓库id
     */
@@ -270,6 +269,8 @@
    @ApiModelProperty(value = "备注")
    private String memo;

    private String remark;

    /**
     * 状态 1: 进行中  0: 初始  2:已完成
     */
@@ -283,6 +284,13 @@
    @ApiModelProperty(value = "入出库类型（0：未知，1：入库，2：出库）")
    @TableField("pakin_pakout_status")
    private Integer pakinPakoutStatus;

    /**
     * 开票客户名称
     */
    @ApiModelProperty(value = "开票客户名称")
    @TableField("kp_cstmr_name")
    private String kpCstmrName;

    public Order() {
    }
@@ -362,6 +370,45 @@
        this.pakinPakoutStatus = pakinPakoutStatus;
    }

    public Order(String uuid, String orderNo, String orderTime, Long docType, String itemId, String itemName, String allotItemId, String defNumber, String number, Long cstmr, String cstmrName, String tel, String operMemb, Double totalFee, Double discount, Double discountFee, Double otherFee, Double actFee, Integer payType, String salesman, Integer accountDay, Integer postFeeType, Double postFee, Date payTime, Date sendTime, String shipName, String shipCode, Long settle, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo, Integer pakinPakoutStatus, String kpCstmrName) {
        this.uuid = uuid;
        this.orderNo = orderNo;
        this.orderTime = orderTime;
        this.docType = docType;
        this.itemId = itemId;
        this.itemName = itemName;
        this.allotItemId = allotItemId;
        this.defNumber = defNumber;
        this.number = number;
        this.cstmr = cstmr;
        this.cstmrName = cstmrName;
        this.tel = tel;
        this.operMemb = operMemb;
        this.totalFee = totalFee;
        this.discount = discount;
        this.discountFee = discountFee;
        this.otherFee = otherFee;
        this.actFee = actFee;
        this.payType = payType;
        this.salesman = salesman;
        this.accountDay = accountDay;
        this.postFeeType = postFeeType;
        this.postFee = postFee;
        this.payTime = payTime;
        this.sendTime = sendTime;
        this.shipName = shipName;
        this.shipCode = shipCode;
        this.settle = settle;
        this.status = status;
        this.createBy = createBy;
        this.createTime = createTime;
        this.updateBy = updateBy;
        this.updateTime = updateTime;
        this.memo = memo;
        this.pakinPakoutStatus = pakinPakoutStatus;
        this.kpCstmrName = kpCstmrName;
    }

    public Order(Order order) {
        this.uuid = order.getUuid();
        this.orderNo = order.getOrderNo();