#

1

4 天以前 e0bb1d56001d44d7b46c4698b4d1e9ea425de07c

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

@@ -318,19 +318,19 @@
     * 备用1
     */
    @ApiModelProperty(value= "备用1")
    private String standby1 = "";
    private String standby1 = "1";

    /**
     * 备用2
     */
    @ApiModelProperty(value= "备用2")
    private String standby2 = "";
    private String standby2 = "1";

    /**
     * 备用3
     */
    @ApiModelProperty(value= "备用3")
    private String standby3 = "";
    private String standby3 = "1";

    /**
     * 备用1
@@ -366,6 +366,21 @@
    @ApiModelProperty(value= "高度")
    @TableField("height")
    private Double height;

    /**
     * erp数量
     */
    @ApiModelProperty(value= "erp数量")
    @TableField("erp_anfme")
    private Double erpAnfme;


    /**
     * 数量
     */
    @ApiModelProperty(value= "下发分拣线数量")
    @TableField("sorting_anfme")
    private Double sortingAnfme;

    public OrderDetl() {}

@@ -462,6 +477,59 @@
        this.height = orderDetl.getHeight();
    }

    public OrderDetl(OrderDetlPakin orderDetl) {
        this.orderId = orderDetl.getOrderId();
        this.orderNo = orderDetl.getOrderNo();
        this.anfme = orderDetl.getAnfme();
        this.qty = orderDetl.getQty();
        this.matnr = orderDetl.getMatnr();
        this.maktx = orderDetl.getMaktx();
        this.batch = orderDetl.getBatch();
        this.specs = orderDetl.getSpecs();
        this.model = orderDetl.getModel();
        this.color = orderDetl.getColor();
        this.brand = orderDetl.getBrand();
        this.unit = orderDetl.getUnit();
        this.price = orderDetl.getPrice();
        this.sku = orderDetl.getSku();
        this.units = orderDetl.getUnits();
        this.barcode = orderDetl.getBarcode();
        this.origin = orderDetl.getOrigin();
        this.manu = orderDetl.getManu();
        this.manuDate = orderDetl.getManuDate();
        this.itemNum = orderDetl.getItemNum();
        this.safeQty = orderDetl.getSafeQty();
        this.weight = orderDetl.getWeight();
        this.manLength = orderDetl.getManLength();
        this.volume = orderDetl.getVolume();
        this.threeCode = orderDetl.getThreeCode();
        this.supp = orderDetl.getSupp();
        this.suppCode = orderDetl.getSuppCode();
        this.beBatch = orderDetl.getBeBatch();
        this.deadTime = orderDetl.getDeadTime();
        this.deadWarn = orderDetl.getDeadWarn();
        this.source = orderDetl.getSource();
        this.inspect = orderDetl.getInspect();
        this.danger = orderDetl.getDanger();
        this.status = orderDetl.getStatus();
        this.createBy = orderDetl.getCreateBy();
        this.createTime = orderDetl.getCreateTime();
        this.updateBy = orderDetl.getUpdateBy();
        this.updateTime = orderDetl.getUpdateTime();
        this.memo = orderDetl.getMemo();
        this.pakinPakoutStatus = orderDetl.getPakinPakoutStatus();
        this.lineNumber = orderDetl.getLineNumber();
        this.standby1 = orderDetl.getStandby1();
        this.standby2 = orderDetl.getStandby2();
        this.standby3 = orderDetl.getStandby3();
        this.boxType1 = orderDetl.getBoxType1();
        this.boxType2 = orderDetl.getBoxType2();
        this.boxType3 = orderDetl.getBoxType3();
        this.erpAnfme = orderDetl.getErpAnfme();
        this.width = orderDetl.getWidth();
        this.height = orderDetl.getHeight();
    }


    public String getOrderId$(){
        OrderService service = SpringUtils.getBean(OrderService.class);