#

luxiaotao1123

2021-03-31 c8f89c1e9353d6e530b8b7fe93c15686251b7d65

#

 src/main/java/zy/cloud/wms/common/service/erp/ErpScheduler.java

@@ -313,6 +313,7 @@
                                    detl0.getQty(),    // 商品数量
                                    detl0.getQty(),    // 总数量
                                    detl0.getPrice(),    // 商品单价
                                    detl0.getRowNo(),       // 商品明细行号
                                    detl0.getComment(),    // 商品备注[非空]
                                    0,    // 状态
                                    now,    // 添加时间

 src/main/java/zy/cloud/wms/common/service/erp/entity/GetOrderResultDetl0.java

@@ -20,4 +20,7 @@
    // 单行商品备注
    private String comment;

    // 商品明细行号
    private Double RowNo;

}

 src/main/java/zy/cloud/wms/manager/entity/CustOrder.java

@@ -67,6 +67,13 @@
    private Double price;

    /**
     * 商品单价
     */
    @ApiModelProperty(value= "商品单价")
    @TableField("row_no")
    private Double rowNo;

    /**
     * 商品备注
     */
    @ApiModelProperty(value= "商品备注")
@@ -100,7 +107,7 @@

    public CustOrder() {}

    public CustOrder(String number,String billDate,String bTypeId,String eTypeId,String userCode,Double qty,Double total,Double price,String comment,Integer status,Date createTime,Date updateTime,String memo) {
    public CustOrder(String number,String billDate,String bTypeId,String eTypeId,String userCode,Double qty,Double total,Double price, Double rowNo, String comment,Integer status,Date createTime,Date updateTime,String memo) {
        this.number = number;
        this.billDate = billDate;
        this.bTypeId = bTypeId;
@@ -109,6 +116,7 @@
        this.qty = qty;
        this.total = total;
        this.price = price;
        this.rowNo = rowNo;
        this.comment = comment;
        this.status = status;
        this.createTime = createTime;
@@ -195,6 +203,14 @@
        this.price = price;
    }

    public Double getRowNo() {
        return rowNo;
    }

    public void setRowNo(Double rowNo) {
        this.rowNo = rowNo;
    }

    public String getComment() {
        return comment;
    }

 src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java

@@ -369,6 +369,7 @@
                    dto.getCount(),    // 商品数量
                    dto.getCount(),    // 总数量
                    Cools.isEmpty(mat.getName())?0.0D:Double.parseDouble(mat.getName()),    // 商品单价
                    null,       // 商品明细行号
                    null,    // 商品备注[空]
                    1,    // 状态
                    now,    // 添加时间

 src/main/resources/mapper/CustOrderMapper.xml

@@ -12,6 +12,7 @@
        <result column="qty" property="qty" />
        <result column="total" property="total" />
        <result column="price" property="price" />
        <result column="row_no" property="rowNo" />
        <result column="comment" property="comment" />
        <result column="status" property="status" />
        <result column="create_time" property="createTime" />