From 5dc8ffb3943d195300168be7b91d517b325a80de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Fri, 8 Nov 2019 11:39:17 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97=E5=A4=84=E7=90=86=E9=98=9F?= =?UTF-8?q?=E5=88=97V1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 41 ++++++++++++++++++++-- .../pojo/model/wms/WmsLogInfoSendToMqModel.java | 29 +++++++++++++++ .../estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java | 1 + .../estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java | 1 + .../cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java | 1 + 5 files changed, 70 insertions(+), 3 deletions(-) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsLogInfoSendToMqModel.java 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 ed412ca..5685375 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 @@ -626,8 +626,8 @@ public class WmsEnumUtil { VDA_PICKING_GOODS(270, "VDA_PICKING_GOODS", "VDA生产领料"), VDA_ONE_PICKING_GOODS(280, "VDA_ONE_PICKING_GOODS", "VDA单箱领料"), VDA_QC(290, "VDA_QC", "VDA质检"), - VDA_SN_SPLIT(300, "VDA_SN_SPLIT", "VDA物料拆分"), - VDA_SN_MERGE(310, "VDA_SN_MERGE", "VDA物料合并"); + VDA_SN_SPLIT(300, "VDA_SN_SPLIT", "VDA物料拆分"), + VDA_SN_MERGE(310, "VDA_SN_MERGE", "VDA物料合并"); private int value; @@ -2808,6 +2808,7 @@ public class WmsEnumUtil { return tmp; } } + /** * 任务数据来源：检查子数据 */ @@ -3617,7 +3618,7 @@ public class WmsEnumUtil { LINE(10, "LINE", "产线"), CUSTOMER(20, "CUSTOMER", "客户"), VENDOR(30, "VENDOR", "供应商"), - BOXING_ERROR_PROOFING(40, "BOXING_ERROR_PROOFING","装箱防错"); + BOXING_ERROR_PROOFING(40, "BOXING_ERROR_PROOFING", "装箱防错"); private int value; private String code; @@ -3968,4 +3969,38 @@ public class WmsEnumUtil { return tmp; } } + + /** + * 日志推送至MQ的处理类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum LOG_TO_MQ_HANDLE_TYPE { + INSERT(10, "新增"), UPDATE(20, "修改"), DELETE(30, "删除"); + + private int value; + private String description; + + LOG_TO_MQ_HANDLE_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + 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; + } + } } \ No newline at end of file diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsLogInfoSendToMqModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsLogInfoSendToMqModel.java new file mode 100644 index 0000000..c6d2d19 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsLogInfoSendToMqModel.java @@ -0,0 +1,29 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +/** + * 操作日志信息推送至队列后台处理 + */ +@Data +public class WmsLogInfoSendToMqModel implements Serializable { + private static final long serialVersionUID = -5490167040159056107L; + @ApiParam("处理类型") + private int handleType; + @ApiParam("日志对象DAO层") + private String baseRepository; + @ApiParam("日志对象（新增）") + private BaseBean logBean; + @ApiParam("查询条件名称（修改）") + private String[] conditionNames; + @ApiParam("查询条件值（修改）") + private Object[] conditionValues; + @ApiParam("更新条件名称（修改）") + private String[] updateNames; + @ApiParam("更新条件值（修改）") + private Object[] updateValues; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java index 0a90db5..208e2ca 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java @@ -27,6 +27,7 @@ import javax.persistence.*; @Table(name = "WMS_MOVE_DETAILS", indexes = { @Index(columnList = "PART_NO"), @Index(columnList = "ORDER_NO"), + @Index(columnList = "ITEM_STATUS"), @Index(columnList = "ORGANIZE_CODE") }) @Api("库存移动单明细信息") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java index 3f75fd5..335aac9 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java @@ -27,6 +27,7 @@ import javax.persistence.*; @Table(name = "WMS_MOVE_MASTER", indexes = { @Index(columnList = "TRANS_TYPE_CODE"), @Index(columnList = "ORDER_NO"), + @Index(columnList = "ORDER_STATUS"), @Index(columnList = "ORGANIZE_CODE") }) @Api("库存移动单主表信息") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java index de05dbf..7785e93 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java @@ -28,6 +28,7 @@ import javax.persistence.*; @Table(name = "WMS_MOVE_SN", indexes = { @Index(columnList = "PART_NO"), @Index(columnList = "ORDER_NO"), + @Index(columnList = "ITEM_STATUS"), @Index(columnList = "SN"), @Index(columnList = "ORGANIZE_CODE") })