diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustomerPart.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustomerPart.java index bf19863..0a93045 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustomerPart.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustomerPart.java @@ -40,4 +40,8 @@ public class MesCustomerPart extends BaseBean { @ApiParam("客户零件号") private String customerPartNo; + @Column(name = "CUSTOMER_PART_NAME") + @ApiParam("客户零件描述") + private String customerPartName; + } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java index 2f6d04b..332fe9f 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java @@ -48,7 +48,7 @@ public class MesPackage extends BaseBean { private Double packSpecQty; @Column(name = "UNIT") - @ApiParam("danwei") + @ApiParam("单位") private String unit; @Column(name = "LOT_NO") @@ -83,13 +83,16 @@ public class MesPackage extends BaseBean { @ApiParam("备注") private String memo; + @Column(name = "CUST_CODE") + @ApiParam("客户代码") + private String custCode; + @Transient @ApiParam("封箱状态") private String sealStatus; - @Transient - @ApiParam("客户代码") - private String custCode; + + public MesPackage() { } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSnTravel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSnTravel.java index e162d62..bd8d086 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSnTravel.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSnTravel.java @@ -29,9 +29,13 @@ import javax.persistence.Transient; @Api("产品条码履历表") public class MesProduceSnTravel extends BaseBean { @Column(name = "SERIAL_NUMBER") - @ApiParam("产品条码") + @ApiParam("过程条码") private String serialNumber; + @Column(name = "PRODUCT_SN") + @ApiParam("产品条码") + private String productSn; + @Column(name = "PART_NO") @ApiParam("物料号") private String partNo; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepParamsModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepParamsModel.java new file mode 100644 index 0000000..7b2296f --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepParamsModel.java @@ -0,0 +1,29 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; +import java.util.Map; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/11/12 3:50 下午 + * @Description: 下拉工步参数对象 + **/ +@Data +@Api("下拉工步参数对象") +public class StepParamsModel implements Serializable { + private static final long serialVersionUID = -6361645141217616499L; + + @ApiParam("参数代码") + private String paramCode; + + @ApiParam("参数代码") + private Map paramValues; + + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepPrintSnModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepPrintSnModel.java index 385a651..2d627aa 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepPrintSnModel.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepPrintSnModel.java @@ -44,4 +44,13 @@ public class StepPrintSnModel extends MesProduceSn { @ApiParam("包装规格") private String packageSpec; + + @ApiParam("供应商") + private String supplier; + + @ApiParam("客户名称") + private String customerName; + + @ApiParam("客户物料名称") + private String customerPartName; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerPart.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerPart.java index 31e9109..b66a21c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerPart.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerPart.java @@ -40,4 +40,7 @@ public class MesCustomerPart extends BaseBean { @ApiParam("客户零件号") private String customerPartNo; + @Column(name = "CUSTOMER_PART_NAME") + @ApiParam("客户零件描述") + private String customerPartName; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java index 6d4f2f2..ce04c3d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java @@ -83,12 +83,12 @@ public class MesPackage extends BaseBean { @ApiParam("备注") private String memo; + @Column(name = "CUST_CODE") + @ApiParam("客户代码") + private String custCode; + @Transient @ApiParam("封箱状态") private String sealStatus; - @Transient - @ApiParam("客户代码") - private String custCode; - } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java index 4eed687..d3d073b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java @@ -29,9 +29,13 @@ import javax.persistence.Transient; @Api("产品条码履历表") public class MesProduceSnTravel extends BaseBean { @Column(name = "SERIAL_NUMBER") - @ApiParam("产品条码") + @ApiParam("过程条码") private String serialNumber; + @Column(name = "PRODUCT_SN") + @ApiParam("产品条码") + private String productSn; + @Column(name = "PART_NO") @ApiParam("物料号") private String partNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepParamsModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepParamsModel.java new file mode 100644 index 0000000..2a90b5e --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepParamsModel.java @@ -0,0 +1,29 @@ +package cn.estsh.i3plus.pojo.mes.model; + + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; +import java.util.Map; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/11/12 3:50 下午 + * @Description: 下拉工步参数对象 + **/ +@Data +@Api("下拉工步参数对象") +public class StepParamsModel implements Serializable { + private static final long serialVersionUID = -6361645141217616499L; + + @ApiParam("参数代码") + private String paramCode; + + @ApiParam("参数代码") + private Map paramValues; + + +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StationRequestBean.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StationRequestBean.java index 3dafd66..49f72e3 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StationRequestBean.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StationRequestBean.java @@ -32,6 +32,9 @@ public class StationRequestBean implements Serializable { @ApiParam("组织代码") private String organizeCode; + @ApiParam("组织名称") + private String organizeName; + @ApiParam("工作中心代码") private String workCenterCode;