diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index 2bb8b09..335f882 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,13 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-${profileActive}-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-andon jar + 1.0-${profileActive}-SNAPSHOT @@ -49,7 +50,7 @@ - ${project.artifactId}-${profileActive}-${project.version} + ${project.artifactId}-${project.version} \ No newline at end of file diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index 4591fe3..7d63653 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,13 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-${profileActive}-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-aps jar + 1.0-${profileActive}-SNAPSHOT @@ -53,7 +54,7 @@ - ${project.artifactId}-${profileActive}-${project.version} + ${project.artifactId}-${project.version} \ No newline at end of file diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index 0e3621b..284f019 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,14 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-${profileActive}-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-base jar - + 1.0-${profileActive}-SNAPSHOT @@ -71,7 +71,7 @@ - ${project.artifactId}-${profileActive}-${project.version} + ${project.artifactId}-${project.version} diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java index da17aec..629d207 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java @@ -135,7 +135,8 @@ public class BlockSoftSwitchEnumUtil { CLIENT_MQ_RABBIT_HELLO(SUIT_MODE.CLIENT ,CASE_TYPE.MQ,150001,"RabbitMQ Client Hello测试服务"), /* FTP */ - CLIENT_FTP_IMPP(SUIT_MODE.CLIENT,CASE_TYPE.FTP,160001,"Client FTP客户端适配器"); + CLIENT_FTP_IMPP(SUIT_MODE.CLIENT,CASE_TYPE.FTP,160001,"Client FTP客户端适配器"), + SERVER_FTP_IMPP(SUIT_MODE.SERVER,CASE_TYPE.FTP,260001,"Client FTP服务端适配器"); private int value; private String description; 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 ad2e0e4..c594693 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 @@ -4560,4 +4560,42 @@ public class MesEnumUtil { return description; } } + + /** + * 工位BOM表中的匹配类型 + * 10. + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum STATION_BOM_MATCH_RULE { + + BARCODE_RULE_MATCHING(10, "条码规则匹配"), + PROCESS_BARCODE_MATCHING(20, "过程条码匹配"), + BAR_CODE_MATCHING(30, "箱条码匹配"); + + private int value; + private String description; + + STATION_BOM_MATCH_RULE(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/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index 4f212ba..9b37512 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 @@ -2473,7 +2473,7 @@ public class MesPcnEnumUtil { IMAGE("image", "图片"), BUTTON("button", "按钮"), TABLES("tables", "多个表格"), - DATA("data", "表格"); + FORM("form", "文本按钮"); private String value; private String description; @@ -2953,7 +2953,7 @@ public class MesPcnEnumUtil { BARCODE_RULE_MATCHING(10, "条码规则匹配"), PROCESS_BARCODE_MATCHING(20, "过程条码匹配"), - BAR_CODE_MATCHING(20, "条码匹配"); + BAR_CODE_MATCHING(30, "箱条码匹配"); private int value; private String description; @@ -3199,4 +3199,39 @@ public class MesPcnEnumUtil { return tmp; } } + + /** + * 客户发运JIT生产队列状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SHIPPING_ACTUAL_STATUS { + CREATE(10, "创建"), + CANCEL(20, "已发运"); + + private int value; + private String description; + + SHIPPING_ACTUAL_STATUS(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 81a5477..0fde085 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 @@ -5353,6 +5353,195 @@ public class WmsEnumUtil { } /** + * 波次合并规则 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum WAVE_MERGE_RULE { + IS_SAME_CUSTOMER("同客户", "isSameCustomer", 2, 10), + IS_SAME_WAREHOUSE("同仓库", "isSameWareHouse", 1, 10), + IS_SAME_PRIORITY("同优先级", "isSamePriority", 1, 10), + IS_SAME_SRC_ZONE("同来源存储区", "isSameSrcZone", 2, 10), + IS_SAME_DEST_ZONE("同目标存储区", "isSameDestZone", 2, 10), + IS_SAME_PART("同物料", "isSamePart", 2, 10), + IS_SAME_PART_GROUP("同物料组", "isSamePartGroup", 2, 10), + IS_SAME_DELIVERY_TIME("同发货时间", "isSameDeliveryTime", 2, 10), + IS_SAME_BUSI_TYPE("同业务类型", "isSameBusiType", 1, 10), + IS_SAME_ORDER_STATUS("同单据状态", "isSameOrderStatus", 1, 10), + IS_CROSS_AREA("允许跨区", "isCrossArea", 2, 10), + IS_COLLECTION("物料整箱归集", "isCollection", 2, 10); + + private String chName; + + private String enName; + + private int waveMergeType; + + private int value; + + WAVE_MERGE_RULE(String chName, String enName, int value, int waveMergeType) { + this.chName = chName; + this.enName = enName; + this.value = value; + this.waveMergeType = waveMergeType; + } + + public String getChName() { + return chName; + } + + public String getEnName() { + return enName; + } + + public int getValue() { + return value; + } + + public int getWaveMergeType() { + return waveMergeType; + } + } + + /** + * 波次合并规则 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum WAVE_MERGE_RANGE { + CUST_NO("客户代码", "custNo", "cn.estsh.i3plus.pojo.wms.bean.BasCustomer", + "custNo, custName", "custNo, custName", "custNo", 20), + WAREHOUSE_CODE("仓库代码", "srcWhNo", "cn.estsh.i3plus.pojo.wms.bean.WareHouse", + "code, name", "code, name", "code", 20), + PRIORITY("优先级", "priority", "PRIORITY_NEW", "", + "", "", 20), + SRC_ZONE_NO("来源存储区代码", "srcZoneNo", "cn.estsh.i3plus.pojo.wms.bean.WmsZones", + "zoneNo, zoneName", "zoneNo", "zoneNo", 20), + DEST_ZONE_NO("目标存储区代码", "destZoneNo", "cn.estsh.i3plus.pojo.wms.bean.WmsZones", + "zoneNo, zoneName", "zoneNo", "zoneNo", 20), + PART_NO("物料号", "partNo", "cn.estsh.i3plus.pojo.wms.bean.WmsPart", + "partNo, partName", "partNo", "partNo", 20), + PART_GROUP_NO("物料组代码", "partGroupNo", "", "", + "", "", 20), + BUSI_TYPE("业务类型", "busiType", "OUT_MOVEMENT_BUSI_TYPE", "", + "", "", 20), + ORDER_STATUS("单据状态", "orderStatus", "MASTER_ORDER_STATUS", "", + "", "", 20); + + // 中文名称 + String chName; + // 英文名称 + String enName; + // 下拉枚举名称 + String entityName; + // 下拉列表显示列名称,多个列名需要根据逗号分隔 + String listColumnName; + // 下拉搜索列名称,多个列名需要根据逗号分隔 + String searchColumnName; + // 回显列名 + String explicitColumnName; + // 合并操作类型 + private int waveMergeType; + + WAVE_MERGE_RANGE(String chName, String enName, String entityName, String listColumnName, + String searchColumnName, String explicitColumnName, int waveMergeType) { + this.chName = chName; + this.enName = enName; + this.entityName = entityName; + this.listColumnName = listColumnName; + this.searchColumnName = searchColumnName; + this.explicitColumnName = explicitColumnName; + this.waveMergeType = waveMergeType; + } + + public String getChName() { + return chName; + } + + public String getEnName() { + return enName; + } + + public String getEntityName() { + return entityName; + } + + public String getListColumnName() { + return listColumnName; + } + + public String getSearchColumnName() { + return searchColumnName; + } + + public String getExplicitColumnName() { + return explicitColumnName; + } + + public int getWaveMergeType() { + return waveMergeType; + } + } + + /** + * 插件类型 10-合并规则，20-合并范围 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum WAVE_MERGE_TYPE { + WAVE_MERGE_RULE(10, "WAVE_MERGE_RULE", "合并规则"), + WAVE_MERGE_RANGE(20, "WAVE_MERGE_RANGE", "合并范围"); + + private int value; + private String code; + private String description; + + WAVE_MERGE_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 WAVE_MERGE_TYPE codeOf(int value) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + return values()[i]; + } + } + return null; + } + + 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 int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + + /** * 存储区-补货方式 * 默认为 10 */ diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index 4d0a808..63c691b 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,13 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-${profileActive}-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-form jar + 1.0-${profileActive}-SNAPSHOT @@ -50,6 +51,6 @@ - ${project.artifactId}-${profileActive}-${project.version} + ${project.artifactId}-${project.version} \ No newline at end of file diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index ecf48ed..35c0762 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,13 +5,15 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-${profileActive}-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-hardswitch jar + 1.0-${profileActive}-SNAPSHOT + dev @@ -42,7 +44,7 @@ - ${project.artifactId}-${profileActive}-${project.version} + ${project.artifactId}-${project.version} \ No newline at end of file diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 2241e93..cbdf688 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,13 +5,15 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-${profileActive}-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-jobflow jar + 1.0-${profileActive}-SNAPSHOT + dev @@ -42,7 +44,7 @@ - ${project.artifactId}-${profileActive}-${project.version} + ${project.artifactId}-${project.version} \ No newline at end of file diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index c9fd4ee..51958ba 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,13 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-${profileActive}-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-lac jar + 1.0-${profileActive}-SNAPSHOT @@ -49,7 +50,7 @@ - ${project.artifactId}-${profileActive}-${project.version} + ${project.artifactId}-${project.version} \ No newline at end of file diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index 27731be..a0cbb85 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,13 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-${profileActive}-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-mes-pcn jar + 1.0-${profileActive}-SNAPSHOT @@ -49,7 +50,7 @@ - ${project.artifactId}-${profileActive}-${project.version} + ${project.artifactId}-${project.version} \ No newline at end of file diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index 2ba9ddd..1c38fc4 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,13 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-${profileActive}-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-mes jar + 1.0-${profileActive}-SNAPSHOT @@ -49,7 +50,7 @@ - ${project.artifactId}-${profileActive}-${project.version} + ${project.artifactId}-${project.version} \ No newline at end of file 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 new file mode 100644 index 0000000..d239828 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java @@ -0,0 +1,91 @@ +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.util.Date; + +/** + * @Description :JIT发运数据同步 + * @Reference : + * @Author : qianhuasheng + * @CreateDate : 2020-03-27 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "if_queue_shipping") +@Api("JIT发运数据同步") +public class IfQueueShipping extends BaseBean implements Serializable { + private static final long serialVersionUID = -8961182851667690154L; + @Column(name = "JIT_NO") + @ApiParam("JIT队列编号") + private String jitNo; + + @Column(name = "VIN_CODE") + @ApiParam("vin") + private String vinCode; + + @Column(name = "CUST_FLAG_NO") + @ApiParam("客户标识号") + private String custFlagNo; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam("物料名称") + private String partName; + + @Column(name = "PRODUCT_SN") + @ApiParam("产品条码") + private String productSn; + + @Column(name = "QTY") + @ApiParam("数量") + private Double qty; + + @Column(name = "SUPPLIER_CODE") + @ApiParam("操作人") + private String supplierCode; + + @Column(name = "ACTION_DATE_TIME") + @ApiParam("操作时间") + private Date actionDateTime; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("产线") + private String workCenterCode; + + @Column(name = "SYNC_STATUS") + @ApiParam("同步状态") + private Integer syncStatus; + + @Column(name = "ERROR_MESSAGE") + @ApiParam("异常消息") + private String errorMessage; + + + @Column(name = "ACTION_CODE") + @ApiParam("动作代码") + private String actionCode; + + @Column(name = "IF_CODE") + @ApiParam("接口代码") + private Integer ifCode; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesActionModuleGroup.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesActionModuleGroup.java new file mode 100644 index 0000000..314f526 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesActionModuleGroup.java @@ -0,0 +1,42 @@ +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; + +/** + * @author Wynne.Lu + * @date 2020/3/30 11:28 + * @desc + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_ACTION_MODULE_GROUP") +@Api("工步集") +public class MesActionModuleGroup extends BaseBean implements Serializable { + private static final long serialVersionUID = 1876053661752102998L; + + @Column(name = "AMG_ID") + @ApiParam("组件集编号") + private Long amgId; + + @Column(name = "AM_CODE") + @ApiParam("组件集代码") + private String amCode; + + @Column(name = "SEQ") + @ApiParam("执行顺序") + private Integer seq; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainer.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainer.java new file mode 100644 index 0000000..12e6ad0 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainer.java @@ -0,0 +1,43 @@ +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; + +/** + * @Description : MES_容器 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-03-27 14:29 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_CONTAINER") +@Api("MES_容器类型") +public class MesContainer extends BaseBean { + private static final long serialVersionUID = -3843389042411645111L; + + @Column(name = "CT_NO") + @ApiParam(value = "容器编号") + private String ctNo; + + @Column(name = "CT_CODE") + @ApiParam(value = "容器类型代码") + private String ctCode; + + @Column(name = "USE_STATUS") + @ApiParam(value = "使用状态") + private String useStatus; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerType.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerType.java new file mode 100644 index 0000000..b317f3c --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerType.java @@ -0,0 +1,55 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +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 : MES_容器类型 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-03-27 14:24 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_CONTAINER_TYPE") +@Api("MES_容器类型") +public class MesContainerType extends BaseBean { + + private static final long serialVersionUID = 2831600566482383573L; + + @Column(name = "CT_CODE") + @ApiParam(value = "容器类型代码") + private String ctCode; + + @Column(name = "CT_NAME") + @ApiParam(value = "容器类型名称") + private String ctName; + + @Column(name = "USE_LIMIT") + @ApiParam(value = "使用期限") + private Integer useLimit; + + @Column(name = "IS_RECYCLE") + @ApiParam(value = "是否回收") + @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description") + private Integer isRecycle; + + @Column(name = "LIMIT_UOM") + @ApiParam(value = "期限单位") + private String limitUom; +} 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 074dea2..c0d1436 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 @@ -42,6 +42,18 @@ public class MesProdRouteOptParam extends BaseBean implements Serializable { @ApiParam("工序代码") private String processCode; + @Column(name = "SM_CODE") + @ApiParam("状态机代码") + private String smCode; + + @Column(name = "STATUS_CODE") + @ApiParam("状态代码") + private String statusCode; + + @Column(name = "AMG_ID") + @ApiParam("工步集代码") + private Long amgId; + @Column(name = "STEP_CODE") @ApiParam("工步代码") private String stepCode; @@ -62,6 +74,10 @@ public class MesProdRouteOptParam extends BaseBean implements Serializable { @ApiParam("工步参数值") private String paramValue; + @Column(name = "IS_ACTIVE") + @ApiParam("是否执行 1=是 2=否") + private Integer isActive; + @Transient @Column(name = "PARAM_ATTRIBUTE") @ApiParam("参数属性") 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 c839b14..84375d0 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 @@ -33,6 +33,7 @@ public class MesQueueJitActual extends BaseBean implements Serializable { private static final long serialVersionUID = 655875369308810110L; + @Column(name = "JIS_ACTUAL_NO") @ApiParam("队列编号") private String jisActualNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java index 89cf68d..654cc56 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.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; /** @@ -47,6 +48,10 @@ public class MesQueueJitActualDetail extends BaseBean implements Serializable { @ApiParam("产品位置代码") private String produceCtgyCode; + @Transient + @ApiParam("产品位置") + private String prodCfgName; + @Column(name = "PART_NAME") @ApiParam("产品名称") private String partName; @@ -62,4 +67,12 @@ public class MesQueueJitActualDetail extends BaseBean implements Serializable { @Column(name = "GROUP_SEQ") @ApiParam("分组序号") private String groupSeq; + + @Column(name = "status") + @ApiParam("状态") + private Integer status; + + @Column(name = "seq") + @ApiParam("主序编号") + private String seq; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcess.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcess.java index fa6d9dd..70d3b44 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcess.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcess.java @@ -54,6 +54,10 @@ public class MesRouteProcess extends BaseBean implements Serializable { @ApiParam("是否必须") private Integer isNecessary; + @Column(name = "SM_CODE") + @ApiParam("状态机代码") + private String smCode; + public int getSeqVal() { return this.seq == null ? 0 : this.seq; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSmRouteOptParam.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSmRouteOptParam.java new file mode 100644 index 0000000..521d413 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSmRouteOptParam.java @@ -0,0 +1,62 @@ +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; + +/** + * @author Wynne.Lu + * @date 2020/3/30 11:48 + * @desc + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_SM_ROUTE_OPT_PARAM") +@Api("产品流程状态机配置操作参数表") +public class MesSmRouteOptParam extends BaseBean implements Serializable { + private static final long serialVersionUID = -5466013923105175070L; + + @Column(name = "PROD_ROUTE_CFG_ID") + @ApiParam("产品流程Id") + private Integer prodRouteCfgId; + + @Column(name="ROUTE_CODE") + @ApiParam("流程代码") + private String routeCode; + + @Column(name="PROCESS_CODE") + @ApiParam("工序代码") + private String processCode; + + @Column(name="STEP_CODE") + @ApiParam("工步代码") + private String stepCode; + + @Column(name="STEP_SEQ") + @ApiParam("工步顺序") + private Integer stepSeq; + + @Column(name="PARAM_TYPE") + private Integer paramType; + + @Column(name="PARAM_CODE") + private String paramCode; + + @Column(name="PARAM_VALUE") + private String paramValue; + + @Column(name="IS_ACTION") + private Integer isAction; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachine.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachine.java new file mode 100644 index 0000000..1672c91 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachine.java @@ -0,0 +1,48 @@ +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.Lob; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/3/30 11:12 + * @desc + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_STATE_MACHINE") +@Api("MES状态机") +public class MesStateMachine extends BaseBean implements Serializable { + private static final long serialVersionUID = 6093522587973076640L; + + @Column(name = "SM_CODE") + @ApiParam("状态机代码") + private String smCode; + + @Column(name = "SM_NAME") + @ApiParam("状态机名称") + private String smName; + + @Column(name = "SM_TYPE") + @ApiParam("状态机类型") + private String smType; + + @Lob + @Column(name = "POSITION") + @ApiParam("GOJS的位置") + private String position; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStatus.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStatus.java new file mode 100644 index 0000000..90bcbf9 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStatus.java @@ -0,0 +1,75 @@ +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.Lob; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/3/30 11:12 + * @desc + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_STATE_MACHINE_STATUS") +@Api("MES状态机步骤") +public class MesStateMachineStatus extends BaseBean implements Serializable { + private static final long serialVersionUID = 6093522587973076640L; + + @Column(name = "SM_CODE") + @ApiParam("状态机代码") + private String smCode; + + @Column(name = "STATUS_CODE") + @ApiParam("状态代码") + private String statusCode; + + @Column(name = "NEXT_STATUS") + @ApiParam("下一状态") + private String nextStatus; + + @Column(name = "STATUS_NAME") + @ApiParam("状态名称") + private String statusName; + + @Column(name = "TRIGGER_TYPE") + @ApiParam("触发类型 10=内部触发 20=外部触发") + private Integer triggerType; + + @Column(name = "TRIGGER_EVENT") + @ApiParam("触发事件") + private String triggerEvent; + + @Column(name = "TRIGGER_WHERE") + @ApiParam("触发条件") + private String triggerWhere; + + @Column(name = "ACTION_AMG_ID") + @ApiParam("触发调用") + private Integer actionAmgId; + + @Column(name = "IN_AMG_ID") + @ApiParam("进入调用") + private Integer inAmgId; + + @Column(name = "OUT_AMG_ID") + @ApiParam("离开调用") + private Integer outAmgId; + + @Column(name = "STATUS_TYPE", columnDefinition = "tinyint default 0") + @ApiParam("状态类型 10=初始化状态") + private Integer statusType; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWindowModule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWindowModule.java new file mode 100644 index 0000000..f51864f --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWindowModule.java @@ -0,0 +1,45 @@ +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 : + * @Reference : + * @Author : zcg + * @Date : 2020/3/20 0020 - 16:21 + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_WINDOW_MODULE") +@Api("MES_界面组件配置") +public class MesWindowModule extends BaseBean implements Serializable { + + private static final long serialVersionUID = -634938009999201410L; + + @Column(name = "WINDOW_NO") + @ApiParam("菜单编号") + private String windowNo; + + @Column(name = "MODULE_CODE") + @ApiParam("按钮组件代码") + private String moduleCode; + + @Column(name = "WINDOW_MODULE_BACK") + @ApiParam("回调界面方法") + private String windowModuleBack; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWindowModuleParam.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWindowModuleParam.java new file mode 100644 index 0000000..4add812 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWindowModuleParam.java @@ -0,0 +1,47 @@ +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 : + * @Reference : + * @Author : zcg + * @Date : 2020/3/20 0020 - 16:25 + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_WINDOW_MODULE_PARAM") +@Api("MES_界面组件参数配置") +public class MesWindowModuleParam extends BaseBean implements Serializable { + private static final long serialVersionUID = -5834883080240684524L; + + @Column(name = "WINDOW_NO") + @ApiParam("界面编号") + private String windowNo; + + @Column(name = "MODULE_CODE") + @ApiParam("组件代码") + private String moduleCode; + + @Column(name = "PARAM_CODE") + @ApiParam("参数代码") + private String paramCode; + + @Column(name = "PARAM_VALUE") + @ApiParam("参数值") + private String paramValue; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonComponentReqModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonComponentReqModel.java new file mode 100644 index 0000000..46dcdbd --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonComponentReqModel.java @@ -0,0 +1,55 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description : 工位扫描中，按钮组件之间传输的model + * @Reference : + * @Author : zcg + * @Date : 2020/3/23 0023 - 13:14 + */ +@Data +@Api("按钮组件传输请求Model") +public class ButtonComponentReqModel { + + @ApiParam("扫描信息") + private String scanInfo; + + @ApiParam("主队列编号") + private String orderNo; + + @ApiParam("物料号") + private String partNo; + + @ApiParam("工厂") + private String organizeCode; + + @ApiParam("生产线") + private String workCenterCode; + + @ApiParam("工作单元") + private String workCellCode; + + @ApiParam("过程条码") + private String serialNumber; + + @ApiParam("确认码") + private String confirmNo; + + @ApiParam("组件代码") + private String moduleCode; + + @ApiParam("界面编号") + private String windowNo; + + @ApiParam("父界面编号") + private String parentWindowNo; + + @ApiParam("客户标识号") + private String custFlagNo; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonComponentResultModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonComponentResultModel.java new file mode 100644 index 0000000..5553485 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonComponentResultModel.java @@ -0,0 +1,38 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.mes.bean.MesProduceSn; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description : + * @Reference : + * @Author : zcg + * @Date : 2020/3/25 0025 - 19:41 + */ +@Data +@Api("按钮组件传输响应Model") +public class ButtonComponentResultModel { + + @ApiParam("成功信号") + private boolean isSuccess; + + @ApiParam("提示信息") + private String msg; + + @ApiParam("动态按钮组") + private List buttonModels; + + @ApiParam("过程条码") + private String serialNumber; + + @ApiParam("产品条码信息") + private MesProduceSn produceSn; + + @ApiParam("主队列编号") + private String orderNo; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonDynamicModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonDynamicModel.java index c98a3f4..4a8aec6 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonDynamicModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonDynamicModel.java @@ -24,12 +24,31 @@ public class ButtonDynamicModel { @ApiParam("按钮代码") private String buttonCode; - @ApiParam("调用类") - private String callClass; + @ApiParam("回调界面方法") + private String windowModuleBack; - public ButtonDynamicModel(Long id, String buttonName, String buttonCode) { + @ApiParam("界面编号") + private String windowNo; + + @ApiParam("参数代码") + private String paramCode; + + @ApiParam("参数值") + private String paramValue; + + + public ButtonDynamicModel(Long id, String buttonCode, String buttonName){ this.id = id; + this.buttonCode = buttonCode; this.buttonName = buttonName; + } + + public ButtonDynamicModel(Long id, String buttonCode, String windowNo, String windowModuleBack, String paramCode, String paramValue){ + this.id = id; this.buttonCode = buttonCode; + this.windowNo = windowNo; + this.windowModuleBack = windowModuleBack; + this.paramCode = paramCode; + this.paramValue = paramValue; } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonModel.java new file mode 100644 index 0000000..dc5d7a9 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonModel.java @@ -0,0 +1,28 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @Description : 按钮model + * @Reference : + * @Author : zcg + * @Date : 2020/3/25 0025 - 5:02 + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Api("按钮组件") +public class ButtonModel { + @ApiParam("组件代码") + private String moduleCode; + + @ApiParam("组件名称") + private String moduleName; + + @ApiParam("界面回调方法") + private String windowModuleBack; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EsProductDataModule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EsProductDataModule.java index 4ac20ee..bd38834 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EsProductDataModule.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EsProductDataModule.java @@ -11,7 +11,6 @@ import lombok.NoArgsConstructor; import java.io.Serializable; import java.util.ArrayList; -import java.util.Map; /** * @Description: diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueShippingModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueShippingModel.java new file mode 100644 index 0000000..47b326f --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueShippingModel.java @@ -0,0 +1,42 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description : JIT发运队列列表Model + * @Reference : + * @Author : qianhuasheng + * @CreateDate : 2019-05-22 16:34 + * @Modify: + **/ +@Data +@Api("JIT发运队列列表Model") +public class QueueShippingModel implements Serializable { + private Long id; + + @ApiParam("显示颜色") + private String color; + + @ApiParam("队列编号") + private String jisActualNo; + + @ApiParam("产品位置代码") + private String produceCtgyCode; + + @ApiParam("产品位置") + private String prodCfgName; + + @ApiParam("起始vin") + private String vin; + + @ApiParam("结束vin") + private String endVin; + + @ApiParam("料架号") + private String queueGroupNo; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepDispatchModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepDispatchModel.java index bf9d485..7585012 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepDispatchModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepDispatchModel.java @@ -18,12 +18,15 @@ public class StepDispatchModel { private String cellParamKey; + private String requestBeanKey; + private String scanInfo; - public StepDispatchModel(String stepListKey, String firstScanKey, String cellParamKey, String scanInfo) { + public StepDispatchModel(String stepListKey, String firstScanKey, String cellParamKey, String requestBeanKey, String scanInfo) { this.stepListKey = stepListKey; this.firstScanKey = firstScanKey; this.cellParamKey = cellParamKey; + this.requestBeanKey = requestBeanKey; this.scanInfo = scanInfo; } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfQueueShippingRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfQueueShippingRepository.java new file mode 100644 index 0000000..1130943 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfQueueShippingRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.IfQueueShipping; + +/** + * @Description :IF_JIT发运数据 + * @Reference : + * @Author : qianhuasheng + * @CreateDate : 2020-03-06 10:57 上午 + * @Modify: + **/ +public interface IfQueueShippingRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWindowModuleParamRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWindowModuleParamRepository.java new file mode 100644 index 0000000..4392957 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWindowModuleParamRepository.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.MesWindowModuleParam; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : zcg + * @Date : 2020/3/20 0020 - 16:37 + */ +@Repository +public interface MesWindowModuleParamRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWindowModuleRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWindowModuleRepository.java new file mode 100644 index 0000000..c96dff8 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWindowModuleRepository.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.MesWindowModule; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : zcg + * @Date : 2020/3/20 0020 - 16:36 + */ +@Repository +public interface MesWindowModuleRepository 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 15b53e4..0fbed4b 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 @@ -2237,4 +2237,47 @@ public class MesHqlPack { } return packBean; } + + /** + * 界面组件配置 + * @param windowModule + * @param organizeCode + * @return + */ + public static DdlPackBean getMesWindowModule(MesWindowModule windowModule, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(windowModule, organizeCode); + if(!StringUtils.isEmpty(windowModule.getWindowNo())){ + DdlPreparedPack.getStringLikerPack(windowModule.getWindowNo(), "windowNo", packBean); + } + if(!StringUtils.isEmpty(windowModule.getModuleCode())){ + DdlPreparedPack.getStringLikerPack(windowModule.getModuleCode(), "moduleCode", packBean); + } + if(!StringUtils.isEmpty(windowModule.getWindowModuleBack())){ + DdlPreparedPack.getStringLikerPack(windowModule.getWindowModuleBack(), "windowModuleBack", packBean); + } + return packBean; + } + + /** + * 界面组件参数配置 + * @param windowModuleParam + * @param organizeCode + * @return + */ + public static DdlPackBean getMesWindowModuleParam(MesWindowModuleParam windowModuleParam, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(windowModuleParam, organizeCode); + if(!StringUtils.isEmpty(windowModuleParam.getWindowNo())){ + DdlPreparedPack.getStringLikerPack(windowModuleParam.getWindowNo(), "windowNo", packBean); + } + if(!StringUtils.isEmpty(windowModuleParam.getModuleCode())){ + DdlPreparedPack.getStringLikerPack(windowModuleParam.getModuleCode(), "moduleCode", packBean); + } + if(!StringUtils.isEmpty(windowModuleParam.getParamCode())){ + DdlPreparedPack.getStringLikerPack(windowModuleParam.getParamCode(), "paramCode", packBean); + } + if(!StringUtils.isEmpty(windowModuleParam.getParamValue())){ + DdlPreparedPack.getStringLikerPack(windowModuleParam.getParamValue(), "paramValue", packBean); + } + return packBean; + } } diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index 3fd87ac..9c029b3 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,13 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-${profileActive}-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-model jar + 1.0-${profileActive}-SNAPSHOT @@ -90,7 +91,7 @@ - ${project.artifactId}-${profileActive}-${project.version} + ${project.artifactId}-${project.version} \ No newline at end of file diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index c0524de..876096e 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,13 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-${profileActive}-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-platform jar + 1.0-${profileActive}-SNAPSHOT @@ -49,7 +50,7 @@ - ${project.artifactId}-${profileActive}-${project.version} + ${project.artifactId}-${project.version} \ No newline at end of file diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java index f52be12..fc4acd3 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java @@ -54,6 +54,11 @@ public class SysLabelTemplate extends BaseBean { @ApiParam(value ="模板内容") private String templateContent; + @Lob + @Column(name="OTHER_TEMPLATE_CONTENT") + @ApiParam(value ="其他模板内容") + private String otherTemplateContent; + // 参数拼接，多参数都好分隔，后台在做处理 @Transient @ApiParam(value ="模板参数拼接") diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java index 5555d83..f8b4f4e 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java @@ -37,6 +37,9 @@ public class SysLocaleResource extends BaseBean { private Integer resourceType; @Transient + private String resourceTypes; + + @Transient private String resourceTypeTxt; public String getResourceTypeTxt(){ @@ -56,6 +59,7 @@ public class SysLocaleResource extends BaseBean { @ApiParam(value = "语言名称",example = "浏览器语言名称") private String languageNameRdd; + @Lob @Column(name="resource_key") @ApiParam(value = "资源KEY",example = "格式A.B，全部大写，参考命名规范开发文档") @AnnoOutputColumn @@ -82,4 +86,5 @@ public class SysLocaleResource extends BaseBean { @ApiParam(value = "是否系统参数",example = "2") @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description") private Integer isSystem; + } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java index 44ddce3..51429a6 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java @@ -4,32 +4,10 @@ import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.base.tool.HqlPack; -import cn.estsh.i3plus.pojo.platform.bean.SysBarcodeRule; -import cn.estsh.i3plus.pojo.platform.bean.SysConfig; -import cn.estsh.i3plus.pojo.platform.bean.SysDepartment; -import cn.estsh.i3plus.pojo.platform.bean.SysDictionary; -import cn.estsh.i3plus.pojo.platform.bean.SysFile; -import cn.estsh.i3plus.pojo.platform.bean.SysLabelTemplate; -import cn.estsh.i3plus.pojo.platform.bean.SysLabelTemplateParam; -import cn.estsh.i3plus.pojo.platform.bean.SysLocaleLanguage; -import cn.estsh.i3plus.pojo.platform.bean.SysLocaleResource; -import cn.estsh.i3plus.pojo.platform.bean.SysMenu; -import cn.estsh.i3plus.pojo.platform.bean.SysMessage; -import cn.estsh.i3plus.pojo.platform.bean.SysOrderNoRule; -import cn.estsh.i3plus.pojo.platform.bean.SysOrganize; -import cn.estsh.i3plus.pojo.platform.bean.SysPosition; -import cn.estsh.i3plus.pojo.platform.bean.SysRefUserDepartment; -import cn.estsh.i3plus.pojo.platform.bean.SysRefUserMessage; -import cn.estsh.i3plus.pojo.platform.bean.SysRefUserRole; -import cn.estsh.i3plus.pojo.platform.bean.SysRole; -import cn.estsh.i3plus.pojo.platform.bean.SysTask; -import cn.estsh.i3plus.pojo.platform.bean.SysTaskCycle; -import cn.estsh.i3plus.pojo.platform.bean.SysTaskPlan; -import cn.estsh.i3plus.pojo.platform.bean.SysTool; -import cn.estsh.i3plus.pojo.platform.bean.SysToolType; -import cn.estsh.i3plus.pojo.platform.bean.SysUser; -import cn.estsh.i3plus.pojo.platform.bean.SysUserInfo; +import cn.estsh.i3plus.pojo.platform.bean.*; +import org.apache.commons.beanutils.ConvertUtils; import org.apache.commons.lang3.StringUtils; + import java.util.List; import java.util.stream.Collectors; @@ -42,6 +20,10 @@ import java.util.stream.Collectors; **/ public class CoreHqlPack { + private CoreHqlPack() { + throw new IllegalStateException("Utility class"); + } + /** * In 参数封装 * @param columnName @@ -81,6 +63,11 @@ public class CoreHqlPack { if(resource != null){ DdlPreparedPack.getNumEqualPack(resource.getResourceType(),"resourceType",result); + // 是否多类型查询 + if(StringUtils.isNotBlank(resource.getResourceTypes())){ + DdlPreparedPack.getInPackArray((Integer[]) ConvertUtils.convert(resource.getResourceTypes().split(","), Integer.class), "resourceType", result); + } + DdlPreparedPack.getNumEqualPack(resource.getSoftType(),"softType",result); DdlPreparedPack.getNumEqualPack(resource.getIsSystem(),"isSystem",result); DdlPreparedPack.getStringEqualPack(resource.getLanguageCode(),"languageCode",result); @@ -630,7 +617,7 @@ public class CoreHqlPack { HqlPack.getNumEqualPack(userInfo.getUserInfoStatus(),"userInfoStatus",result); HqlPack.getStringEqualPack(userInfo.getOrganizeCode(),"organizeCode",result); - if(userInfo.getDepartmentIdList() != null && userInfo.getDepartmentIdList().size() > 0){ + if(userInfo.getDepartmentIdList() != null && !userInfo.getDepartmentIdList().isEmpty()){ HqlPack.getInPack(StringUtils.join(userInfo.getDepartmentIdList(), ","), "departmentId", result); } @@ -653,7 +640,7 @@ public class CoreHqlPack { DdlPreparedPack.getStringEqualPack(userInfo.getOrganizeCode(),"organizeCode",result); DdlPreparedPack.getInPackList(idList,"id",result); - if(userInfo.getDepartmentIdList() != null && userInfo.getDepartmentIdList().size() > 0){ + if(userInfo.getDepartmentIdList() != null && !userInfo.getDepartmentIdList().isEmpty() ){ DdlPreparedPack.getInPackList(userInfo.getDepartmentIdList(),"departmentId",result); } @@ -677,7 +664,7 @@ public class CoreHqlPack { // And HqlPack.getNumEqualPack(userInfo.getUserInfoStatus(),"userInfoStatus",result); - if(idList != null && idList.size() > 0){ + if(idList != null && !idList.isEmpty()){ HqlPack.getInPack(StringUtils.join(idList, ","), "id", result); } @@ -977,7 +964,7 @@ public class CoreHqlPack { */ public static DdlPackBean packHqlSysOrganize(List sysRefUserDepartments){ DdlPackBean packBean = DdlPackBean.getDdlPackBean(); - DdlPreparedPack.getInPackList(sysRefUserDepartments.stream().map(d -> d.getOrganizeId()).collect(Collectors.toList()),"id",packBean); + DdlPreparedPack.getInPackList(sysRefUserDepartments.stream().map(SysRefUserDepartment::getOrganizeId).collect(Collectors.toList()),"id",packBean); return packBean; } diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index 4b73b1a..c56e1c6 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,13 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-${profileActive}-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-ptl jar + 1.0-${profileActive}-SNAPSHOT @@ -49,6 +50,6 @@ - ${project.artifactId}-${profileActive}-${project.version} + ${project.artifactId}-${project.version} \ No newline at end of file diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index 4ebc2f7..4e4a397 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,13 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-${profileActive}-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-report jar + 1.0-${profileActive}-SNAPSHOT @@ -50,6 +51,6 @@ - ${project.artifactId}-${profileActive}-${project.version} + ${project.artifactId}-${project.version} \ No newline at end of file diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index b3c4fc8..442875c 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,13 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-${profileActive}-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-softswitch jar + 1.0-${profileActive}-SNAPSHOT @@ -50,6 +51,6 @@ - ${project.artifactId}-${profileActive}-${project.version} + ${project.artifactId}-${project.version} \ No newline at end of file diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index b601666..8573c4e 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,13 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-${profileActive}-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-sweb jar + 1.0-${profileActive}-SNAPSHOT @@ -49,7 +50,7 @@ - ${project.artifactId}-${profileActive}-${project.version} + ${project.artifactId}-${project.version} \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 2d56516..a578bda 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,13 +5,14 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-${profileActive}-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-wms jar + 1.0-${profileActive}-SNAPSHOT @@ -53,7 +54,7 @@ - ${project.artifactId}-${profileActive}-${project.version} + ${project.artifactId}-${project.version} \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAreaOwner.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAreaOwner.java index 153aeff..a852b02 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAreaOwner.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAreaOwner.java @@ -62,6 +62,10 @@ public class WmsAreaOwner extends BaseBean { @ApiParam(value = "是否预分配人员") private Integer isPreAssign; + @Column(name="SHIFT_NO") + @ApiParam("班次编码") + private String shiftNo; + @Transient @ApiParam(value = "供应商名称") private String vendorName; @@ -81,4 +85,8 @@ public class WmsAreaOwner extends BaseBean { @Column(name = "CUST_NO") @ApiParam(value = "客户编号") private String custNo; + + @Transient + @ApiParam(value = "分配次数") + private Integer count; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBusiType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBusiType.java index 781c348..f235943 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBusiType.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBusiType.java @@ -48,5 +48,10 @@ public class WmsBusiType extends BaseBean { @ApiParam("移动类型") public Integer moveType; - + /** + * 是否启用波次计划 10-是，20-否 + */ + @Column(name = "IS_ENABLE_WAVE") + @ApiParam("是否启用波次计划") + public Integer isEnableWave; } 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 10e116b..88f3576 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 @@ -140,6 +140,11 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam(value = "已移库数量", example = "1") private Double moveQty; + @Column(name = "TASK_GENERATE_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") + @ApiParam(value = "任务生成数量", example = "1") + private Double taskGenerateQty; + @Column(name = "SRC_AREA_NO") @ApiParam("源库存地代码") public String srcAreaNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java index 8688652..468634a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java @@ -80,6 +80,7 @@ public class WmsSnOperateRecord extends BaseBean { @Column(name = "ref_sn") @ApiParam(value = "关联二维码") - private String refSN; + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + private String refSN; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWaveRule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWaveRule.java new file mode 100644 index 0000000..a9b02e2 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWaveRule.java @@ -0,0 +1,109 @@ +package cn.estsh.i3plus.pojo.wms.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.util.List; + +/** + * @Description : 波次规则数据 + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2020-03-25 10:10 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "WMS_WAVE_RULE") +@Api(value = "波次规则数据表") +public class WmsWaveRule extends BaseBean { + + private static final long serialVersionUID = 8664373854844368961L; + + @Column(name = "RULE_CODE") + @ApiParam(value = "波次规则代码") + public String ruleCode; + + @Column(name = "RULE_DESC") + @ApiParam(value = "波次规则描述") + public String ruleDesc; + + /** + * 分配规则 2-不分配(默认) 1-分配到责任区 + */ + @Column(name = "ALLOCATE_RULE") + @ApiParam(value = "分配规则", example = "1") + public Integer allocateRule; + + @Column(name = "EXTEND_SQL") + @ApiParam(value = "扩展脚本") + public String extendSql; + + @Column(name = "START_EFFECT_DATE") + @ApiParam(value = "开始生效时间") + public String startEffectDate; + + @Column(name = "END_EFFECT_DATE") + @ApiParam(value = "结束生效时间") + public String endEffectDate; + + @Column(name = "SORT_CONDITIONS") + @ApiParam(value = "单据排序条件") + public String sortConditions; + + @Column(name = "ORDER_CONTROL_TIME") + @ApiParam(value = "单据控制时间") + public String orderControlTime; + + @Column(name = "FIXED_ORDER_QTY") + @ApiParam(value = "固定单据数量", example = "0") + public Integer fixedOrderQty; + + @Column(name = "FIXED_PART_QTY") + @ApiParam(value = "固定物料箱数", example = "0") + public Integer fixedPartQty; + + @Column(name = "WAVE_QTY") + @ApiParam(value = "波次数量", example = "0") + public Integer waveQty; + + @Column(name = "ORDER_MAX_QTY") + @ApiParam(value = "最大单据数量", example = "0") + public Integer orderMaxQty; + + @Column(name = "PART_MAX_QTY") + @ApiParam(value = "最大物料数量", example = "0") + public Double partMaxQty; + + @Column(name = "ORDER_TIMEOUT_TIME") + @ApiParam(value = "单据等待时间", example = "0") + public Integer orderTimeOutTime; + + @Column(name = "NEXT_WAVE_TIME") + @ApiParam(value = "下次波次时间") + public String nextWaveTime; + + @Column(name = "IS_CROSS_AREA") + @ApiParam(value = "允许跨区", example = "0") + public Integer isCrossArea; + + @Column(name = "IS_COLLECTION") + @ApiParam(value = "允许整箱归集") + public Integer isCollection; + + @Transient + @ApiParam(value = "波次规则明细信息") + private List waveRuleDetailsList; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWaveRuleDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWaveRuleDetails.java new file mode 100644 index 0000000..f2e7cf7 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWaveRuleDetails.java @@ -0,0 +1,56 @@ +package cn.estsh.i3plus.pojo.wms.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 : siliter.yuan + * @CreateDate : 2020-03-25 10:10 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "WMS_WAVE_RULE_DETAILS") +@Api(value = "波次规则明细数据表") +public class WmsWaveRuleDetails extends BaseBean { + + private static final long serialVersionUID = 8664373954844368961L; + + @Column(name = "RULE_ID") + @ApiParam(value = "波次规则编号", example = "0") + public Long ruleId; + + @Column(name = "FIELD_CH_NAME") + @ApiParam(value = "字段中文名称") + public String fieldChName; + + @Column(name = "FIELD_EN_NAME") + @ApiParam(value = "字段英文名称") + public String fieldEnName; + + @Column(name = "MERGE_OPERATOR_TYPE") + @ApiParam(value = "合并操作类型", example = "0") + public Integer mergeOperatorType; + + @Column(name = "FILED_VALUE") + @ApiParam(value = "字段值") + public String fieldValue; + + public Long getRuleId() { + return ruleId == null ? 0L : ruleId.longValue(); + } +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDocMovementModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDocMovementModel.java new file mode 100644 index 0000000..8f0336a --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDocMovementModel.java @@ -0,0 +1,90 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import org.hibernate.annotations.ColumnDefault; + +/** + * @Description : 移库单数据模型Model + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2020-03-26 11:18 + * @Modify: + **/ +@Data +@AllArgsConstructor +@Api("移库单数据模型") +public class WmsDocMovementModel { + + @ApiParam("订单号") + private String orderNo; + + @ApiParam(value = "业务类型", example = "1") + private Integer busiType; + + @ApiParam("客户代码") + private String custNo; + + @ApiParam("来源仓库代码") + private String srcWhNo; + + @ApiParam("来源存储区代码") + private String srcZoneNo; + + @ApiParam("目标仓库代码") + private String destWhNo; + + @ApiParam("目标存储区代码") + private String destZoneNo; + + @ApiParam("物料组代码") + private String partGroupNo; + + @ApiParam("订单状态") + private String orderStatus; + + @ApiParam(value = "优先级", example = "1") + public Integer priority; + + @ApiParam("物料号") + private String partNo; + + @ColumnDefault("0") + @ApiParam(value = "已拣货数量", example = "1") + private Double pickQty; + + @ColumnDefault("0") + @ApiParam(value = "已出库数量", example = "1") + private Double outQty; + + @ColumnDefault("0") + @ApiParam(value = "已移库数量", example = "1") + private Double moveQty; + + @ColumnDefault("0") + @ApiParam(value = "需求数量", example = "0") + public Double qty; + + @ApiParam("源单行号") + public String srcItem; + + @ApiParam(value = "源单号") + private String srcNo; + + @ApiParam("物料号") + private String partNameRdd; + + @ApiParam("单位") + private String unit; + + @ApiParam(value = "标准包装", example = "1") + private Double snp; + + @ApiParam(value = "一步法/两步法") + private Integer isSingleStep; + + @ApiParam(value = "创建时间") + private String createDateTime; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsWaveRuleDetailsRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsWaveRuleDetailsRepository.java new file mode 100644 index 0000000..75e9542 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsWaveRuleDetailsRepository.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.WmsWaveRuleDetails; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2020-03-25 11:29 + * @Modify: + **/ +@Repository +public interface WmsWaveRuleDetailsRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsWaveRuleRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsWaveRuleRepository.java new file mode 100644 index 0000000..44d5332 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsWaveRuleRepository.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.WmsWaveRule; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2020-03-25 11:29 + * @Modify: + **/ +@Repository +public interface WmsWaveRuleRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index 09eaafe..c92cbc1 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -2893,4 +2893,18 @@ public class WmsHqlPack { return result; } + /** + * 插件信息分页查询条件 + * @param rule + * @return + */ + public static DdlPackBean packHqlWmsWaveRule(WmsWaveRule rule) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(rule.getRuleCode(), "ruleCode", result); + DdlPreparedPack.getStringBiggerPack(rule.getStartEffectDate(), "startEffectDate", result); + DdlPreparedPack.getStringSmallerPack(rule.getEndEffectDate(), "endEffectDate", result); + getStringBuilderPack(rule, result); + return result; + } + } diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index 4395f3c..067d448 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,13 +5,16 @@ i3plus-pojo i3plus.pojo - 1.0-SNAPSHOT + 1.0-${profileActive}-SNAPSHOT ../../pom.xml 4.0.0 i3plus-pojo-workflow jar + 1.0-${profileActive}-SNAPSHOT + + dev @@ -42,7 +45,7 @@ - ${project.artifactId}-${profileActive}-${project.version} + ${project.artifactId}-${project.version} \ No newline at end of file diff --git a/pom.xml b/pom.xml index 96a06e4..d90bca1 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-SNAPSHOT + 1.0-${profileActive}-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform @@ -77,23 +77,23 @@ - i3plus.platform - i3plus-platform-common + i3plus.pojo + i3plus-pojo-base ${project.version} + - i3plus.pojo - i3plus-pojo-model + i3plus.platform + i3plus-platform-common ${project.version} i3plus.pojo - i3plus-pojo-base + i3plus-pojo-model ${project.version} - i3plus.pojo i3plus-pojo-mes @@ -221,7 +221,6 @@ - dev @@ -252,6 +251,7 @@ - ${project.artifactId}-${profileActive}-${project.version} + ${project.artifactId}-${project.version} + \ No newline at end of file