修改test分支POM配置

yun-zuoyi
钮海涛 5 years ago
parent 28ce8615fd
commit 9e0158e749

@ -34,21 +34,24 @@ public class OperInput extends BaseAPS {
@FieldAnnotation(relation = "Operation", notEmpty = true, display = false) @FieldAnnotation(relation = "Operation", notEmpty = true, display = false)
private Long operationId; private Long operationId;
@Column(name="MATERIAL_ID") @Column(name="INPUT_MATERIAL_ID")
@ApiParam(value ="物料") @ApiParam(value ="物料")
@FieldAnnotation(relation = "Material", notEmpty = true) @FieldAnnotation(relation = "InputMaterial", notEmpty = true)
private Long materialId; private Long inputMaterialId;
@Column(name="INPUT_COUNT", columnDefinition = "decimal(18,8)") @Column(name="INPUT_COUNT", columnDefinition = "decimal(18,8)")
@ApiParam(value ="单位输入量") @ApiParam(value ="单位输入量")
@FieldAnnotation(defaultValue = "1.0")
private Double inputCount; private Double inputCount;
@Column(name="YIELD", columnDefinition = "decimal(18,8)") @Column(name="YIELD", columnDefinition = "decimal(18,8)")
@ApiParam(value ="成品率") @ApiParam(value ="成品率")
@FieldAnnotation(defaultValue = "1.0")
private Double yield; private Double yield;
@Column(name="FIX_SCRAP_COUNT", columnDefinition = "decimal(18,8)") @Column(name="FIX_SCRAP_COUNT", columnDefinition = "decimal(18,8)")
@ApiParam(value ="固定报废数") @ApiParam(value ="固定报废数")
@FieldAnnotation(defaultValue = "0.0")
private Double fixScrapCount; private Double fixScrapCount;
@Column(name="CONS_TYPE") @Column(name="CONS_TYPE")
@ -73,13 +76,13 @@ public class OperInput extends BaseAPS {
BeanRelation.set(this, EOperInput.Operation, oper); BeanRelation.set(this, EOperInput.Operation, oper);
} }
public Material getMaterial() { public Material getInputMaterial() {
return BeanRelation.get(this, EOperInput.Material); return BeanRelation.get(this, EOperInput.InputMaterial);
} }
public void setMaterial(Material material) { public void setInputMaterial(Material material) {
this.materialId = material != null ? material.getId() : 0l; this.inputMaterialId = material != null ? material.getId() : 0l;
BeanRelation.set(this, EOperInput.Material, material); BeanRelation.set(this, EOperInput.InputMaterial, material);
} }
@JsonBackReference @JsonBackReference

