Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev

yun-zuoyi
nies 3 years ago
commit ce359615b9

@ -72,6 +72,11 @@ public class StandOperation extends BaseAPS {
@FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
private String baseTimeLimit; private String baseTimeLimit;
@Column(name="OVER_SHIFT_SPLIT_LIMIT")
@ApiParam(value ="跨班次时间限制")
@FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
private String overShiftSplitLimit;
@Column(name="COMB_TYPE") @Column(name="COMB_TYPE")
@ApiParam(value ="生产组合方式") @ApiParam(value ="生产组合方式")
@FieldAnnotation(defaultValue = "MAX_ALL_RESOURCE") @FieldAnnotation(defaultValue = "MAX_ALL_RESOURCE")

Loading…
Cancel
Save