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 6a9bff3..99f2ba2 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 @@ -4996,4 +4996,93 @@ public class MesEnumUtil { } } + /** + * 看板类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum BOARD_TYPE { + BOARD_CAPACITY_JIT("BOARD_CAPACITY_JIT", "产能监控看板(JIT)"), + BOARD_EQU_STATUS("BOARD_EQU_STATUS", "设备状态监控看板(布局模式)"); + + private String code; + private String description; + + BOARD_TYPE(String code, String description) { + this.code = code; + this.description = description; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + public static BOARD_TYPE getByCode(String code) { + for (BOARD_TYPE boardType : values()) { + if (boardType.getCode().equals(code)) { + return boardType; + } + } + return null; + } + + public static String valueOfDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 看板类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum BOARD_OBJECT_TYPE { + ORGANIZE_CODE("organizeCode", "工厂代码"), + AREA_CODE("areaCode", "区域代码"), + WORK_CENTER_CODE("workCenterCode", "产线代码"); + + private String value; + private String description; + + BOARD_OBJECT_TYPE(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static BOARD_OBJECT_TYPE getByCode(String code) { + for (BOARD_OBJECT_TYPE boardObjectType : values()) { + if (boardObjectType.getValue().equals(code)) { + return boardObjectType; + } + } + return null; + } + + public static String valueOfDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value.equals(code)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index 75612bd..b7d0c56 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -3277,7 +3277,7 @@ public class MesPcnEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum SHIPPING_ACTUAL_STATUS { CREATE(10, "创建"), - SHIPPED(20, "已发运"); + CANCEL(20, "已发运"); private int value; private String description; 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 1b3c5ae..a4a7078 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 @@ -6415,4 +6415,95 @@ public class WmsEnumUtil { return valueOf(val); } } + + /** + * BatchHold 检测大类 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum BH_CHECK_TYPE { + FUNCTION(10, "FUNCTION", "功能检测"), + SIZE(20, "SIZE", "尺寸检测"), + DEPTH(30, "DEPTH", "熔深检测"); + + private int value; + private String code; + private String description; + + BH_CHECK_TYPE(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + return valueOf(val); + } + } + + /** + * BatchHold 值类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum BH_VALUE_TYPE { + NUMBER(10, "NUMBER", "功能检测"), + TEXT(20, "TEXT", "尺寸检测"); + + private int value; + private String code; + private String description; + + BH_VALUE_TYPE(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + return valueOf(val); + } + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/.DS_Store b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/.DS_Store new file mode 100644 index 0000000..cc05df3 Binary files /dev/null and b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/.DS_Store differ 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 154eada..22c7b64 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 @@ -42,9 +42,11 @@ public class MesBoardEquDetail extends BaseBean implements Serializable { @ApiParam("设备名称") private String equName; + @Column(name = "HORIZONTAL_AXIS") @ApiParam(value = "横坐标") private Float horizontalAxis = 0f; + @Column(name = "VERTICAL_AXIS") @ApiParam(value = "纵坐标") private Float verticalAxis = 0f; } 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 cb09cd4..842f52f 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 @@ -57,6 +57,10 @@ public class MesBoardPlanCapacity extends BaseBean implements Serializable { private Integer planCapacity; @Transient + @ApiParam("班次名称") + private String shiftName; + + @Transient @ApiParam("看板时段计划产量") private List boardShiftSectionCapacities; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardShiftSection.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardShiftSection.java index 64f4771..e9138cf 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardShiftSection.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardShiftSection.java @@ -11,6 +11,7 @@ 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; /** @@ -49,4 +50,8 @@ public class MesBoardShiftSection extends BaseBean implements Serializable { @Column(name = "IS_SPANDAY") @ApiParam("是否跨天") private Integer isSpanday; + + @Transient + @ApiParam("班次名称") + private String shiftName; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardShiftSectionCapacity.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardShiftSectionCapacity.java index cdf0482..2b2e211 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardShiftSectionCapacity.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardShiftSectionCapacity.java @@ -11,6 +11,7 @@ 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; /** @@ -53,4 +54,8 @@ public class MesBoardShiftSectionCapacity extends BaseBean implements Serializab @Column(name = "PLAN_CAPACITY") @ApiParam("计划产量") private Integer planCapacity; + + @Transient + @ApiParam("实际产量") + private Integer actualCapacity; } 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 new file mode 100644 index 0000000..46fe2ed --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOffLineRecord.java @@ -0,0 +1,68 @@ +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/22 11:03 上午 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_OFF_LINE_RECORD") +@Api("MES_产品下线记录") +public class MesOffLineRecord extends BaseBean implements Serializable { + + private static final long serialVersionUID = -2767323581134885752L; + + @Column(name = "AREA_CODE") + @ApiParam("区域代码") + private String areaCode; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "PART_NAME_RDD") + @ApiParam("物料名称") + private String partNameRdd; + + @Column(name = "SERIAL_NUMBER") + @ApiParam("产品条码") + private String serialNumber; + + @Column(name = "QTY") + @ApiParam("数量") + private Double qty; + + @Column(name = "WORK_ORDER_NO") + @ApiParam("生产工单号") + private String workOrderNo; + + @Column(name = "OFF_LINE_TIME") + @ApiParam("下线时间") + private String offLineTime; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BoardModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BoardModel.java index b4284e5..d1dd2da 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BoardModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BoardModel.java @@ -1,5 +1,7 @@ package cn.estsh.i3plus.pojo.mes.model; +import cn.estsh.i3plus.pojo.mes.bean.MesBoardEquDetail; +import cn.estsh.i3plus.pojo.mes.bean.MesBoardEquStatus; import cn.estsh.i3plus.pojo.mes.bean.MesBoardShiftSectionCapacity; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -29,9 +31,21 @@ public class BoardModel { @ApiParam("实际人数") private Integer actualPeopleNum; + @ApiParam("计划产量") + private Integer planCapacity; + @ApiParam("目标达成数") - private Integer achievedPeopleNum; + private Integer achievedNum; + + @ApiParam("看板图片路径") + private String pictureUrl; @ApiParam("看板时段计划产量") private List boardShiftSectionCapacityList; + + @ApiParam("看板设备状态") + private List boardEquStatusList; + + @ApiParam("看板设备明细") + private List boardEquDetailList; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesOffLineRecordRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesOffLineRecordRepository.java new file mode 100644 index 0000000..80e3159 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesOffLineRecordRepository.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.MesOffLineRecord; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/4/22 11:10 上午 + * @Modify: + */ +@Repository +public interface MesOffLineRecordRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlWindow.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlWindow.java deleted file mode 100644 index 66904b1..0000000 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlWindow.java +++ /dev/null @@ -1,40 +0,0 @@ -package cn.estsh.i3plus.pojo.ptl.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; - -/** - * @author Wynne.Lu - * @date 2020/2/12 17:41 - * @desc - */ - -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@Table(name = "PTL_WINDOW") -@EqualsAndHashCode(callSuper = true) -@Api("PTL_界面") -public class PtlWindow extends BaseBean implements Serializable { - private static final long serialVersionUID = -1596443842758197995L; - - @Column(name = "WINDOW_NO") - @ApiParam("界面代码") - private String windowNo; - - @Column(name = "WINDOW_NAME") - @ApiParam("界面名称") - private String windowName; -} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlWindowElement.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlWindowElement.java deleted file mode 100644 index 02ee762..0000000 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlWindowElement.java +++ /dev/null @@ -1,40 +0,0 @@ -package cn.estsh.i3plus.pojo.ptl.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; - -/** - * @author Wynne.Lu - * @date 2020/2/12 17:41 - * @desc - */ - -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@Table(name = "PTL_WINDOW_ELEMENT") -@EqualsAndHashCode(callSuper = true) -@Api("PTL_界面元素") -public class PtlWindowElement extends BaseBean implements Serializable { - private static final long serialVersionUID = -1596427582758197995L; - - @Column(name = "WINDOW_NO") - @ApiParam("界面代码") - private String windowNo; - - @Column(name = "ELEMENT_NO") - @ApiParam("元素代码") - private String elementNo; -} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlWindowElementAttribute.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlWindowElementAttribute.java deleted file mode 100644 index b291eff..0000000 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlWindowElementAttribute.java +++ /dev/null @@ -1,49 +0,0 @@ -package cn.estsh.i3plus.pojo.ptl.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; - -/** - * @author Wynne.Lu - * @date 2020/2/12 17:41 - * @desc - */ - -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@Table(name = "PTL_WINDOW_ELEMENT_ATTRIBUTE") -@EqualsAndHashCode(callSuper = true) -@Api("PTL_界面元素属性") -public class PtlWindowElementAttribute extends BaseBean implements Serializable { - private static final long serialVersionUID = -1596427582758285995L; - - @Column(name = "WINDOW_NO") - @ApiParam("界面代码") - private String windowNo; - - @Column(name = "ELEMENT_NO") - @ApiParam("元素代码") - private String elementNo; - - @Column(name = "ATTRIBUTE_NO") - @ApiParam("属性代码") - private String attributeNo; - - @Column(name = "ATTRIBUTE_VALUE") - @ApiParam("属性值") - private String attributeValue; - -} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpTemplate.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpTemplate.java index d091e87..697f6dd 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpTemplate.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpTemplate.java @@ -55,4 +55,12 @@ public class MesPpTemplate extends BaseBean { @ApiParam(value = "工单数量") @AnnoOutputColumn private Double qty; + + @ApiParam(value = "序号") + @AnnoOutputColumn + private Integer seq; + + @ApiParam(value = "零件组号") + @AnnoOutputColumn + public String partGroupNo; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBhChildDetectionItem.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBhChildDetectionItem.java new file mode 100644 index 0000000..e157150 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBhChildDetectionItem.java @@ -0,0 +1,52 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +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 : BH子检测项 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-04-23 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "WMS_BH_CHILD_DETECTION_ITEM") +@Api("BH子检测项") +public class WmsBhChildDetectionItem extends BaseBean { + + @Column(name = "CHECK_TYPE") + @ApiParam("检测大类") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "BH_CHECK_TYPE") + private Integer checkType; + + @Column(name = "ITEM_CHECK_CODE") + @ApiParam("子检测项代码") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String itemCheckCode; + + @Column(name = "ITEM_CHECK_NAME") + @ApiParam("子检测项名称") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String itemCheckName; + + @Column(name = "VALUE_TYPE") + @ApiParam("值类型") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "BH_VALUE_TYPE") + private Integer valueType; +} 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 92a70bb..574361d 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 @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; @@ -185,6 +186,15 @@ public class WmsDocMovementDetails extends BaseBean { private String soOrderNo; @Transient + @ApiParam(value = "替代物料编码") + private String subPartNo; + + + @Transient + @ApiParam(value = "替代物料名称") + private String subPartName; + + @Transient @ApiParam("实际批次") private String actualLot; 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 ead19c3..3fe234b 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 @@ -11,7 +11,11 @@ import lombok.ToString; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.*; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Index; +import javax.persistence.Table; +import javax.persistence.Transient; import java.util.List; /** @@ -115,6 +119,10 @@ public class WmsDocMovementMaster extends BaseBean { @ApiParam(value = "客户单号") private String custOrderNo; + @Column(name = "REMARK") + @ApiParam("备注") + private String remark; + @Transient private List movementDetailsList; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartCheckType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartCheckType.java new file mode 100644 index 0000000..5af3d21 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartCheckType.java @@ -0,0 +1,57 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +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-04-23 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "WMS_PART_CHECK_TYPE") +@Api("物料检测大类") +public class WmsPartCheckType extends BaseBean { + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("产线代码") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String workCenterCode; + + @Column(name = "PART_NO") + @ApiParam("物料号") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam("物料名称") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String partName; + + @Column(name = "CHECK_TYPE") + @ApiParam("检测大类") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "BH_CHECK_TYPE") + private Integer checkType; + + @Column(name = "SAMPLE_SIZE") + @ApiParam("样本数") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + private Integer sampleSize; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartItemCheck.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartItemCheck.java new file mode 100644 index 0000000..8498c36 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartItemCheck.java @@ -0,0 +1,77 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +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-04-23 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "WMS_PART_ITEM_CHECK") +@Api("物料子检测项") +public class WmsPartItemCheck extends BaseBean { + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("产线代码") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String workCenterCode; + + @Column(name = "PART_NO") + @ApiParam("物料号") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String partNo; + + @Column(name = "CHECK_TYPE") + @ApiParam("检测大类") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "BH_CHECK_TYPE") + private Integer checkType; + + @Column(name = "CHECK_ITEM_CODE") + @ApiParam("子检测项代码") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String checkItemCode; + + @Column(name = "CHECK_ITEM_NAME") + @ApiParam("子检测项名称") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String checkItemName; + + @Column(name = "VALUE_TYPE") + @ApiParam("子检测箱值类型") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "BH_VALUE_TYPE") + private Integer valueType; + + @Column(name = "STANDARD") + @ApiParam("标准值") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + private Double standard; + + @Column(name = "MAX") + @ApiParam("最大值") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + private Double max; + + @Column(name = "MIN") + @ApiParam("最小值") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + private Double min; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsBhChildDetectionItemRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsBhChildDetectionItemRepository.java new file mode 100644 index 0000000..9698716 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsBhChildDetectionItemRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsBhChildDetectionItem; +import org.springframework.stereotype.Repository; + +/** + * @Description : BH子检测项 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-04-23 + * @Modify: + **/ +@Repository +public interface WmsBhChildDetectionItemRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartCheckTypeRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartCheckTypeRepository.java new file mode 100644 index 0000000..5c0dbe7 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartCheckTypeRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsPartCheckType; +import org.springframework.stereotype.Service; + +/** + * @Description : 物料检测大类 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-04-23 + * @Modify: + **/ +@Service +public interface WmsPartCheckTypeRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartItemCheckRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartItemCheckRepository.java new file mode 100644 index 0000000..4c6d2ec --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartItemCheckRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsPartItemCheck; +import org.springframework.stereotype.Repository; + +/** + * @Description : 持久层物料子检测项 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-04-23 + * @Modify: + **/ +@Repository +public interface WmsPartItemCheckRepository extends BaseRepository { +}