自动化立体仓库 - WMS系统
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
pang.jiabao
3 天以前 203e2664c13883f8bb64f638cb1794c0b4480ec2 
 src/main/java/com/zy/asrs/entity/Order.java


@@ -8,6 +8,7 @@


import com.core.common.SpringUtils;


import com.zy.asrs.service.DocTypeService;


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;


@@ -268,6 +269,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 +313,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(


@@ -362,6 +447,17 @@


                return "记账";


            default:


                return String.valueOf(this.payType);


        }


    }




    public String getPakinPakoutStatus$(){


        switch (this.pakinPakoutStatus){


            case 1:


                return "Y";


            case 2:


                return "N";


            default:


                return null;


        }


    }




@@ -458,5 +554,8 @@


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


    }




    public void sync(Object source) {


        Synchro.Copy(source, this);


    }




}