#

1

2025-12-12 bd3f1b6d3b0dd7429b6f3974f88e0890a401d968

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

@@ -66,7 +66,7 @@
    @TableField("item_id")
    private Long itemId;

    @ApiModelProperty(value= "")
    @ApiModelProperty(value= "Po")
    @TableField("item_name")
    private String itemName;

@@ -315,6 +315,84 @@
        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(
//            null,    // 编号[非空]
//            null,    // 订单编号
@@ -373,6 +451,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){