From 80d9852dd664097450434e73c035a6c33bbc830f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Tue, 3 Mar 2020 18:16:39 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=92=8C=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/PtlEnumUtil.java | 37 +++++++++ .../i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java | 91 ++++++++++++++++++++++ .../cn/estsh/i3plus/pojo/ptl/bean/PtlNode.java | 10 +-- .../estsh/i3plus/pojo/ptl/bean/PtlPcnSyncCfg.java | 20 ----- .../cn/estsh/i3plus/pojo/ptl/bean/PtlPcnTask.java | 90 +++++++++++++++++++++ .../estsh/i3plus/pojo/ptl/bean/PtlPcnTaskLog.java | 53 +++++++++++++ .../pojo/ptl/repository/PtlPcnTaskRepository.java | 16 ++++ .../estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java | 34 ++++++++ 8 files changed, 322 insertions(+), 29 deletions(-) create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnTask.java create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnTaskLog.java create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlPcnTaskRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java index 3897219..cd9a311 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java @@ -547,4 +547,41 @@ public class PtlEnumUtil { return tmp; } } + + /** + * ptl-pcn定时任务状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PTL_PCN_TASK_STATUS { + + OPEN(1, "开启"), + CLOSE(2, "关闭"); + + private int value; + private String description; + + PTL_PCN_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; + } + } + } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java index 42becd3..921cbf3 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java @@ -1236,4 +1236,95 @@ public class PtlPcnEnumUtil { } } + /** + * PCN同步PTL主数据同步类型枚举 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SYNC_TYPE { + + GET_PTL_DATA(1, "pcn获取Ptl数据"), + DATA_TO_PTL(2, "pcn推送数据至ptl"); + + private int value; + private String description; + + SYNC_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; + } + } + + /** + * PCN同步PTL主数据同步方式枚举 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SYNC_PATTERN { + + UPDATE(1, "修改"), + INSERT(2, "新增"); + + private int value; + private String description; + + SYNC_PATTERN(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-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlNode.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlNode.java index fd3a0d9..1c842e1 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlNode.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlNode.java @@ -45,14 +45,6 @@ public class PtlNode extends BaseBean implements Serializable { @ApiParam("区域名称") private String areaName; - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心") - private String workCenterCode; - - @Column(name = "WORK_CENTER_NAME") - @ApiParam("工作中心名称") - private String workCenterName; - @Column(name = "PCN_VERSION") @ApiParam("PCN版本") private String pcnVersion; @@ -74,7 +66,7 @@ public class PtlNode extends BaseBean implements Serializable { private String connectTime; @Column(name = "CODE_SPECIFIC") - @ApiParam("PCN特殊字段") + @ApiParam("编码规则特殊符") private String codeSpecific; public int getConnectCountVal() { diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnSyncCfg.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnSyncCfg.java index 060404d..6fd597a 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnSyncCfg.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnSyncCfg.java @@ -77,26 +77,6 @@ public class PtlPcnSyncCfg extends BaseBean implements Serializable { @ApiParam(value = "从数据库抽取的条件限制") private String extractCondition; - @Column(name = "IS_IGNORE_ORG") - @ApiParam(value = "同步的时候是否区分工厂") - private Integer isIgnoreOrg = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(); - - @Transient - @ApiParam("同步方式") - private String syncPatternName; - - @Transient - @ApiParam("同步类型名称") - private String syncTypeName; - - @Transient - @ApiParam(value = "同步的时候是否区分工厂") - private String isIgnoreOrgName; - - public int getIsIgnoreOrgVal() { - return this.isIgnoreOrg == null ? 0 : this.isIgnoreOrg; - } - public int getSyncFrequencyVal() { return this.syncFrequency == null ? 0 : this.syncFrequency; } diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnTask.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnTask.java new file mode 100644 index 0000000..916a9ce --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnTask.java @@ -0,0 +1,90 @@ +package cn.estsh.i3plus.pojo.ptl.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description :ptl-pcn定时任务工作清单 + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-08-26 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "PTL_PCN_TASK") +@Api("ptl-pcn定时任务工作清单") +public class PtlPcnTask extends BaseBean implements Serializable { + private static final long serialVersionUID = 4129714382965409395L; + + @Column(name = "TASK_CODE") + @ApiParam("任务代码") + private String taskCode; + + @Column(name = "TASK_NAME") + @ApiParam("任务名称") + private String taskName; + + @Column(name = "TASK_GROUP_NAME") + @ApiParam("任务组名称") + private String taskGroupName; + + @Column(name = "TASK_DESCRIPTION") + @ApiParam("任务描述") + private String taskDescription; + + @Column(name = "TASK_TYPE") + @ApiParam("任务类型") + private Integer taskType; + + @Column(name = "TASK_MODULE") + @ApiParam("任务模块") + private String taskModule; + + @Column(name = "TASK_CLASS") + @ApiParam("任务类名") + private String taskClass; + + @Column(name = "TASK_PACKAGE") + @ApiParam("任务包名") + private String taskPackage; + + @Column(name = "PCN_NAME") + @ApiParam("PCN节点名称") + private String pcnName; + + @Column(name = "PCN_CODE") + @ApiParam("PCN节点名称代码") + private String pcnCode; + + @Column(name = "TASK_CYCLE_EXPS") + @ApiParam("任务周期表达式") + private String taskCycleExps; + + @Column(name = "TASK_CYCLE_DESCRIPTION") + @ApiParam("任务周期描述") + private String taskCycleDescription; + + @Column(name = "TASK_PARAM") + @ApiParam("任务参数") + private String taskParam; + + public int getTaskTypeVal() { + return this.taskType == null ? 0 : this.taskType; + } + +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnTaskLog.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnTaskLog.java new file mode 100644 index 0000000..f10f0e0 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnTaskLog.java @@ -0,0 +1,53 @@ +package cn.estsh.i3plus.pojo.ptl.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description :ptl-pcn定时任务工作清单同步记录 + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-08-27 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "PTL_PCN_TASK_LOG") +@Api("ptl-pcn定时任务工作清单同步记录") +public class PtlPcnTaskLog extends BaseBean implements Serializable { + private static final long serialVersionUID = -784806174962540310L; + + @Column(name = "SYNC_TIME_START") + @ApiParam("同步数据开始时间") + private String syncTimeStart; + + @Column(name = "SYNC_TIME_END") + @ApiParam("同步数据截止时间") + private String syncTimeEnd; + + @Column(name = "SYNC_STATUS") + @ApiParam("同步状态") + private Integer syncStatus; + + @Column(name = "ERROR_CONTENT") + @ApiParam("异常内容") + private Long errorContent; + + public int getSyncStatusVal() { + return this.syncStatus == null ? 0 : this.syncStatus; + } +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlPcnTaskRepository.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlPcnTaskRepository.java new file mode 100644 index 0000000..7db5d90 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlPcnTaskRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.ptl.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.ptl.bean.PtlPcnTask; +import org.springframework.stereotype.Repository; + +/** + * @Description :ptl-pcn定时任务清单 + * @Reference : + * @Author : adair.song + * @CreateDate : 2020-03-03 + * @Modify: + **/ +@Repository +public interface PtlPcnTaskRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java index 5efbb4d..9e9cfcc 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java @@ -124,6 +124,22 @@ public class PtlHqlPack { return packBean; } + /** + * PTL PCN系统配置信息条件查询 + * + * @param ptlConfig + * @return + */ + public static DdlPackBean getPtlSyncConfig(PtlConfig ptlConfig, String organizeCode) { + DdlPackBean packBean = getAllBaseData(organizeCode); + DdlPreparedPack.getStringLikerPack(ptlConfig.getCfgCode(), "cfgCode", packBean); + DdlPreparedPack.getStringLikerPack(ptlConfig.getCfgName(), "cfgName", packBean); + DdlPreparedPack.getStringEqualPack(ptlConfig.getCfgKey(), "cfgKey", packBean); + DdlPreparedPack.getStringEqualPack(ptlConfig.getCfgType(), "cfgType", packBean); + DdlPreparedPack.getNumEqualPack(ptlConfig.getIsValid(), "isValid", packBean); + return packBean; + } + /** * PTL-PCN节点查询条件封装 @@ -183,4 +199,22 @@ public class PtlHqlPack { return packBean; } + + /** + * ptl-pcn定时任务清单 + * + * @param ptlPcnTask + * @param organizeCode + * @return + */ + public static DdlPackBean getPtlPcnTask(PtlPcnTask ptlPcnTask, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(ptlPcnTask, organizeCode); + if (!StringUtils.isEmpty(ptlPcnTask.getTaskCode())) { + DdlPreparedPack.getStringLikerPack(ptlPcnTask.getTaskCode(), "taskCode", packBean); + } + if (!StringUtils.isEmpty(ptlPcnTask.getTaskName())) { + DdlPreparedPack.getStringLikerPack(ptlPcnTask.getTaskName(), "taskName", packBean); + } + return packBean; + } } From 83464294bb991c7f8b6297d474389a67fd051fe6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Wed, 4 Mar 2020 09:19:13 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E3=80=90PTL=5F=E6=9E=9A=E4=B8=BE=E5=BC=95?= =?UTF-8?q?=E7=94=A8=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/ptl/sqlpack/PtlHqlPack.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java index 9e9cfcc..6e5fc7e 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.ptl.sqlpack; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.PtlPcnEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.ptl.bean.*; @@ -83,9 +84,9 @@ public class PtlHqlPack { public static DdlPackBean packHqlPtlPrintingQueueByPrintNo(PtlPrintingQueue ptlPrintingQueue) { DdlPackBean result = new DdlPackBean(); - DdlPreparedPack.getNumEqualPack(WmsEnumUtil.ETC_PRINT_STATUS.NOT_HIT.getValue(), "printStatus", result); + DdlPreparedPack.getNumEqualPack(PtlPcnEnumUtil.ETC_PRINT_STATUS.NOT_HIT.getValue(), "printStatus", result); DdlPreparedPack.getStringLikerPack(ptlPrintingQueue.getPrintNo(), "printNo", result); - DdlPreparedPack.getNumEqualPack(WmsEnumUtil.PRINT_TYPE.SN.getValue(), "printType", result); + DdlPreparedPack.getNumEqualPack(PtlPcnEnumUtil.PRINT_TYPE.PART_NO.getValue(), "printType", result); getStringBuilderPack(ptlPrintingQueue, result); From cc98e84ba43b4ab42b0a2e2453fdb00117ddeb49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Wed, 4 Mar 2020 10:14:47 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E5=8A=A8=E6=80=81=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=EF=BC=9A=E5=A2=9E=E5=8A=A0=E5=BC=80=E7=AA=97=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/annotation/DynamicField.java | 6 +++- .../i3plus/pojo/model/wms/WmsListSearchModel.java | 34 ++++++++++++++++++++++ .../cn/estsh/i3plus/pojo/ptl/bean/PtlControl.java | 11 +++++-- .../cn/estsh/i3plus/pojo/ptl/bean/PtlPart.java | 2 +- .../java/cn/estsh/i3plus/pojo/ptl/bean/PtlTag.java | 14 ++++----- .../cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java | 4 +-- .../cn/estsh/i3plus/pojo/wms/bean/WmsPart.java | 14 ++++----- .../cn/estsh/i3plus/pojo/wms/bean/WmsZones.java | 16 +++++----- .../pojo/wms/bean/dynamictable/WmsFieldInfo.java | 8 +++++ 9 files changed, 80 insertions(+), 29 deletions(-) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsListSearchModel.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/DynamicField.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/DynamicField.java index 2d18d24..3df382d 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/DynamicField.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/DynamicField.java @@ -34,5 +34,9 @@ public @interface DynamicField { // 是否跳过本字段扫描 0-不跳过，1-跳过 int isSkip() default 0; // 下拉枚举名称 - String enumName() default ""; + String entityName() default ""; + // 下拉列表显示列名称,多个列名需要根据逗号分隔 + String listColumnName() default ""; + // 下拉搜索列名称,多个列名需要根据逗号分隔 + String searchColumnName() default ""; } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsListSearchModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsListSearchModel.java new file mode 100644 index 0000000..43e219f --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsListSearchModel.java @@ -0,0 +1,34 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import cn.estsh.i3plus.pojo.base.common.Pager; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : WMS列表搜索model + * @Reference : + * @Author : silliter + * @CreateDate : 2020-01-07 14:33 + * @Modify: + **/ +@Data +public class WmsListSearchModel { + + @ApiParam(value = "开窗列表查询key") + private String searchKey; + + @ApiParam(value = "开窗列表查询value") + private String searchValue; + + @ApiParam(value = "排序参数") + private String orderByParams; + + @ApiParam(value = "分页组件") + private Pager pager; + + @ApiParam(value = "实体类名") + private String objClassName; + + @ApiParam(value = "有效性") + public Integer isValid; +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlControl.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlControl.java index 7dfbfcc..c1ca40c 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlControl.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlControl.java @@ -3,7 +3,6 @@ package cn.estsh.i3plus.pojo.ptl.bean; import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.base.enumutil.PtlEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -15,6 +14,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Version; import java.io.Serializable; /** @@ -45,7 +45,7 @@ public class PtlControl extends BaseBean implements Serializable { @Column(name = "CONTROL_TYPE") @ApiParam("控制器类型") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, enumName = "PTL_CONTROL_TYPE") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PTL_CONTROL_TYPE") private Integer controlType; @Column(name = "IP") @@ -65,7 +65,7 @@ public class PtlControl extends BaseBean implements Serializable { @Column(name = "STATUS") @ApiParam("控制器状态") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, enumName = "PTL_CONTROL_STATUS") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PTL_CONTROL_STATUS") private Integer status; @Column(name = "FREQUENCY") @@ -73,4 +73,9 @@ public class PtlControl extends BaseBean implements Serializable { @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) private Integer frequency; + @Version + @Column(name = "LOCK_VERSION") + @ApiParam(value = "乐观锁", example = "1") + public transient Integer lockVersion; + } diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPart.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPart.java index 3cd1329..8d2a609 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPart.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPart.java @@ -43,7 +43,7 @@ public class PtlPart extends BaseBean implements Serializable { @Column(name = "PART_TYPE") @ApiParam("物料类型") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, enumName = "PTL_PART_TYPE") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PTL_PART_TYPE") private String partType; @Column(name = "UNIT") diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTag.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTag.java index bb576ab..5ead0fb 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTag.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTag.java @@ -64,37 +64,37 @@ public class PtlTag extends BaseBean implements Serializable { @Column(name = "TAG_TYPE") @ApiParam("标签类型") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, enumName = "PTL_TAG_TYPE") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PTL_TAG_TYPE") private Integer tagType; @Column(name = "LIGHT_STATUS") @ApiParam("亮灯状态") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, enumName = "PTL_LIGHT_STATUS") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PTL_LIGHT_STATUS") private Integer lightStatus; @Column(name = "TAG_STATUS") @ApiParam("标签状态") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, enumName = "PTL_TAG_STATUS") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PTL_TAG_STATUS") private Integer tagStatus; @Column(name = "LIGHT_MODE") @ApiParam("亮灯方式") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, enumName = "PTL_LIGHT_MODE") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PTL_LIGHT_MODE") private Integer lightMode; @Column(name = "LIGHT_COLOR") @ApiParam("亮灯颜色") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, enumName = "PTL_LIGHT_COLOR") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PTL_LIGHT_COLOR") private Integer lightColor; @Column(name = "IS_BUZZING") @ApiParam("是否蜂鸣") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, enumName = "PTL_IS_BUZZING") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PTL_IS_BUZZING") private Integer isBuzzing; @Column(name = "MUSIC_TYPE") @ApiParam("音乐类型") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, enumName = "PTL_MUSIC_TYPE") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PTL_MUSIC_TYPE") private Integer musicType; @Column(name = "DISPLAY_CONTEXT") 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 4eeefd9..338d1d6 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 @@ -47,7 +47,7 @@ public class WmsLocate extends BaseBean { */ @Column(name = "LOCATE_TYPE") @ApiParam(value = "库位类型") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, enumName = "LOCATE_TYPE") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, entityName = "LOCATE_TYPE") private Integer locateType; @Column(name = "WH_NO") @@ -102,7 +102,7 @@ public class WmsLocate extends BaseBean { @Column(name = "STATUS") @ApiParam(value = "库位状态", example = "-1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, enumName = "LOCATE_STATUS") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, entityName = "LOCATE_STATUS") private Integer status; @Column(name = "MAX_PACKAGE_QTY") 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 c0a9d25..42c9bf0 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 @@ -50,7 +50,7 @@ public class WmsPart extends BaseBean { @Column(name = "PART_TYPE") @ApiParam(value = "物料类型") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, enumName = "WMS_PART_TYPE") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "WMS_PART_TYPE") @AnnoOutputColumn(refClass = WmsEnumUtil.WMS_PART_TYPE_STR.class, refForeignKey = "value", value = "description") private String partType; @@ -112,7 +112,7 @@ public class WmsPart extends BaseBean { @ColumnDefault("2") @Column(name = "IQC") @ApiParam(value = "是否免检", example = "1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, enumName = "TRUE_OR_FALSE") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "TRUE_OR_FALSE") private Integer iqc; @Column(name = "MIN", columnDefinition = "decimal(18,8)") @@ -137,7 +137,7 @@ public class WmsPart extends BaseBean { @Column(name = "SN_CONTROL") @ApiParam(value = "是否条码管理", example = "1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, enumName = "TRUE_OR_FALSE") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "TRUE_OR_FALSE") private Integer snControl; @Column(name = "VENDOR_NO") @@ -182,7 +182,7 @@ public class WmsPart extends BaseBean { @Column(name = "IS_REPORT_PARTNO") @ApiParam("是否报工零件") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, enumName = "TRUE_OR_FALSE") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "TRUE_OR_FALSE") private Integer isReportPartNo; @Column(name = "REPORT_LOCATE_NO") @@ -207,7 +207,7 @@ public class WmsPart extends BaseBean { @Column(name = "IS_VALUABLE", columnDefinition = "int default 2") @ApiParam(value = "是否贵重") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, enumName = "IS_VALUABLE") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "IS_VALUABLE") @AnnoOutputColumn(refClass = WmsEnumUtil.IS_VALUABLE.class, refForeignKey = "value", value = "description") private Integer isValuable; @@ -228,12 +228,12 @@ public class WmsPart extends BaseBean { private Double verbNum; @Column(name = "IS_PROD_LOT") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, enumName = "TRUE_OR_FALSE") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "TRUE_OR_FALSE") @ApiParam(value = "是否录入生产批次", example = "1") private Integer isProdLot = 2; @Column(name = "PULL_WAY") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, enumName = "PULL_WAY_STATUS") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "PULL_WAY_STATUS") @ApiParam(value = "拉动方式", example = "0") private Integer pullWay = 0; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java index f991b51..4c9e00d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java @@ -60,32 +60,32 @@ public class WmsZones extends BaseBean { @Column(name = "IS_SON_NODE") @ApiParam(value = "是否子节点") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, enumName = "TRUE_OR_FALSE") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, entityName = "TRUE_OR_FALSE") private Integer isSonNode; @Column(name = "IS_PM") @ApiParam(value = "零件级管控", example = "2") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, enumName = "TRUE_OR_FALSE") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, entityName = "TRUE_OR_FALSE") private Integer isPm; @Column(name = "IS_LM") @ApiParam(value = "批次级管控", example = "2") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, enumName = "TRUE_OR_FALSE") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, entityName = "TRUE_OR_FALSE") private Integer isLm; @Column(name = "IS_SN") @ApiParam(value = "条码级管控", example = "1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, enumName = "TRUE_OR_FALSE") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, entityName = "TRUE_OR_FALSE") private Integer isSn; @Column(name = "IS_MIX") @ApiParam(value = "允许混淆", example = "1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, enumName = "TRUE_OR_FALSE") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, entityName = "TRUE_OR_FALSE") private Integer isMix; @Column(name = "IS_SC") @ApiParam(value = "库容检查", example = "1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, enumName = "TRUE_OR_FALSE") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, entityName = "TRUE_OR_FALSE") private Integer isSc; @Column(name = "STRATEGY") @@ -95,12 +95,12 @@ public class WmsZones extends BaseBean { @Column(name = "IS_NEGATIVE") @ApiParam(value = "允许负库存", example = "1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, enumName = "TRUE_OR_FALSE") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, entityName = "TRUE_OR_FALSE") private Integer isNegative; @Column(name = "CHECK_FIFO") @ApiParam(value = "校验先进先出", example = "1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, enumName = "TRUE_OR_FALSE") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, entityName = "TRUE_OR_FALSE") private Integer checkFifo; @Column(name = "ZONE_LENGTH", columnDefinition = "decimal(18,8)") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsFieldInfo.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsFieldInfo.java index 924d245..b46e544 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsFieldInfo.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsFieldInfo.java @@ -92,4 +92,12 @@ public class WmsFieldInfo extends BaseBean { @Column(name = "CONDITION_CONNECTOR") @ApiParam(value = "条件连接符:and/or") private String conditionConnector; + + @Column(name = "LIST_COLUMNNAME") + @ApiParam(value = "开窗列表显示列名称") + private String listColumnName; + + @Column(name = "SEARCH_COLUMNNAME") + @ApiParam(value = "开窗搜索列名称") + private String searchColumnName; } From df03827264812f81b642026b6e10a2d19d19885a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Wed, 4 Mar 2020 10:22:42 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E5=8A=A8=E6=80=81=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=EF=BC=9A=E6=B3=A8=E8=A7=A3enumName=E5=B1=9E=E6=80=A7=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E6=94=B9=E4=B8=BAentityName?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/WmsCsStrategy.java | 90 +++++++++++----------- .../i3plus/pojo/wms/bean/WmsSnOperateRecord.java | 2 +- 2 files changed, 46 insertions(+), 46 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCsStrategy.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCsStrategy.java index 57df4a3..7223d70 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCsStrategy.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCsStrategy.java @@ -31,63 +31,63 @@ import java.io.Serializable; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Api(value = "盘点策略表", description = "盘点策略表") -public class WmsCsStrategy extends BaseBean implements Serializable { +public class WmsCsStrategy extends BaseBean implements Serializable { - private static final long serialVersionUID = -1692487594678973549L; + private static final long serialVersionUID = -1692487594678973549L; - @Column(name = "STRATEGY_NAME") - @ApiParam(value = "策略名称") - private String strategyName; + @Column(name = "STRATEGY_NAME") + @ApiParam(value = "策略名称") + private String strategyName; - @Column(name = "part_type") - @ApiParam(value = "物料分类") - @AnnoOutputColumn(refClass = WmsEnumUtil.PART_ABC.class, refForeignKey = "value", value = "description") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, enumName = "PART_ABC") - private String partType; + @Column(name = "part_type") + @ApiParam(value = "物料分类") + @AnnoOutputColumn(refClass = WmsEnumUtil.PART_ABC.class, refForeignKey = "value", value = "description") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PART_ABC") + private String partType; - @Column(name = "STRATEGY_TYPE") - @ApiParam(value = "策略分类", example = "0") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, enumName = "CS_STRATEGY_TYPE") - @AnnoOutputColumn(refClass = WmsEnumUtil.CS_STRATEGY_TYPE.class, refForeignKey = "value", value = "description") - private Integer strategyType; + @Column(name = "STRATEGY_TYPE") + @ApiParam(value = "策略分类", example = "0") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "CS_STRATEGY_TYPE") + @AnnoOutputColumn(refClass = WmsEnumUtil.CS_STRATEGY_TYPE.class) + private Integer strategyType; - @Column(name = "CYCLE_RULE") - @ApiParam(value = "循环规则") - private String cycleRule; + @Column(name = "CYCLE_RULE") + @ApiParam(value = "循环规则") + private String cycleRule; - @Column(name = "START_DATE") - @ApiParam(value = "开始日期", example = "0") - private String startDate; + @Column(name = "START_DATE") + @ApiParam(value = "开始日期", example = "0") + private String startDate; - @Column(name = "END_DATE") - @ApiParam(value = "结束日期", example = "0") - private String endDate; + @Column(name = "END_DATE") + @ApiParam(value = "结束日期", example = "0") + private String endDate; - @Column(name = "NUM_MAX") - @ApiParam(value = "明细数量上限") - private Integer numMax; + @Column(name = "NUM_MAX") + @ApiParam(value = "明细数量上限") + private Integer numMax; - @Column(name = "COVERAGE_RATE") - @ApiParam(value = "抽盘覆盖率") - private Double coverageRate; + @Column(name = "COVERAGE_RATE") + @ApiParam(value = "抽盘覆盖率") + private Double coverageRate; - @Column(name = "ZONE_NOS") - @ApiParam(value = "存储区") - private String zoneNos; + @Column(name = "ZONE_NOS") + @ApiParam(value = "存储区") + private String zoneNos; - @Column(name = "LOCATES") - @ApiParam(value = "盘点库位") - private String locates; + @Column(name = "LOCATES") + @ApiParam(value = "盘点库位") + private String locates; - @Column(name = "last_run_time") - @ApiParam(value = "上次运行时间") - private String lastRunTime; + @Column(name = "last_run_time") + @ApiParam(value = "上次运行时间") + private String lastRunTime; - @Column(name = "next_run_time") - @ApiParam(value = "下次运行时间") - private String nextRunTime; + @Column(name = "next_run_time") + @ApiParam(value = "下次运行时间") + private String nextRunTime; - @Column(name = "REMAKE") - @ApiParam(value = "备注") - private String remake; + @Column(name = "REMAKE") + @ApiParam(value = "备注") + private String remake; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java index 4f60667..8827222 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java @@ -74,7 +74,7 @@ public class WmsSnOperateRecord extends BaseBean { @Column(name = "OPERATE_TYPE") @ApiParam(value = "操作类型") @AnnoOutputColumn(refClass = WmsEnumUtil.SN_OPERATE_TYPE.class, refForeignKey = "value", value = "description") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, enumName = "SN_OPERATE_TYPE") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "SN_OPERATE_TYPE") private Integer operateType; @Column(name = "ref_sn") From 0471038b9bbb6945fccc602e03bac587e77961e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Wed, 4 Mar 2020 10:26:23 +0800 Subject: [PATCH 5/9] =?UTF-8?q?sqlserver=E6=95=B0=E6=8D=AE=E5=BA=93?= =?UTF-8?q?=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java index 936d73e..103be31 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java @@ -1,23 +1,21 @@ package cn.estsh.i3plus.pojo.base.jpa.daoimpl; import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; +import cn.estsh.i3plus.pojo.base.codemaker.SnowflakeIdMaker; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; -import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.base.codemaker.SnowflakeIdMaker; -import cn.estsh.i3plus.pojo.base.util.BeanMapUtils; -import cn.estsh.i3plus.pojo.base.util.StringCastUtils; import cn.estsh.i3plus.pojo.base.util.StringUtil; import org.apache.commons.lang3.StringUtils; import org.hibernate.NonUniqueResultException; -import org.hibernate.SQLQuery; -import org.hibernate.transform.Transformers; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.data.jpa.repository.support.SimpleJpaRepository; -import javax.persistence.*; +import javax.persistence.EntityManager; +import javax.persistence.Id; +import javax.persistence.NoResultException; +import javax.persistence.Query; import java.io.Serializable; import java.lang.reflect.Field; import java.lang.reflect.Modifier; @@ -860,7 +858,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep public int findByHqlWhereCount(DdlPackBean packBean) { StringBuffer queryString = new StringBuffer(); queryString.append("select count(distinct model) from " + persistentClass.getSimpleName() - + " as model where 1=1 " + packBean.getPackedHql()); + + " as model where 1=1 " + packBean.getWhereAppend()); Query query = entityManager.createQuery(queryString.toString(), Long.class); for (String key : packBean.getHqlPreparedMap().keySet()) { From 5610a25ab79509dcdde537e2fe77f2a83f26d310 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Wed, 4 Mar 2020 13:15:15 +0800 Subject: [PATCH 6/9] =?UTF-8?q?ptl=E5=8F=8D=E9=A6=88=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java | 41 ++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java index 921cbf3..36bf1fe 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java @@ -286,6 +286,47 @@ public class PtlPcnEnumUtil { } /** + * 反馈信号子命令 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SIGNAL_CHILD_CMD { + CHILD_CMD_06H("06", 6, "正常"), + CHILD_CMD_07H("07", 7, "缺货"), + CHILD_CMD_09H("09", 9, "标签自检"), + CHILD_CMD_0AH("0A", 10, "亮灯错误"), + CHILD_CMD_0BH("0B", 11, "查询设备故障，返回设备故障"), + CHILD_CMD_0CH("0C", 12, "设备无法执行命令,用错命令"), + CHILD_CMD_0DH("0D", 13, "卡键,按键卡住"), + CHILD_CMD_0FH("0F", 15, "返回库存模式下的缺货量"), + CHILD_CMD_64H("64", 100, "熄灭情况下返回"), + CHILD_CMD_FAH("FA", 250, "设备的 F/W 模型信息"), + CHILD_CMD_FCH("FC", 252, "标签产品信息"); + + private String code; + private Integer value; + private String description; + + SIGNAL_CHILD_CMD(String code, Integer value, String description) { + this.code = code; + this.value = value; + this.description = description; + } + + public String getCode() { + return code; + } + + public Integer getValue() { + return value; + } + + public String getDescription() { + return description; + } + + } + + /** * 标签显示器亮灯颜色枚举 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) From 37d032ca24f74cff368c54931b7a97044de94712 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Wed, 4 Mar 2020 13:42:47 +0800 Subject: [PATCH 7/9] =?UTF-8?q?ptl=E5=8F=8D=E9=A6=88=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java index 36bf1fe..ea9fc99 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java @@ -286,7 +286,7 @@ public class PtlPcnEnumUtil { } /** - * 反馈信号子命令 + * 反馈信号子命令(灭灯状态) */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum SIGNAL_CHILD_CMD { @@ -312,6 +312,16 @@ public class PtlPcnEnumUtil { this.description = description; } + public static SIGNAL_CHILD_CMD getByValue(String code) { + for (SIGNAL_CHILD_CMD signalChildCmd : values()) { + if (signalChildCmd.getCode() == code) { + return signalChildCmd; + } + } + return null; + } + + public String getCode() { return code; } From abb737f265fe55b2adb582a004884409365694f3 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Wed, 4 Mar 2020 14:54:28 +0800 Subject: [PATCH 8/9] ptl --- .../cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java index ea9fc99..81ea67a 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java @@ -321,6 +321,16 @@ public class PtlPcnEnumUtil { return null; } + public static Integer codeOfValue(String code) { + Integer tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].value; + } + } + return tmp; + } + public String getCode() { return code; From 4918707fc8cd4b879536b5cd14c3ac309d8dee23 Mon Sep 17 00:00:00 2001 From: luweihao Date: Wed, 4 Mar 2020 15:23:31 +0800 Subject: [PATCH 9/9] =?UTF-8?q?bug=20`7626`=20=E5=BC=80=E7=BA=BF=E7=AE=A1?= =?UTF-8?q?=E6=8E=A7-=E6=95=B0=E6=8D=AE=E5=AD=98=E5=85=A5=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BA=93=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java | 2 +- .../estsh/i3plus/pojo/mes/model/CellFeedModel.java | 25 ++++++++++++++++++++++ .../i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java | 9 ++++++++ 3 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/CellFeedModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java index a775b40..41042ca 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java @@ -55,7 +55,7 @@ public class MesCellFeed extends BaseBean implements Serializable { private String rawSn; @Column(name = "RAW_QTY") - @ApiParam("特殊批次") + @ApiParam("原材料数量") private Double rawQty; @Column(name = "LOT_NO") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/CellFeedModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/CellFeedModel.java new file mode 100644 index 0000000..809f29c --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/CellFeedModel.java @@ -0,0 +1,25 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import lombok.Data; + +/** + * @author Wynne.Lu + * @date 2020/3/3 13:14 + * @desc + */ +@Data +public class CellFeedModel { + + private String workCenterCode; + + private String workCellCode; + + private String color; + + private String partNo; + + private String itemPartNo; + + private String qty; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java index 3ab2c36..a0d8eaa 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java @@ -124,6 +124,15 @@ public class MesPcnHqlPack { return packBean; } + public static DdlPackBean getStationBom(String org,String workCenter,String workCell,String partNo) { + DdlPackBean packBean = getAllBaseData(org); + DdlPreparedPack.getStringEqualPack(workCenter, "workCenterCode", packBean); + DdlPreparedPack.getStringEqualPack(workCell, "workCellCode", packBean); + DdlPreparedPack.getStringEqualPack(partNo, "partNo", packBean); + DdlPreparedPack.getNumEqualPack(MesPcnEnumUtil.PROCESS_BOM_ISFEED.FEED.getValue(), "isFeed", packBean); + return packBean; + } + /** * 生产工单查询条件封装 *