diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java index 20826ec..aad4948 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java @@ -290,6 +290,10 @@ public class AndonManageQueue extends BaseManageQueue implements Serializable { @ApiParam(value ="响应时长-分钟") private Integer downtime; + @Transient + @ApiParam(value ="故障时长-分钟") + private Integer brokenTime; + // 是否转呼 public Integer getIsShiftCall() { return this.isShiftCall == null ? 0 : this.isShiftCall; @@ -313,7 +317,9 @@ public class AndonManageQueue extends BaseManageQueue implements Serializable { * @param alarmCode * @param andonCount */ - public AndonManageQueue(String workCenterCode,String workCenterNameRdd, String workCellCode,String workCellNameRdd, String equipmentCode, String equipmentNameRdd, String shiftCode, String shiftNameRdd, String alarmCode, Long andonCount) { + public AndonManageQueue(String workCenterCode,String workCenterNameRdd, String workCellCode,String workCellNameRdd, + String equipmentCode, String equipmentNameRdd, String shiftCode, String shiftNameRdd, + String alarmCode, Long andonCount,String callTime,String resetTime) { this.workCenterCode = workCenterCode; this.workCenterNameRdd = workCenterNameRdd; this.workCellNameRdd = workCellNameRdd; @@ -324,6 +330,8 @@ public class AndonManageQueue extends BaseManageQueue implements Serializable { this.shiftNameRdd = shiftNameRdd; this.alarmCode = alarmCode; this.andonCount = andonCount; + this.callTime = callTime; + this.resetTime = resetTime; } /** diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 56a6580..7b07732 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -12,6 +12,46 @@ import com.fasterxml.jackson.annotation.JsonFormat; public class MesEnumUtil { + /** + * MES_SPC关键数据 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SPC_KEY_DATA_OBJECT_TYPE{ + POJO_OBJECT(10,"实体对象（单表）"), + DYNAMIC(20,"动态对象（生产数据表）"); + + private Integer value; + private String description; + SPC_KEY_DATA_OBJECT_TYPE(Integer value,String description ){ + this.value = value; + this.description = description; + } + public static String valueOfDesc(String val) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value.equals(val)) { + return values()[i].description; + } + } + return null; + } + + public Integer getValue() { + return value; + } + + public void setValue(Integer value) { + this.value = value; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + } + @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum HQL_EXPRESSION { GT(">", ">", "大于"), @@ -111,6 +151,36 @@ public class MesEnumUtil { } /** + * 启用还是禁用 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum IS_VALID{ + YES(1,"启用"), + NO(2,"禁用"); + private Integer isValid; + private String description; + + IS_VALID(int isValid,String description){ + this.isValid = isValid; + this.description = description; + } + public int getIsValid() { + return isValid; + } + + public void setIsValid(int isValid) { + this.isValid = isValid; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + } + /** * 排序方式 */ public enum ASC_OR_DESC { @@ -5194,7 +5264,8 @@ public class MesEnumUtil { BOARD_EQU_STATUS("BOARD_EQU_STATUS", "设备状态监控看板(布局模式)"), BOARD_ORG_HOUR_OEE("BOARD_ORG_HOUR_OEE", " 工厂小时OEE"), BOARD_WORK_CELL_STATUS("BOARD_WORK_CELL_STATUS", " 工位状态监听看板"), - BOARD_HNC_WC_CAPACITY("BOARD_HNC_WC_CAPACITY", " 生产线产能看板"); + BOARD_HNC_WC_CAPACITY("BOARD_HNC_WC_CAPACITY", " 生产线产能看板"), + BOARD_MGN_CAPACITY("BOARD_MGN_CAPACITY", "产能看板"); private String code; private String description; @@ -7481,4 +7552,154 @@ public class MesEnumUtil { return tmp; } } + + /** + * mes 看板展示类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SHOW_TYPE { + + PICTURE(10, "图片"), + VIDEO(20, "视频"); + + private int value; + private String description; + + SHOW_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * mes 数据来源 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum QC_CHECK_DATA_SOURCE { + MANUAL_INPUT(10, "10", "人工输入"), + DB(30, "30", "数据库"), + PLC(20, "20", "PLC"); + + private int value; + private String description; + private String code; + + QC_CHECK_DATA_SOURCE(int value, String code, String description) { + this.value = value; + this.description = description; + this.code = code; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * mes 检验值类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum QC_CHECK_VALUE_TYPE { + STRING(10, "字符串"), + INTEGER(20, "数值"); + + private int value; + private String description; + + QC_CHECK_VALUE_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 控制计划审核状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum CONTROL_PLAN_AUDIT_TYPE { + WAIT_AUDIT(10, "待审核"), + AUDIT_PASS(20, "审核通过"), + AUDIT_NON_PASS(30, "审核驳回"); + + private int value; + private String description; + + CONTROL_PLAN_AUDIT_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index fc8dbdb..b28e142 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -866,7 +866,8 @@ public class WmsEnumUtil { OUT_RETURN_RECOVER(700, "OUT_RETURN_RECOVER", "委外返工收回"), WITHOUT_PRICE_CENTER_OUT(710, "WITHOUT_PRICE_CENTER_OUT", "无成本中心出库"), WITHOUT_PRICE_CENTER_IN(720, "WITHOUT_PRICE_CENTER_OUT", "无成本中心入库"), - OTHER_IN(730, "OTHER_IN", "其它入库"); + OTHER_IN(730, "OTHER_IN", "其它入库"), + OTHER_OUT(740, "OTHER_OUT", "其它出库"); private int value; private String code; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDefectData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDefectData.java index ae079bb..289babc 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDefectData.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDefectData.java @@ -6,6 +6,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -67,7 +68,8 @@ public class IfDefectData extends BaseBean implements Serializable { @ApiParam("不良处理类型") private String defectActionType; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数量") private Double qty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDismantleRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDismantleRecord.java index 98d4fc0..991b3a1 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDismantleRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDismantleRecord.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -55,7 +56,8 @@ public class IfDismantleRecord extends BaseBean implements Serializable { @ApiParam("产品条码") private String sn; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("产品数量") private Double qty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java index 280de6b..bab82d3 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -55,7 +56,8 @@ public class IfPackageDetail extends BaseBean implements Serializable { @ApiParam("包装批次") private String lotNo; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数量") private Double qty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPartPull.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPartPull.java index e26bbcd..005e0d3 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPartPull.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPartPull.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -54,7 +55,8 @@ public class IfPartPull extends BaseBean implements Serializable { @ApiParam("子物料编码") private String itemPartNo; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("拉动数量") private Double qty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java index d1dcee7..001d4cd 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -42,7 +43,8 @@ public class IfProductOffLine extends BaseBean implements Serializable { @ApiParam("包装条码") private String packageNo; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数量") private Double qty; @@ -66,7 +68,8 @@ public class IfProductOffLine extends BaseBean implements Serializable { @ApiParam("原材料物料名称") private String itemPartName; - @Column(name = "ITEM_QTY") + @Column(name = "ITEM_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("原材料用量") private Double itemQty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQcOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQcOrder.java index 74de05a..25c6e0e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQcOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQcOrder.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -38,7 +39,8 @@ public class IfQcOrder extends BaseBean implements Serializable { @ApiParam("物料号") private String partNo; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数量") private Double qty = 0D; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java index c9b462d..4693daa 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java @@ -6,6 +6,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -55,7 +56,8 @@ public class IfQueueShipping extends BaseBean implements Serializable { @ApiParam("产品条码") private String productSn; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数量") private Double qty; @@ -115,7 +117,8 @@ public class IfQueueShipping extends BaseBean implements Serializable { @ApiParam("原材料物料名称") private String itemPartName; - @Column(name = "ITEM_QTY") + @Column(name = "ITEM_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("原材料物料用量") private Double itemQty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfRawPartData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfRawPartData.java index bb50de6..561bd95 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfRawPartData.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfRawPartData.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -46,7 +47,8 @@ public class IfRawPartData extends BaseBean implements Serializable { @ApiParam("原料条码") private String serialNumber; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数量") private Double qty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardCustomerData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardCustomerData.java new file mode 100644 index 0000000..9509fc5 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardCustomerData.java @@ -0,0 +1,44 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/4/20 4:47 下午 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_BOARD_CUSTOMER_DATA") +@Api("MES_看板客户相关信息") +public class MesBoardCustomerData extends BaseBean implements Serializable { + + private static final long serialVersionUID = 3871945569470777555L; + + @Column(name = "BOARD_CODE") + @ApiParam("看板代码") + private String boardCode; + + @Column(name = "COMPLAIN_PLAN_QTY") + @ApiParam("客户抱怨目标数量") + private Integer complainPlanQty; + + @Column(name = "COMPLAIN_ACTUAL_QTY") + @ApiParam("客户抱怨实际数量") + private Integer complainActualQty; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardEquDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardEquDetail.java index 16462e9..6902d49 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardEquDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardEquDetail.java @@ -6,6 +6,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -44,11 +45,13 @@ public class MesBoardEquDetail extends BaseBean implements Serializable { @ApiParam("设备名称") private String equName; - @Column(name = "X_AXES") + @Column(name = "X_AXES", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam(value = "横坐标") private Double xAxes = 0d; - @Column(name = "Y_AXES") + @Column(name = "Y_AXES", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam(value = "纵坐标") private Double yAxes = 0d; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardPlanCapacity.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardPlanCapacity.java index 2df2ad6..80d3a4e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardPlanCapacity.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardPlanCapacity.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -64,7 +65,8 @@ public class MesBoardPlanCapacity extends BaseBean implements Serializable { @ApiParam("时段产能") private Integer hourCapacity; - @Column(name = "STOP_TIME") + @Column(name = "STOP_TIME", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("停机时间") private Double stopTime; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardSubmenu.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardSubmenu.java new file mode 100644 index 0000000..55288d0 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardSubmenu.java @@ -0,0 +1,64 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; +import java.io.Serializable; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/4/20 4:47 下午 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_BOARD_SUBMENU") +@Api("MES_看板子菜单") +public class MesBoardSubmenu extends BaseBean implements Serializable { + + private static final long serialVersionUID = 6544735793917822548L; + + @Column(name = "BOARD_CODE") + @ApiParam("看板代码") + private String boardCode; + + @Column(name = "ITEM_NAME") + @ApiParam("子项名称") + private String itemName; + + @Column(name = "ICON") + @ApiParam("ICO图标") + private String icon; + + @Column(name = "SEQ") + @ApiParam("顺序号") + private Integer seq; + + /** + * 10-图片 20-视频 + */ + @Column(name = "SHOW_TYPE") + @ApiParam("展示类型") + private Integer showType; + + @Column(name = "PICTURE_URL") + @ApiParam("图片路径") + private String pictureUrl; + + @Column(name = "VIDEO_URL") + @ApiParam("视频路径") + private String videoUrl; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardWorkCell.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardWorkCell.java index 59d5305..1140335 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardWorkCell.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardWorkCell.java @@ -47,11 +47,13 @@ public class MesBoardWorkCell extends BaseBean implements Serializable { @ApiParam("工作单元代码") private String workCellCode; - @Column(name = "X_AXES") + @Column(name = "X_AXES", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("横坐标") private Double xAxes = 0d; - @Column(name = "Y_AXES") + @Column(name = "Y_AXES", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("纵坐标") private Double yAxes = 0d; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java index a5a8a52..96d5dce 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java @@ -6,6 +6,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -60,7 +61,8 @@ public class MesCellFeed extends BaseBean implements Serializable { @ApiParam("原材料条码") private String rawSn; - @Column(name = "RAW_QTY") + @Column(name = "RAW_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("原材料数量") private Double rawQty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeedRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeedRecord.java index aec9dcf..62e56c9 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeedRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeedRecord.java @@ -6,6 +6,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -59,7 +60,8 @@ public class MesCellFeedRecord extends BaseBean implements Serializable { @ApiParam("原材料条码") private String rawSn; - @Column(name = "RAW_QTY") + @Column(name = "RAW_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("原材料数量") private Double rawQty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesControlPlan.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesControlPlan.java new file mode 100644 index 0000000..b016661 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesControlPlan.java @@ -0,0 +1,64 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description: MES控制计划-主表 + * @CreateDate: 2020/9/27 + * @Author: simon.song + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_CONTROL_PLAN") +@Api("中航控制计划主表") +public class MesControlPlan extends BaseBean implements Serializable { + + private static final long serialVersionUID = 1454433409471781390L; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "PART_NO") + @ApiParam("物料编码") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam("物料名称") + private String partName; + + @Column(name = "CUST_CODE") + @ApiParam("客户代码") + private String custCode; + + @Column(name = "CUST_NAME") + @ApiParam("客户名称") + private String custName; + + @Column(name = "VERSION") + @ApiParam("版本号") + private Integer version; + + @Column(name = "AUDIT_TYPE") + @ApiParam("审核状态") + private Integer auditType; + + @Column(name = "IS_ENABLE") + @ApiParam("是否启用") + private Integer isEnable; + +} 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 92bcd86..71e21af 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 @@ -6,6 +6,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -50,7 +51,8 @@ public class MesCustomerPart extends BaseBean implements Serializable { @ApiParam("客户物料颜色") private String customerPartColor; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("用量") private Double qty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java index 26ca667..54d14d1 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -84,7 +85,8 @@ public class MesDefectRecord extends BaseBean implements Serializable { @ApiParam("不良处理类型") private String defectActionType; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数量") private Double qty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDismantleRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDismantleRecord.java index 6a682d7..d57df5e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDismantleRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDismantleRecord.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -60,7 +61,8 @@ public class MesDismantleRecord extends BaseBean implements Serializable { @ApiParam("生产工单号") private String workOrderNo; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("产品数量") private Double qty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFiCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFiCfg.java index 3bbe40e..06a48ba 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFiCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFiCfg.java @@ -6,6 +6,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -41,7 +42,8 @@ public class MesFiCfg extends BaseBean implements Serializable { @ApiParam("客户代码") private String custCode; - @Column(name = "FI_QTY") + @Column(name = "FI_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("首检数量") private Double fiQty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKeyData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKeyData.java index b17f81d..00839db 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKeyData.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKeyData.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -37,11 +38,13 @@ public class MesKeyData extends BaseBean implements Serializable { @ApiParam("关键数据名称") private String keyDataName; - @Column(name = "UPPER_LIMIT") + @Column(name = "UPPER_LIMIT", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数据上限") private Double upperLimit; - @Column(name = "LOWER_LIMIT") + @Column(name = "LOWER_LIMIT", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数据下限") private Double lowerLimit; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpData.java index 752cdd2..c7a6e6d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpData.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpData.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -47,11 +48,13 @@ public class MesKpData extends BaseBean implements Serializable { @ApiParam("关键数据数量") private Integer keyDataCount; - @Column(name = "UPPER_LIMIT") + @Column(name = "UPPER_LIMIT", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数据上限") private Double upperLimit; - @Column(name = "LOWER_LIMIT") + @Column(name = "LOWER_LIMIT", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数据下限") private Double lowerLimit; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLocation.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLocation.java index 581368f..2ab848c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLocation.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLocation.java @@ -6,6 +6,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -47,7 +48,8 @@ public class MesLocation extends BaseBean implements Serializable { @ApiParam("工作中心代码") private String workCenterCode; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数量") private Double qty = 0d; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMouldPart.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMouldPart.java index 698ffde..0e42446 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMouldPart.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMouldPart.java @@ -6,6 +6,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -39,7 +40,8 @@ public class MesMouldPart extends BaseBean implements Serializable { @ApiParam("模具代码") private String mouldCode; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数量") private Double qty = 0d; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOee.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOee.java index 43454da..bd5d000 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOee.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOee.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -68,11 +69,13 @@ public class MesOee extends BaseBean implements Serializable { @ApiParam("结束时段") private String endTime; - @Column(name = "TOTAL_RUN_TIME", columnDefinition = "decimal(18,4)") + @Column(name = "TOTAL_RUN_TIME", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("总生产时间") private Double totalRunTime; - @Column(name = "TOTAL_STOP_TIME", columnDefinition = "decimal(18,4)") + @Column(name = "TOTAL_STOP_TIME", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("总停机时间") private Double totalStopTime; @@ -92,27 +95,33 @@ public class MesOee extends BaseBean implements Serializable { @ApiParam("实际节拍") private Integer actualTakt; - @Column(name = "TIME_RATE", columnDefinition = "decimal(18,4)") + @Column(name = "TIME_RATE", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("时间开动率") private Double timeRate; - @Column(name = "TAKT_RATE", columnDefinition = "decimal(18,4)") + @Column(name = "TAKT_RATE", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("性能开动率") private Double taktRate; - @Column(name = "QUALIFIED_RATE", columnDefinition = "decimal(18,4)") + @Column(name = "QUALIFIED_RATE", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("良品率") private Double qualifiedRate; - @Column(name = "OEE", columnDefinition = "decimal(18,4)") + @Column(name = "OEE", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("OEE") private Double oee; - @Column(name = "TARGET_OEE", columnDefinition = "decimal(18,3)") + @Column(name = "TARGET_OEE", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("OEE目标值") private Double targetOee; - @Column(name = "MIN_OEE", columnDefinition = "decimal(18,3)") + @Column(name = "MIN_OEE", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("OEE警戒值") private Double minOee; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOffLineRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOffLineRecord.java index bc7b401..5637728 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOffLineRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOffLineRecord.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -55,7 +56,8 @@ public class MesOffLineRecord extends BaseBean implements Serializable { @ApiParam("产品条码") private String serialNumber; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数量") private Double qty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackSpec.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackSpec.java index dac14a4..37a9793 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackSpec.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackSpec.java @@ -40,22 +40,22 @@ public class MesPackSpec extends BaseBean implements Serializable { @ApiParam("包装规格名称") private String specName; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "包装数量", example = "0") private Double qty = 0d; - @Column(name = "QTY2") + @Column(name = "QTY2", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "包装数量2", example = "0") private Double qty2; - @Column(name = "QTY3") + @Column(name = "QTY3", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "包装数量3", example = "0") private Double qty3; - @Column(name = "QTY4") + @Column(name = "QTY4", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "包装数量4", example = "0") private Double qty4; 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 4c1f98a..e1e09fd 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 @@ -6,6 +6,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -42,11 +43,13 @@ public class MesPackage extends BaseBean implements Serializable { @ApiParam("物料名称") private String partNameRdd; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数量") private Double qty; - @Column(name = "PACK_SPEC_QTY") + @Column(name = "PACK_SPEC_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("包装规格数量") private Double packSpecQty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTrans.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTrans.java index 230f503..77c9ed0 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTrans.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTrans.java @@ -6,6 +6,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -43,7 +44,8 @@ public class MesPackageTrans extends BaseBean implements Serializable { @ApiParam("物料名称") private String partNameRdd; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数量") private Double qty = 0d; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java index f26050e..95ae538 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java @@ -6,6 +6,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -48,7 +49,8 @@ public class MesPart extends BaseBean implements Serializable { @ApiParam("零件规格") private String partSpec; - @Column(name = "PART_SPEC_QTY") + @Column(name = "PART_SPEC_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("标准包规数量") private Double partSpecQty; @@ -128,7 +130,8 @@ public class MesPart extends BaseBean implements Serializable { @ApiParam("是否小尺寸物料") private Integer isSmallSize = 1; - @Column(name = "QTY2") + @Column(name = "QTY2", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam(value = "包装数量") private Double qty2; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartSample.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartSample.java index 4b756ee..9ad4d4b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartSample.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartSample.java @@ -6,6 +6,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -37,7 +38,8 @@ public class MesPartSample extends BaseBean implements Serializable { @ApiParam("物料号") private String partNo; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数量") private Double qty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartScheduleBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartScheduleBom.java index ac42795..7689354 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartScheduleBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartScheduleBom.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -37,7 +38,8 @@ public class MesPartScheduleBom extends BaseBean implements Serializable { @ApiParam("关联物料号") private String itemPartNo; - @Column(name = "ITEM_QTY") + @Column(name = "ITEM_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("用量") private Double itemQty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java index d5f6ed3..55bd48c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java @@ -6,6 +6,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -52,11 +53,13 @@ public class MesPlanOrder extends BaseBean implements Serializable { @ApiParam("物料名称") private String partNameRdd; - @Column(name = "PLAN_QTY") + @Column(name = "PLAN_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("计划数量") private Double planQty; - @Column(name = "DECOMPOSE_QTY") + @Column(name = "DECOMPOSE_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("分解数量") private Double decomposeQty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java index 94ceddd..91b3ecd 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java @@ -68,7 +68,7 @@ public class MesProdBindRecord extends BaseBean implements Serializable { @ApiParam("原材料条码") private String kpSn; - @Column(name = "KP_QTY") + @Column(name = "KP_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "原材料数量", example = "0") private Double kpQty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteOptParam.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteOptParam.java index 3bfe3b7..6913225 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteOptParam.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteOptParam.java @@ -8,10 +8,7 @@ import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; +import javax.persistence.*; import java.io.Serializable; /** @@ -26,7 +23,11 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PROD_ROUTE_OPT_PARAM") +@Table(name = "MES_PROD_ROUTE_OPT_PARAM", indexes = { + @Index(columnList = "ROUTE_CODE"), + @Index(columnList = "PROCESS_CODE"), + @Index(columnList = "STEP_CODE") +}) @Api("产品流程配置操作参数表") public class MesProdRouteOptParam extends BaseBean implements Serializable { private static final long serialVersionUID = -5043197912658757665L; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdWorkCenter.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdWorkCenter.java index ed640d7..b463839 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdWorkCenter.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdWorkCenter.java @@ -6,6 +6,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -48,7 +49,8 @@ public class MesProdWorkCenter extends BaseBean implements Serializable { @ApiParam("料箱编号") private String rackNo; - @Column(name = "TARGET_PASS_RATE") + @Column(name = "TARGET_PASS_RATE", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("目标合格率") private Double targetPassRate; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java index b9a1af3..4cd5e8a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -52,7 +53,8 @@ public class MesProduceSn extends BaseBean implements Serializable { @ApiParam("物料名称") private String partNameRdd; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数量") private Double qty; 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 0f176b5..76c61d8 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 @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -53,7 +54,8 @@ public class MesProduceSnTravel extends BaseBean implements Serializable { @ApiParam("物料名称") private String partNameRdd; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数量") private Double qty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java index c6c488a..c215d8b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -97,18 +98,20 @@ public class MesQcCheckStandard extends BaseBean implements Serializable { private String dataSource; @Column(name = "CHECK_VALUE_TYPE") - @ApiParam("任务单类型") + @ApiParam("检测值类型") private String checkValueType; @Column(name = "CHECK_CFG_NO") @ApiParam("检测值配置编号") private String checkCfgNo; - @Column(name = "MAXIMUM") + @Column(name = "MAXIMUM", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("最大数") private Double maximum = 0d; - @Column(name = "MINIMUM") + @Column(name = "MINIMUM", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("最小数") private Double minimum = 0d; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java index 0ff6d06..ed50194 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java @@ -6,6 +6,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -49,11 +50,13 @@ public class MesQcOrder extends BaseBean implements Serializable { @ApiParam("物料名称") private String partName; - @Column(name = "FINISH_QTY") + @Column(name = "FINISH_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("已检数量") private Double finishQty = 0D; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数量") private Double qty = 0D; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderApprovalStatus.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderApprovalStatus.java index c1774c7..2b8d481 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderApprovalStatus.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderApprovalStatus.java @@ -6,6 +6,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -45,7 +46,8 @@ public class MesQcOrderApprovalStatus extends BaseBean implements Serializable { @ApiParam("工单号") private String workOrderNo; - @Column(name = "PLAN_QTY") + @Column(name = "PLAN_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("计划数量") private Double planQty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java index 6fefde1..fb90c4c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java @@ -6,6 +6,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -80,11 +81,13 @@ public class MesQcOrderDetail extends BaseBean implements Serializable { @ApiParam("已检数量") private Integer finishQty; - @Column(name = "MAXIMUM") + @Column(name = "MAXIMUM", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("最大数") private Double maximum = 0d; - @Column(name = "MINIMUM") + @Column(name = "MINIMUM", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("最小数") private Double minimum = 0d; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQualityStandard.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQualityStandard.java new file mode 100644 index 0000000..1df34df --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQualityStandard.java @@ -0,0 +1,118 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; +import java.math.BigDecimal; + +/** + * @Description: MES质量标准-明细表（主表：控制计划MES_CONTROL_PLAN） + * @CreateDate: 2020/9/27 + * @Author: simon.song + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_QUALITY_STANDARD") +@Api("中航质量标准明细表") +public class MesQualityStandard extends BaseBean implements Serializable { + + private static final long serialVersionUID = 1454433409471781390L; + + @Column(name = "CONTROL_PLAN_ID") + @ApiParam("控制计划表主键ID") + private Long controlPlanId; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name = "VERSION") + @ApiParam("版本") + private Integer version; + + //检测类型：10=首检，20=巡检，30=终检，40=发运检 + @Column(name = "CHECK_TYPE") + @ApiParam("检测类型") + private Integer checkType; + + @Column(name = "CHECK_ITEM_TYPE") + @ApiParam("检测项类型") + private String checkItemType; + + @Column(name = "CHECK_ITEM") + @ApiParam("检测项") + private String checkItem; + + @Column(name = "CHECK_STANDARD") + @ApiParam("检测标准") + private String checkStandard; + + @Column(name = "CHECK_GUIDE") + @ApiParam("检测指导") + private String checkGuide; + + @Column(name = "CHECK_FREQUENCY") + @ApiParam("频率") + private String checkFrequency; + + @Column(name = "IS_CONCESSION") + @ApiParam("是否允许让步") + private String isConcession; + + @Column(name = "CHECK_INTERVAL") + @ApiParam("间隔时间") + private String checkInterval; + + //个数标识：标记那几个数量需要进行检验。使用逗号间隔。如：1,2 + @Column(name = "NUMBER_FLAG") + @ApiParam("个数标识") + private String numberFlag; + + @Column(name = "QTY") + @ApiParam("检测数量") + private Integer qty; + + //任务单类型,动态枚举 + @Column(name = "CHECK_ORDER_TYPE") + @ApiParam("任务单类型") + private String checkOrderType; + + //数据来源：10=手工录入，20=PLC，30=DB + @Column(name = "DATA_SOURCE") + @ApiParam("数据来源") + private String dataSource; + + //检验值类型：10=字符串，20=数值 + @Column(name = "CHECK_VALUE_TYPE") + @ApiParam("检验值类型") + private String checkValueType; + + @Column(name = "DIFFERENCE_MAX_LIMIT") + @ApiParam("公差上限") + private BigDecimal differenceMaxLimit; + + @Column(name = "DIFFERENCE_MIN_LIMIT") + @ApiParam("公差下限") + private BigDecimal differenceMinLimit; + + @Column(name = "IS_KEY_CHECK_ITEM") + @ApiParam("是否关键检测项") + private Integer isKeyCheckItem; + + @Column(name = "CHECK_CFG_NO") + @ApiParam("检测值配置编号") + private String checkCfgNo; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJis.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJis.java index 4a6ca87..8035a05 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJis.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJis.java @@ -6,6 +6,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -48,7 +49,8 @@ public class MesQueueJis extends BaseBean implements Serializable { @ApiParam("车号") private String carNo; - @Column(name = "SEQ") + @Column(name = "SEQ", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("排序") private Double seq; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java index 5ecb56c..dd46d65 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java @@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.mes.model.MesButtonFlagModel; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.*; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -50,7 +51,8 @@ public class MesQueueJitActual extends BaseBean implements Serializable { @ApiParam("客户标识号") private String custFlagNo; - @Column(name = "SEQ") + @Column(name = "SEQ", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("排序号") private Double seq; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualBom.java index cde084a..93f729c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualBom.java @@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.*; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -52,7 +53,8 @@ public class MesQueueJitActualBom extends BaseBean implements Serializable { @ApiParam("物料号") private String partNo; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("用量") private Double qty = 0d; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlan.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlan.java index b55af50..04d6155 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlan.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlan.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -53,7 +54,8 @@ public class MesQueueJitPlan extends BaseBean implements Serializable { @ApiParam("选配码") private String vehicleCode; - @Column(name = "SEQ") + @Column(name = "SEQ", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("计划排序号") private Double seq; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanBom.java index 5177ba9..f7eedab 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanBom.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -51,7 +52,8 @@ public class MesQueueJitPlanBom extends BaseBean implements Serializable { @ApiParam("道口") private String dockNo; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("用量") private Double qty; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java index 88771e3..5162f3d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -52,7 +53,8 @@ public class MesQueueOrder extends BaseBean implements Serializable { @ApiParam("产品配置名称") private String prodCfgNameRdd; - @Column(name = "SEQ") + @Column(name = "SEQ", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("排序") private Double seq; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderBom.java index e1066b7..61ad875 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderBom.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -51,7 +52,8 @@ public class MesQueueOrderBom extends BaseBean implements Serializable { @ApiParam("物料号") private String partNo; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("用量") private Double qty = 0d; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java index dff8934..1a8a0d8 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -48,11 +49,13 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable { @ApiParam("产品条码") private String serialNumber; - @Column(name = "SEQ") + @Column(name = "SEQ", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("队列明细序号") private Double seq; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数量") private Double qty; @@ -112,7 +115,8 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable { @ApiParam("队列序号") private Double queueSeq; - @Column(name = "FINSIH_QTY") + @Column(name = "FINSIH_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("已生产数量") private Double finsihQty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueShipping.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueShipping.java index bc23151..3337e50 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueShipping.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueShipping.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -51,7 +52,8 @@ public class MesQueueShipping extends BaseBean implements Serializable { @ApiParam("客户标识号") private String custFlagNo; - @Column(name = "SEQ") + @Column(name = "SEQ", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("排序号") private Double seq; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueShippingDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueShippingDetail.java index 6f0005e..575899c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueShippingDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueShippingDetail.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -67,11 +68,13 @@ public class MesQueueShippingDetail extends BaseBean implements Serializable { @ApiParam("分组序号") private String groupSeq; - @Column(name = "qty") + @Column(name = "qty", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数量") private Double qty; - @Column(name = "SEQ") + @Column(name = "SEQ", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("队列明细序号") private Double seq; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRawPartSn.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRawPartSn.java index ee3e3b5..dd7a8eb 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRawPartSn.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRawPartSn.java @@ -6,6 +6,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -48,7 +49,8 @@ public class MesRawPartSn extends BaseBean implements Serializable { @ApiParam("原材料条码") private String rawSn; - @Column(name = "RAW_QTY") + @Column(name = "RAW_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数量") private Double rawQty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartCfgBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartCfgBom.java index fd2e7c3..f1b5039 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartCfgBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartCfgBom.java @@ -64,7 +64,7 @@ public class MesScatterPartCfgBom extends BaseBean implements Serializable { @ApiParam("零件标志值") private String partFlagValue; - @Column(name = "QTY", columnDefinition = "decimal(18,3)") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "用量", example = "0") public Double qty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartProdCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartProdCfg.java index a95f2be..f562fd3 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartProdCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterPartProdCfg.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -162,11 +163,13 @@ public class MesScatterPartProdCfg extends BaseBean implements Serializable { @ApiParam("是否截至顺序号") private Integer isEndSeq; - @Column(name = "MULTIMEDIA_PLUG_QTY") + @Column(name = "MULTIMEDIA_PLUG_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("多媒体插头数量") private Double multimediaPlusQty; - @Column(name = "QUALIFIED_COUNT") + @Column(name = "QUALIFIED_COUNT", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("应收合格数") private Double qualifiedCount; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScrapRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScrapRecord.java index 8263d3e..6f4c169 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScrapRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScrapRecord.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -69,7 +70,8 @@ public class MesScrapRecord extends BaseBean implements Serializable { @ApiParam("工单编号") private String workOrderNo; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数量") private Double qty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShift.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShift.java index 3fd79bb..fe879fa 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShift.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShift.java @@ -6,6 +6,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -51,7 +52,8 @@ public class MesShift extends BaseBean implements Serializable { @ApiParam("下班时间") private String endTime; - @Column(name = "WORK_TIMES") + @Column(name = "WORK_TIMES", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("作业时长") private Double workTimes; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftRest.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftRest.java index ef567e2..ae77fe6 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftRest.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftRest.java @@ -6,6 +6,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -43,7 +44,8 @@ public class MesShiftRest extends BaseBean implements Serializable { @ApiParam("开始时间") private String startTime; - @Column(name = "REST_TIMES") + @Column(name = "REST_TIMES", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("休息时长") private Double restTimes; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSpcControlCoefficient.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSpcControlCoefficient.java index 4c896fc..a90ab6f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSpcControlCoefficient.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSpcControlCoefficient.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -44,7 +45,8 @@ public class MesSpcControlCoefficient extends BaseBean implements Serializable { @ApiParam("系数描述") private String coefficientDesc; - @Column(name = "COEFFICIENT_VALUE") + @Column(name = "COEFFICIENT_VALUE", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("系数值") private Double coefficientValue; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSpcKeyData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSpcKeyData.java index 774a869..f1c2cfd 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSpcKeyData.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSpcKeyData.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -36,15 +37,18 @@ public class MesSpcKeyData extends BaseBean implements Serializable { @ApiParam("关键数据名称") private String kdName; - @Column(name = "NOMINAL_VALUE") + @Column(name = "NOMINAL_VALUE", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("公称值") private Double nominalValue; - @Column(name = "SPEC_USL") + @Column(name = "SPEC_USL", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("规格上限") private Double specUsl; - @Column(name = "SPEC_LSL") + @Column(name = "SPEC_LSL", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("规格下限") private Double specLsl; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java index 7cd1e59..e159d8e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java @@ -57,7 +57,7 @@ public class MesStationBom extends BaseBean implements Serializable { @ApiParam("原材料物料名称") private String itemPartName; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "子零件数量", example = "0") private Double qty; @@ -86,7 +86,8 @@ public class MesStationBom extends BaseBean implements Serializable { @ApiParam(value = "绑定物料类型") private Integer bindPartType = 20; - @Column(name = "FEED_WARNING_QTY") + @Column(name = "FEED_WARNING_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam(value = "投料预警值") private Double feedWarningQty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTorqueDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTorqueDetail.java index 56743f5..e303080 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTorqueDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTorqueDetail.java @@ -6,6 +6,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -35,15 +36,18 @@ public class MesTorqueDetail extends BaseBean implements Serializable { @ApiParam("过程条码") private String serialNumber; - @Column(name = "UPPER_LIMIT") + @Column(name = "UPPER_LIMIT", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("最大值") private Double upperLimit; - @Column(name = "LOWER_LIMIT") + @Column(name = "LOWER_LIMIT", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("最小值") private Double lowerLimit; - @Column(name = "TORQUE_DETAIL_VALUE") + @Column(name = "TORQUE_DETAIL_VALUE", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("扭矩值") private Double torqueValue; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java index 571dd6c..0739b8d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java @@ -7,6 +7,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -70,7 +71,8 @@ public class MesWorkCell extends BaseBean implements Serializable { @ApiParam("工位等级") private Integer grade; - @Column(name = "TARGET_PASS_RATE") + @Column(name = "TARGET_PASS_RATE", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("目标合格率") private Double targetPassRate; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPoint.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPoint.java index 9ab0cb3..fb8ef53 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPoint.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPoint.java @@ -7,6 +7,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -42,11 +43,13 @@ public class MesWorkCellPoint extends BaseBean implements Serializable { @ApiParam("工作单元代码") private String workCellCode; - @Column(name = "QUEUE_SEQ") + @Column(name = "QUEUE_SEQ", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("队列主表序号") private Double queueSeq; - @Column(name = "QUEUE_DETAIL_SEQ") + @Column(name = "QUEUE_DETAIL_SEQ", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("队列明细表序号") private Double queueDetailSeq; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPointGroup.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPointGroup.java index b539f74..4ca4471 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPointGroup.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPointGroup.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -51,11 +52,13 @@ public class MesWorkCellPointGroup extends BaseBean implements Serializable { @ApiParam("主队列编号") private String orderNo; - @Column(name = "QUEUE_SEQ") + @Column(name = "QUEUE_SEQ", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("队列主表序号") private Double queueSeq; - @Column(name = "QUEUE_DETAIL_SEQ") + @Column(name = "QUEUE_DETAIL_SEQ", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("队列明细表序号") private Double queueDetailSeq; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java index 0d056b6..7582002 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java @@ -6,6 +6,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -50,23 +51,28 @@ public class MesWorkOrder extends BaseBean implements Serializable { @ApiParam("产品配置代码") private String prodCfgCode; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数量") private Double qty; - @Column(name = "COMPLETE_QTY") + @Column(name = "COMPLETE_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("完成数量") private Double completeQty; - @Column(name = "REPAIR_QTY") + @Column(name = "REPAIR_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("返修数量") private Double repairQty; - @Column(name = "SCRAP_QTY") + @Column(name = "SCRAP_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("报废数量") private Double scrapQty; - @Column(name = "SEQ") + @Column(name = "SEQ", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("工单序号") private Double seq; @@ -146,15 +152,18 @@ public class MesWorkOrder extends BaseBean implements Serializable { @ApiParam("客户订单号") private String custOrderNo; - @Column(name = "FI_QTY") + @Column(name = "FI_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("首检数量") private Double fiQty; - @Column(name = "FI_COMPLETE_QTY") + @Column(name = "FI_COMPLETE_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("首检完成数量") private Double fiCompleteQty; - @Column(name = "FI_GENERATE_QTY") + @Column(name = "FI_GENERATE_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("首检生成数量") private Double fiGenerateQty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrderLog.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrderLog.java index 6213888..18be551 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrderLog.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrderLog.java @@ -5,6 +5,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -47,23 +48,28 @@ public class MesWorkOrderLog extends BaseBean implements Serializable { @ApiParam("产品配置代码") private String prodCfgCode; - @Column(name = "QTY") + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("数量") private Double qty; - @Column(name = "COMPLETE_QTY") + @Column(name = "COMPLETE_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("完成数量") private Double completeQty; - @Column(name = "REPAIR_QTY") + @Column(name = "REPAIR_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("返修数量") private Double repairQty; - @Column(name = "SCRAP_QTY") + @Column(name = "SCRAP_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("报废数量") private Double scrapQty; - @Column(name = "SEQ") + @Column(name = "SEQ", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("工单序号") private Double seq; @@ -139,15 +145,18 @@ public class MesWorkOrderLog extends BaseBean implements Serializable { @ApiParam("客户订单号") private String custOrderNo; - @Column(name = "FI_QTY") + @Column(name = "FI_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("首检数量") private Double fiQty; - @Column(name = "FI_COMPLETE_QTY") + @Column(name = "FI_COMPLETE_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("首检完成数量") private Double fiCompleteQty; - @Column(name = "FI_GENERATE_QTY") + @Column(name = "FI_GENERATE_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") @ApiParam("首检生成数量") private Double fiGenerateQty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesControlPlanModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesControlPlanModel.java new file mode 100644 index 0000000..4dab68a --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesControlPlanModel.java @@ -0,0 +1,46 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description: + * @CreateDate: 2020/9/29 + * @Author: simon.song + */ +@Data +public class MesControlPlanModel { + + @ApiParam("控制计划主键ID") + private Long id; + + @ApiParam("工作中心代码") + private String workCenterCode; + + @ApiParam("物料编码") + private String partNo; + + @ApiParam("物料名称") + private String partName; + + @ApiParam("客户代码") + private String custCode; + + @ApiParam("客户名称") + private String custName; + + @ApiParam("版本号") + private Integer version; + + @ApiParam("审核状态") + private Integer auditType; + + @ApiParam("是否启用") + private Integer isEnable; + + @ApiParam("质量标准数组") + private List standardList; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesControlPlanTemplateModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesControlPlanTemplateModel.java new file mode 100644 index 0000000..df5b532 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesControlPlanTemplateModel.java @@ -0,0 +1,136 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.List; + +/** + * @Description: 控制计划导入模板 + * @CreateDate: 2020/9/29 + * @Author: simon.song + */ +@Data +@Api(value="控制计划导入模板",description = "控制计划导入模板") +public class MesControlPlanTemplateModel extends BaseBean { + + private static final long serialVersionUID = 6846982556729401884L; + + @ApiParam("工作中心代码") + @AnnoOutputColumn + private String workCenterCode; + + @ApiParam("物料编码") + @AnnoOutputColumn + private String partNo; + + @ApiParam("物料名称") + @AnnoOutputColumn + private String partName; + + @ApiParam("客户代码") + @AnnoOutputColumn + private String custCode; + + @ApiParam("客户名称") + @AnnoOutputColumn + private String custName; + + @ApiParam("控制计划版本号") + @AnnoOutputColumn + private Integer controlPlanVersion; + + @ApiParam("是否启用") + @AnnoOutputColumn + private Integer isEnable; + +// @Column(name = "IS_ENABLE") +// @ApiParam("是否启用") +// private Integer isEnable; + + @ApiParam("工作单元代码") + @AnnoOutputColumn + private String workCellCode; + + @ApiParam("质量标准版本") + @AnnoOutputColumn + private Integer qualityStandardVersion; + + //检测类型：10=首检，20=巡检，30=终检，40=发运检 + @ApiParam("检测类型") + @AnnoOutputColumn + private Integer checkType; + + @ApiParam("检测项类型") + @AnnoOutputColumn + private String checkItemType; + + @ApiParam("检测项") + @AnnoOutputColumn + private String checkItem; + + @ApiParam("检测标准") + @AnnoOutputColumn + private String checkStandard; + + @ApiParam("检测指导") + @AnnoOutputColumn + private String checkGuide; + + @ApiParam("频率") + @AnnoOutputColumn + private String checkFrequency; + + @ApiParam("是否允许让步") + @AnnoOutputColumn + private String isConcession; + + @ApiParam("间隔时间") + @AnnoOutputColumn + private String checkInterval; + + //个数标识：标记那几个数量需要进行检验。使用逗号间隔。如：1,2 + @ApiParam("个数标识") + @AnnoOutputColumn + private String numberFlag; + + @ApiParam("检测数量") + @AnnoOutputColumn + private Integer qty; + + //任务单类型,动态枚举 + @ApiParam("任务单类型") + @AnnoOutputColumn + private String checkOrderType; + + //数据来源：10=手工录入，20=PLC，30=DB + @ApiParam("数据来源") + @AnnoOutputColumn + private String dataSource; + + //检验值类型：10=字符串，20=数值 + @ApiParam("检验值类型") + @AnnoOutputColumn + private String checkValueType; + + @ApiParam("公差上限") + @AnnoOutputColumn + private BigDecimal differenceMaxLimit; + + @ApiParam("公差下限") + @AnnoOutputColumn + private BigDecimal differenceMinLimit; + + @ApiParam("是否关键检测项") + @AnnoOutputColumn + private Integer isKeyCheckItem; + + @ApiParam("检测值配置编号") + @AnnoOutputColumn + private String checkCfgNo; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesDbCheckRecordModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesDbCheckRecordModel.java index 1fa374a..5d5f06c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesDbCheckRecordModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesDbCheckRecordModel.java @@ -10,6 +10,9 @@ import lombok.Data; */ @Data public class MesDbCheckRecordModel { + @ApiParam("主键") + private Long id; + @ApiParam("过程条码") private String serialNumber; @@ -25,11 +28,15 @@ public class MesDbCheckRecordModel { @ApiParam("缺陷原因") private String defectDesc; - public MesDbCheckRecordModel(String serialNumber, String partNo, String partDesc, String defectType, String defectDesc) { + @ApiParam("生产记录表主键ID") + private Long productDataId; + + public MesDbCheckRecordModel(Long id, String serialNumber, String partNo, String partDesc, String defectDesc, Long productDataId) { + this.id = id; this.serialNumber = serialNumber; this.partNo = partNo; this.partDesc = partDesc; - this.defectType = defectType; this.defectDesc = defectDesc; + this.productDataId = productDataId; } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesProductDataDefectModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesProductDataDefectModel.java index fec884f..d825602 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesProductDataDefectModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesProductDataDefectModel.java @@ -41,4 +41,13 @@ public class MesProductDataDefectModel { this.defectDesc = defectDesc; this.offlineTime = offlineTime; } + + public MesProductDataDefectModel(String orderNo, String partNo, String partDesc, String productSn, String defectDesc, String offlineTime) { + this.orderNo = orderNo; + this.partNo = partNo; + this.partDesc = partDesc; + this.productSn = productSn; + this.defectDesc = defectDesc; + this.offlineTime = offlineTime; + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesQualityStandardModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesQualityStandardModel.java new file mode 100644 index 0000000..dce1aa2 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesQualityStandardModel.java @@ -0,0 +1,83 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * @Description: + * @CreateDate: 2020/9/29 + * @Author: simon.song + */ +@Data +public class MesQualityStandardModel { + + @ApiParam("质量标准主键ID") + private Long id; + + @ApiParam("控制计划表主键ID") + private Long controlPlanId; + + @ApiParam("工作单元代码") + private String workCellCode; + + @ApiParam("版本") + private Integer version; + + //检测类型：10=首检，20=巡检，30=终检，40=发运检 + @ApiParam("检测类型") + private Integer checkType; + + @ApiParam("检测项类型") + private String checkItemType; + + @ApiParam("检测项") + private String checkItem; + + @ApiParam("检测标准") + private String checkStandard; + + @ApiParam("检测指导") + private String checkGuide; + + @ApiParam("频率") + private String checkFrequency; + + @ApiParam("是否允许让步") + private String isConcession; + + @ApiParam("间隔时间") + private String checkInterval; + + //个数标识：标记那几个数量需要进行检验。使用逗号间隔。如：1,2 + @ApiParam("个数标识") + private String numberFlag; + + @ApiParam("检测数量") + private Integer qty; + + //任务单类型,动态枚举 + @ApiParam("任务单类型") + private String checkOrderType; + + //数据来源：10=手工录入，20=PLC，30=DB + @ApiParam("数据来源") + private String dataSource; + + //检验值类型：10=字符串，20=数值 + @ApiParam("检验值类型") + private String checkValueType; + + @ApiParam("公差上限") + private BigDecimal differenceMaxLimit; + + @ApiParam("公差下限") + private BigDecimal differenceMinLimit; + + @ApiParam("是否关键检测项") + private Integer isKeyCheckItem; + + @ApiParam("检测值配置编号") + private String checkCfgNo; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardCustomerDataRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardCustomerDataRepository.java new file mode 100644 index 0000000..41ee9e7 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardCustomerDataRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesBoardCustomerData; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/4/20 8:53 下午 + * @Modify: + */ +@Repository +public interface MesBoardCustomerDataRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardSubMenuRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardSubMenuRepository.java new file mode 100644 index 0000000..c45b135 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardSubMenuRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesBoardSubmenu; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/4/20 8:53 下午 + * @Modify: + */ +@Repository +public interface MesBoardSubMenuRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesControlPlanRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesControlPlanRepository.java new file mode 100644 index 0000000..ab6c93c --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesControlPlanRepository.java @@ -0,0 +1,12 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesControlPlan; + +/** + * @Description: + * @CreateDate: 2020/9/27 + * @Author: simon.song + */ +public interface MesControlPlanRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQualityStandardRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQualityStandardRepository.java new file mode 100644 index 0000000..0693f9c --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQualityStandardRepository.java @@ -0,0 +1,12 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesQualityStandard; + +/** + * @Description: + * @CreateDate: 2020/9/27 + * @Author: simon.song + */ +public interface MesQualityStandardRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index f310d79..da89988 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -870,6 +870,34 @@ public class MesHqlPack { return packBean; } + public static DdlPackBean getMesSpcKeyData(MesSpcKeyData keyData,String organizeCode){ + DdlPackBean packBean = getAllBaseDataByNormalPro(keyData, organizeCode); + if (!StringUtils.isEmpty(keyData.getObjectCode())) { + DdlPreparedPack.getStringEqualPack(keyData.getObjectCode(), "objectCode", packBean); + } + if (!StringUtils.isEmpty(keyData.getFieldCode())) { + DdlPreparedPack.getStringEqualPack(keyData.getFieldCode(), "fieldCode", packBean); + } + if (keyData.getObjectType() != null && keyData.getObjectType() != 0) { + DdlPreparedPack.getNumEqualPack(keyData.getObjectType(), "objectType", packBean); + } + if (!StringUtils.isEmpty(keyData.getKdCondition())) { + DdlPreparedPack.getStringEqualPack(keyData.getKdCondition(), "kdCondition", packBean); + } + if (!StringUtils.isEmpty(keyData.getKdName())) { + DdlPreparedPack.getStringEqualPack(keyData.getKdName(), "kdName", packBean); + } + if (!StringUtils.isEmpty(keyData.getKdCode())) { + DdlPreparedPack.getStringEqualPack(keyData.getKdCode(), "kdCode", packBean); + } + if (keyData.getSpecLsl() != null) { + DdlPreparedPack.getNumEqualPack(keyData.getSpecLsl(), "specLsl", packBean); + } + if (keyData.getSpecUsl() != null) { + DdlPreparedPack.getNumEqualPack(keyData.getSpecUsl(), "specUsl", packBean); + } + return packBean; + } /** * MES 物料关键数据关系信息查询条件封装 * @@ -2299,6 +2327,25 @@ public class MesHqlPack { return packBean; } + public static DdlPackBean getMesSpcKeyData(MesSpcKeyData spcKeyData) { + DdlPackBean packBean = getAllBaseData(spcKeyData.getOrganizeCode()); + if (!StringUtils.isEmpty(spcKeyData.getIsValid())) { + DdlPreparedPack.getNumEqualPack(spcKeyData.getIsValid(), "isValid", packBean); + } + if (!StringUtils.isEmpty(spcKeyData.getKdCode())) { + DdlPreparedPack.getStringEqualPack(spcKeyData.getKdCode(), "kdCode", packBean); + } + if (spcKeyData.getObjectType() != null) { + DdlPreparedPack.getNumEqualPack(spcKeyData.getObjectType(), "objectType", packBean); + } + if (!StringUtils.isEmpty(spcKeyData.getObjectCode())) { + DdlPreparedPack.getStringEqualPack(spcKeyData.getObjectCode(), "objectCode", packBean); + } + if (!StringUtils.isEmpty(spcKeyData.getFieldCode())) { + DdlPreparedPack.getStringEqualPack(spcKeyData.getFieldCode(), "fieldCode", packBean); + } + return packBean; + } /** * 监听任务查询条件封装 * @@ -3342,4 +3389,27 @@ public class MesHqlPack { DdlPreparedPack.getNumEqualPack(mesSubPart.getIsValid(), "isValid", packBean); return packBean; } + + public static DdlPackBean getControlPlan(MesControlPlan controlPlan) { + DdlPackBean packBean = DdlPackBean.getDdlPackBean(controlPlan.getOrganizeCode(), controlPlan.getIsValid()); + if (!StringUtils.isEmpty(controlPlan.getWorkCenterCode())) { + DdlPreparedPack.getStringEqualPack(controlPlan.getWorkCenterCode(), "workCenterCode", packBean); + } +// if (!StringUtils.isEmpty(controlPlan.getWorkCellCode())) { +// DdlPreparedPack.getStringEqualPack(controlPlan.getWorkCellCode(), "workCellCode", packBean); +// } + if (!StringUtils.isEmpty(controlPlan.getPartNo())) { + DdlPreparedPack.getStringEqualPack(controlPlan.getPartNo(), "partNo", packBean); + } + if (!StringUtils.isEmpty(controlPlan.getCustCode())) { + DdlPreparedPack.getStringEqualPack(controlPlan.getCustCode(), "custCode", packBean); + } + if (!StringUtils.isEmpty(controlPlan.getVersion())) { + DdlPreparedPack.getNumberBiggerEqualPack(controlPlan.getVersion(), "version", packBean); + } + if (!StringUtils.isEmpty(controlPlan.getAuditType())) { + DdlPreparedPack.getNumberBiggerEqualPack(controlPlan.getAuditType(), "auditType", packBean); + } + return packBean; + } } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitRecordModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitRecordModel.java new file mode 100644 index 0000000..5367486 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitRecordModel.java @@ -0,0 +1,33 @@ +package cn.estsh.i3plus.pojo.model.softswitch; + +import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitFile; +import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitRecord; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-09-28 17:48 + * @Modify: + **/ +@Data +@ApiModel("适配记录模型") +public class SuitRecordModel { + + @ApiModelProperty("主记录") + private BsSuitRecord bsSuitRecord; + + @ApiModelProperty("适配文件") + private BsSuitFile bsSuitFile; + + public SuitRecordModel() { + } + + public SuitRecordModel(BsSuitRecord bsSuitRecord, BsSuitFile bsSuitFile) { + this.bsSuitRecord = bsSuitRecord; + this.bsSuitFile = bsSuitFile; + } +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java index e859e21..f80ec78 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java @@ -41,6 +41,7 @@ public class SuitServerModel implements Serializable { private String requestId; // 传输单对象 @XmlElement(name = "data") + @XStreamAlias("data") private Object obj; // 传输集合 private List list; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMessageStyleModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMessageStyleModel.java index 0a8b2f9..7e1103a 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMessageStyleModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMessageStyleModel.java @@ -57,7 +57,7 @@ public class WmsMessageStyleModel implements Serializable { } else if (actQty == transQty) {//处理完成 this.odStatus = WmsEnumUtil.MASTER_ORDER_STATUS.RECEIPT_FINISH.getValue(); } else if (transQty < actQty) {//处理中 处理数量可以大于需求数量 - this.odStatus = WmsEnumUtil.MASTER_ORDER_STATUS.RECEIPT.getValue(); + this.odStatus = WmsEnumUtil.MASTER_ORDER_STATUS.RECEIPT_FINISH.getValue(); } } } diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseFTP.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseFTP.java index 93a159f..bce2e0d 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseFTP.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseFTP.java @@ -123,6 +123,9 @@ public class BsSuitCaseFTP extends BaseBean { @Transient @ApiParam(value = "临时适配路径") private String tempSuitFilePath; + @Transient + @ApiParam(value = "临时适配路径") + private List ftpFileList; @Transient @ApiParam(value = "适配文件列表") diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitFile.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitFile.java index 7e2b460..7d4b198 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitFile.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitFile.java @@ -85,4 +85,19 @@ public class BsSuitFile extends BaseBean { @ApiParam(value = "处理时间") private String processTime; + public void setFtpPathInfo(String ftpPathInfo){ + if(ftpPathInfo == null){ + return; + } + + int pathIdx = ftpPathInfo.lastIndexOf("/"); + if (pathIdx == -1) { + this.setFolderPath("/"); + this.setFileName(ftpPathInfo); + }else{ + this.setFolderPath(ftpPathInfo.substring(0,pathIdx)); + this.setFileName(ftpPathInfo.substring(pathIdx + 1)); + } + } + } diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java index d3af46c..f13d15b 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java @@ -128,6 +128,7 @@ public class BsSuitRecord extends BaseBean { @Column(name = "PROCESS_STATE") @ApiParam(value = "处理状态") + @AnnoOutputColumn(refClass = BlockSoftSwitchEnumUtil.SUIT_PROCESS_STATUS.class) private Integer processState; @Column(name = "PROCESS_TIME") diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java index cfa357f..2d9e16d 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java @@ -387,6 +387,7 @@ public class SoftSwitchHqlPack { DdlPreparedPack.getStringLikerPack(bsSuitFile.getSuitCaseCode(),"suitCaseCode",ddlPackBean); DdlPreparedPack.getNumEqualPack(bsSuitFile.getSuitCaseId(), "suitCaseId", ddlPackBean); DdlPreparedPack.getStringLikerPack(bsSuitFile.getFileName(), "fileName", ddlPackBean); + DdlPreparedPack.getStringLikerPack(bsSuitFile.getFolderPath(), "folderPath", ddlPackBean); DdlPreparedPack.timeBuilder(bsSuitFile.getSuitDateTime(), "suitDateTime", ddlPackBean, false, true); ddlPackBean.setOrderByStr(bsSuitFile.orderBy()); @@ -430,4 +431,13 @@ public class SoftSwitchHqlPack { DdlPreparedPack.getNumEqualPack(bsBusiScript.getRefId(),"refId",ddlPackBean); return ddlPackBean; } + + public static DdlPackBean packHqlCheckSuitFile(BsSuitFile bsSuitFile){ + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(bsSuitFile); + DdlPreparedPack.getNumEqualPack(bsSuitFile.getSuitCaseId(), "suitCaseId", ddlPackBean); + DdlPreparedPack.getStringEqualPack(bsSuitFile.getFileName(),"fileName",ddlPackBean); + DdlPreparedPack.getStringEqualPack(bsSuitFile.getFolderPath(),"folderPath",ddlPackBean); + DdlPreparedPack.getNumNOEqualPack(bsSuitFile.getId(),"id",ddlPackBean); + return ddlPackBean; + } } diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorAlarm.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorAlarm.java new file mode 100644 index 0000000..b8acd2d --- /dev/null +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorAlarm.java @@ -0,0 +1,65 @@ +package cn.estsh.i3plus.pojo.sweb.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : 供应商报警单 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-09-27 + * @Modify: + **/ +@Data +@Table(name = "SWEB_VENDOR_ALARM") +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api("供应商报警单") +public class SwebVendorAlarm extends BaseBean { + @Column(name = "PART_NO") + @ApiParam("物料代码") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam("物料名称") + private String partName; + + @Column(name = "VENDOR_CODE") + @ApiParam("供应商代码") + private String vendorCode; + + @Column(name = "VENDOR_NAME") + @ApiParam("供应商名称") + private String vendorName; + + @Column(name = "ALARM_CONTENT") + @ApiParam("报警内容") + private String alarmContent; + + @Column(name = "ALARM_LEVEL") + @ApiParam("报警级别") + private Integer alarmLevel; + + @Column(name = "STATUS") + @ApiParam("状态") + private Integer status; + + @Column(name = "ORDER_NO") + @ApiParam("订单号") + private String orderNo; + + @Column(name = "PART_SPEC") + @ApiParam("物料描述") + private String partSpec; +} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebVendorAlarmRepository.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebVendorAlarmRepository.java new file mode 100644 index 0000000..cfb7325 --- /dev/null +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebVendorAlarmRepository.java @@ -0,0 +1,9 @@ +package cn.estsh.i3plus.pojo.sweb.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.sweb.bean.SwebVendorAlarm; +import org.springframework.stereotype.Repository; + +@Repository +public interface SwebVendorAlarmRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java index e81e51b..e18520b 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java @@ -204,9 +204,13 @@ public class SwebHqlPack { return buildHql(details, result); } - public static DdlPackBean getVendorSupplierCapcity(SwebVendorSupplierCapcity capcity) { + public static DdlPackBean getVendorSupplierCapcity(SwebVendorSupplierCapcity capcity, List vendorCodes) { DdlPackBean result = new DdlPackBean(); - DdlPreparedPack.getStringLikerPack(capcity.getVendorCode(), "vendorCode", result); + if (vendorCodes.size() == 1) { + DdlPreparedPack.getStringLikerPack(vendorCodes.get(0), "vendorCode", result); + } else if (vendorCodes.size() > 1){ + DdlPreparedPack.getInPackList(vendorCodes, "vendorCode", result); + } DdlPreparedPack.getStringLikerPack(capcity.getPartNo(), "partNo", result); DdlPreparedPack.getNumEqualPack(capcity.getStatus(), "status", result); if (!StringUtil.isEmpty(capcity.getDateStart())) { @@ -219,9 +223,13 @@ public class SwebHqlPack { return buildHql(capcity, result); } - public static DdlPackBean getSwebRequireAlarm(SwebRequireAlarm alarm) { + public static DdlPackBean getSwebRequireAlarm(SwebRequireAlarm alarm, List vendorCodes) { DdlPackBean result = new DdlPackBean(); - DdlPreparedPack.getStringLikerPack(alarm.getVendorCode(), "vendorCode", result); + if (vendorCodes.size() == 1) { + DdlPreparedPack.getStringLikerPack(vendorCodes.get(0), "vendorCode", result); + } else if (vendorCodes.size() > 1){ + DdlPreparedPack.getInPackList(vendorCodes, "vendorCode", result); + } DdlPreparedPack.getStringLikerPack(alarm.getPartNo(), "partNo", result); if (!StringUtil.isEmpty(alarm.getDateStart())) { DdlPreparedPack.getStringBiggerPack(alarm.getDateStart(), "countDate", result); @@ -233,17 +241,28 @@ public class SwebHqlPack { return buildHql(alarm, result); } - public static DdlPackBean getSwebVendorStock(SwebVendorStock stock) { + public static DdlPackBean getSwebVendorStock(SwebVendorStock stock, List vendorCodes) { DdlPackBean result = new DdlPackBean(); - DdlPreparedPack.getStringLikerPack(stock.getVendorCode(), "vendorCode", result); + if (vendorCodes.size() == 1) { + DdlPreparedPack.getStringLikerPack(vendorCodes.get(0), "vendorCode", result); + } else if (vendorCodes.size() > 1){ + DdlPreparedPack.getInPackList(vendorCodes, "vendorCode", result); + } DdlPreparedPack.getStringLikerPack(stock.getPartNo(), "partNo", result); -// if (!StringUtil.isEmpty(alarm.getDateStart())) { -// DdlPreparedPack.getStringBiggerPack(alarm.getDateStart(), "countDate", result); -// } -// if (!StringUtil.isEmpty(alarm.getDateEnd())) { -// DdlPreparedPack.getStringSmallerPack(alarm.getDateEnd(), "countDate", result); -// } DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result); return buildHql(stock, result); } + + public static DdlPackBean getSwebVendorAlarm(SwebVendorAlarm alarm, List vendorCodes) { + DdlPackBean result = new DdlPackBean(); + if (vendorCodes.size() == 1) { + DdlPreparedPack.getStringLikerPack(vendorCodes.get(0), "vendorCode", result); + } else if (vendorCodes.size() > 1){ + DdlPreparedPack.getInPackList(vendorCodes, "vendorCode", result); + } + DdlPreparedPack.getStringLikerPack(alarm.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringLikerPack(alarm.getPartNo(), "partNo", result); + DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result); + return buildHql(alarm, result); + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java index dcc76ee..68abad8 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java @@ -112,7 +112,7 @@ public class WmsCSOrderDetails extends BaseBean { @ApiParam(value = "供应商编码") public String vendorNo; - @Column(name = "LOT_NO", nullable = false) + @Column(name = "LOT_NO") @ColumnDefault("") @ApiParam("收货批次") public String lotNo = ""; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index 82d05f2..f24ff0c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java @@ -344,6 +344,9 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam(value = "子位置号") private String itemSeqNo; + @ApiParam(value = "最早需求时间") + private String firstTime; + public String getRecommondLot() { return recommondLot == null ? "无" : this.recommondLot; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java index 7cd233a..bb34224 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java @@ -338,6 +338,14 @@ public class WmsDocMovementMaster extends BaseBean { @ApiParam(value = "过滤业务类型") private String filterBusiType; + @Transient + @ApiParam("源存储区代码") + public String srcZoneNo; + + @Transient + @ApiParam("目标库位代码") + public String destLocateNo; + public int getOrderStatusVal() { return this.orderStatus == null ? 0 : this.orderStatus; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java index f3e05c4..50d0007 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java @@ -348,4 +348,13 @@ public class WmsPart extends BaseBean { this.qty = cqty; this.createDatetime = createDateTime; } + + public WmsPart(String partNo, String partName, String inLocateNo, String stockUnit, Double snp, String partSpec) { + this.partNo = partNo; + this.partName = partName; + this.inLocateNo = inLocateNo; + this.stockUnit = stockUnit; + this.snp = snp; + this.partSpec = partSpec; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPrintingQueue.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPrintingQueue.java index 9aac6f4..69724ce 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPrintingQueue.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPrintingQueue.java @@ -52,4 +52,8 @@ public class WmsPrintingQueue extends BaseBean{ @Column(name="PRINT_STATUS") @ApiParam("打印状态") private Integer printStatus; + + @Column(name="VENDOR_NO") + @ApiParam("供应商编码") + private String vendorNo; } \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java index e26eba3..8fe824f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java @@ -126,6 +126,10 @@ public class WmsQCMaster extends BaseBean { @ApiParam(value = "零件名称") public String partNameRdd; + @Transient + @ApiParam(value = "收货数量") + public Double qty; + public int getOrderStatusVal() { return this.orderStatus == null ? 0 : this.orderStatus; } @@ -152,4 +156,16 @@ public class WmsQCMaster extends BaseBean { this.partNameRdd = partNameRdd; this.createDatetime = createDatetime; } + + public WmsQCMaster(String orderNo, Double qty, String vendorNo, String VendorDesc, String refType, String refSrc, String partNo, String partNameRdd, String createDatetime) { + this.orderNo = orderNo; + this.qty = qty; + this.vendorNo = vendorNo; + this.VendorDesc = VendorDesc; + this.refType = refType; + this.refSrc = refSrc; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.createDatetime = createDatetime; + } } diff --git a/sonar-project.properties b/sonar-project.properties index 268eaf2..0786d8d 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -6,7 +6,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo # defaults to project key sonar.projectName=i3plus-pojo # defaults to 'not provided' -sonar.projectVersion=1.0-DEV-SNAPSHOT +sonar.projectVersion=1.0-TEST-SNAPSHOT # Path is relative to the sonar-project.properties file. Defaults to . #sonar.sources=./