diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderFeedback.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderFeedback.java index d5533c2..968e93e 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderFeedback.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderFeedback.java @@ -46,10 +46,6 @@ public class OrderFeedback extends BaseAPS { @ApiParam(value ="库存扣减数量") private Double inventoryCount; - @Column(name="LAST_OPERATION_COUNT") - @ApiParam(value ="硫化报工数量") - private Double lastOperationCount; - @Column(name="UNQUALIFIED_COUNT") @ApiParam(value ="不良数量") private Double unqualifiedCount; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java index a754400..08cbb35 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java @@ -53,4 +53,12 @@ public class SysParam extends BaseAPS { @Column(name="RECORD_RESULT") @ApiParam(value ="记录资源评估结果") private Boolean recordResult; + + @Column(name="SCHEDULE_RESULT") + @ApiParam(value ="记录排程结果") + private Boolean scheduleResult; + + @Column(name="SPLIT_BY_SHIFT") + @ApiParam(value ="按班次分割下发的工作") + private Boolean splitByShift; } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ScheduleResultModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ScheduleResultModel.java new file mode 100644 index 0000000..452fa02 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ScheduleResultModel.java @@ -0,0 +1,28 @@ +package cn.estsh.i3plus.pojo.aps.model; + +import cn.estsh.i3plus.pojo.aps.bean.Work; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.Date; +import java.util.HashSet; +import java.util.Set; + +/** + * @Description : 排程结果信息 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-06-22 + * @Modify: + **/ +@Data +public class ScheduleResultModel { + @ApiParam(value ="排程开始时间") + private Date beginTime; + + @ApiParam(value ="排程结束时间") + private Date endTime; + + @ApiParam(value ="参与排程的工作") + private Set works = new HashSet<>(); +} diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java index ec2bba5..250095b 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java @@ -1261,18 +1261,20 @@ public class ApsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum APS_ORDER_TYPE { - SALES_ORDER("S", "销售订单"), - PRODUCT_ORDER("M", "生产订单"), - PURCHASE_ORDER("P", "采购订单"), - INVENTORY("W", "库存订单"), - SAFE_STOCK_ORDER("Q", "安全库存订单"), - INSERTED_ORDER("I", "插单"); + SALES_ORDER("SALES_ORDER", "S", "销售订单"), + PRODUCT_ORDER("PRODUCT_ORDER", "M", "生产订单"), + PURCHASE_ORDER("PURCHASE_ORDER", "P", "采购订单"), + INVENTORY("INVENTORY", "W", "库存订单"), + SAFE_STOCK_ORDER("SAFE_STOCK_ORDER", "Q", "安全库存订单"), + INSERTED_ORDER("INSERTED_ORDER", "I", "插单"); private String value; + private String prefix; private String description; - APS_ORDER_TYPE(String value, String description) { + APS_ORDER_TYPE(String value, String prefix, String description) { this.value = value; + this.prefix = prefix; this.description = description; } @@ -1280,6 +1282,8 @@ public class ApsEnumUtil { return value; } + public String getPrefix() { return prefix; } + public String getDescription() { return description; }