自动化立体仓库 - WMS系统
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
skyouc
9 小时以前 680c4484aebd032289a7a5ab1bad5c6c357ffee9 
 src/main/java/com/zy/asrs/entity/Order.java


@@ -4,10 +4,13 @@


import com.baomidou.mybatisplus.annotations.TableId;


import com.baomidou.mybatisplus.annotations.TableName;


import com.baomidou.mybatisplus.enums.IdType;


import com.baomidou.mybatisplus.mapper.EntityWrapper;


import com.core.common.Cools;


import com.core.common.SpringUtils;


import com.zy.asrs.service.DocTypeService;


import com.zy.asrs.service.MatService;


import com.zy.asrs.service.OrderSettleService;


import com.zy.common.utils.Synchro;


import com.zy.system.entity.User;


import com.zy.system.service.UserService;


import io.swagger.annotations.ApiModelProperty;


@@ -75,6 +78,10 @@


    @ApiModelProperty(value= "调拨项目编号")


    @TableField("allot_item_id")


    private Long allotItemId;




    @ApiModelProperty("目标库区")


    @TableField("target_location")


    private String targetLocation;




    /**


     * 初始票据号


@@ -268,6 +275,13 @@


    @TableField("move_status")


    private Integer moveStatus;




    /**


     * 状态 1: 进行中  0: 初始  2:已完成


     */


    @ApiModelProperty(value= "入出库类型（0：未知，1：入库，2：出库）")


    @TableField("pakin_pakout_status")


    private Integer pakinPakoutStatus;




    public Order() {}




    public Order(String uuid,String orderNo,String orderTime,Long docType,Long itemId,String itemName,Long 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) {


@@ -305,6 +319,83 @@


        this.updateBy = updateBy;


        this.updateTime = updateTime;


        this.memo = memo;


    }




    public Order(String uuid,String orderNo,String orderTime,Long docType,Long itemId,String itemName,Long 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) {


        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;


    }




    public Order(Order order) {


        this.uuid = order.getUuid();


        this.orderNo = order.getOrderNo();


        this.orderTime = order.getOrderTime();


        this.docType = order.getDocType();


        this.itemId = order.getItemId();


        this.itemName = order.getItemName();


        this.allotItemId = order.getAllotItemId();


        this.defNumber = order.getDefNumber();


        this.number = order.getNumber();


        this.cstmr = order.getCstmr();


        this.cstmrName = order.getCstmrName();


        this.tel = order.getTel();


        this.operMemb = order.getOperMemb();


        this.totalFee = order.getTotalFee();


        this.discount = order.getDiscount();


        this.discountFee = order.getDiscountFee();


        this.otherFee = order.getOtherFee();


        this.actFee = order.getActFee();


        this.payType = order.getPayType();


        this.salesman = order.getSalesman();


        this.accountDay = order.getAccountDay();


        this.postFeeType = order.getPostFeeType();


        this.postFee = order.getPostFee();


        this.payTime = order.getPayTime();


        this.sendTime = order.getSendTime();


        this.shipName = order.getShipName();


        this.shipCode = order.getShipCode();


        this.settle = order.getSettle();


        this.status = order.getStatus();


        this.createBy = order.getCreateBy();


        this.createTime = order.getCreateTime();


        this.updateBy = order.getUpdateBy();


        this.updateTime = order.getUpdateTime();


        this.memo = order.getMemo();


        this.moveStatus = order.getMoveStatus();


        this.pakinPakoutStatus = order.getPakinPakoutStatus();


    }




//    Order order = new Order(


@@ -365,6 +456,17 @@


        }


    }




    public String getPakinPakoutStatus$(){


        switch (this.pakinPakoutStatus){


            case 1:


                return "Y";


            case 2:


                return "N";


            default:


                return null;


        }


    }




    public String getPostFeeType$(){


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


        switch (this.postFeeType){


@@ -376,6 +478,7 @@


                return String.valueOf(this.postFeeType);


        }


    }






    public String getPayTime$(){


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


@@ -458,5 +561,8 @@


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


    }




    public void sync(Object source) {


        Synchro.Copy(source, this);


    }




}