@ -33,21 +33,24 @@ public class OperOutput extends BaseAPS {
@FieldAnnotation(relation = "Operation", notEmpty = true, display = false) @FieldAnnotation(relation = "Operation", notEmpty = true, display = false)
private Long operationId; private Long operationId;
@Column(name="MATERIAL_ID") @Column(name="OUTPUT_MATERIAL_ID")
@ApiParam(value ="物料") @ApiParam(value ="物料")
@FieldAnnotation(relation = "Material", notEmpty = true) @FieldAnnotation(relation = "Material", notEmpty = true)
private Long materialId; private Long outputMaterialId;
@Column(name="OUTPUT_COUNT", columnDefinition = "decimal(18,8)") @Column(name="OUTPUT_COUNT", columnDefinition = "decimal(18,8)")
@ApiParam(value ="单位输出量") @ApiParam(value ="单位输出量")
@FieldAnnotation(defaultValue = "1.0")
private Double outputCount; private Double outputCount;
@Column(name="YIELD", columnDefinition = "decimal(18,8)") @Column(name="YIELD", columnDefinition = "decimal(18,8)")
@ApiParam(value ="成品率") @ApiParam(value ="成品率")
@FieldAnnotation(defaultValue = "1.0")
private Double yield; private Double yield;
@Column(name="FIX_SCRAP_COUNT", columnDefinition = "decimal(18,8)") @Column(name="FIX_SCRAP_COUNT", columnDefinition = "decimal(18,8)")
@ApiParam(value ="固定报废数") @ApiParam(value ="固定报废数")
@FieldAnnotation(defaultValue = "0.0")
private Double fixScrapCount; private Double fixScrapCount;
public Operation getOperation() { public Operation getOperation() {
@ -59,13 +62,13 @@ public class OperOutput extends BaseAPS {
BeanRelation.set(this, EOperOutput.Operation, oper); BeanRelation.set(this, EOperOutput.Operation, oper);
} }
public Material getMaterial() { public Material getOutputMaterial() {
return BeanRelation.get(this, EOperOutput.Material); return BeanRelation.get(this, EOperOutput.OutputMaterial);
} }
public void setMaterial(Material material) { public void setOutputMaterial(Material material) {
this.materialId = material != null ? material.getId() : 0l; this.outputMaterialId = material != null ? material.getId() : 0l;
BeanRelation.set(this, EOperOutput.Material, material); BeanRelation.set(this, EOperOutput.OutputMaterial, material);
} }
@JsonBackReference @JsonBackReference

@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
import cn.estsh.i3plus.pojo.aps.holders.EProductOrder; import cn.estsh.i3plus.pojo.aps.holders.EProductOrder;
import cn.estsh.i3plus.pojo.aps.holders.EProductRouting; import cn.estsh.i3plus.pojo.aps.holders.EProductRouting;
import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil;
import com.fasterxml.jackson.annotation.JsonBackReference; import com.fasterxml.jackson.annotation.JsonBackReference;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiParam;
@ -51,6 +52,7 @@ public class ProductOrder extends BaseOrder {
@Column(name="SPECIFY_ROUTING") @Column(name="SPECIFY_ROUTING")
@ApiParam(value ="指定工艺路线") @ApiParam(value ="指定工艺路线")
@FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.OBJECT, typeName = "ProductRouting")
private String specifyRouting; private String specifyRouting;
@Column(name="RECALC_COUNT") @Column(name="RECALC_COUNT")

@ -211,7 +211,12 @@ public class BeanInfo {
} }
public static Set<Class<? extends BaseBean>> getBeanClasses() { public static Set<Class<? extends BaseBean>> getBeanClasses() {
return beanInfos.keySet(); Set<Class<? extends BaseBean>> beanClasses = new HashSet<>();
for (Map.Entry<Class<? extends BaseBean>, BeanInfo> entry : beanInfos.entrySet()) {
beanClasses.add(entry.getKey());
}
return beanClasses;
} }
public static BeanInfo getBeanInfo(Class<? extends BaseBean> cls) { public static BeanInfo getBeanInfo(Class<? extends BaseBean> cls) {
@ -234,9 +239,9 @@ public class BeanInfo {
public static List<Class<? extends BaseBean>> getChildClasses(Class<? extends BaseBean> cls) { public static List<Class<? extends BaseBean>> getChildClasses(Class<? extends BaseBean> cls) {
List<Class<? extends BaseBean>> beanClasses = new ArrayList<>(); List<Class<? extends BaseBean>> beanClasses = new ArrayList<>();
List<BeanInfo> beanInfos = getBeanInfo(cls).childsBeanInfos; List<BeanInfo> childBeanInfos = getBeanInfo(cls).childsBeanInfos;
for (BeanInfo beanInfo : beanInfos) { for (BeanInfo childBeanInfo : childBeanInfos) {
beanClasses.add(beanInfo.getBeanClass()); beanClasses.add(childBeanInfo.getBeanClass());
} }
return beanClasses; return beanClasses;
} }

@ -2,6 +2,6 @@ package cn.estsh.i3plus.pojo.aps.holders;
public enum EOperInput { public enum EOperInput {
Operation, Operation,
Material, InputMaterial,
WorkInputs WorkInputs
} }

@ -2,6 +2,6 @@ package cn.estsh.i3plus.pojo.aps.holders;
public enum EOperOutput { public enum EOperOutput {
Operation, Operation,
Material, OutputMaterial,
WorkOutputs WorkOutputs
} }

@ -40,4 +40,5 @@ public class APSPager extends Pager {
} }
private String filter; private String filter;
private List<SortData> sorts; private List<SortData> sorts;
private String query;
} }

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Class name="OperInput"> <Class name="OperInput">
<Relation field="Material" name="Material" reverse="OperInputs" type="MULTI_TO_ONE" owner="false"> <Relation field="InputMaterial" name="Material" reverse="OperInputs" type="MULTI_TO_ONE" owner="false">
</Relation> </Relation>
</Class> </Class>

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Class name="OperOutput"> <Class name="OperOutput">
<Relation field="Material" name="Material" reverse="OperOutputs" type="MULTI_TO_ONE" owner="false"> <Relation field="OutputMaterial" name="Material" reverse="OperOutputs" type="MULTI_TO_ONE" owner="false">
</Relation> </Relation>
</Class> </Class>

@ -333,7 +333,7 @@ public class ApsEnumUtil {
*/ */
@JsonFormat(shape = JsonFormat.Shape.OBJECT) @JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum RESOURCE_LOCK_TYPE { public enum RESOURCE_LOCK_TYPE {
NONE("NONE", "不锁定"), // NONE("NONE", "不锁定"),
PRODUCE_BEGIN("PRODUCE_BEGIN", "后工序生产开始时刻"), PRODUCE_BEGIN("PRODUCE_BEGIN", "后工序生产开始时刻"),
PRODUCE_END("PRODUCE_END", "后工序生产结束时刻"); PRODUCE_END("PRODUCE_END", "后工序生产结束时刻");

Loading…
Cancel
Save