diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/OrderFinishStatusModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/OrderFinishStatusModel.java new file mode 100644 index 0000000..44919e9 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/OrderFinishStatusModel.java @@ -0,0 +1,57 @@ +package cn.estsh.i3plus.pojo.aps.model; + +import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; +import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; +import io.swagger.annotations.Api; +import lombok.Data; + +/** + * 顶层订单完成情况 + * + * @Description : OrderFinishStatusModel + * @Author :gsz + * @Date 2021/10/21 10:45 + * @Modify + **/ +@Data +@Api("顶层订单完成情况报表") +public class OrderFinishStatusModel extends APSPager { + //订单号 + private String topOrderNo; + //订单类型 + private String orderType; + //物料编码 + private String materialCode; + //工厂货品 + private String materialName; + //商标编码 + private String code; + //商标 + private String logo; + //皮带标识编码 + private String leatherSignId; + //皮带标识 + private String sign; + //顶层订单数量 + private Integer topOrderCount; + //库存扣减数量 + private Integer inventoryBackCount; + //生产订单数量 + private Integer productOrderCount; + //参与排程数量 + private Double inScheduleCount; + //已下发数量 + private Double confirmCount; + //已报工数量 + private Double reportCount; + //牵纱排程数量 + private Double trainbearerScheduleCount; + //覆胶排程数量 + private Double coatingScheduleCount; + //包布排程数量 + private Double wrappingScheduleCount; + //硫化排程数量 + private Double sulfidationScheduleCount; + + +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/RuleDetailModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/RuleDetailModel.java index f40114a..3e9821b 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/RuleDetailModel.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/RuleDetailModel.java @@ -35,6 +35,9 @@ public class RuleDetailModel { @ApiParam(value ="异常消息") private String exception = ""; + @ApiParam(value ="错误信息") + private ImportErrorInfo errorInfo; + public void addProcess() { this.curProcess += 1; }