From 5388c4405b8231c58254b005fc7763b0b5f5cac6 Mon Sep 17 00:00:00 2001 From: wangjie Date: Fri, 30 Aug 2019 14:59:13 +0800 Subject: [PATCH 1/5] =?UTF-8?q?mes-pcn-task=E8=A1=A8=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTask.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnTask.java | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTask.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTask.java index 054bb21..5120404 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTask.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTask.java @@ -65,6 +65,10 @@ public class MesPcnTask extends BaseBean { @ApiParam("PCN节点名称") private String pcnName; + @Column(name="PCN_CODE") + @ApiParam("PCN节点名称代码") + private String pcnCode; + @Column(name="TASK_CYCLE_EXPS") @ApiParam("任务周期表达式") private String taskCycleExps; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnTask.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnTask.java index 5f2e53d..cacfdc0 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnTask.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnTask.java @@ -65,6 +65,10 @@ public class MesPcnTask extends BaseBean { @ApiParam("PCN节点名称") private String pcnName; + @Column(name="PCN_CODE") + @ApiParam("PCN节点名称代码") + private String pcnCode; + @Column(name="TASK_CYCLE_EXPS") @ApiParam("任务周期表达式") private String taskCycleExps; From 8034e104c8adb5a028cb4ca3a9a3fcdf59eb9d1a Mon Sep 17 00:00:00 2001 From: wangjie Date: Fri, 30 Aug 2019 15:24:24 +0800 Subject: [PATCH 2/5] =?UTF-8?q?mes=E5=B7=A5=E4=BD=9C=E5=8D=95=E5=85=83?= =?UTF-8?q?=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/pcn/bean/MesWorkCellParam.java | 46 ++++++++++++++++++++++ .../pcn/repository/MesWorkCellParamRepository.java | 16 ++++++++ .../i3plus/pojo/mes/bean/MesWorkCellParam.java | 46 ++++++++++++++++++++++ .../mes/repository/MesWorkCellParamRepository.java | 16 ++++++++ 4 files changed, 124 insertions(+) create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellParam.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellParamRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellParam.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellParamRepository.java diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellParam.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellParam.java new file mode 100644 index 0000000..97f8525 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellParam.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 : wangjie + * @CreateDate : 2019-08-30 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_WORK_CELL_PARAM") +@Api("mes工作单元参数") +public class MesWorkCellParam extends BaseBean { + + @Column(name = "PARAM_CODE") + @ApiParam("参数代码") + private String paramCode; + + @Column(name = "PARAM_NAME") + @ApiParam("参数名称") + private String paramName; + + @Column(name = "PARAM_TYPE") + @ApiParam("参数类型") + private Integer paramType; + + @Column(name = "PARAM_MODEL") + @ApiParam("参数模式") + private Integer paramModel; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellParamRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellParamRepository.java new file mode 100644 index 0000000..3a714cf --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellParamRepository.java @@ -0,0 +1,16 @@ +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.MesWorkCellParam; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-08-30 + * @Modify: + **/ +@Repository +public interface MesWorkCellParamRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellParam.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellParam.java new file mode 100644 index 0000000..db71d8e --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellParam.java @@ -0,0 +1,46 @@ +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 : wangjie + * @CreateDate : 2019-08-30 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_WORK_CELL_PARAM") +@Api("mes工作单元参数") +public class MesWorkCellParam extends BaseBean { + + @Column(name = "PARAM_CODE") + @ApiParam("参数代码") + private String paramCode; + + @Column(name = "PARAM_NAME") + @ApiParam("参数名称") + private String paramName; + + @Column(name = "PARAM_TYPE") + @ApiParam("参数类型") + private Integer paramType; + + @Column(name = "PARAM_MODEL") + @ApiParam("参数模式") + private Integer paramModel; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellParamRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellParamRepository.java new file mode 100644 index 0000000..7ec67d6 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellParamRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesWorkCellParam; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-08-30 + * @Modify: + **/ +@Repository +public interface MesWorkCellParamRepository extends BaseRepository { +} From 09eee24769e47c29bcb5f206cf14c2907a1f9c65 Mon Sep 17 00:00:00 2001 From: wangjie Date: Fri, 30 Aug 2019 15:52:39 +0800 Subject: [PATCH 3/5] =?UTF-8?q?mes=E5=B7=A5=E4=BD=9C=E5=8D=95=E5=85=83?= =?UTF-8?q?=E5=8F=82=E6=95=B0CRUD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 30 ++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) 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 6796c95..b45d67d 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 @@ -1079,6 +1079,27 @@ public class MesHqlPack { } /** + * MES工作单元参数查询条件封装 + * + * @param workCellParam + * @return + */ + public static DdlPackBean getMesWorkCellParam(MesWorkCellParam workCellParam, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(workCellParam, organizeCode); + if (StringUtils.isNotEmpty(workCellParam.getParamCode())) { + DdlPreparedPack.getStringLikerPack(workCellParam.getParamCode(), "paramCode", packBean); + } + if (null != workCellParam.getParamType()) { + DdlPreparedPack.getNumEqualPack(workCellParam.getParamType(), "paramType", packBean); + } + if (null != workCellParam.getParamModel()) { + DdlPreparedPack.getNumEqualPack(workCellParam.getParamModel(), "paramModel", packBean); + } + return packBean; + } + + + /** * MES工作单元队列查询条件封装 * * @param workCellPoint @@ -1146,9 +1167,14 @@ public class MesHqlPack { */ public static DdlPackBean getMesPcnTask(MesPcnTask mesPcnTask, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(mesPcnTask, organizeCode); - DdlPreparedPack.getStringLikerPack(mesPcnTask.getTaskCode(), "taskCode", packBean); - DdlPreparedPack.getStringLikerPack(mesPcnTask.getTaskName(), "taskName", packBean); + if (StringUtils.isNotEmpty(mesPcnTask.getTaskCode())) { + DdlPreparedPack.getStringLikerPack(mesPcnTask.getTaskCode(), "taskCode", packBean); + } + if (StringUtils.isNotEmpty(mesPcnTask.getTaskName())) { + DdlPreparedPack.getStringLikerPack(mesPcnTask.getTaskName(), "taskName", packBean); + } packBean.setOrderByStr(mesPcnTask.orderBy()); return packBean; } + } From 2e86ff81d0bb9bafb633832d03397a4a1d73389a Mon Sep 17 00:00:00 2001 From: wangjie Date: Fri, 30 Aug 2019 17:45:47 +0800 Subject: [PATCH 4/5] =?UTF-8?q?mes=E5=B7=A5=E4=BD=9C=E5=8D=95=E5=85=83?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E5=A2=9E=E5=8A=A0=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/MesEnumUtil.java | 74 ++++++++++++++++++++++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 3 + 2 files changed, 77 insertions(+) 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 742ff35..cd2e4c1 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 @@ -12,6 +12,80 @@ import com.fasterxml.jackson.annotation.JsonFormat; public class MesEnumUtil { /** + * mes工作单元参数类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_WORK_CELL_PARAM_TYPE { + + NUMBER(10, "数值"), + STRING(20, "字符串"); + + private int value; + private String description; + + MES_WORK_CELL_PARAM_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; + } + } + + /** + * mes工作单元参数模式 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_WORK_CELL_PARAM_MODEL { + + PUBLIC(10, "公用"), + JIT(20, "JIT生产"), + WORK_ORDER(30, "工单生产"), + OTHER(99, "其他"); + + private int value; + private String description; + + MES_WORK_CELL_PARAM_MODEL(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; + } + } + + /** * mes条码生成规则最大值后是否循环 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) 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 b45d67d..e268aaf 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 @@ -1173,6 +1173,9 @@ public class MesHqlPack { if (StringUtils.isNotEmpty(mesPcnTask.getTaskName())) { DdlPreparedPack.getStringLikerPack(mesPcnTask.getTaskName(), "taskName", packBean); } + if (null != mesPcnTask.getTaskStatus()) { + DdlPreparedPack.getNumEqualPack(mesPcnTask.getTaskStatus(), "taskStatus", packBean); + } packBean.setOrderByStr(mesPcnTask.orderBy()); return packBean; } From d269576dbfb1c6b4af978e70d17ec4736a1edf7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Fri, 30 Aug 2019 18:24:50 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5?= 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 | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java | 8 +++----- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java | 4 ++++ 3 files changed, 11 insertions(+), 5 deletions(-) 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 4c288f4..294ec8b 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 @@ -96,6 +96,10 @@ public class WmsLocate extends BaseBean { @ApiParam(value = "零件数", example = "-1") private Double partQty; + @Column(name = "ENCRYPTION_NO") + @ApiParam(value = "加密编码") + private String encryptionNo; + public Integer getMaxPackageQty() { return this.maxPackageQty == null ? 0 : this.maxPackageQty.intValue(); } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java index 7453a8c..4c22c8b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java @@ -151,7 +151,9 @@ public class WmsMoveSn extends BaseBean { @ApiParam("特殊批次") public String fixLotNo; - + @Column(name="VENDOR_NO") + @ApiParam("供应商编号") + private String vendorNo; @Transient @ApiParam("业务类型编码") @@ -171,10 +173,6 @@ public class WmsMoveSn extends BaseBean { private String ZoneNo; @Transient - @ApiParam("供应商编码") - private String vendorNo; - - @Transient @ApiParam("交易类型名称") private String transTypeName; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java index 10d7ec4..a8c4c5e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java @@ -109,6 +109,10 @@ public class WmsPOMaster extends BaseBean { @ApiParam(value = "是否生成条码", example = "1") public Integer isSn; + @Column(name = "CONTAINER_NO") + @ApiParam("集装箱号") + public String containerNo; + @Transient @ApiParam(value = "工厂名称") public String organizeName;