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 1/8] =?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 2/8] =?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 3/8] =?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 4/8] =?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 From 280f9a22331826ed00de49f4993ed3d098e72c59 Mon Sep 17 00:00:00 2001 From: "yiming.gu" Date: Tue, 21 May 2019 17:54:32 +0800 Subject: [PATCH 5/8] =?UTF-8?q?MES=E6=96=B0=E5=A2=9E=E7=8F=AD=E6=AC=A1?= =?UTF-8?q?=E4=BC=91=E6=81=AF=E8=A1=A8=E3=80=81=E7=89=A9=E6=96=99=E5=85=B3?= =?UTF-8?q?=E9=94=AE=E6=95=B0=E6=8D=AE=E5=85=B3=E7=B3=BB=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../model/SysOrganizeModel.java | 46 +++++++ .../sqlpack/AndonHqlPack.java | 20 +++ .../cn/estsh/i3plus/pojo/mes/bean/MesKeyData.java | 2 +- .../cn/estsh/i3plus/pojo/mes/bean/MesKpData.java | 65 +++++++++ .../estsh/i3plus/pojo/mes/bean/MesShiftRest.java | 46 +++++++ .../pojo/mes/repository/MesKpDataRepository.java | 16 +++ .../mes/repository/MesShiftRestRepository.java | 16 +++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 151 +++++++++++++++++++++ 8 files changed, 361 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/model/SysOrganizeModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpData.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftRest.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesKpDataRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesShiftRestRepository.java diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/model/SysOrganizeModel.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/model/SysOrganizeModel.java new file mode 100644 index 0000000..53e0faf --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/model/SysOrganizeModel.java @@ -0,0 +1,46 @@ +package cn.estsh.i3plus.pojo.andon.model; + +import cn.estsh.i3plus.pojo.andon.bean.MesArea; +import io.swagger.annotations.ApiParam; + +import javax.persistence.Transient; +import java.util.List; + +public class SysOrganizeModel{ + + @Transient + @ApiParam(value ="父节点") + private Long parentId; + + @Transient + @ApiParam(value ="名称") + private String name; + + @Transient + @ApiParam(value ="子集列表") + private List childTreeList; + + public List getChildTreeList() { + return childTreeList; + } + + public void setChildTreeList(List childTreeList) { + this.childTreeList = childTreeList; + } + + public Long getParentId() { + return parentId; + } + + public void setParentId(Long parentId) { + this.parentId = parentId; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } +} 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..6c45dd0 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 @@ -310,6 +310,26 @@ public class AndonHqlPack { } /** + * MES班次信息查询条件封装 + * @param shift + * @return + */ + public static DdlPackBean getMesShift(MesShift shift, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(shift, organizeCode); + if (StringUtils.isNotEmpty(shift.getShiftCode())){ + DdlPreparedPack.getStringEqualPack(shift.getShiftCode(), "shiftCode", packBean); + } + if (StringUtils.isNotEmpty(shift.getShiftName())){ + DdlPreparedPack.getStringLikerPack(shift.getShiftName(), "shiftName", packBean); + } + if (StringUtils.isNotEmpty(shift.getWorkCenterCode())){ + DdlPreparedPack.getStringEqualPack(shift.getWorkCenterCode(), "workCenterCode", packBean); + } + + return packBean; + } + + /** * 通知配置信息封装 * @param responseCfg * @return diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKeyData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKeyData.java index 37112eb..870ff9b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKeyData.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKeyData.java @@ -33,7 +33,7 @@ public class MesKeyData extends BaseBean { @Column(name="KEY_DATA_NAME") @ApiParam("关键数据名称") - private Integer keyDataName; + private String keyDataName; @Column(name="UPPER_LIMIT") @ApiParam("数据上限") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpData.java new file mode 100644 index 0000000..7b4ac33 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpData.java @@ -0,0 +1,65 @@ +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: yiming.gu + * @CreateDate:2019-05-21 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_KP_DATA") +@Api("物料关键数据关系") +public class MesKpData extends BaseBean { + @Column(name="PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name="KEY_DATA_CODE") + @ApiParam("关键数据代码") + private String keyDataCode; + + @Column(name="KEY_DATA_NAME") + @ApiParam("关键数据名称") + private String keyDataName; + + @Column(name="KEY_DATA_COUNT") + @ApiParam("关键数据数量") + private Integer keyDataCount; + + @Column(name="UPPER_LIMIT") + @ApiParam("数据上限") + private Double upperLimit; + + @Column(name="LOWER_LIMIT") + @ApiParam("数据下限") + private Double lowerLimit; + + public double getKeyDataCountVal() { + return this.keyDataCount == null ? 0 : this.keyDataCount; + } + + public double getUpperLimitVal() { + return this.upperLimit == null ? 0.0d : this.upperLimit; + } + + public double getLowerLimitVal() { + return this.lowerLimit == null ? 0.0d : this.lowerLimit; + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftRest.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftRest.java new file mode 100644 index 0000000..9c61ae3 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftRest.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 :mes系统业务动作 + * @Reference : + * @Author : yiming.gu + * @CreateDate : 2019-05-20 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_SHIFT_REST") +@Api("班次休息信息") +public class MesShiftRest extends BaseBean { + @Column(name="WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name="SHIFT_CODE") + @ApiParam("班次代码") + private String shiftCode; + + @Column(name="START_TIME") + @ApiParam("开始时间") + private String startTime; + + @Column(name="REST_TIMES") + @ApiParam("休息时长") + private Double restTimes; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesKpDataRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesKpDataRepository.java new file mode 100644 index 0000000..33b3483 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesKpDataRepository.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.MesKpData; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: yiming.gu + * @CreateDate:2019-05-21 + * @Modify: + **/ +@Repository +public interface MesKpDataRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesShiftRestRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesShiftRestRepository.java new file mode 100644 index 0000000..8ac8bdc --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesShiftRestRepository.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.MesShiftRest; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: yiming.gu + * @CreateDate:2019-05-20 + * @Modify: + **/ +@Repository +public interface MesShiftRestRepository 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 f48202e..b3685f6 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 @@ -328,6 +328,23 @@ public class MesHqlPack { } /** + * MES班次休息信息查询条件封装 + * @param shiftRest + * @return + */ + public static DdlPackBean getMesShiftRest(MesShiftRest shiftRest, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(shiftRest, organizeCode); + if (StringUtils.isNotEmpty(shiftRest.getWorkCenterCode())){ + DdlPreparedPack.getStringEqualPack(shiftRest.getWorkCenterCode(), "workCenterCode", packBean); + } + if (StringUtils.isNotEmpty(shiftRest.getShiftCode())){ + DdlPreparedPack.getStringEqualPack(shiftRest.getShiftCode(), "shiftCode", packBean); + } + + return packBean; + } + + /** * MES工序信息查询条件封装 * @param process * @return @@ -425,6 +442,26 @@ public class MesHqlPack { } /** + * MES工序BOM信息查询条件封装 + * @param processBom + * @return + */ + public static DdlPackBean getMesProcessBom(MesProcessBom processBom, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(processBom, organizeCode); + if (StringUtils.isNotEmpty(processBom.getPartNo())){ + DdlPreparedPack.getStringEqualPack(processBom.getPartNo(), "partNo", packBean); + } + if (StringUtils.isNotEmpty(processBom.getItemPartNo())){ + DdlPreparedPack.getStringEqualPack(processBom.getItemPartNo(), "itemPartNo", packBean); + } + if (StringUtils.isNotEmpty(processBom.getProcessCode())){ + DdlPreparedPack.getStringEqualPack(processBom.getProcessCode(), "processCode", packBean); + } + + return packBean; + } + + /** * MES 客户信息查询条件封装 * @param customer * @return @@ -477,4 +514,118 @@ public class MesHqlPack { return packBean; } + + /** + * MES 设备关键数据信息查询条件封装 + * @param keyData + * @return + */ + public static DdlPackBean getMesKeyData(MesKeyData keyData, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(keyData, organizeCode); + if (StringUtils.isNotEmpty(keyData.getKeyDataCode())){ + DdlPreparedPack.getStringEqualPack(keyData.getKeyDataCode(), "keyDataCode", packBean); + } + if (StringUtils.isNotEmpty(keyData.getKeyDataName())){ + DdlPreparedPack.getStringEqualPack(keyData.getKeyDataName(), "keyDataName", packBean); + } + + return packBean; + } + + /** + * MES 物料关键数据关系信息查询条件封装 + * @param kpData + * @return + */ + public static DdlPackBean getMesKpData(MesKpData kpData, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(kpData, organizeCode); + if (StringUtils.isNotEmpty(kpData.getPartNo())){ + DdlPreparedPack.getStringEqualPack(kpData.getKeyDataCode(), "partNo", packBean); + } + if (StringUtils.isNotEmpty(kpData.getKeyDataCode())){ + DdlPreparedPack.getStringEqualPack(kpData.getKeyDataCode(), "keyDataCode", packBean); + } + + return packBean; + } + + /** + * MES 产品配置类型信息查询条件封装 + * @param prodCfgType + * @return + */ + public static DdlPackBean getMesProdCfgType(MesProdCfgType prodCfgType, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(prodCfgType, organizeCode); + if (StringUtils.isNotEmpty(prodCfgType.getProdCfgTypeCode())){ + DdlPreparedPack.getStringEqualPack(prodCfgType.getProdCfgTypeCode(), "prodCfgTypeCode", packBean); + } + if (StringUtils.isNotEmpty(prodCfgType.getProdCfgTypeName())){ + DdlPreparedPack.getStringEqualPack(prodCfgType.getProdCfgTypeName(), "prodCfgTypeName", packBean); + } + + return packBean; + } + + /** + * MES 产品配置信息查询条件封装 + * @param prodCfg + * @return + */ + public static DdlPackBean getMesProdCfg(MesProdCfg prodCfg, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(prodCfg, organizeCode); + if (StringUtils.isNotEmpty(prodCfg.getProdCfgCode())){ + DdlPreparedPack.getStringEqualPack(prodCfg.getProdCfgCode(), "prodCfgCode", packBean); + } + if (StringUtils.isNotEmpty(prodCfg.getProdCfgName())){ + DdlPreparedPack.getStringLikerPack(prodCfg.getProdCfgName(), "prodCfgName", packBean); + } + if (StringUtils.isNotEmpty(prodCfg.getProdCfgTypeCode())){ + DdlPreparedPack.getStringEqualPack(prodCfg.getProdCfgTypeCode(), "prodCfgTypeCode", packBean); + } + + return packBean; + } + + /** + * MES 产品配置关系信息查询条件封装 + * @param prodCfgDetail + * @return + */ + public static DdlPackBean getMesProdCfgDetail(MesProdCfgDetail prodCfgDetail, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(prodCfgDetail, organizeCode); + if (StringUtils.isNotEmpty(prodCfgDetail.getProdCfgCode())){ + DdlPreparedPack.getStringEqualPack(prodCfgDetail.getProdCfgCode(), "prodCfgCode", packBean); + } + if (StringUtils.isNotEmpty(prodCfgDetail.getPartNo())){ + DdlPreparedPack.getStringEqualPack(prodCfgDetail.getPartNo(), "partNo", packBean); + } + + return packBean; + } + + /** + * MES 物料信息查询条件封装 + * @param part + * @return + */ + public static DdlPackBean getMesPart(MesPart part, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(part, organizeCode); + if (StringUtils.isNotEmpty(part.getPartNo())){ + DdlPreparedPack.getStringEqualPack(part.getPartNo(), "partNo", packBean); + } + if (StringUtils.isNotEmpty(part.getPartName())){ + DdlPreparedPack.getStringLikerPack(part.getPartName(), "partName", packBean); + } + if (StringUtils.isNotEmpty(part.getCategoryCode1())){ + DdlPreparedPack.getStringEqualPack(part.getCategoryCode1(), "categoryCode1", packBean); + } + if (StringUtils.isNotEmpty(part.getCategoryCode2())){ + DdlPreparedPack.getStringEqualPack(part.getCategoryCode2(), "categoryCode2", packBean); + } + if (StringUtils.isNotEmpty(part.getCategoryCode3())){ + DdlPreparedPack.getStringEqualPack(part.getCategoryCode3(), "categoryCode3", packBean); + } + + return packBean; + } } From 93ace83b5fbc93b94e33547fd10d79ec43573570 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Tue, 21 May 2019 18:23:44 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E9=95=BF=E6=96=87=E6=9C=AC=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/form/bean/BfDataObject.java | 8 ++---- .../cn/estsh/i3plus/pojo/form/bean/BfLayout.java | 10 +++---- .../i3plus/pojo/form/bean/BfLayoutColumn.java | 4 ++- .../estsh/i3plus/pojo/form/bean/BfLayoutRow.java | 10 +++---- .../cn/estsh/i3plus/pojo/form/bean/BfMenu.java | 4 ++- .../mes/engine/script/EngineScriptPersistence.java | 8 ++---- .../pojo/platform/bean/SysLabelTemplate.java | 9 +++--- .../pojo/platform/bean/SysLabelTemplateParam.java | 9 +++--- .../i3plus/pojo/platform/bean/SysMessage.java | 8 ++---- .../estsh/i3plus/pojo/platform/bean/SysRole.java | 5 +++- .../i3plus/pojo/platform/bean/SysTaskPlan.java | 6 +++- .../estsh/i3plus/pojo/platform/bean/SysUser.java | 29 +++++++++++++------ .../pojo/platform/platbean/WmsActionLogData.java | 11 ++++++-- .../estsh/i3plus/pojo/report/bean/BrElement.java | 9 +++--- .../cn/estsh/i3plus/pojo/report/bean/BrLayout.java | 12 ++++---- .../i3plus/pojo/report/bean/BrLayoutColumn.java | 12 ++++---- .../estsh/i3plus/pojo/report/bean/BrLayoutRow.java | 12 ++++---- .../pojo/report/bean/BrRefReportTypeset.java | 8 ++++-- .../i3plus/pojo/report/bean/BrRefRoleMenu.java | 2 +- .../cn/estsh/i3plus/pojo/report/bean/BrReport.java | 12 ++++---- .../estsh/i3plus/pojo/report/bean/BrTemplate.java | 33 +++++++++++++--------- .../pojo/report/bean/BrTemplateCustomHql.java | 5 +++- .../wms/engine/rule/EngineRulePersistence.java | 4 ++- .../wms/engine/script/EngineScriptPersistence.java | 4 ++- 24 files changed, 135 insertions(+), 99 deletions(-) diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObject.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObject.java index 7208908..432f0a1 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObject.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObject.java @@ -9,10 +9,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.Table; -import javax.persistence.Transient; +import javax.persistence.*; import java.util.List; /** @@ -43,7 +40,8 @@ public class BfDataObject extends BaseBean { @ApiParam(value ="数据表名") private String objectTableName; - @Column(name="OBJECT_CONTENT",columnDefinition="TEXT") + @Lob + @Column(name="OBJECT_CONTENT") @ApiParam(value ="数据内容") private String objectContent; diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfLayout.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfLayout.java index 2441c0d..d58c49c 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfLayout.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfLayout.java @@ -7,10 +7,9 @@ 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; +import org.hibernate.annotations.Type; + +import javax.persistence.*; import java.util.List; /** @@ -60,7 +59,8 @@ public class BfLayout extends BaseBean { @ApiParam(value = "引用报表数量") private Integer layoutReportCount; - @Column(name = "LAYOUT_DESCRIPTION", columnDefinition = "TEXT") + @Lob + @Column(name = "LAYOUT_DESCRIPTION") @ApiParam(value = "布局描述") private String layoutDescription; diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfLayoutColumn.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfLayoutColumn.java index 6adb621..bafc0a5 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfLayoutColumn.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfLayoutColumn.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Lob; import javax.persistence.Table; /** @@ -59,7 +60,8 @@ public class BfLayoutColumn extends BaseBean { @ApiParam(value = "排序，降序") private Integer columnSort; - @Column(name = "COLUMN_DESCRIPTION", columnDefinition = "TEXT") + @Lob + @Column(name = "COLUMN_DESCRIPTION") @ApiParam(value = "列描述") private String columnDescription; } diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfLayoutRow.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfLayoutRow.java index df72dd0..c9888f1 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfLayoutRow.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfLayoutRow.java @@ -9,10 +9,9 @@ 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; +import org.hibernate.annotations.Type; + +import javax.persistence.*; import java.util.List; /** @@ -44,7 +43,8 @@ public class BfLayoutRow extends BaseBean { @ApiParam(value = "排序") private Integer rowSort; - @Column(name = "ROW_STYLE", columnDefinition = "TEXT") + @Lob + @Column(name = "ROW_STYLE") @ApiParam(value = "行样式") private String rowStyle; diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMenu.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMenu.java index 6a404a4..e1f5a71 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMenu.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMenu.java @@ -10,6 +10,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; +import org.hibernate.annotations.Type; import javax.persistence.*; import java.util.List; @@ -61,7 +62,8 @@ public class BfMenu extends BaseBean { @ApiParam(value ="菜单图标") private String menuIcon; - @Column(name="MENU_STYLE", columnDefinition = "TEXT") + @Lob + @Column(name="MENU_STYLE") @ApiParam(value ="菜单样式") private String menuStyle; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/engine/script/EngineScriptPersistence.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/engine/script/EngineScriptPersistence.java index 90ea6c9..f5e33c7 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/engine/script/EngineScriptPersistence.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/engine/script/EngineScriptPersistence.java @@ -7,10 +7,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.Table; -import javax.persistence.Transient; +import javax.persistence.*; import javax.script.CompiledScript; /** @@ -41,7 +38,8 @@ public class EngineScriptPersistence extends BaseBean { @Column(name = "LANGUAGE_TYPE") private int languageType; // 脚本的具体内容 - @Column(name = "SCRIPT_CONTENT", columnDefinition = "TEXT") + @Lob + @Column(name = "SCRIPT_CONTENT") private String scriptContent; // 脚本的描述，包含脚本的用法，参数说明等 @Column(name = "SCRIPT_REMARK", length = 2000) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java index 7759328..39eb527 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java @@ -7,11 +7,9 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; +import org.hibernate.annotations.Type; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; +import javax.persistence.*; /** * @Description : 打印模板 @@ -37,7 +35,8 @@ public class SysLabelTemplate extends BaseBean { @ApiParam(value ="模板名称") private String templateName; - @Column(name="TEMPLATE_CONTENT", columnDefinition = "TEXT") + @Lob + @Column(name="TEMPLATE_CONTENT") @ApiParam(value ="模板内容") private String templateContent; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplateParam.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplateParam.java index 6b39045..4654f76 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplateParam.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplateParam.java @@ -9,11 +9,9 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; +import org.hibernate.annotations.Type; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; +import javax.persistence.*; /** * @Description : 打印模板参数 @@ -44,7 +42,8 @@ public class SysLabelTemplateParam extends BaseBean { @ApiParam(value ="模板参数") private String templateParam; - @Column(name="TEMPLATE_PARAM_TEXT", columnDefinition = "TEXT") + @Lob + @Column(name="TEMPLATE_PARAM_TEXT") @ApiParam(value ="模板参数描述") private String templateParamText; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java index beb96bf..695c519 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java @@ -12,10 +12,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import org.hibernate.annotations.Subselect; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; +import javax.persistence.*; import java.util.List; /** @@ -58,7 +55,8 @@ public class SysMessage extends BaseBean { @ApiParam(value = "消息内容类型(枚举：ImppEnumUtil.MESSAGE_TYPE_CONTENT)", example = "-1") private Integer messageContentType; - @Column(name = "MESSAGE_CONTENT", columnDefinition = "TEXT") + @Lob + @Column(name = "MESSAGE_CONTENT") @ApiParam(value = "消息内容", access = "消息内容") private String messageContent; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRole.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRole.java index 9a8948e..4ded623 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRole.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRole.java @@ -9,9 +9,11 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; +import org.hibernate.annotations.Type; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Lob; import javax.persistence.Table; /** @@ -63,7 +65,8 @@ public class SysRole extends BaseBean { @ApiParam(value ="权限功能数量" , example ="0" , access ="权限功能数量") private Integer menuNumber; - @Column(name="MENU_NAMES_RDD",columnDefinition="TEXT") + @Lob + @Column(name="MENU_NAMES_RDD") @ApiParam(value ="权限功能名称" , access ="权限功能名称") private String menuNamesRdd; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskPlan.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskPlan.java index fad0818..df65a54 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskPlan.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskPlan.java @@ -9,8 +9,11 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; +import org.hibernate.annotations.Type; + import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Lob; import javax.persistence.Table; /** @@ -124,7 +127,8 @@ public class SysTaskPlan extends BaseBean { @ApiParam(value = "通知方式", example = "1") private Integer noticeMethod; - @Column(name = "NOTICE_CHANNEL", columnDefinition = "TEXT") + @Lob + @Column(name = "NOTICE_CHANNEL") @ApiParam(value = "通知渠道") private String noticeChannel; } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java index 9fbed02..85b26eb 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java @@ -9,11 +9,9 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; +import org.hibernate.annotations.Type; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; +import javax.persistence.*; import java.util.List; /** @@ -104,15 +102,18 @@ public class SysUser extends BaseBean { @ApiParam(value ="组织名称" , access ="组织名称") private String organizeNameRdd; - @Column(name="ROLE_NAMES_RDD",columnDefinition = "TEXT") + @Lob + @Column(name="ROLE_NAMES_RDD") @ApiParam(value ="角色名称集合") private String roleNamesRdd; - @Column(name="DEPARTMENT_NAMES_RDD",columnDefinition = "TEXT") + @Lob + @Column(name="DEPARTMENT_NAMES_RDD") @ApiParam(value ="部门名称集合") private String departmentNamesRdd; - @Column(name="ORGANIZE_NAMES_RDD",columnDefinition = "TEXT") + @Lob + @Column(name="ORGANIZE_NAMES_RDD") @ApiParam(value ="组织名称集合") private String organizeNamesRdd; @@ -133,7 +134,7 @@ public class SysUser extends BaseBean { @Transient @ApiParam(value ="账号所有操作部门 Id 集合") private List departmentIdList; - + @Transient @ApiParam(value ="账号所有操作部门信息") private List departmentList; @@ -147,7 +148,7 @@ public class SysUser extends BaseBean { @ApiParam(value ="角色ID集合" , example = "0") @JsonSerialize(using = ToStringSerializer.class) private List roleIdList; - + @Transient @ApiParam(value ="账号所有角色信息") private List roleList; @@ -156,4 +157,14 @@ public class SysUser extends BaseBean { @ApiParam(value ="账号所有操作权限信息") private List menuList; + /*** test ***/ +// @Lob +// @Basic(fetch=FetchType.LAZY) +// @Column(name = "CONTENT", columnDefinition = "BLOB") +// private byte[] content; +// +// @Lob +// @Basic(fetch=FetchType.LAZY) +// @Column(name="REMARK", columnDefinition="CLOB") +// private String remark; } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/WmsActionLogData.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/WmsActionLogData.java index d162959..8a426ea 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/WmsActionLogData.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/WmsActionLogData.java @@ -10,9 +10,11 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; +import org.hibernate.annotations.Type; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Lob; import javax.persistence.Table; /** @@ -62,15 +64,18 @@ public class WmsActionLogData extends BaseBean { @ApiParam(value="结束执行时间",example = "2000-01-01 01:00:00") private String endTime; - @Column(name = "IN_PARAMS", columnDefinition = "TEXT") + @Lob + @Column(name = "IN_PARAMS") @ApiParam(value = "输入参数") private String inParams; - @Column(name = "OUT_PARAMS", columnDefinition = "TEXT") + @Lob + @Column(name = "OUT_PARAMS") @ApiParam(value = "输出参数") private String outParams; - @Column(name = "OUT_RESULT", columnDefinition = "TEXT") + @Lob + @Column(name = "OUT_RESULT") @ApiParam(value = "执行结果") private String outResult; } diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrElement.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrElement.java index 0689b99..891996a 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrElement.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrElement.java @@ -9,11 +9,9 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; +import org.hibernate.annotations.Type; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; +import javax.persistence.*; import java.util.List; /** @@ -57,7 +55,8 @@ public class BrElement extends BaseBean { @ApiParam(value ="元素样式css") private String elementStyle; - @Column(name="ELEMENT_HTML",columnDefinition = "TEXT") + @Lob + @Column(name="ELEMENT_HTML") @ApiParam(value ="元素html") private String elementHtml; } diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayout.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayout.java index 9f80884..6351b74 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayout.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayout.java @@ -7,11 +7,9 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; +import org.hibernate.annotations.Type; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; +import javax.persistence.*; import java.util.List; /** @@ -54,11 +52,13 @@ public class BrLayout extends BaseBean { @ApiParam(value ="引用报表数量") private Integer layoutReportCount; - @Column(name="LAYOUT_HTML",columnDefinition = "TEXT") + @Lob + @Column(name="LAYOUT_HTML") @ApiParam(value ="布局html") private String layoutHtml; - @Column(name = "LAYOUT_DESCRIPTION",columnDefinition = "TEXT") + @Lob + @Column(name = "LAYOUT_DESCRIPTION") @ApiParam(value ="布局描述") private String layoutDescription; diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayoutColumn.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayoutColumn.java index 88be0d5..9665e99 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayoutColumn.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayoutColumn.java @@ -9,11 +9,9 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; +import org.hibernate.annotations.Type; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; +import javax.persistence.*; import java.util.List; /** @@ -70,11 +68,13 @@ public class BrLayoutColumn extends BaseBean { @ApiParam(value ="排序，降序") private Integer columnSort; - @Column(name = "COLUMN_DESCRIPTION",columnDefinition = "TEXT") + @Lob + @Column(name = "COLUMN_DESCRIPTION") @ApiParam(value ="列描述") private String columnDescription; - @Column(name="COLUMN_HTML",columnDefinition = "TEXT") + @Lob + @Column(name="COLUMN_HTML") @ApiParam(value ="列html") private String columnHtml; } diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayoutRow.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayoutRow.java index 24db11e..9b23fb0 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayoutRow.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrLayoutRow.java @@ -9,11 +9,9 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; +import org.hibernate.annotations.Type; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; +import javax.persistence.*; import java.util.List; /** @@ -49,7 +47,8 @@ public class BrLayoutRow extends BaseBean { @ApiParam(value ="排序") private Integer rowSort; - @Column(name="ROW_STYLE",columnDefinition = "TEXT") + @Lob + @Column(name="ROW_STYLE") @ApiParam(value ="行样式") private String rowStyle; @@ -57,7 +56,8 @@ public class BrLayoutRow extends BaseBean { @ApiParam(value ="行所关联列数") private Integer rowColNum; - @Column(name="ROW_HTML",columnDefinition = "TEXT") + @Lob + @Column(name="ROW_HTML") @ApiParam(value ="行html") private String rowHtml; diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrRefReportTypeset.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrRefReportTypeset.java index c329c15..2c32625 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrRefReportTypeset.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrRefReportTypeset.java @@ -9,9 +9,11 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; +import org.hibernate.annotations.Type; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Lob; import javax.persistence.Table; /** @@ -59,11 +61,13 @@ public class BrRefReportTypeset extends BaseBean { /** * 关联元素或模板html */ - @Column(name = "REF_HTML",columnDefinition = "TEXT") + @Lob + @Column(name = "REF_HTML") @ApiParam(value = "关联对象html") private String refHtml; - @Column(name = "TYPESET_DESCRIPTION",columnDefinition = "TEXT") + @Lob + @Column(name = "TYPESET_DESCRIPTION") @ApiParam(value ="排版描述") private String typesetDescription; } \ No newline at end of file diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrRefRoleMenu.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrRefRoleMenu.java index 1c29ea9..5b2cb10 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrRefRoleMenu.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrRefRoleMenu.java @@ -26,7 +26,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="SYS_REF_ROLE_MENU") +@Table(name="BR_REF_ROLE_MENU") @Api(value="关系-角色目录",description = "关系-角色目录") public class BrRefRoleMenu extends BaseBean { diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrReport.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrReport.java index f37e43e..7debebc 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrReport.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrReport.java @@ -10,11 +10,9 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; +import org.hibernate.annotations.Type; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; +import javax.persistence.*; import java.util.List; /** @@ -55,7 +53,8 @@ public class BrReport extends BaseBean { @ApiParam(value ="布局名称") private String layoutNameRdd; - @Column(name="LAYOUT_HTML",columnDefinition = "TEXT") + @Lob + @Column(name="LAYOUT_HTML") @ApiParam(value ="报表html") private String reportHtml; @@ -71,7 +70,8 @@ public class BrReport extends BaseBean { @ApiParam(value ="元素数量") private Integer elementNum; - @Column(name = "REPORT_DESCRIPTION",columnDefinition = "TEXT") + @Lob + @Column(name = "REPORT_DESCRIPTION") @ApiParam(value ="报表描述") private String reportDescription; diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrTemplate.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrTemplate.java index 40ff440..d2f2342 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrTemplate.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrTemplate.java @@ -7,11 +7,9 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; +import org.hibernate.annotations.Type; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; +import javax.persistence.*; import java.util.ArrayList; import java.util.List; @@ -47,7 +45,8 @@ public class BrTemplate extends BaseBean { @ApiParam(value ="对象数量" , example ="0" , access ="对象数量") private Integer numPojo; - @Column(name="TEMPLATE_POJO_NAMES_RDD",columnDefinition = "TEXT") + @Lob + @Column(name="TEMPLATE_POJO_NAMES_RDD") @ApiParam(value ="对象名称" , access ="对象名称") private String templatePojoNamesRdd; @@ -55,11 +54,13 @@ public class BrTemplate extends BaseBean { @ApiParam(value ="对象数量" , example ="0" , access ="对象数量") private Integer numServer; - @Column(name="TEMPLATE_SERVER_ID_LIST",columnDefinition = "TEXT") + @Lob + @Column(name="TEMPLATE_SERVER_ID_LIST") @ApiParam(value ="数据服务ID集合" , access ="服务名称") private String templateServerIdList; - @Column(name="TEMPLATE_SERVER_NAMES_RDD",columnDefinition = "TEXT") + @Lob + @Column(name="TEMPLATE_SERVER_NAMES_RDD") @ApiParam(value ="服务名称" , access ="服务名称") private String templateServerNamesRdd; @@ -67,7 +68,8 @@ public class BrTemplate extends BaseBean { @ApiParam(value ="对象数量" , example ="0" , access ="对象数量") private Integer numTemplateAttrFilter; - @Column(name="template_attr_filter_list",columnDefinition = "TEXT") + @Lob + @Column(name="template_attr_filter_list") @ApiParam(value ="模板查询条件" , access ="模板查询条件") private String templateAttrFilterList; @@ -75,7 +77,8 @@ public class BrTemplate extends BaseBean { @ApiParam(value ="对象数量" , example ="0" , access ="对象数量") private Integer numTemplateAttrFilterGroup; - @Column(name="TEMPLATE_ATTR_FILTER_GROUP_LIST",columnDefinition = "TEXT") + @Lob + @Column(name="TEMPLATE_ATTR_FILTER_GROUP_LIST") @ApiParam(value ="模板分组条件" , access ="模板分組条件") private String templateAttrFilterGroupList; @@ -83,7 +86,8 @@ public class BrTemplate extends BaseBean { @ApiParam(value ="对象数量" , example ="0" , access ="对象数量") private Integer numTemplateAttrShow; - @Column(name="TEMPLATE_ATTR_SHOW_LIST",columnDefinition = "TEXT") + @Lob + @Column(name="TEMPLATE_ATTR_SHOW_LIST") @ApiParam(value ="模板显示属性" , access ="模板显示属性") private String templateAttrShowList; @@ -91,7 +95,8 @@ public class BrTemplate extends BaseBean { @ApiParam(value ="对象聚集数量" , example ="0" , access ="对象聚集数量") private Integer numTemplateAggregation; - @Column(name="TEMPLATE_ATTR_AGGREGATION_LIST",columnDefinition = "TEXT") + @Lob + @Column(name="TEMPLATE_ATTR_AGGREGATION_LIST") @ApiParam(value ="模板聚集属性" , access ="模板聚集属性") private String templateAttrAggregationList; @@ -99,11 +104,13 @@ public class BrTemplate extends BaseBean { @ApiParam(value ="模板描述" , access ="模板描述") private String templateDescription; - @Column(name="TEMPLATE_HQL",columnDefinition = "TEXT") + @Lob + @Column(name="TEMPLATE_HQL") @ApiParam(value ="模板执行HQL" , access ="模板执行HQL") private String templateHql; - @Column(name="TEMPLATE_HTML",columnDefinition = "TEXT") + @Lob + @Column(name="TEMPLATE_HTML") @ApiParam(value ="模板HTML" , access ="模板HTML") private String templateHtml; diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrTemplateCustomHql.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrTemplateCustomHql.java index 5e5cfd0..8e5e68a 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrTemplateCustomHql.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrTemplateCustomHql.java @@ -9,9 +9,11 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; +import org.hibernate.annotations.Type; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Lob; import javax.persistence.Table; /** @@ -39,7 +41,8 @@ public class BrTemplateCustomHql extends BaseBean { @ApiParam(value ="自定义类型" , example ="-1") private Integer dataType; - @Column(name="CUSTOM_CONTENT",columnDefinition="TEXT") + @Lob + @Column(name="CUSTOM_CONTENT") @ApiParam(value ="自定义语句内容" , access ="自定义语句内容") private String customContent; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/EngineRulePersistence.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/EngineRulePersistence.java index 342b258..ab93720 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/EngineRulePersistence.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/EngineRulePersistence.java @@ -12,6 +12,7 @@ import org.springframework.data.annotation.Transient; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Lob; import javax.persistence.Table; /** @@ -37,7 +38,8 @@ public class EngineRulePersistence extends BaseBean { @Column(name = "RULE_NAME", length = 50) private String ruleName; // 规则的具体内容 - @Column(name = "RULE_CONTENT", columnDefinition = "TEXT") + @Lob + @Column(name = "RULE_CONTENT") private String ruleContent; // 规则的描述，包含规则的用法，参数说明等 @Column(name = "RULE_REMARK", length = 2000) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/script/EngineScriptPersistence.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/script/EngineScriptPersistence.java index c928ee1..da76b34 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/script/EngineScriptPersistence.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/script/EngineScriptPersistence.java @@ -7,6 +7,7 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; +import org.hibernate.annotations.Type; import javax.persistence.*; import javax.script.CompiledScript; @@ -47,7 +48,8 @@ public class EngineScriptPersistence extends BaseBean { private Integer languageType; // 脚本的具体内容 - @Column(name = "SCRIPT_CONTENT", columnDefinition = "TEXT") + @Lob + @Column(name = "SCRIPT_CONTENT") private String scriptContent; // 脚本的描述，包含脚本的用法，参数说明等 From 245596ee0b3e524bbbde924c054767188f2d4026 Mon Sep 17 00:00:00 2001 From: "yihang.lv" Date: Tue, 21 May 2019 19:53:01 +0800 Subject: [PATCH 7/8] =?UTF-8?q?sweb=20=E5=AF=BC=E5=85=A5=E9=9D=9E=E6=A0=87?= =?UTF-8?q?=E5=87=86=E5=8C=85=E8=A3=85=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/sweb/sqlpack/SwebHqlPack.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java index 7b4026d..9bfe0df 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java @@ -127,7 +127,7 @@ public class SwebHqlPack { } /** - * 将该供应商下该单号状态全部改为已发布状态 where sql + * 将该供应商下该单号状态全部改为已发布状态 where sql（只查询状态为新建的订单） * @param details * @return */ @@ -136,6 +136,7 @@ public class SwebHqlPack { DdlPreparedPack.getStringEqualPack(details.getOrderNo(), "orderNo", result); DdlPreparedPack.getStringEqualPack(details.getVendorCode(), "vendorCode", result); DdlPreparedPack.getNumEqualPack(details.getOrderType(), "orderType", result); + DdlPreparedPack.getNumEqualPack(SwebEnumUtil.ORDER_DETAILS_STATUS.CREATE.getValue(), "itemStatus", result); return buildHql(details, result); } From d0840978de375b45ea3a9807b84793f07e1d3e16 Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Tue, 21 May 2019 21:54:22 +0800 Subject: [PATCH 8/8] =?UTF-8?q?PLC=E6=95=B0=E6=8D=AE=E9=87=87=E9=9B=86?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: crish <570360737@qq.com> --- .../estsh/i3plus/pojo/mes/pcn/bean/MesPLCConfigure.java | 4 ++++ .../estsh/i3plus/pojo/mes/pcn/bean/MesTorqueDetail.java | 17 +++++++++++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPLCConfigure.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPLCConfigure.java index 548db37..0d139b8 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPLCConfigure.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPLCConfigure.java @@ -32,6 +32,10 @@ public class MesPLCConfigure extends BaseBean { @ApiParam("设备ip") private String ipAddress; + @Column(name="CHANNEL_NAME") + @ApiParam("通道名称") + private String channelName; + @Column(name="DEVICE_NAME") @ApiParam("设备地址") private String deviceName; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTorqueDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTorqueDetail.java index f99cd7f..52296a7 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTorqueDetail.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTorqueDetail.java @@ -28,6 +28,7 @@ import javax.persistence.Table; @Table(name="MES_TORQUE_DETAIL") @Api("扭矩信息记录表") public class MesTorqueDetail extends BaseBean { + @Column(name="SN") @ApiParam("过程条码") private String serialNumber; @@ -61,8 +62,8 @@ public class MesTorqueDetail extends BaseBean { private String ok; @Column(name="PART_NO") - @ApiParam("扭矩是否合格") - private String partNO; + @ApiParam("物料号") + private String partNo; @Column(name="p_set") @ApiParam("螺丝枪PSET设置值") @@ -79,4 +80,16 @@ public class MesTorqueDetail extends BaseBean { @Column(name="FINALANGLE") @ApiParam("最终扭矩") private Integer finalAngle; + + @Column(name="WORK_ORDER_NO") + @ApiParam("工单号") + private String workOrderNo; + + @Column(name="KEY_DATA_CODE") + @ApiParam("关键数据代码") + private String keyDataCode; + + @Column(name="RESULT_MSG") + @ApiParam("扭矩判定结果") + private String resultMsg; }