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


@@ -4,9 +4,11 @@


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;


@@ -76,6 +78,10 @@


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


    @TableField("allot_item_id")


    private Long allotItemId;




    @ApiModelProperty("目标库区")


    @TableField("target_location")


    private String targetLocation;




    /**


     * 初始票据号


@@ -315,6 +321,44 @@


        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();


@@ -435,6 +479,7 @@


        }


    }






    public String getPayTime$(){


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


            return "";