修复启动问题

yun-zuoyi
钮海涛 5 years ago
parent 5643f1aab4
commit 9dd7c54678

@ -65,7 +65,7 @@ public class Material extends BaseAPS {
private String purchaseLeadTime; private String purchaseLeadTime;
@Column(name="MANUF_LEAD_TIME") @Column(name="MANUF_LEAD_TIME")
@ApiParam(value ="制造提前期") @ApiParam(value ="生产提前期")
@FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
private String manufLeadTime; private String manufLeadTime;
@ -79,7 +79,7 @@ public class Material extends BaseAPS {
private Integer unitPurchase; private Integer unitPurchase;
@Column(name="UNIT_MANUF") @Column(name="UNIT_MANUF")
@ApiParam(value ="单位制造量") @ApiParam(value ="单位生产量")
private Integer unitManuf; private Integer unitManuf;
@Column(name="UNIT_SHIPMENT") @Column(name="UNIT_SHIPMENT")
@ -98,16 +98,16 @@ public class Material extends BaseAPS {
private Boolean autoFixPegging; private Boolean autoFixPegging;
@Column(name="MAX_PRODUCT_BATCH", columnDefinition = "decimal(18,8)") @Column(name="MAX_PRODUCT_BATCH", columnDefinition = "decimal(18,8)")
@ApiParam(value ="最大制造批量") @ApiParam(value ="最大生产批量")
private Double maxProductBatch; private Double maxProductBatch;
@Column(name="MIN_PRODUCT_BATCH", columnDefinition = "decimal(18,8)") @Column(name="MIN_PRODUCT_BATCH", columnDefinition = "decimal(18,8)")
@ApiParam(value ="最小制造批量") @ApiParam(value ="最小生产批量")
@FieldAnnotation(defaultValue = "0.0") @FieldAnnotation(defaultValue = "0.0")
private Double minProductBatch; private Double minProductBatch;
@Column(name="UNIT_PRODUCT_BATCH", columnDefinition = "decimal(18,8)") @Column(name="UNIT_PRODUCT_BATCH", columnDefinition = "decimal(18,8)")
@ApiParam(value ="制造批量单位") @ApiParam(value ="生产批量单位")
private Double UnitProductBatch; private Double UnitProductBatch;
@Column(name="MAX_PUR_BATCH", columnDefinition = "decimal(18,8)") @Column(name="MAX_PUR_BATCH", columnDefinition = "decimal(18,8)")

@ -195,7 +195,7 @@ public class ApsEnumUtil {
public enum MATERIAL_ASSIGN_LIMIT { public enum MATERIAL_ASSIGN_LIMIT {
INVENTORY(1, "库存制约"), INVENTORY(1, "库存制约"),
PURCHASE(2, "采购制约"), PURCHASE(2, "采购制约"),
PRODUCT(4, "制造制约"); PRODUCT(4, "生产制约");
private int value; private int value;
private String description; private String description;

Loading…
Cancel
Save