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

Jenkins自动合并

Browse Source
yun-zuoyi
jenkins 5 years ago
parent c90df4e96a 9e0158e749
commit cf44b8866a
10 changed files with 38 additions and 24 deletions
Show Stats Download Patch File Download Diff File

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

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

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

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

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

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

13
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanInfo.java
Unescape Escape View File

@ -211,7 +211,12 @@ public class BeanInfo {
}
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) {
@ -234,9 +239,9 @@ public class BeanInfo {
public static List<Class<? extends BaseBean>> getChildClasses(Class<? extends BaseBean> cls) {
List<Class<? extends BaseBean>> beanClasses = new ArrayList<>();
List<BeanInfo> beanInfos = getBeanInfo(cls).childsBeanInfos;
for (BeanInfo beanInfo : beanInfos) {
beanClasses.add(beanInfo.getBeanClass());
List<BeanInfo> childBeanInfos = getBeanInfo(cls).childsBeanInfos;
for (BeanInfo childBeanInfo : childBeanInfos) {
beanClasses.add(childBeanInfo.getBeanClass());
}
return beanClasses;
}

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

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

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

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

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

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

2
modules/i3plus-pojo-aps/src/main/resources/relations/OperInput.xml
Unescape Escape View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<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>
</Class>

2
modules/i3plus-pojo-aps/src/main/resources/relations/OperOutput.xml
Unescape Escape View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<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>
</Class>

2
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java
Unescape Escape View File

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

Write Preview
Loading…
Cancel
Save