blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
#
mrzhssss
2022-04-26 d17c089f1d7ff3be848b05161917346e7f664a1d 
 src/main/java/zy/cloud/wms/manager/entity/Order.java


@@ -7,6 +7,9 @@


import com.core.common.Cools;


import com.core.common.SpringUtils;


import io.swagger.annotations.ApiModelProperty;


import lombok.AllArgsConstructor;


import lombok.Data;


import lombok.NoArgsConstructor;


import zy.cloud.wms.manager.service.CstmrService;


import zy.cloud.wms.manager.service.DocTypeService;


import zy.cloud.wms.manager.service.ItemService;


@@ -20,6 +23,9 @@


import java.text.SimpleDateFormat;


import java.util.Date;




@Data


@NoArgsConstructor


@AllArgsConstructor


@TableName("man_order")


public class Order implements Serializable {




@@ -268,45 +274,56 @@


    @ApiModelProperty(value= "备注")


    private String memo;




    public Order() {}


    /**


     * 订单编号


     */


    @ApiModelProperty(value= "波次编号")


    @TableField("wave_no")


    private String waveNo;




    public Order(Long hostId, 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) {


        this.hostId = hostId;


        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;


    }


//    public Order() {}




//    public Order(Long hostId, 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, String waveNo) {


//        this.hostId = hostId;


//        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;


//    }




//    Order order = new Order(


//            null,    // 编号[非空]