From 5841ae2ed2333a0f04f63e741ebbd21feaa72a81 Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Mon, 20 May 2019 13:57:39 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E9=94=99=E8=AF=AF=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: crish <570360737@qq.com> --- .../i3plus/pojo/mes/pcn/repository/MesPLCConfigureRepository.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPLCConfigureRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPLCConfigureRepository.java index cce563e..2aa1ee2 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPLCConfigureRepository.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPLCConfigureRepository.java @@ -2,6 +2,7 @@ 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.MesArea; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPLCConfigure; import org.springframework.stereotype.Repository; /** @@ -12,5 +13,5 @@ import org.springframework.stereotype.Repository; * @Modify: **/ @Repository -public interface MesPLCConfigureRepository extends BaseRepository { +public interface MesPLCConfigureRepository extends BaseRepository { } From 21f6d4eaf87d59dbe1e9a193f482ba694b42213f Mon Sep 17 00:00:00 2001 From: jiajack Date: Mon, 20 May 2019 14:20:47 +0800 Subject: [PATCH 2/6] =?UTF-8?q?PLC=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/pcn/repository/MesPLCConfigureRepository.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPLCConfigureRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPLCConfigureRepository.java index cce563e..d10efa8 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPLCConfigureRepository.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPLCConfigureRepository.java @@ -1,7 +1,7 @@ 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.MesArea; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPLCConfigure; import org.springframework.stereotype.Repository; /** @@ -12,5 +12,5 @@ import org.springframework.stereotype.Repository; * @Modify: **/ @Repository -public interface MesPLCConfigureRepository extends BaseRepository { +public interface MesPLCConfigureRepository extends BaseRepository { } From d9b263d10c1ad80bce36b68d5f3dd86b338c5704 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= Date: Tue, 21 May 2019 09:44:24 +0800 Subject: [PATCH 3/6] =?UTF-8?q?ANDON=5FHQLPACK=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java index 6eca0eb..cab20b1 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java @@ -173,6 +173,7 @@ public class AndonHqlPack { DdlPreparedPack.getStringEqualPack(andonManageQueue.getAlarmCode(), "alarmCode", result); DdlPreparedPack.getStringEqualPack(andonManageQueue.getActionCode(), "actionCode", result); DdlPreparedPack.getStringEqualPack(andonManageQueue.getAndonOrderNo(), "andonOrderNo", result); + DdlPreparedPack.getStringEqualPack(andonManageQueue.getShiftCode(), "shiftCode", result); DdlPreparedPack.getInPackArray(obj, "statusCode", result); getStringBuilderPack(andonManageQueue, result); From 8e2e1f65432d3f5b060089495d20870e7d89587e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Tue, 21 May 2019 10:02:21 +0800 Subject: [PATCH 4/6] =?UTF-8?q?MES=EF=BC=9A=E6=B5=81=E7=A8=8B=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E6=B7=BB=E5=8A=A0=E5=B7=A5=E5=BA=8F=EF=BC=8C=E5=B7=A5?= =?UTF-8?q?=E6=AD=A5=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/model/mes/MesRouteModel.java | 2 -- .../java/cn/estsh/i3plus/pojo/model/mes/MesRouteProcessModel.java | 2 +- 3 files changed, 5 insertions(+), 3 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 0e9ac7f..77403bf 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 @@ -303,6 +303,7 @@ public class MesHqlPack { DdlPackBean packBean = getAllBaseDataByNormalPro(mesProdRouteCfg, organizeCode); DdlPreparedPack.getStringEqualPack(mesProdRouteCfg.getPartNo(), "partNo", packBean); DdlPreparedPack.getStringEqualPack(mesProdRouteCfg.getWorkCenterCode(), "workCenterCode", packBean); + DdlPreparedPack.getStringEqualPack(mesProdRouteCfg.getRouteCode(), "routeCode", packBean); packBean.setOrderByStr(mesProdRouteCfg.orderBy()); return packBean; } @@ -357,6 +358,9 @@ public class MesHqlPack { if (StringUtils.isNotEmpty(step.getStepName())){ DdlPreparedPack.getStringLikerPack(step.getStepName(), "stepName", packBean); } + if (StringUtils.isNotEmpty(step.getStepType())){ + DdlPreparedPack.getStringLikerPack(step.getStepType(), "stepType", packBean); + } return packBean; } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/MesRouteModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/MesRouteModel.java index 88bf83a..46163cf 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/MesRouteModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/MesRouteModel.java @@ -21,8 +21,6 @@ import java.util.List; public class MesRouteModel implements Serializable { @ApiParam("流程代码") public String routeCode; - @ApiParam("工厂代码") - public String organizeCode; @ApiParam("GOJS位置") public String position; @ApiParam("流程明细Model集合") diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/MesRouteProcessModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/MesRouteProcessModel.java index 6ad566d..14a8d46 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/MesRouteProcessModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/MesRouteProcessModel.java @@ -25,6 +25,6 @@ public class MesRouteProcessModel { public MesRouteProcess mesRouteProcess; @ApiParam("流程工步参数配置表(根据Seq分组)") public Map> mesRouteProcessStepMap; - @ApiParam("流程工步参数配置表(根据Seq分组)") + @ApiParam("产品流程参数配置表(根据Seq分组)") public Map> mesProdRouteOptParamMap; } From 302ac8a7e83d7962c66ec464c6eec3385ce8e701 Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Tue, 21 May 2019 13:59:55 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E7=9B=AE=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java index 3042a97..4c9d314 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java @@ -26,7 +26,6 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -//@Table(name="SYS_MENU",indexes = {@Index(name="索引名称",columnList = "列名1,列名2")}) @Table(name="SYS_MENU",indexes = { @Index(name="index_sys_menu_parent_id",columnList = "PARENT_ID"), }) @@ -46,7 +45,7 @@ public class SysMenu extends BaseBean { private String menuCode; @Column(name="MENU_TYPE") - @ApiParam(value ="功能类型（枚举：1.模块，2.菜单，3.按钮）" , example ="-1") + @ApiParam(value ="功能类型" , example ="-1" ,access = "枚举：1.模块，2.菜单，3.按钮") private Integer menuType; // 根节点-1 @@ -88,7 +87,7 @@ public class SysMenu extends BaseBean { private String menuDescription; @Column(name="MENU_STATUS") - @ApiParam(value ="功能状态（1.正常，2.禁用）" , example ="1" , access ="功能状态（1.正常，2.禁用）",defaultValue="1") + @ApiParam(value ="功能状态" , example ="1" , access ="功能状态（1.正常，2.禁用）",defaultValue="1") private Integer menuStatus; @Transient From 309f3f2282ed2a0d74b39796c2f78ca7ae0bcc12 Mon Sep 17 00:00:00 2001 From: alwaysfrin <39822157+alwaysfrin@users.noreply.github.com> Date: Tue, 21 May 2019 17:28:30 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E4=BA=8B=E5=8A=A1=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E5=8F=8Ademo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/model/test/TestConstructModel.java | 28 ++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/test/TestConstructModel.java diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/test/TestConstructModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/test/TestConstructModel.java new file mode 100644 index 0000000..8f48c15 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/test/TestConstructModel.java @@ -0,0 +1,28 @@ +package cn.estsh.i3plus.pojo.model.test; + +import cn.estsh.i3plus.pojo.platform.bean.TestTransUser; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import org.aspectj.weaver.ast.Test; + +import java.util.List; + +/** + * @Description : + * @Reference : + * @Author : alwaysfrin + * @CreateDate : 2019-05-19 18:15 + * @Modify: + **/ +@Getter +@Setter +@ToString +public class TestConstructModel { + + private long id; + + private TestTransUser user; + + private List userList; +} \ No newline at end of file