1

cp

2025-03-27 a3bea567c554c2c57809ceed2a040baf473aa95f

 zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/OrderDetlLog.java

@@ -35,6 +35,7 @@
     * ID
     */
    @ApiModelProperty(value= "ID")
    @TableId(value = "id", type = IdType.AUTO)
    private Long id;

    /**
@@ -44,10 +45,22 @@
    private Long orderId;

    /**
     * 单据编号
     */
    @ApiModelProperty(value= "单据编号")
    private String orderNo;

    /**
     * 数量
     */
    @ApiModelProperty(value= "数量")
    private Double anfme;

    @ApiModelProperty(value= "已完成数量")
    private Double qty;

    @ApiModelProperty(value= "作业数量")
    private Double workQty;

    /**
     * 商品编码
@@ -62,10 +75,10 @@
    private String maktx;

    /**
     * 名称
     * 批号
     */
    @ApiModelProperty(value= "名称")
    private String name;
    @ApiModelProperty(value= "批号")
    private String batch;

    /**
     * 规格
@@ -80,10 +93,16 @@
    private String model;

    /**
     * 批号
     * 颜色
     */
    @ApiModelProperty(value= "批号")
    private String batch;
    @ApiModelProperty(value= "颜色")
    private String color;

    /**
     * 品牌
     */
    @ApiModelProperty(value= "品牌")
    private String brand;

    /**
     * 单位
@@ -92,40 +111,130 @@
    private String unit;

    /**
     * 商品条码
     */
    @ApiModelProperty(value= "商品条码")
    private String barcode;

    /**
     * 供应商
     */
    @ApiModelProperty(value= "供应商")
    private String supplier;

    /**
     * 单价
     */
    @ApiModelProperty(value= "单价")
    private Double unitPrice;
    private Double price;

    /**
     * sku
     */
    @ApiModelProperty(value= "sku")
    private String sku;

    /**
     * 单位量
     */
    @ApiModelProperty(value= "单位量")
    private Double units;

    /**
     * 条码
     */
    @ApiModelProperty(value= "条码")
    private String barcode;

    /**
     * 产地
     */
    @ApiModelProperty(value= "产地")
    private String origin;

    /**
     * 厂家
     */
    @ApiModelProperty(value= "厂家")
    private String manu;

    /**
     * 生产日期
     */
    @ApiModelProperty(value= "生产日期")
    private String manuDate;

    /**
     * 品项数
     */
    @ApiModelProperty(value= "品项数")
    private Integer itemNum;
    private String itemNum;

    /**
     * 数量
     * 安全库存量
     */
    @ApiModelProperty(value= "数量")
    private Double count;
    @ApiModelProperty(value= "安全库存量")
    private Double safeQty;

    /**
     * 重量
     */
    @ApiModelProperty(value= "重量")
    private Double weight;

    /**
     * 长度
     */
    @ApiModelProperty(value= "长度")
    private Double length;

    /**
     * 体积
     */
    @ApiModelProperty(value= "体积")
    private Double volume;

    /**
     * 仓库号
     */
    @ApiModelProperty(value= "仓库号")
    private String threeCode;

    /**
     * 来源单号
     */
    @ApiModelProperty(value= "来源单号")
    private String supp;

    /**
     * 来源序号
     */
    @ApiModelProperty(value= "来源序号")
    private String suppCode;

    /**
     * 是否批次 1: 是  0: 否
     */
    @ApiModelProperty(value= "是否批次 1: 是  0: 否  ")
    private Integer beBatch;

    /**
     * 保质期
     */
    @ApiModelProperty(value= "保质期")
    private String deadTime;

    /**
     * 预警天数
     */
    @ApiModelProperty(value= "预警天数")
    private Integer deadWarn;

    /**
     * 制购 1: 制造  2: 采购  3: 外协
     */
    @ApiModelProperty(value= "制购 1: 制造  2: 采购  3: 外协  ")
    private Integer source;

    /**
     * 要求检验 1: 是  0: 否
     */
    @ApiModelProperty(value= "要求检验 1: 是  0: 否  ")
    private Integer inspect;

    /**
     * 危险品 1: 是  0: 否
     */
    @ApiModelProperty(value= "危险品 1: 是  0: 否  ")
    private Integer danger;

    /**
     * 状态 1: 正常  0: 禁用  
@@ -173,31 +282,31 @@

    public OrderDetlLog() {}

    public OrderDetlLog(Long id,Long orderId,Double anfme,String matnr,String maktx,String name,String specs,String model,String batch,String unit,String barcode,String supplier,Double unitPrice,Integer itemNum,Double count,Double weight,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo,Long hostId) {
        this.id = id;
        this.orderId = orderId;
        this.anfme = anfme;
        this.matnr = matnr;
        this.maktx = maktx;
        this.name = name;
        this.specs = specs;
        this.model = model;
        this.batch = batch;
        this.unit = unit;
        this.barcode = barcode;
        this.supplier = supplier;
        this.unitPrice = unitPrice;
        this.itemNum = itemNum;
        this.count = count;
        this.weight = weight;
        this.status = status;
        this.createBy = createBy;
        this.createTime = createTime;
        this.updateBy = updateBy;
        this.updateTime = updateTime;
        this.memo = memo;
        this.hostId = hostId;
    }
//    public OrderDetlLog(Long id,Long orderId,Double anfme,String matnr,String maktx,String name,String specs,String model,String batch,String unit,String barcode,String supplier,Double unitPrice,Integer itemNum,Double count,Double weight,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo,Long hostId) {
//        this.id = id;
//        this.orderId = orderId;
//        this.anfme = anfme;
//        this.matnr = matnr;
//        this.maktx = maktx;
//        this.name = name;
//        this.specs = specs;
//        this.model = model;
//        this.batch = batch;
//        this.unit = unit;
//        this.barcode = barcode;
//        this.supplier = supplier;
//        this.unitPrice = unitPrice;
//        this.itemNum = itemNum;
//        this.count = count;
//        this.weight = weight;
//        this.status = status;
//        this.createBy = createBy;
//        this.createTime = createTime;
//        this.updateBy = updateBy;
//        this.updateTime = updateTime;
//        this.memo = memo;
//        this.hostId = hostId;
//    }

//    OrderDetlLog orderDetlLog = new OrderDetlLog(
//            null,    // ID[非空]