From 0cc70fe2d059b4ed0a2f376307e6d9e58fcca3d5 Mon Sep 17 00:00:00 2001 From: E <1565181015@qq.com> Date: Thu, 9 Jan 2020 18:30:52 +0800 Subject: [PATCH 01/28] =?UTF-8?q?=E3=80=90#1390=20=E5=9F=BA=E7=A1=80?= =?UTF-8?q?=E6=95=B0=E6=8D=AE-=E5=AE=A2=E6=88=B7=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AF=BC=E5=85=A5=E5=8A=9F=E8=83=BD=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasCustomer.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasCustomer.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasCustomer.java index f2a841b..60cabe4 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasCustomer.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasCustomer.java @@ -30,7 +30,7 @@ public class BasCustomer extends BaseBean { private static final long serialVersionUID = -1980207700343546396L; @Column(name = "CUST_NO") - @ApiParam(value = "客户编号") + @ApiParam(value = "客户编码") private String custNo; @Column(name = "CUST_NAME") @@ -54,7 +54,7 @@ public class BasCustomer extends BaseBean { private String custEmail; @Column(name = "CUST_TEL") - @ApiParam(value = "联系人电话") + @ApiParam(value = "电话号码") private String custTel; @Column(name = "CUST_FAX") From 241350ae83bc08a6aa6f989a8b70707e234fef6a Mon Sep 17 00:00:00 2001 From: qianhs Date: Thu, 9 Jan 2020 19:18:43 +0800 Subject: [PATCH 02/28] =?UTF-8?q?=E3=80=90=E7=9B=98=E7=82=B9--=E8=B0=83?= =?UTF-8?q?=E5=B7=AE=E5=90=8E=E5=BA=93=E5=AD=98=E5=AF=B9=E4=B8=8D=E4=B8=8A?= =?UTF-8?q?(C202001070020=EF=BC=8CC202001070021)=E3=80=91=E3=80=90bug7314?= =?UTF-8?q?=09=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java index c08e1eb..8b4fda5 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java @@ -132,12 +132,12 @@ public class WmsCSFactTrans extends BaseBean { * 60=在途,70=已隔离,80=破包,90=冻结,100=作废 */ @Transient - @AnnoOutputColumn(hidden = true) @ApiParam(value = "条码状态", example = "1") + @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class,refForeignKey = "value",value = "description") public Integer snStatus; @Transient - @AnnoOutputColumn(hidden = true) + @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class,refForeignKey = "value",value = "description") @ApiParam(value = "条码状态(冻结时)", example = "1") public Integer destSnStatus; From add40a27e31ec102a062c78c63deda271095fa02 Mon Sep 17 00:00:00 2001 From: zcg Date: Thu, 9 Jan 2020 19:28:17 +0800 Subject: [PATCH 03/28] =?UTF-8?q?=E3=80=90=E4=BB=BB=E5=8A=A1=EF=BC=9A1382?= =?UTF-8?q?=EF=BC=8C=E6=95=B0=E6=8D=AE=E7=9B=91=E5=90=AC=E5=9F=BA=E7=A1=80?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E5=BC=80=E5=8F=91=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 82 ++++++++++++++++++++++ .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 47 +++++++++++++ .../i3plus/pojo/mes/pcn/bean/MesMonitorTask.java | 50 +++++++++++++ .../pojo/mes/pcn/bean/MesMonitorTaskDetail.java | 46 ++++++++++++ .../repository/MesMonitorTaskDetailRepository.java | 15 ++++ .../pcn/repository/MesMonitorTaskRepository.java | 15 ++++ .../estsh/i3plus/pojo/mes/bean/MesMonitorTask.java | 50 +++++++++++++ .../i3plus/pojo/mes/bean/MesMonitorTaskDetail.java | 51 ++++++++++++++ .../repository/MesMonitorTaskDetailRepository.java | 15 ++++ .../mes/repository/MesMonitorTaskRepository.java | 15 ++++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 47 +++++++++++++ 11 files changed, 433 insertions(+) create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMonitorTask.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMonitorTaskDetail.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesMonitorTaskDetailRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesMonitorTaskRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMonitorTask.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMonitorTaskDetail.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesMonitorTaskDetailRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesMonitorTaskRepository.java 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 2a7e925..4323d3e 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 @@ -3945,4 +3945,86 @@ public class MesEnumUtil { } } + /** + * MesMonitorTask实体对应的status值 监听任务状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MONITOR_TASK_STATUS { + + NORMAL(10, "正常"), + CLOSE(20, "关闭"); + + private int value; + private String description; + + MONITOR_TASK_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; + } + } + + /** + * 监听任务任务对象类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MONITOR_TASK_OBJECT_TYPE { + + PLC(10, "PLC"), + DB(20, "DB"), + OTHER(30, "其他"); + + private int value; + private String description; + + MONITOR_TASK_OBJECT_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static Integer descriptionOfValue(String description) { + Integer tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(description)) { + tmp = values()[i].value; + } + } + 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 5c3308e..63a107d 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 @@ -2685,4 +2685,51 @@ public class MesPcnEnumUtil { } } + /** + * 监听任务任务对象类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MONITOR_TASK_OBJECT_TYPE { + + PLC(10, "PLC"), + DB(20, "DB"), + OTHER(30, "其他"); + + private int value; + private String description; + + MONITOR_TASK_OBJECT_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static Integer descriptionOfValue(String description) { + Integer tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(description)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMonitorTask.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMonitorTask.java new file mode 100644 index 0000000..d3b50c3 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMonitorTask.java @@ -0,0 +1,50 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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 : zcg + * @Date : 2020/1/8 0008 - 17:11 + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_MONITOR_TASK") +@Api("监听任务") +public class MesMonitorTask extends BaseBean { + + @Column(name = "TASK_NO") + @ApiParam("任务编号") + private String taskNo; + + @Column(name = "TASK_NAME") + @ApiParam("任务名称") + private String taskName; + + @Column(name = "TASK_OBJECT_TYPE") + @ApiParam("任务对象类型") + private String taskObjectType; + + @Column(name = "TASK_STATUS") + @ApiParam("任务状态") + private Integer taskStatus; + + @Column(name = "TASK_EXCEPTION_DESC") + @ApiParam("异常描述") + private String taskExceptionDesc; + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMonitorTaskDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMonitorTaskDetail.java new file mode 100644 index 0000000..baa40e9 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMonitorTaskDetail.java @@ -0,0 +1,46 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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 : zcg + * @Date : 2020/1/8 0008 - 17:19 + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_MONITOR_TASK_DETAIL") +@Api("监听任务明细") +public class MesMonitorTaskDetail extends BaseBean { + + @Column(name = "TASK_NO") + @ApiParam("任务编号") + private String taskNo; + + @Column(name = "DATA_OBJECT_NO") + @ApiParam("数据对象编号") + private String dataObjectNo; + +// @Column(name = "STORE_OBJECT_CODE") +// @ApiParam("存储对象代码") +// private String storeObjectCode; +// +// @Column(name = "STORE_FIELD_CODE") +// @ApiParam("存储字段代码") +// private String storeFieldCode; + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesMonitorTaskDetailRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesMonitorTaskDetailRepository.java new file mode 100644 index 0000000..46e8f5d --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesMonitorTaskDetailRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesMonitorTaskDetail; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : zcg + * @Date : 2020/1/8 0008 - 18:42 + */ +@Repository +public interface MesMonitorTaskDetailRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesMonitorTaskRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesMonitorTaskRepository.java new file mode 100644 index 0000000..f87ff43 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesMonitorTaskRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesMonitorTask; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : zcg + * @Date : 2020/1/8 0008 - 18:43 + */ +@Repository +public interface MesMonitorTaskRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMonitorTask.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMonitorTask.java new file mode 100644 index 0000000..6cfb945 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMonitorTask.java @@ -0,0 +1,50 @@ +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 : + * @Reference : + * @Author : zcg + * @Date : 2020/1/8 0008 - 17:11 + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_MONITOR_TASK") +@Api("监听任务") +public class MesMonitorTask extends BaseBean { + + @Column(name = "TASK_NO") + @ApiParam("任务编号") + private String taskNo; + + @Column(name = "TASK_NAME") + @ApiParam("任务名称") + private String taskName; + + @Column(name = "TASK_OBJECT_TYPE") + @ApiParam("任务对象类型") + private String taskObjectType; + + @Column(name = "TASK_STATUS") + @ApiParam("任务状态") + private Integer taskStatus; + + @Column(name = "TASK_EXCEPTION_DESC") + @ApiParam("异常描述") + private String taskExceptionDesc; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMonitorTaskDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMonitorTaskDetail.java new file mode 100644 index 0000000..643be95 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMonitorTaskDetail.java @@ -0,0 +1,51 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; + +/** + * @Description : + * @Reference : + * @Author : zcg + * @Date : 2020/1/8 0008 - 17:19 + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_MONITOR_TASK_DETAIL") +@Api("监听任务明细") +public class MesMonitorTaskDetail extends BaseBean { + + @Column(name = "TASK_NO") + @ApiParam("任务编号") + private String taskNo; + + @Column(name = "DATA_OBJECT_NO") + @ApiParam("数据对象编号") + private String dataObjectNo; + +// @Column(name = "STORE_OBJECT_CODE") +// @ApiParam("存储对象代码") +// private String storeObjectCode; +// +// @Column(name = "STORE_FIELD_CODE") +// @ApiParam("存储字段代码") +// private String storeFieldCode; + + @Transient + @ApiParam("任务名称") + private String taskName; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesMonitorTaskDetailRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesMonitorTaskDetailRepository.java new file mode 100644 index 0000000..5bd0ae1 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesMonitorTaskDetailRepository.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.MesMonitorTaskDetail; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : zcg + * @Date : 2020/1/8 0008 - 18:42 + */ +@Repository +public interface MesMonitorTaskDetailRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesMonitorTaskRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesMonitorTaskRepository.java new file mode 100644 index 0000000..335ca46 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesMonitorTaskRepository.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.MesMonitorTask; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : zcg + * @Date : 2020/1/8 0008 - 18:43 + */ +@Repository +public interface MesMonitorTaskRepository 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 7df0f79..aa3623c 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 @@ -2085,6 +2085,7 @@ public class MesHqlPack { /** * JIS发运模式 + * * @param patternJis * @param organizeCode * @return @@ -2106,5 +2107,51 @@ public class MesHqlPack { return packBean; } + /** + * 监听任务查询条件封装 + * + * @param monitorTask + * @param organizeCode + * @return + */ + public static DdlPackBean getMesMonitorTask(MesMonitorTask monitorTask, String organizeCode) { + DdlPackBean packBean = getAllBaseData(organizeCode); + if (!StringUtils.isEmpty(monitorTask.getTaskNo())) { + DdlPreparedPack.getStringLikerPack(monitorTask.getTaskNo(), "taskNo", packBean); + } + if (!StringUtils.isEmpty(monitorTask.getTaskName())) { + DdlPreparedPack.getStringLikerPack(monitorTask.getTaskName(), "taskName", packBean); + } + if (!StringUtils.isEmpty(monitorTask.getTaskObjectType())) { + DdlPreparedPack.getStringEqualPack(monitorTask.getTaskObjectType(), "taskObjectType", packBean); + } + if (!StringUtils.isEmpty(monitorTask.getTaskStatus())) { + DdlPreparedPack.getNumEqualPack(monitorTask.getTaskStatus(), "taskStatus", packBean); + } + if (monitorTask.getIsValid() != null) { + DdlPreparedPack.getNumEqualPack(monitorTask.getIsValid(), "isValid", packBean); + } + return packBean; + } + /** + * 监听任务明细查询条件封装 + * + * @param monitorTaskDetail + * @param organizeCode + * @return + */ + public static DdlPackBean getMesMonitorTaskDetail(MesMonitorTaskDetail monitorTaskDetail, String organizeCode) { + DdlPackBean packBean = getAllBaseData(organizeCode); + if (!StringUtils.isEmpty(monitorTaskDetail.getTaskNo())) { + DdlPreparedPack.getStringLikerPack(monitorTaskDetail.getTaskNo(), "taskNo", packBean); + } + if (!StringUtils.isEmpty(monitorTaskDetail.getDataObjectNo())) { + DdlPreparedPack.getStringLikerPack(monitorTaskDetail.getDataObjectNo(), "dataObjectNo", packBean); + } + if (monitorTaskDetail.getIsValid() != null) { + DdlPreparedPack.getNumEqualPack(monitorTaskDetail.getIsValid(), "isValid", packBean); + } + return packBean; + } } From 51839d7be5beb3733e8d7b740282b83f2da0bdf7 Mon Sep 17 00:00:00 2001 From: jokelone Date: Thu, 9 Jan 2020 20:09:11 +0800 Subject: [PATCH 04/28] =?UTF-8?q?=E3=80=90=E4=BB=BB=E5=8A=A1=EF=BC=9A1381?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 34 ++++++++++++++++++++++ .../i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java | 5 ---- .../i3plus/pojo/mes/model/ActionRequestBean.java | 3 ++ 3 files changed, 37 insertions(+), 5 deletions(-) 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 2a7e925..05d0ea7 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 @@ -13,6 +13,40 @@ import com.fasterxml.jackson.annotation.JsonFormat; public class MesEnumUtil { /** + * 动作-module + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_ACTION_MODULE { + WORK_ORDER_LANDED(10, "生产工单下达"); + + private int value; + private String description; + + MES_ACTION_MODULE(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; + } + } + + /** * JIS发运模式类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java index 6eea3a5..8d48efd 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java @@ -173,8 +173,6 @@ public class MesHqlPack { mesWorkOrder.getCreateDateTimeEnd(), "createDatetime", packBean, true); } - DdlPreparedPack.getOrderDefault(mesWorkOrder); - DdlPreparedPack.getOrderByPack(new Object[]{"2"}, new String[]{mesWorkOrder.getOrderByParam()}, packBean); return packBean; } @@ -205,9 +203,6 @@ public class MesHqlPack { if (!StringUtils.isEmpty(mesPart.getCategoryCode3())) { DdlPreparedPack.getStringEqualPack(mesPart.getCategoryCode3(), "categoryCode3", packBean); } - - DdlPreparedPack.getOrderDefault(mesPart); - DdlPreparedPack.getOrderByPack(new Object[]{"2"}, new String[]{mesPart.getOrderByParam()}, packBean); return packBean; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ActionRequestBean.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ActionRequestBean.java index 944b7fd..3c022ef 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ActionRequestBean.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ActionRequestBean.java @@ -32,4 +32,7 @@ public class ActionRequestBean implements Serializable { @ApiParam("Map请求集") public Map resultMap; + + @ApiParam("module代码") + public Integer moduleCode; } From cf92fb2b2345470637867aad804a75c68696e175 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Thu, 9 Jan 2020 20:16:26 +0800 Subject: [PATCH 05/28] =?UTF-8?q?Wms=E5=8A=A8=E6=80=81=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E4=B8=8E=E8=87=AA=E5=AE=9A=E4=B9=89=E5=88=97=E8=A1=A8=EF=BC=8C?= =?UTF-8?q?=E8=A1=A8=E5=8D=95=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/model/wms/WmsListElementModel.java | 2 +- .../java/cn/estsh/i3plus/pojo/model/wms/WmsSearchElementModel.java | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsListElementModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsListElementModel.java index 0a11f26..9007f92 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsListElementModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsListElementModel.java @@ -25,7 +25,7 @@ public class WmsListElementModel extends BaseBean { @ApiParam(value = "用户编号") private String userCode; - @ApiParam(value = "是否默认配置") + @ApiParam(value = "是否默认配置 1-默认，2-自定义") private Integer isDefault; List wmsListElementList; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchElementModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchElementModel.java index 0056ba7..d554934 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchElementModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchElementModel.java @@ -34,6 +34,9 @@ public class WmsSearchElementModel extends BaseBean { @ApiParam(value = "是否共享") private Integer isShare; + @ApiParam(value = "搜索名称") + private String searchName; + @ApiParam(value = "Wms查询元素列表") private List searchElementList; } From 29220002b125ffeddcd58e806adba7766d3e917a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Thu, 9 Jan 2020 20:55:45 +0800 Subject: [PATCH 06/28] =?UTF-8?q?Wms=E5=8A=A8=E6=80=81=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E4=B8=8E=E8=87=AA=E5=AE=9A=E4=B9=89=E5=88=97=E8=A1=A8=EF=BC=8C?= =?UTF-8?q?=E8=A1=A8=E5=8D=95=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/model/wms/WmsSearchGroupModel.java | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchGroupModel.java diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchGroupModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchGroupModel.java new file mode 100644 index 0000000..22e8533 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchGroupModel.java @@ -0,0 +1,20 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description : WMS列表搜索model + * @Reference : + * @Author : sjc + * @CreateDate : 2020-01-07 14:33 + * @Modify: + **/ +@Data +public class WmsSearchGroupModel { + + @ApiParam(value = "组列表") + private List searchElementModelList; +} From 7090f30b944c54dc18e7e9b64ddab4aeb33168c0 Mon Sep 17 00:00:00 2001 From: gcj Date: Fri, 10 Jan 2020 13:26:08 +0800 Subject: [PATCH 07/28] =?UTF-8?q?=E3=80=90=E6=8C=89=E8=A7=84=E5=88=99?= =?UTF-8?q?=E6=8E=A8=E9=80=81=E9=82=AE=E4=BB=B6=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsPushConfig.java | 5 ++++- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsPushLog.java | 14 +++++++------- .../estsh/i3plus/pojo/wms/modelbean/MailMessageModel.java | 7 +++---- .../estsh/i3plus/pojo/wms/modelbean/PushMessageModel.java | 6 ++++-- 4 files changed, 18 insertions(+), 14 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushConfig.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushConfig.java index 374abd7..823a810 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushConfig.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushConfig.java @@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Lob; import javax.persistence.Table; /** @@ -33,7 +34,7 @@ public class WmsPushConfig extends BaseBean{ @Column(name = "PUSH_NAME") private String pushName; - @ApiParam("规则类型") + @ApiParam("规则表达式") @Column(name = "QUARTZ_CRON") private String quartzCron; @@ -61,10 +62,12 @@ public class WmsPushConfig extends BaseBean{ @Column(name = "SCRIPT_NO") private String scriptNo; + @Lob @ApiParam("标题模板") @Column(name = "TITLE_TEMPLATE") private String titleTemplate; + @Lob @ApiParam("消息体模板") @Column(name = "CONTENT_TEMPLATE") private String contentTemplate; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushLog.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushLog.java index 6a57625..e10dca9 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushLog.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushLog.java @@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Lob; import javax.persistence.Table; /** @@ -29,24 +30,23 @@ import javax.persistence.Table; public class WmsPushLog extends BaseBean{ private static final long serialVersionUID = -1708833666516164845L; - @Column(name = "EXE_HQL") - @ApiParam("执行Hql") - private String exeHql; @Column(name = "PUSH_TITLE") @ApiParam("推送标题") private String pushTitle; + @Lob @Column(name = "PUSH_CONTENT") @ApiParam("推送内容") private String pushContent; @Column(name = "PUSH_TYPE") @ApiParam("推送类型") - private String pushType; + private Integer pushType; + + @Column(name = "PATH_URL") + @ApiParam("推送地址") + private String pathUrl; - @Column(name = "PUSH_RESULT") - @ApiParam("推送结果") - private String pushResult; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/MailMessageModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/MailMessageModel.java index 6667a49..7c2fd7c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/MailMessageModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/MailMessageModel.java @@ -2,14 +2,13 @@ package cn.estsh.i3plus.pojo.wms.modelbean; import lombok.Data; +import java.util.List; import java.util.Map; @Data public class MailMessageModel extends PushMessageModel { - - //附加，value 文件的绝对地址/动态模板数据 - private Map attachment; - + //推送数据 + List dataList; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/PushMessageModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/PushMessageModel.java index 1e2ff26..66d8f9f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/PushMessageModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/PushMessageModel.java @@ -20,6 +20,8 @@ public class PushMessageModel { //推送地址 public String pathUrl; - //推送数据 - List> dataList; + //工厂代码 + private String organizeCode; + + } From 8414af2011d52a1ef2c06db84949d9ffb9a81f3b Mon Sep 17 00:00:00 2001 From: gcj Date: Fri, 10 Jan 2020 13:37:33 +0800 Subject: [PATCH 08/28] =?UTF-8?q?=E3=80=90=E6=8C=89=E8=A7=84=E5=88=99?= =?UTF-8?q?=E6=8E=A8=E9=80=81=E9=82=AE=E4=BB=B6=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/modelbean/MailMessageModel.java | 2 ++ .../i3plus/pojo/wms/modelbean/PushMessageModel.java | 16 +++++++++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/MailMessageModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/MailMessageModel.java index 7c2fd7c..28fbe82 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/MailMessageModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/MailMessageModel.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.wms.modelbean; +import io.swagger.annotations.ApiParam; import lombok.Data; import java.util.List; @@ -9,6 +10,7 @@ import java.util.Map; public class MailMessageModel extends PushMessageModel { //推送数据 + @ApiParam("推送数据集合") List dataList; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/PushMessageModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/PushMessageModel.java index 66d8f9f..8c7abb5 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/PushMessageModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/PushMessageModel.java @@ -1,5 +1,7 @@ package cn.estsh.i3plus.pojo.wms.modelbean; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +import io.swagger.annotations.ApiParam; import lombok.Data; import java.util.List; @@ -9,18 +11,22 @@ import java.util.Map; public class PushMessageModel { - //标题 + @ApiParam("标题") public String title; - //内容 + + @ApiParam("内容") public String content; - //推送类型 + //推送类型-枚举 ：WmsEnumUtil.PUSH_TYPE + @ApiParam("推送类型") public String pushType; - //推送地址 + //推送地址，邮箱以逗号分割 + @ApiParam("推送地址") public String pathUrl; - //工厂代码 + + @ApiParam("工厂代码") private String organizeCode; From 3d7f88d2ee0c4cd0a1ff16fa132e7db55636839f Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Fri, 10 Jan 2020 14:19:03 +0800 Subject: [PATCH 09/28] =?UTF-8?q?=E3=80=907201=20=E6=94=B6=E8=B4=A7BOP?= =?UTF-8?q?=E7=A7=BB=E5=BA=93=E6=B5=81=E7=A8=8B=E5=9B=BE=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/QadBop.java | 113 +++++++++++++++++++++ .../estsh/i3plus/pojo/wms/bean/QadItemPacking.java | 91 +++++++++++++++++ .../pojo/wms/repository/QadBopRepository.java | 14 +++ .../wms/repository/QadItemPackingRepository.java | 14 +++ 4 files changed, 232 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QadBop.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QadItemPacking.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/QadBopRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/QadItemPackingRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QadBop.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QadBop.java new file mode 100644 index 0000000..323ed7b --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QadBop.java @@ -0,0 +1,113 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.annotation.FieldAnnotation; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +import com.alibaba.fastjson.annotation.JSONField; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import org.hibernate.annotations.ColumnDefault; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; +import org.hibernate.annotations.GenericGenerator; + +import javax.persistence.*; +import java.io.Serializable; + +/** + * @Description : 包材BOM信息 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-01-09 14:40 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name="QAD_BOP") +@Api("包材BOM信息") +public class QadBop implements Serializable { + + private static final long serialVersionUID = 4673217061075875734L; + + @Id + @GeneratedValue(generator = "IDGenerator") + @GenericGenerator(name = "IDGenerator", strategy = "assigned") + @Column(name="ID") + @ApiParam(value = "主键",example = "0") + @JsonSerialize(using = ToStringSerializer.class) + @AnnoOutputColumn(hidden = true) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + public Long id; + + //get单独处理 + public Long getId() { + if(id != null) { + return id.longValue(); + }else{ + return id; + } + } + + /** + * MonogoDB _id映射 + * @param id + */ + @JSONField(name="_id") + public void setId(Long id) { + this.id = id; + } + + @Column(name="BOP_CODE") + @ApiParam("BOP编号") + public String bopCode; + + @Column(name="BOP_DESC") + @ApiParam("BOP描述") + public String bopDesc; + + @Column(name="BOP_DOMAIN") + @ApiParam("BOP所属Domain") + public String bopDomain; + + @Column(name="PARENT_PART") + @ApiParam("父层级packcode对应的qad零件号") + public String parentPart; + + @Column(name="PARENT_RETURN_PART") + @ApiParam("父层级packcode对应的可回用零件号") + public String parentReturnPart; + + @Column(name="BOPDW_QTY") + @ApiParam("默认1 不考虑") + public String bopdwQty; + + @Column(name="SUB_BOP_CODE") + @ApiParam("子层级packcode代码或者是物料零件号") + public String subBopCode; + + @Column(name="SUB_BOP_PART") + @ApiParam("子层级packcode对应的qad零件号，如果是物料零件这里为空") + public String subBopPart; + + @Column(name="SUB_ITEM_PART") + @ApiParam("子层级packcode对应的可回用零件号，如果是物料零件这里为空") + public String subItemPart; + + @Column(name="SUB_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") + @ApiParam(value = "该层级在父层级中的个数", example = "0") + public String subQty; + + @Column(name="SUB_UNIT") + @ApiParam("单位") + public String subUnit; + + @Column(name="CREATE_DATE_TIME") + @ApiParam("创建时间") + public String createDateTime; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QadItemPacking.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QadItemPacking.java new file mode 100644 index 0000000..82c26a9 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QadItemPacking.java @@ -0,0 +1,91 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.annotation.FieldAnnotation; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +import com.alibaba.fastjson.annotation.JSONField; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; +import org.hibernate.annotations.GenericGenerator; + +import javax.persistence.*; +import java.io.Serializable; + +/** + * @Description : 零件包装主数据信息 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-01-09 14:04 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name="QAD_ITEM_PACKING") +@Api("零件包装主数据信息") +public class QadItemPacking implements Serializable { + + private static final long serialVersionUID = -9204074690166851001L; + + @Id + @GeneratedValue(generator = "IDGenerator") + @GenericGenerator(name = "IDGenerator", strategy = "assigned") + @Column(name="ID") + @ApiParam(value = "主键",example = "0") + @JsonSerialize(using = ToStringSerializer.class) + @AnnoOutputColumn(hidden = true) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + public Long id; + + //get单独处理 + public Long getId() { + if(id != null) { + return id.longValue(); + }else{ + return id; + } + } + + /** + * MonogoDB _id映射 + * @param id + */ + @JSONField(name="_id") + public void setId(Long id) { + this.id = id; + } + + @Column(name="IN_ADDR") + @ApiParam("收货时是供应商编号，发运时是客户发往地") + public String inAddr; + + @Column(name="IN_BOP_CODE") + @ApiParam("BOP编号") + public String inBopCode; + + @Column(name="IN_DOMAIN") + @ApiParam("所属Domain") + public String inDomain; + + @Column(name="IN_PART") + @ApiParam("物料代码") + public String inPart; + + @Column(name="IN_SITE") + @ApiParam("工厂代码") + public String inSite; + + @Column(name="IN_TRANS_TYPE") + @ApiParam("交易类型") + public String inTransType; + + @Column(name="CREATE_DATE_TIME") + @ApiParam("创建时间") + public String createDateTime; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/QadBopRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/QadBopRepository.java new file mode 100644 index 0000000..f6c8ef8 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/QadBopRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.QadBop; + +/** + * @Description : + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-01-09 15:06 + * @Modify: + **/ +public interface QadBopRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/QadItemPackingRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/QadItemPackingRepository.java new file mode 100644 index 0000000..21c95ef --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/QadItemPackingRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.QadItemPacking; + +/** + * @Description : + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-01-09 15:06 + * @Modify: + **/ +public interface QadItemPackingRepository extends BaseRepository { +} From c24de431d4155caa727e964c185483d4c4528a97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Fri, 10 Jan 2020 14:40:37 +0800 Subject: [PATCH 10/28] =?UTF-8?q?=E3=80=906853=20=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E8=BF=81=E7=A7=BB=EF=BC=9A=E4=BA=A7=E5=93=81=E6=8A=A5=E5=B7=A5?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E8=A1=A8=E3=80=81=E4=BA=A7=E5=93=81=E5=8F=91?= =?UTF-8?q?=E8=BF=90=E8=A1=A8=E3=80=81=E4=BA=A7=E5=93=81=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E8=A1=A8=E3=80=82=E5=AE=9A=E6=9C=9F=E8=BF=81=E7=A7=BB=E3=80=82?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDataMigrationConfig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDataMigrationConfig.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDataMigrationConfig.java index 9038989..34ed123 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDataMigrationConfig.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDataMigrationConfig.java @@ -50,7 +50,7 @@ public class WmsDataMigrationConfig extends BaseBean{ @Column(name="LAST_MRGRATION_QTY") @ApiParam(value = "末次迁移记录数", example = "0") - private Integer LastmMigrationQty; + private Integer lastmMigrationQty; @Column(name="NEXT_EXECUTION_TIME") @ApiParam("下次执行时间") From 51c66e9279e73fcac470045c13fe5f3643c45f84 Mon Sep 17 00:00:00 2001 From: gcj Date: Fri, 10 Jan 2020 15:34:03 +0800 Subject: [PATCH 11/28] =?UTF-8?q?=E3=80=90=E5=AE=81=E5=BE=B7=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E6=B8=85=E5=8D=95=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushConfig.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushConfig.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushConfig.java index 823a810..ef75213 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushConfig.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushConfig.java @@ -50,10 +50,12 @@ public class WmsPushConfig extends BaseBean{ @Column(name = "SERIAL_NUMBER") private Integer serialNumber; + @Lob @ApiParam("查询Hql") @Column(name = "HQL_STR") private String hqlStr; + @Lob @ApiParam("查询Sql") @Column(name = "SQL_STR") private String sqlStr; From 5c841c706b244c1b1f126680bffdf25ce2fd4102 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Fri, 10 Jan 2020 16:16:44 +0800 Subject: [PATCH 12/28] =?UTF-8?q?=E3=80=907201=20=E6=94=B6=E8=B4=A7BOP?= =?UTF-8?q?=E7=A7=BB=E5=BA=93=E6=B5=81=E7=A8=8B=E5=9B=BE=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 e618c9d..e24bbf8 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 @@ -2107,7 +2107,8 @@ public class WmsEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum COMMON_SN { PO_SN("PO_SN", "PO条码"), - VDA_SN("VDA_SN", "VDA条码"); + VDA_SN("VDA_SN", "VDA条码"), + SELF_SN("SELF_SN", "自制件条码"); private String code; private String description; From 503f3cd7a3f6c453840300930da88b7aa81e2a93 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Fri, 10 Jan 2020 16:27:22 +0800 Subject: [PATCH 13/28] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E8=A1=A8?= =?UTF-8?q?=E5=8D=95=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/enumutil/BlockReportEnumUtil.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockReportEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockReportEnumUtil.java index 9fc03f1..f012813 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockReportEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockReportEnumUtil.java @@ -286,7 +286,8 @@ public class BlockReportEnumUtil { ECHARTS_PIE(10, "饼图", "实芯饼图"), ECHARTS_BAR(20, "柱状图", "柱状图-向上具状图"), ECHARTS_LINE(30, "折线图", "向右折线条图"), - ECHARTS_TREEMAP(40, "矩形图", "矩形图"); + ECHARTS_TREEMAP(40, "矩形图", "矩形图"), + SELECT_SINGLE(50, "下拉单选", "下拉单选"); private int value; private String name; From 86694d3ceb4aca9ba8f41a49d6f70d5a94e22224 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Fri, 10 Jan 2020 19:12:15 +0800 Subject: [PATCH 14/28] =?UTF-8?q?Wms=E5=8A=A8=E6=80=81=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E4=B8=8E=E8=87=AA=E5=AE=9A=E4=B9=89=E5=88=97=E8=A1=A8=EF=BC=8C?= =?UTF-8?q?=E8=A1=A8=E5=8D=95=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElement.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElement.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElement.java index 8ffe833..e9d4ccc 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElement.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElement.java @@ -8,10 +8,7 @@ import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Index; -import javax.persistence.Table; +import javax.persistence.*; /** * @Description : WMS搜索元素表 @@ -62,4 +59,8 @@ public class WmsSearchElement extends BaseBean { @Column(name = "USER_CODE") @ApiParam(value = "用户编号") private String userCode; + + private String groupName; + + private String groupConnector; } From c2e66de6384048b95bb5aeaeed986d4d975852b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Fri, 10 Jan 2020 19:13:22 +0800 Subject: [PATCH 15/28] =?UTF-8?q?Wms=E5=8A=A8=E6=80=81=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E4=B8=8E=E8=87=AA=E5=AE=9A=E4=B9=89=E5=88=97=E8=A1=A8=EF=BC=8C?= =?UTF-8?q?=E8=A1=A8=E5=8D=95=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElement.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElement.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElement.java index e9d4ccc..302f426 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElement.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElement.java @@ -60,7 +60,13 @@ public class WmsSearchElement extends BaseBean { @ApiParam(value = "用户编号") private String userCode; + /** + * 搜索组名称 + */ private String groupName; + /** + * 搜索组连接符 + */ private String groupConnector; } From 41047a17c1280836d11a26f3a9c35629c9da6622 Mon Sep 17 00:00:00 2001 From: qianhs Date: Sat, 11 Jan 2020 15:36:49 +0800 Subject: [PATCH 16/28] =?UTF-8?q?=E3=80=90=E7=9B=98=E7=82=B9--=E8=B0=83?= =?UTF-8?q?=E5=B7=AE=E5=90=8E=E5=BA=93=E5=AD=98=E5=AF=B9=E4=B8=8D=E4=B8=8A?= =?UTF-8?q?(C202001070020=EF=BC=8CC202001070021)=E3=80=91=E3=80=90bug7314?= =?UTF-8?q?=09=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java index 3bd0c51..ecc426c 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java @@ -321,6 +321,15 @@ public class DdlPreparedPack { } /** + * 两个字段不相等 + * + * @param firstColumnName 列名 + * @param packBean + */ + public static void getNotEqueals(String firstColumnName, String twoColumnName, DdlPackBean packBean) { + packBean.addColumnQuery(null, " and UPPER(model." + firstColumnName + ")!= UPPER(model." + twoColumnName+")", null); + } + /** * 封装long或者int的负整数对象成equal语句 * * @param columnName 列名 From 2396863babacaf2a7ff4c868d2f6009d626bc676 Mon Sep 17 00:00:00 2001 From: zcg Date: Mon, 13 Jan 2020 14:15:16 +0800 Subject: [PATCH 17/28] =?UTF-8?q?=E3=80=90=E4=BB=BB=E5=8A=A1:1383=20?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=9B=91=E5=90=AC=E5=AE=9A=E6=97=B6=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=8A=93=E5=8F=96=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 70 ++++++++++++++++++++++ .../i3plus/pojo/mes/pcn/bean/MesMonitorTask.java | 2 +- .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java | 4 ++ .../pojo/mes/pcn/model/DataAcquisitionModel.java | 35 +++++++++++ .../estsh/i3plus/pojo/mes/bean/MesMonitorTask.java | 2 +- .../java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java | 4 ++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 2 +- 7 files changed, 116 insertions(+), 3 deletions(-) create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/DataAcquisitionModel.java 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 63a107d..a17cee1 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 @@ -2732,4 +2732,74 @@ public class MesPcnEnumUtil { } } + /** + * MesMonitorTask实体对应的status值 监听任务状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MONITOR_TASK_STATUS { + + NORMAL(10, "正常"), + CLOSE(20, "关闭"); + + private int value; + private String description; + + MONITOR_TASK_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; + } + } + + /** + * 是否解析 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PLC_IS_PARSE { + TRUE(1, "是"), + FALSE(2, "否"); + + private int value; + private String description; + + PLC_IS_PARSE(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-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMonitorTask.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMonitorTask.java index d3b50c3..cba8ef5 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMonitorTask.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMonitorTask.java @@ -37,7 +37,7 @@ public class MesMonitorTask extends BaseBean { @Column(name = "TASK_OBJECT_TYPE") @ApiParam("任务对象类型") - private String taskObjectType; + private Integer taskObjectType; @Column(name = "TASK_STATUS") @ApiParam("任务状态") diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java index 2f172df..d995e03 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java @@ -96,6 +96,10 @@ public class MesPlc extends BaseBean { @ApiParam("反馈值") private String feedValue; + @Column(name = "OBJECT_CODE") + @ApiParam("对象代码") + private String objectCode; + @Transient @ApiParam("设备名称") private String equipmentName; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/DataAcquisitionModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/DataAcquisitionModel.java new file mode 100644 index 0000000..f70aaaa --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/DataAcquisitionModel.java @@ -0,0 +1,35 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : + * @Reference : + * @Author : zcg + * @Date : 2020/1/10 0010 - 15:28 + */ +@Data +@Api("数据采集Model") +public class DataAcquisitionModel { + + @ApiParam("对象代码") + private String objectCode; + + @ApiParam("对象名称") + private String objectName; + + @ApiParam("字段代码") + private String fieldCode; + + @ApiParam("字段名称") + private String fieldName; + + @ApiParam("字段值") + private String fieldValue; +// +// @ApiParam("组号") +// private String groupNo; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMonitorTask.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMonitorTask.java index 6cfb945..166a822 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMonitorTask.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMonitorTask.java @@ -37,7 +37,7 @@ public class MesMonitorTask extends BaseBean { @Column(name = "TASK_OBJECT_TYPE") @ApiParam("任务对象类型") - private String taskObjectType; + private Integer taskObjectType; @Column(name = "TASK_STATUS") @ApiParam("任务状态") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java index 5623665..98c4796 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java @@ -98,6 +98,10 @@ public class MesPlc extends BaseBean { @ApiParam("反馈值") private String feedValue; + @Column(name = "OBJECT_CODE") + @ApiParam("对象代码") + private String objectCode; + @Transient @ApiParam("设备名称") private String equipmentName; 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 aa3623c..934414c 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 @@ -2123,7 +2123,7 @@ public class MesHqlPack { DdlPreparedPack.getStringLikerPack(monitorTask.getTaskName(), "taskName", packBean); } if (!StringUtils.isEmpty(monitorTask.getTaskObjectType())) { - DdlPreparedPack.getStringEqualPack(monitorTask.getTaskObjectType(), "taskObjectType", packBean); + DdlPreparedPack.getNumEqualPack(monitorTask.getTaskObjectType(), "taskObjectType", packBean); } if (!StringUtils.isEmpty(monitorTask.getTaskStatus())) { DdlPreparedPack.getNumEqualPack(monitorTask.getTaskStatus(), "taskStatus", packBean); From 2eb14492d43029b4bfa696171116efc276926ac5 Mon Sep 17 00:00:00 2001 From: qianhs Date: Mon, 13 Jan 2020 18:49:32 +0800 Subject: [PATCH 18/28] =?UTF-8?q?=E3=80=90=E7=9B=98=E7=82=B9--=E8=B0=83?= =?UTF-8?q?=E5=B7=AE=E5=90=8E=E5=BA=93=E5=AD=98=E5=AF=B9=E4=B8=8D=E4=B8=8A?= =?UTF-8?q?(C202001070020=EF=BC=8CC202001070021)=E3=80=91=E3=80=90bug7314?= =?UTF-8?q?=09=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java index d5344c2..ba7a743 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java @@ -134,6 +134,11 @@ public class WmsLocate extends BaseBean { this.destBoxQty = destBoxQty; } + public WmsLocate(Integer boxQty , Double partQty,String locateNo){ + this.boxQty=boxQty; + this.partQty=partQty; + this.locateNo=locateNo; + } public Integer getMaxPackageQty() { return this.maxPackageQty == null ? 0 : this.maxPackageQty.intValue(); } From 328f2e64c55619c404e2cd16fdda13db927ce3c3 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Mon, 13 Jan 2020 18:51:24 +0800 Subject: [PATCH 19/28] =?UTF-8?q?=E3=80=90=E5=90=8C=E6=89=B9=E6=AC=A1?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java index 0e5b1f3..e95da2c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java @@ -286,6 +286,10 @@ public class WmsStockSn extends BaseBean { @ApiParam("打印模板名称") private String templateName; + @Transient + @ApiParam("是否同批次条码") + private Integer isSameBatch; + public WmsStockSn() { } From 8ef70ed627eee5f79f25d58ae71d37c98a745d5c Mon Sep 17 00:00:00 2001 From: jokelone Date: Mon, 13 Jan 2020 19:35:08 +0800 Subject: [PATCH 20/28] =?UTF-8?q?=E3=80=90=E7=8E=B0=E5=9C=BA=E4=BC=98?= =?UTF-8?q?=E5=8C=96=EF=BC=9A59=20=E8=BF=87=E7=A8=8B=E8=B4=A8=E9=87=8F?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/mes/pcn/bean/MesQcCheckStandard.java | 11 ++- .../pojo/mes/pcn/model/QcCheckStandardModel.java | 80 ++++++++++++++++++++++ 2 files changed, 90 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QcCheckStandardModel.java diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckStandard.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckStandard.java index 9226c3a..6e00f6b 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckStandard.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckStandard.java @@ -12,6 +12,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.util.List; /** * @Description: @@ -77,10 +78,17 @@ public class MesQcCheckStandard extends BaseBean { @ApiParam("检测项类型") private String checkItemType; + @ApiParam("检测项类型名称") + private String checkItemTypeName; + + @Transient + private List childQcList; + public MesQcCheckStandard() { } - public MesQcCheckStandard(Long id, String partNo, String workCenterCode, String workCellCode, Integer checkType, String checkItem, String checkStandard, String checkGuide, String checkFrequency, String partName, String checkItemType) { + public MesQcCheckStandard(Long id, String partNo, String workCenterCode, String workCellCode, Integer checkType, String checkItem, String checkStandard + , String checkGuide, String checkFrequency, String partName, String checkItemType, String checkItemTypeName) { this.id = id; this.partNo = partNo; this.workCenterCode = workCenterCode; @@ -92,5 +100,6 @@ public class MesQcCheckStandard extends BaseBean { this.checkFrequency = checkFrequency; this.partName = partName; this.checkItemType = checkItemType; + this.checkItemTypeName = checkItemTypeName; } } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QcCheckStandardModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QcCheckStandardModel.java new file mode 100644 index 0000000..b038988 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QcCheckStandardModel.java @@ -0,0 +1,80 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesQcCheckStandard; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2020\1\13 17:23 + * @Modify: + **/ +@Data +public class QcCheckStandardModel { + + private Long id; + + @ApiParam("物料编码") + private String partNo; + + @ApiParam("工作中心代码") + private String workCenterCode; + + @ApiParam("工作单元代码") + private String workCellCode; + + @ApiParam("检测类型") + private Integer checkType; + + @ApiParam("检测项") + private String checkItem; + + @ApiParam("检测标准") + private String checkStandard; + + @ApiParam("检测指导") + private String checkGuide; + + @ApiParam("频率") + private String checkFrequency; + + @ApiParam("物料名称") + private String partName; + + @ApiParam("检测结果") + private String checkResult; + + @ApiParam("检测值") + private String checkValue; + + @ApiParam("检测项类型") + private String checkItemType; + + @ApiParam("检测项类型名称") + private String checkItemTypeName; + + private List childQcList; + + public QcCheckStandardModel() { + } + + public QcCheckStandardModel(Long id, String partNo, String workCenterCode, String workCellCode, Integer checkType, String checkItem, String checkStandard + , String checkGuide, String checkFrequency, String partName, String checkItemType, String checkItemTypeName) { + this.id = id; + this.partNo = partNo; + this.workCenterCode = workCenterCode; + this.workCellCode = workCellCode; + this.checkType = checkType; + this.checkItem = checkItem; + this.checkStandard = checkStandard; + this.checkGuide = checkGuide; + this.checkFrequency = checkFrequency; + this.partName = partName; + this.checkItemType = checkItemType; + this.checkItemTypeName = checkItemTypeName; + } +} From 2d8b55b61a777a0b06c7c9e28beb974325ef94ba Mon Sep 17 00:00:00 2001 From: jokelone Date: Mon, 13 Jan 2020 19:43:50 +0800 Subject: [PATCH 21/28] =?UTF-8?q?=E3=80=90=E7=8E=B0=E5=9C=BA=E4=BC=98?= =?UTF-8?q?=E5=8C=96=EF=BC=9A59=20=E8=BF=87=E7=A8=8B=E8=B4=A8=E9=87=8F?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckStandard.java | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckStandard.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckStandard.java index 6e00f6b..9c96abd 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckStandard.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckStandard.java @@ -78,6 +78,7 @@ public class MesQcCheckStandard extends BaseBean { @ApiParam("检测项类型") private String checkItemType; + @Transient @ApiParam("检测项类型名称") private String checkItemTypeName; From 8285c87624dd1783989bc3eb1e9a87c4dd6f06ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Mon, 13 Jan 2020 19:59:33 +0800 Subject: [PATCH 22/28] =?UTF-8?q?Wms=E5=8A=A8=E6=80=81=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E4=B8=8E=E8=87=AA=E5=AE=9A=E4=B9=89=E5=88=97=E8=A1=A8=EF=BC=8C?= =?UTF-8?q?=E8=A1=A8=E5=8D=95=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/base/annotation/FieldAnnotation.java | 2 + .../cn/estsh/i3plus/pojo/base/bean/BaseBean.java | 22 ++++--- .../i3plus/pojo/model/wms/WmsFieldInfoModel.java | 6 +- .../cn/estsh/i3plus/pojo/wms/bean/WmsPart.java | 74 +++++++++++----------- .../pojo/wms/bean/dynamic/WmsListElement.java | 4 ++ 5 files changed, 62 insertions(+), 46 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/FieldAnnotation.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/FieldAnnotation.java index 2e2b0a2..6067155 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/FieldAnnotation.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/FieldAnnotation.java @@ -31,4 +31,6 @@ public @interface FieldAnnotation { int isRequire() default 1; // 是否表单字段展示:默认1-显示，2-隐藏 int isShow() default 1; + // 是否跳过本字段扫描 0-不跳过，1-跳过 + int isSkip() default 0; } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java index 9c10c6c..c91a810 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java @@ -41,7 +41,7 @@ public abstract class BaseBean implements Serializable { @ApiParam(value = "主键",example = "0") @JsonSerialize(using = ToStringSerializer.class) @AnnoOutputColumn(hidden = true) - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) public Long id; //get单独处理 @@ -64,19 +64,19 @@ public abstract class BaseBean implements Serializable { @Column(name="ORGANIZE_CODE") @ApiParam(value ="组织代码") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2) // @AnnoOutputColumn(hidden = true) public String organizeCode; @Column(name="IS_VALID", columnDefinition = "int default 1", nullable = false) @ApiParam(value = "有效性",example = "1") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isSkip = 1) @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description", hidden = true) public Integer isValid; //CommonEnumUtil.IS_VAILD; @Column(name="IS_DELETED", columnDefinition = "int default 2", nullable = false) @ApiParam(value = "是否已删除",example = "2") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isSkip = 1) @AnnoOutputColumn(hidden = true) //逻辑删除，软删除 public Integer isDeleted; //CommonEnumUtil.TRUE_OR_FALSEA @@ -84,58 +84,64 @@ public abstract class BaseBean implements Serializable { @Column(name="CREATE_USER",updatable = false) @ApiParam(value = "创建用户") @AnnoOutputColumn(hidden = true) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) public String createUser; @Indexed(direction = IndexDirection.DESCENDING) @Column(name="CREATE_DATE_TIME",updatable = false) @ApiParam(value = "创建日期") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) public String createDatetime; @Column(name="MODIFY_USER") @ApiParam(value = "修改人") @AnnoOutputColumn(hidden = true) - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) public String modifyUser; @Column(name="MODIFY_DATE_TIME") @ApiParam(value = "修改日期") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) public String modifyDatetime; @Transient // @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiParam(value="创建日期查询用，查询起始日期",example = "2018-01-01 01:00:00") @AnnoOutputColumn(hidden = true) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isSkip = 1) public String createDateTimeStart; @Transient // @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiParam(value="创建日期查询用，查询结束日期",example = "2018-12-31 23:59:59") @AnnoOutputColumn(hidden = true) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isSkip = 1) public String createDateTimeEnd; @Transient // @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiParam(value="修改日期查询用，查询起始日期",example = "2018-01-01 01:00:00") @AnnoOutputColumn(hidden = true) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isSkip = 1) public String modifyDateTimeStart; @Transient // @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiParam(value = "修改日期查询用，查询结束日期",example = "2018-12-31 23:59:59") @AnnoOutputColumn(hidden = true) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isSkip = 1) public String modifyDateTimeEnd; @Transient @ApiParam(value = "排序属性") @AnnoOutputColumn(hidden = true) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isSkip = 1) public String orderByParam = ""; @Transient @ApiParam(value = "排序类型，1 正序，2 倒序",example = "1") @AnnoOutputColumn(hidden = true) - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isSkip = 1) //CommonEnumUtil.ASC_OR_DESC 1 asc,2 desc public transient Integer ascOrDesc = 1; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsFieldInfoModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsFieldInfoModel.java index ecbf355..8338df3 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsFieldInfoModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsFieldInfoModel.java @@ -27,8 +27,12 @@ public class WmsFieldInfoModel implements Serializable { @ApiParam(value = "新增数据操作类") private String baseRepository; - public WmsFieldInfoModel (String baseRepository, List wmsFieldInfoList) { + @ApiParam("处理类型") + private int handleType; + + public WmsFieldInfoModel (String baseRepository, int handleType, List wmsFieldInfoList) { this.baseRepository = baseRepository; this.wmsFieldInfoList = wmsFieldInfoList; + this.handleType = handleType; } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java index 748e194..0d4e335 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java @@ -56,170 +56,170 @@ public class WmsPart extends BaseBean { @Column(name = "PART_TYPE_DESC") @ApiParam(value = "物料类型描述") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String partTypeDesc; @Column(name = "GRAPHI_NO") @ApiParam(value = "图号") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String graphiNo; @Column(name = "VERSION") @ApiParam(value = "版本") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String version; @Column(name = "COLOR") @ApiParam(value = "颜色") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String color; @Column(name = "STOCK_UNIT") @ApiParam(value = "库存单位") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String stockUnit; @Column(name = "ABC") @ApiParam(value = "分类") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String abc; @Column(name = "BUY_UNIT") @ApiParam(value = "采购单位") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String buyUnit; @Column(name = "BU2SU", columnDefinition = "decimal(18,8)") @ApiParam(value = "换算率1", example = "1") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double bu2su; @Column(name = "PRICE_UNIT") @ApiParam(value = "计价单位") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String priceUnit; @Column(name = "PU2SU", columnDefinition = "decimal(18,8)") @ApiParam(value = "换算率2", example = "1") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double pu2su; @Column(name = "SNP", columnDefinition = "decimal(18,8)") @ApiParam(value = "标包", example = "1") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double snp; @ColumnDefault("2") @Column(name = "IQC") @ApiParam(value = "是否免检", example = "1") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2) private Integer iqc; @Column(name = "MIN", columnDefinition = "decimal(18,8)") @ApiParam(value = "最低库存", example = "1") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double min; @Column(name = "MAX", columnDefinition = "decimal(18,8)") @ApiParam(value = "最高库存", example = "1") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double max; @Column(name = "PART_GROUP") @ApiParam(value = "物料组") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String partGroup; @Column(name = "LOT_CHECK_RULE") @ApiParam(value = "批次校验规则") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String lotCheckRule; @Column(name = "SN_CONTROL") @ApiParam(value = "是否条码管理", example = "1") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2) private Integer snControl; @Column(name = "VENDOR_NO") @ApiParam(value = "供应商代码") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String vendorNo; @Column(name = "IN_LOCATE_NO") @ApiParam(value = "默认入库库位") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String inLocateNo; @Column(name = "PROD_CFG_TYPE_CODE") @ApiParam("项目代码") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String prodCfgTypeCode; @Column(name = "PROD_CFG_TYPE_NAME") @ApiParam("项目名称") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String prodCfgTypeName; @Column(name = "OUT_CLOSE_FLAG") @ApiParam("項目结算标识") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String outCloseFlag = "2"; @Column(name = "OUT_CLOSE_TYPE") @ApiParam("结算方式") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String outCloseType; @Column(name = "OUT_CLOSE_VENDOR") @ApiParam("结算供应商") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String outCloseVendor; @Column(name = "QUALITY_DAYS") @ApiParam("保质期天数") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Integer qualityDays; @Column(name = "IS_REPORT_PARTNO") @ApiParam("是否报工零件") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2) private Integer isReportPartNo; @Column(name = "REPORT_LOCATE_NO") @ApiParam("报工库位") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String reportLocateNo; @Column(name = "REPORT_ZONE_NO") @ApiParam("报工存储区") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String reportZoneNo; @Column(name = "PRODUCT_LINES") @ApiParam("报工产线") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String productLines; @Column(name = "PROPORTION", columnDefinition = "decimal(10,5)") @ApiParam(value = "待质检比例", example = "1") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double proportion; @Column(name = "IS_VALUABLE", columnDefinition = "int default 2") @ApiParam(value = "是否贵重") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2) @AnnoOutputColumn(refClass = WmsEnumUtil.IS_VALUABLE.class, refForeignKey = "value", value = "description") private Integer isValuable; @Transient @ApiParam("总数量") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double qty; @Transient @ApiParam("库存水平") @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_LEVEL_STATUS.class, refForeignKey = "value", value = "description") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String stockLevelStatus; @Column(name="verb_num") @@ -227,23 +227,23 @@ public class WmsPart extends BaseBean { private Double verbNum; @Column(name = "IS_PROD_LOT") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2) @ApiParam(value = "是否录入生产批次", example = "1") private Integer isProdLot = 2; @Column(name = "PULL_WAY") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2) @ApiParam(value = "拉动方式", example = "0") private Integer pullWay = 0; @Column(name = "CYCLE_RQUEST_PERIOD") @ApiParam(value = "循环补货周期", example = "0") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Integer cycleRquestPeriod = 0; @Column(name = "CYCLE_RQUEST_QTY") @ApiParam(value = "循环补货数量", example = "0") - @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double cycleRquestQty = 0d; public int getIqcVal(){ diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsListElement.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsListElement.java index d654c64..7371f25 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsListElement.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsListElement.java @@ -77,4 +77,8 @@ public class WmsListElement extends BaseBean { @Column(name = "USER_CODE") @ApiParam(value = "用户编号") private String userCode; + + @Column(name = "FUNCTION_ID") + @ApiParam(value = "功能菜单ID") + private Long functionId; } From 9d744318cd7b02619079c13fbf8ea4f988ca6033 Mon Sep 17 00:00:00 2001 From: qianhs Date: Mon, 13 Jan 2020 21:34:26 +0800 Subject: [PATCH 23/28] =?UTF-8?q?=E3=80=90=E7=9B=98=E7=82=B9--=E8=B0=83?= =?UTF-8?q?=E5=B7=AE=E5=90=8E=E5=BA=93=E5=AD=98=E5=AF=B9=E4=B8=8D=E4=B8=8A?= =?UTF-8?q?(C202001070020=EF=BC=8CC202001070021)=E3=80=91=E3=80=90bug7314?= =?UTF-8?q?=09=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java index 8b4fda5..0d4fb51 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java @@ -136,7 +136,6 @@ public class WmsCSFactTrans extends BaseBean { @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class,refForeignKey = "value",value = "description") public Integer snStatus; - @Transient @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class,refForeignKey = "value",value = "description") @ApiParam(value = "条码状态(冻结时)", example = "1") public Integer destSnStatus; From f1afdf92e9d3df1b7801f1430e766eb12346f292 Mon Sep 17 00:00:00 2001 From: qianhs Date: Mon, 13 Jan 2020 22:22:28 +0800 Subject: [PATCH 24/28] =?UTF-8?q?=E3=80=90=E7=9B=98=E7=82=B9--=E8=B0=83?= =?UTF-8?q?=E5=B7=AE=E5=90=8E=E5=BA=93=E5=AD=98=E5=AF=B9=E4=B8=8D=E4=B8=8A?= =?UTF-8?q?(C202001070020=EF=BC=8CC202001070021)=E3=80=91=E3=80=90bug7314?= =?UTF-8?q?=09=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java index 0d4fb51..69772a7 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java @@ -89,7 +89,7 @@ public class WmsCSFactTrans extends BaseBean { @Transient @AnnoOutputColumn(hidden = true) - @ApiParam(value = "剩余数量", example = "1") + @ApiParam(value = "差异数量", example = "1") public Double surplusQty; @Column diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java index 086e420..b12010a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java @@ -122,7 +122,7 @@ public class WmsCSOrderDetails extends BaseBean { public Double factQty; @Transient - @ApiParam(value = "剩余数量", example = "1") + @ApiParam(value = "差异数量", example = "1") @AnnoOutputColumn(hidden = true) public Double surplusQty; From 28587fbb98aca9398d7a0b9b4fee45c79d3b7b00 Mon Sep 17 00:00:00 2001 From: luweihao Date: Tue, 14 Jan 2020 00:01:33 +0800 Subject: [PATCH 25/28] =?UTF-8?q?task=20`1392`=20=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E5=B7=A5=E6=AD=A5=20=E9=94=99=E8=AF=AF=E5=A4=84=E7=90=86?= =?UTF-8?q?=E5=AE=9E=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/pcn/model/StepResult.java | 69 ++++++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepResult.java diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepResult.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepResult.java new file mode 100644 index 0000000..d34c46d --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepResult.java @@ -0,0 +1,69 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + + +import io.swagger.annotations.Api; +import lombok.Data; + +import java.util.Collection; + +@Data +@Api("工步返回信息") +public class StepResult { + + private boolean isCompleted; + + private T data; + + private Collection dataCollection; + + private String msg; + + public static StepResult getSuccessComplete() { + return new StepResult(true); + } + + public static StepResult getNonComplete() { + return new StepResult(false); + } + + public static StepResult getSuccessComplete(String msg) { + return new StepResult(true, msg); + } + + public static StepResult getNonComplete(String msg) { + return new StepResult(false, msg); + } + + public static StepResult getSuccessData(T data, String msg) { + return new StepResult<>(true, data, msg); + } + + public static StepResult getSuccessData(Collection data, String msg) { + return new StepResult(true, data, msg); + } + + private StepResult() { + } + + private StepResult(boolean isCompleted) { + this.isCompleted = isCompleted; + } + + private StepResult(boolean isCompleted, String msg) { + this.isCompleted = isCompleted; + this.msg = msg; + } + + public StepResult(boolean isCompleted, T data, String msg) { + this.isCompleted = isCompleted; + this.data = data; + this.msg = msg; + } + + public StepResult(boolean isCompleted, Collection dataCollection, String msg) { + this.isCompleted = isCompleted; + this.dataCollection = dataCollection; + this.msg = msg; + } + +} From e1dd7c3cdd8c5572947647274dd6c6c53fb5a00a Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Tue, 14 Jan 2020 10:22:22 +0800 Subject: [PATCH 26/28] =?UTF-8?q?PTL=20=E9=A1=B9=E7=9B=AE=E5=88=9D?= =?UTF-8?q?=E5=A7=8B=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-ptl-pcn/pom.xml | 26 ++++++++ .../estsh/i3plus/pojo/ptl/pcn/bean/PpTestUser.java | 71 +++++++++++++++++++++ .../cn/estsh/i3plus/pojo/ptl/pcn/package-info.java | 14 +++++ .../ptl/pcn/repository/PpTestUserRepository.java | 14 +++++ modules/i3plus-pojo-ptl/pom.xml | 22 +++++++ .../cn/estsh/i3plus/pojo/ptl/bean/PtlTestUser.java | 73 ++++++++++++++++++++++ .../cn/estsh/i3plus/pojo/ptl/package-info.java | 14 +++++ .../pojo/ptl/repository/PtlTestUserRepository.java | 14 +++++ 8 files changed, 248 insertions(+) create mode 100644 modules/i3plus-pojo-ptl-pcn/pom.xml create mode 100644 modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PpTestUser.java create mode 100644 modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/package-info.java create mode 100644 modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/repository/PpTestUserRepository.java create mode 100644 modules/i3plus-pojo-ptl/pom.xml create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTestUser.java create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/package-info.java create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlTestUserRepository.java diff --git a/modules/i3plus-pojo-ptl-pcn/pom.xml b/modules/i3plus-pojo-ptl-pcn/pom.xml new file mode 100644 index 0000000..ed7ad85 --- /dev/null +++ b/modules/i3plus-pojo-ptl-pcn/pom.xml @@ -0,0 +1,26 @@ + + + + i3plus-pojo + i3plus.pojo + 1.0-DEV-SNAPSHOT + ../../pom.xml + + 4.0.0 + + i3plus-pojo-ptl-pcn + jar + + + + i3plus.pojo + i3plus-pojo-base + + + + + + + \ No newline at end of file diff --git a/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PpTestUser.java b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PpTestUser.java new file mode 100644 index 0000000..bd13740 --- /dev/null +++ b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/bean/PpTestUser.java @@ -0,0 +1,71 @@ +package cn.estsh.i3plus.pojo.ptl.pcn.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +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 : wei.peng + * @CreateDate : 20-1-10 下午5:16 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="PTL_PCN_TEST_USER") +@Api(value="PTL PCN 测试用户",description = "测试用户") +public class PpTestUser extends BaseBean { + + private static final long serialVersionUID = -8985367251249816850L; + @Column(name="USER_INFO_ID") + @ApiParam(value ="人员ID" , example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long userInfoId; + + @Column(name="LANGUAGE_CODE") + @ApiParam(value ="用户语言") + private String languageCode; + + @Column(name="USER_NAME_RDD") + @ApiParam(value ="用户名称" , access ="账号名称") + private String userName; + + @Column(name="USER_LOGIN_NAME") + @ApiParam(value ="登陆名称" , access ="登陆名称") + private String userLoginName; + + @Column(name="USER_EMP_NO") + @ApiParam(value ="工号") + private String userEmpNo; + + @Column(name="USER_LOGIN_PASSWORD") + @ApiParam(value ="登陆密码") + private String userLoginPassword; + + @Column(name="USER_TYPE") + @ApiParam(value ="账号类型（枚举，待定）" , example ="-1") + private Integer userType; + + @Column(name="USER_EMAIL") + @ApiParam(value ="邮箱" , access ="邮箱") + private String userEmail; + + @Column(name="USER_PHONE") + @ApiParam(value ="手机号" , access ="手机号") + private String userPhone; + +} diff --git a/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/package-info.java b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/package-info.java new file mode 100644 index 0000000..1e562ec --- /dev/null +++ b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/package-info.java @@ -0,0 +1,14 @@ +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-1-10 下午5:19 + * @Modify: + **/ +package cn.estsh.i3plus.pojo.ptl.pcn; + +/** + * Bean对象包说明 cn.estsh.i3plus.pojo.ptl.pcn.bean + * 创建Bean Pp 开头 + * Bean 必须实现序列号ID (未实现会造成序列化问题) + */ \ No newline at end of file diff --git a/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/repository/PpTestUserRepository.java b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/repository/PpTestUserRepository.java new file mode 100644 index 0000000..ddcca36 --- /dev/null +++ b/modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/repository/PpTestUserRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.ptl.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.ptl.pcn.bean.PpTestUser; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-1-10 下午5:18 + * @Modify: + **/ +public interface PpTestUserRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml new file mode 100644 index 0000000..92de049 --- /dev/null +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -0,0 +1,22 @@ + + + + i3plus-pojo + i3plus.pojo + 1.0-DEV-SNAPSHOT + ../../pom.xml + + 4.0.0 + + i3plus-pojo-ptl + jar + + + + i3plus.pojo + i3plus-pojo-base + + + \ No newline at end of file diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTestUser.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTestUser.java new file mode 100644 index 0000000..5f056b7 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTestUser.java @@ -0,0 +1,73 @@ +package cn.estsh.i3plus.pojo.ptl.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +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 : wei.peng + * @CreateDate : 20-1-10 下午5:16 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="PTL_TEST_USER") +@Api(value="PTL 测试用户",description = "测试用户") +public class PtlTestUser extends BaseBean { + + private static final long serialVersionUID = -130240511327784335L; + + + @Column(name="USER_INFO_ID") + @ApiParam(value ="人员ID" , example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long userInfoId; + + @Column(name="LANGUAGE_CODE") + @ApiParam(value ="用户语言") + private String languageCode; + + @Column(name="USER_NAME_RDD") + @ApiParam(value ="用户名称" , access ="账号名称") + private String userName; + + @Column(name="USER_LOGIN_NAME") + @ApiParam(value ="登陆名称" , access ="登陆名称") + private String userLoginName; + + @Column(name="USER_EMP_NO") + @ApiParam(value ="工号") + private String userEmpNo; + + @Column(name="USER_LOGIN_PASSWORD") + @ApiParam(value ="登陆密码") + private String userLoginPassword; + + @Column(name="USER_TYPE") + @ApiParam(value ="账号类型（枚举，待定）" , example ="-1") + private Integer userType; + + @Column(name="USER_EMAIL") + @ApiParam(value ="邮箱" , access ="邮箱") + private String userEmail; + + @Column(name="USER_PHONE") + @ApiParam(value ="手机号" , access ="手机号") + private String userPhone; + +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/package-info.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/package-info.java new file mode 100644 index 0000000..70b4956 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/package-info.java @@ -0,0 +1,14 @@ +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-1-10 下午5:19 + * @Modify: + **/ +package cn.estsh.i3plus.pojo.ptl; + +/** + * Bean对象包说明 cn.estsh.i3plus.pojo.ptl.bean + * 创建Bean 以Ptl 开头 + * Bean 必须实现序列号ID (未实现会造成序列化问题) + */ \ No newline at end of file diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlTestUserRepository.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlTestUserRepository.java new file mode 100644 index 0000000..91896ed --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlTestUserRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.ptl.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.ptl.bean.PtlTestUser; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-1-10 下午5:18 + * @Modify: + **/ +public interface PtlTestUserRepository extends BaseRepository { +} From 3e31641b20d777c6fbe2ee9fcbc4a37b999e8238 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Tue, 14 Jan 2020 10:24:13 +0800 Subject: [PATCH 27/28] =?UTF-8?q?PTL=20=E9=A1=B9=E7=9B=AE=E5=88=9D?= =?UTF-8?q?=E5=A7=8B=E5=8C=96=20PTL=20PCN=20=E9=A1=B9=E7=9B=AE=E5=88=9D?= =?UTF-8?q?=E5=A7=8B=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java | 5 ++++- pom.xml | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index 873e21d..33d75d9 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -27,6 +27,9 @@ public class CommonEnumUtil { MES_PCN(6, 8350, 12, "i3mes-pcn", "生产管理软件-节点中心"), SWEB(7, 8800, 19, "i3sweb", "供应商服务"), + PTL(8, 8700, 20, "i3ptl", "亮灯自动拣选"), + PTL_PCN(9, 8750, 21, "i3ptl-pcn", "亮灯自动拣选-节点中心"), + FORM(20, 8900, 16, "block-form", "智能表单"), REPORT(21, 8910, 17, "block-report", "智能报表"), WORKFLOW(22, 0, 0, "block-workflow", "智能工作流"), @@ -35,7 +38,7 @@ public class CommonEnumUtil { HARDSWITCH(25, 0, 0, "block-hardswitch", "硬件适配器"), LAC(26, 8600, 13, "lac", "连接适配器"), ANDON(27, 8500, 14, "andon", "安灯"), - APS(28, 8410, 15, "APS", "高级计划与排程"), + APS(28, 8400, 15, "APS", "高级计划与排程"), CENTER(99, 8000, 1, "icloud-server", "注册中心"), SURFACE(98, 0, 0, "i3surface", "对外服务"), CLOUD(97, 0, 0, "i3cloud", "微服务"), diff --git a/pom.xml b/pom.xml index d2b502e..a7b24f3 100644 --- a/pom.xml +++ b/pom.xml @@ -32,6 +32,8 @@ modules/i3plus-pojo-sweb modules/i3plus-pojo-andon modules/i3plus-pojo-lac + modules/i3plus-pojo-ptl + modules/i3plus-pojo-ptl-pcn From 3a9e719005442c4d53c699941a0a742c40978e1c Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Tue, 14 Jan 2020 10:45:56 +0800 Subject: [PATCH 28/28] =?UTF-8?q?=E3=80=90vda=E6=94=B6=E8=B4=A7=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E6=98=AF=E5=90=A6=E5=88=86=E7=BB=84=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java | 4 ++++ 1 file changed, 4 insertions(+) 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 3311b77..a9b133d 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 @@ -125,6 +125,10 @@ public class WmsMoveDetails extends BaseBean { @ApiParam("关联单号") public String refSrc; + @Column(name = "GROUP_NO") + @ApiParam("分组号") + public String groupNo; + @ApiParam(value = "待出库数量", example = "0") @Transient private Long waitingCounts;