diff --git a/src/main/java/com/huaheng/api/mes/dto/Detail.java b/src/main/java/com/huaheng/api/mes/dto/Detail.java index 8a08b49..32c37a1 100644 --- a/src/main/java/com/huaheng/api/mes/dto/Detail.java +++ b/src/main/java/com/huaheng/api/mes/dto/Detail.java @@ -1,9 +1,11 @@ package com.huaheng.api.mes.dto; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; import java.math.BigDecimal; +@Data public class Detail { @ApiModelProperty(value = "id") diff --git a/src/main/java/com/huaheng/api/mes/dto/Header.java b/src/main/java/com/huaheng/api/mes/dto/Header.java index bde9448..24cd92c 100644 --- a/src/main/java/com/huaheng/api/mes/dto/Header.java +++ b/src/main/java/com/huaheng/api/mes/dto/Header.java @@ -111,6 +111,14 @@ public class Header { @ApiModelProperty(value = "出库单备注") private String shipmentNote; + /** + * 日计划导入日期 + */ + @ApiModelProperty(value = "日计划导入日期") + private Date dailyScheduleImportDate; + + + public String getProductionWorker() { return productionWorker; } diff --git a/src/main/java/com/huaheng/pc/shipment/shipmentDetail/domain/ShipmentDetail.java b/src/main/java/com/huaheng/pc/shipment/shipmentDetail/domain/ShipmentDetail.java index 17bc383..6568114 100644 --- a/src/main/java/com/huaheng/pc/shipment/shipmentDetail/domain/ShipmentDetail.java +++ b/src/main/java/com/huaheng/pc/shipment/shipmentDetail/domain/ShipmentDetail.java @@ -349,4 +349,11 @@ public class ShipmentDetail implements Serializable { @TableField(value = "recordCode") @ApiModelProperty(value = "记录合并之前的单据号") private String recordCode; + + /** + * 库存入库单编码 + */ + @TableField(value = "receiptCode") + @ApiModelProperty(value = "库存入库单编码") + private String receiptCode; } diff --git a/src/main/java/com/huaheng/pc/shipment/shipmentHeader/domain/ShipmentHeader.java b/src/main/java/com/huaheng/pc/shipment/shipmentHeader/domain/ShipmentHeader.java index 52b178f..cb4d12f 100644 --- a/src/main/java/com/huaheng/pc/shipment/shipmentHeader/domain/ShipmentHeader.java +++ b/src/main/java/com/huaheng/pc/shipment/shipmentHeader/domain/ShipmentHeader.java @@ -504,6 +504,12 @@ public class ShipmentHeader implements Serializable { @ApiModelProperty(value="回传状态,0默认,1成功,2失败,3提前过账") public Integer pushSuccessStatus; + /** + * 日计划导入日期 + */ + @TableField(value = "dailyScheduleImportDate") + @ApiModelProperty(value="日计划导入日期") + public Date dailyScheduleImportDate; }