I3_YF_SEAT
/
i3plus-pojo
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

添加执行命令组进度明细。

Browse Source
yun-zuoyi
钮海涛 5 years ago
parent 60ab897195
commit e1225bbccd
10 changed files with 43 additions and 54 deletions
Show Stats Download Patch File Download Diff File

50
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BomTree.java
Unescape Escape View File

@ -1,50 +0,0 @@
package cn.estsh.i3plus.pojo.aps.bean;
import cn.estsh.i3plus.pojo.aps.annotation.ExcludeImportExport;
import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* @Description :BOM树
* @Reference :
* @Author : jason.niu
* @CreateDate : 2019-09-17
* @Modify:
**/
@Data
@EqualsAndHashCode(callSuper = true)
@Api("BOM树")
@ExcludeImportExport
public class BomTree extends BaseAPS {
@ApiParam(value ="物料类型")
private ApsEnumUtil.MATERIAL_TYPE type;
@ApiParam(value ="备料类型")
private ApsEnumUtil.PREPARE_TYPE prepareType;
@ApiParam(value ="补充类型")
private ApsEnumUtil.REPLENISHMENT_TYPE replType;
@ApiParam(value ="采购提前期")
private String purchaseLeadTime;
@ApiParam(value ="制造提前期")
private String manufLeadTime;
@ApiParam(value ="配送提前期")
private String shipmentLeadTime;
@ApiParam(value ="单位采购量")
private Integer unitPurchase;
@ApiParam(value ="单位制造量")
private Integer unitManuf;
@ApiParam(value ="单位配送量")
private Integer unitShipment;
}

2
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java
Unescape Escape View File

@ -1,6 +1,7 @@
package cn.estsh.i3plus.pojo.aps.bean;
import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -42,5 +43,6 @@ public class HeuristicRule extends BaseRule {
@Column(name="BATCH_PERIOD")
@ApiParam(value ="组炉区间")
@FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
private String batchPeriod;
}

1
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java
Unescape Escape View File

@ -139,6 +139,7 @@ public class Material extends BaseAPS {
@Column(name="ORDER_BATCH_PERIOD")
@ApiParam(value ="订单合并期间")
@FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
private String orderBatchPeriod;
@JsonBackReference

1
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java
Unescape Escape View File

@ -74,6 +74,7 @@ public class ProductOrder extends BaseOrder {
@Column(name="SPECIFY_LEAD_TIME")
@ApiParam(value ="指定提前期")
@FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
private String specifyLeadTime;
@Column(name="CALC_LEAD_TIME")

2
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PurchaseOrder.java
Unescape Escape View File

@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.aps.bean;
import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder;
import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
@ -40,6 +41,7 @@ public class PurchaseOrder extends BaseOrder {
@Column(name="SPECIFY_LEAD_TIME")
@ApiParam(value ="指定提前期")
@FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
private String specifyLeadTime;
@Column(name="CALC_LEAD_TIME")

6
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java
Unescape Escape View File

@ -60,10 +60,12 @@ public class Resource extends BaseAPS {
@Column(name="PREV_BUFFER")
@ApiParam(value ="前缓冲时间")
@FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
private String prevBuffer;
@Column(name="POST_BUFFER")
@ApiParam(value ="后缓冲时间")
@FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
private String postBuffer;
@Column(name="MAX_PRODUCE_BATCH", columnDefinition = "decimal(18,8)")
@ -80,14 +82,17 @@ public class Resource extends BaseAPS {
@Column(name="MAX_PREV_SD_TIME")
@ApiParam(value ="最大前设置中断时间")
@FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
private String maxPrevSdTime;
@Column(name="MAX_PRODUCE_SD_TIME")
@ApiParam(value ="最大生产中断时间")
@FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
private String maxProduceSdTime;
@Column(name="MAX_POST_SD_TIME")
@ApiParam(value ="最大后设置中断时间")
@FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
private String maxPostSdTime;
@Column(name="ROUND_TYPE")
@ -117,6 +122,7 @@ public class Resource extends BaseAPS {
@Column(name="LOCK_TIME")
@ApiParam(value ="锁定时间长度")
@FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
private String lockTime;
@JsonBackReference

6
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleGroup.java
Unescape Escape View File

@ -37,6 +37,12 @@ public class RuleGroup extends BaseAPS {
@ApiParam(value ="序号")
private Integer orderNumber;
@ApiParam(value ="当前执行的规则序号")
private transient Integer curDetailNumber;
@ApiParam(value ="当前执行的规则名称")
private transient String curDetailName;
@JsonBackReference
public List<RuleDetail> getDetails() { return BeanRelation.list(this, ERuleGroup.Details); }
}

2
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java
Unescape Escape View File

@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.aps.bean;
import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder;
import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
@ -41,6 +42,7 @@ public class SalesOrder extends BaseOrder {
@Column(name="SPECIFY_LEAD_TIME")
@ApiParam(value ="指定提前期")
@FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
private String specifyLeadTime;
@Column(name="CALC_LEAD_TIME")

11
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/converter/CustomDateDeserializer.java
Unescape Escape View File

@ -4,6 +4,7 @@ import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.JsonDeserializer;
import org.springframework.util.StringUtils;
import java.io.IOException;
import java.text.ParseException;
@ -15,10 +16,12 @@ public class CustomDateDeserializer extends JsonDeserializer<Date> {
@Override
public Date deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
try {
return DATETIME_FORMATOR.parse(jsonParser.getText());
} catch (ParseException e) {
e.printStackTrace();
String text = jsonParser.getText();
if (!StringUtils.isEmpty(text)) {
try {
return DATETIME_FORMATOR.parse(text);
} catch (ParseException e) {
}
}
return null;
}

16
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/RuleGroupProgress.java
Unescape Escape View File

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.aps.model;
import lombok.Data;
/**
* @Description : 进度条显示信息。
* @Reference :
* @Author : jason.niu
* @CreateDate : 2020-01-21
* @Modify:
**/
@Data
public class RuleGroupProgress {
private String message;
private String progress;
}
Write Preview
Loading…
Cancel
Save