From 58c29f5aee23b8631346dbcbee849b08d9b299cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Wed, 8 May 2019 21:44:14 +0800 Subject: [PATCH 01/19] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3+=E4=BD=9C=E4=B8=9A=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=81=94=E8=B0=83=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/WmsActionGroup.java | 56 +++++++++++----------- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 2 +- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java index 310e5fa..eef67a2 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java @@ -49,33 +49,33 @@ public class WmsActionGroup extends BaseBean { @ApiParam(value = "初始化组件编号", example = "0") private Long initAmId; - @Transient - @ApiParam(value = "初始化组件名称") - private String initAmName; +// @Transient +// @ApiParam(value = "初始化组件名称") +// private String initAmName; @Column(name = "DETAILS_AM_ID") @ApiParam(value = "明细处理组件编号", example = "0") private Long detailsAmId; - @Transient - @ApiParam(value = "明细处理组件名称") - private String detailsAmName; +// @Transient +// @ApiParam(value = "明细处理组件名称") +// private String detailsAmName; @Column(name = "SUBMIT_AM_ID") @ApiParam(value = "提交组件编号", example = "0") private Long submitAmId; - @Transient - @ApiParam(value = "提交组件名称") - private String submitAmName; +// @Transient +// @ApiParam(value = "提交组件名称") +// private String submitAmName; @Column(name = "END_AM_ID") @ApiParam(value = "结束组件编号", example = "0") private Long endAmId; - - @Transient - @ApiParam(value = "结束组件名称") - private String endAmName; +// +// @Transient +// @ApiParam(value = "结束组件名称") +// private String endAmName; // 1=true, 2 = false @Column(name = "AUTO_INIT") @@ -109,19 +109,19 @@ public class WmsActionGroup extends BaseBean { public WmsActionGroup() { } - public WmsActionGroup(String agNameE, String agDescE, String agNameC, String agDescC, Integer autoInit, Long initAmId, String initAmName, Long detailsAmId, String detailsAmName, Long submitAmId, String submitAmName, Long endAmId, String endAmName) { - this.agNameE = agNameE; - this.agDescE = agDescE; - this.agNameC = agNameC; - this.agDescC = agDescC; - this.autoInit = autoInit; - this.initAmId = initAmId; - this.initAmName = initAmName; - this.detailsAmId = detailsAmId; - this.detailsAmName = detailsAmName; - this.submitAmId = submitAmId; - this.submitAmName = submitAmName; - this.endAmId = endAmId; - this.endAmName = endAmName; - } +// public WmsActionGroup(String agNameE, String agDescE, String agNameC, String agDescC, Integer autoInit, Long initAmId, String initAmName, Long detailsAmId, String detailsAmName, Long submitAmId, String submitAmName, Long endAmId, String endAmName) { +// this.agNameE = agNameE; +// this.agDescE = agDescE; +// this.agNameC = agNameC; +// this.agDescC = agDescC; +// this.autoInit = autoInit; +// this.initAmId = initAmId; +// this.initAmName = initAmName; +// this.detailsAmId = detailsAmId; +// this.detailsAmName = detailsAmName; +// this.submitAmId = submitAmId; +// this.submitAmName = submitAmName; +// this.endAmId = endAmId; +// this.endAmName = endAmName; +// } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index f53fe7d..ec7c7fc 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -1291,7 +1291,7 @@ public class WmsHqlPack { DdlPreparedPack.getStringLikerPack(wmsActionModule.getAmName(), "amName", result); DdlPreparedPack.getNumEqualPack(wmsActionModule.getId(), "id", result); DdlPreparedPack.getNumEqualPack(wmsActionModule.getAmType(), "amType", result); - DdlPreparedPack.getNumEqualPack(wmsActionModule.getOpTypeCode(), "opTypeCode", result); + DdlPreparedPack.getStringEqualPack(wmsActionModule.getOpTypeCode(), "opTypeCode", result); DdlPreparedPack.getNumEqualPack(wmsActionModule.getIsShowInfo(), "isShowInfo", result); getStringBuilderPack(wmsActionModule, result); From c771fa925b0b89f5cf36c7d14c039de393cf28af Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Thu, 9 May 2019 17:18:50 +0800 Subject: [PATCH 02/19] =?UTF-8?q?=E6=9B=B4=E6=94=B9model=E4=BD=8D=E7=BD=AE?= 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/model/RequestModel.java | 55 ++++++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/RequestModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/RequestModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/RequestModel.java new file mode 100644 index 0000000..5ed8956 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/RequestModel.java @@ -0,0 +1,55 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.mes.bean.MesPart; +import cn.estsh.i3plus.pojo.mes.bean.MesPlanOrder; +import cn.estsh.i3plus.pojo.mes.bean.MesWorkOrder; + +import java.util.List; + +/** + * @Description: + * @Reference: + * @Author: Crish + * @CreateDate:2019-04-29-11:58 + * @Modify: + **/ +public class RequestModel { + + private List workOrderList; + + private List partList; + + private List planOrderList; + + public RequestModel(List workOrderList, List partList) { + this.workOrderList = workOrderList; + this.partList = partList; + } + + public List getWorkOrderList() { + return workOrderList; + } + + public RequestModel() { + } + + public void setWorkOrderList(List workOrderList) { + this.workOrderList = workOrderList; + } + + public List getPartList() { + return partList; + } + + public void setPartList(List partList) { + this.partList = partList; + } + + public List getPlanOrderList() { + return planOrderList; + } + + public void setPlanOrderList(List planOrderList) { + this.planOrderList = planOrderList; + } +} From 10844622a765ab43dfe2ff69b3775cb8b1bc9944 Mon Sep 17 00:00:00 2001 From: Silliter Date: Fri, 10 May 2019 14:58:01 +0800 Subject: [PATCH 03/19] =?UTF-8?q?1.=E4=BC=98=E5=8C=96=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E8=AF=AD=E5=8F=A5=202.=E6=B5=81=E7=A8=8B=E7=AE=A1=E5=AE=B6?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E5=8A=A0=E4=B8=8A=E5=B7=A5?= =?UTF-8?q?=E5=8E=82=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 181 ++++----------------- 1 file changed, 33 insertions(+), 148 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index f53fe7d..30e113f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -25,13 +25,6 @@ import java.util.stream.Collectors; **/ public class WmsHqlPack { - public static String packInParams(String colnumName, String[] params) { - StringBuffer sb = new StringBuffer(); - HqlPack.getInPackString(String.join(",", params), colnumName, sb); - HqlPack.getNumEqualPack(WmsEnumUtil.IS_PART.IS_ADJUST.getValue(), "snControl", sb); - return sb.toString(); - } - /** * 封装公用查询参数 * @@ -54,27 +47,6 @@ public class WmsHqlPack { } /** - * 封装公用查询参数 - * - * @param bean 实体对象 - * @param hqlStr 查询语句 - * @return 封装完成的查询语句 - */ - public static String getStringBuilderPack(BaseBean bean, StringBuffer hqlStr) { - - // 判断工厂代码是否为空 - if (StringUtils.isNotBlank(bean.getOrganizeCode())) { - HqlPack.getStringEqualPack(bean.getOrganizeCode(), "organizeCode", hqlStr); - } - - // 封装有效状态和删除状态 - HqlPack.getNumEqualPack(bean.getIsValid(), "isValid", hqlStr); - HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", hqlStr); - - return hqlStr.toString(); - } - - /** * PO订单明细表 分页查询 * * @param wmsPOMasterDetails @@ -202,14 +174,14 @@ public class WmsHqlPack { * @param routingCode * @return */ - public static String packHqlWmsRoutingChildren(String routingCode) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsRoutingChildren(String routingCode) { + DdlPackBean result = new DdlPackBean(); - HqlPack.getStringEqualPack(routingCode, "routingCode", result); - HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), + DdlPreparedPack.getStringEqualPack(routingCode, "routingCode", result); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); - return result.toString(); + return result; } @@ -219,14 +191,14 @@ public class WmsHqlPack { * @param wmsRoutingMaster * @return */ - public static String packHqlWmsRoutingMaster(WmsRoutingMaster wmsRoutingMaster) { - StringBuffer result = new StringBuffer(); - HqlPack.getStringLikerPack(wmsRoutingMaster.getRoutingCode(), "routingCode", result); - HqlPack.getStringLikerPack(wmsRoutingMaster.getRoutingName(), "routingName", result); + public static DdlPackBean packHqlWmsRoutingMaster(WmsRoutingMaster wmsRoutingMaster) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringLikerPack(wmsRoutingMaster.getRoutingCode(), "routingCode", result); + DdlPreparedPack.getStringLikerPack(wmsRoutingMaster.getRoutingName(), "routingName", result); getStringBuilderPack(wmsRoutingMaster, result); - return result.toString(); + return result; } /** @@ -235,18 +207,18 @@ public class WmsHqlPack { * @param wmsPart * @return */ - public static String packHqlWmsPart(WmsPart wmsPart) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsPart(WmsPart wmsPart) { + DdlPackBean result = new DdlPackBean(); - HqlPack.getStringLikerPack(wmsPart.getPartNo(), "partNo", result); - HqlPack.getStringLikerPack(wmsPart.getPartName(), "partName", result); - HqlPack.getStringLikerPack(wmsPart.getPartSpec(), "partSpec", result); - HqlPack.getStringLikerPack(wmsPart.getPartType(), "partType", result); - HqlPack.getNumEqualPack(wmsPart.getSnControl(), "snControl", result); + DdlPreparedPack.getStringLikerPack(wmsPart.getPartNo(), "partNo", result); + DdlPreparedPack.getStringLikerPack(wmsPart.getPartName(), "partName", result); + DdlPreparedPack.getStringLikerPack(wmsPart.getPartSpec(), "partSpec", result); + DdlPreparedPack.getStringLikerPack(wmsPart.getPartType(), "partType", result); + DdlPreparedPack.getNumEqualPack(wmsPart.getSnControl(), "snControl", result); getStringBuilderPack(wmsPart, result); - return result.toString(); + return result; } /** @@ -293,26 +265,6 @@ public class WmsHqlPack { } /** - * 库存交易记录信息 分页查询 - * - * @param wmsTrans - * @return - */ - public static String packHqlWmsTrans(WmsTrans wmsTrans) { - StringBuffer result = new StringBuffer(); - - //查询参数封装 - HqlPack.getStringEqualPack(wmsTrans.getTransCode(), "transCode", result); - HqlPack.getStringEqualPack(wmsTrans.getSn(), "sn", result); - HqlPack.timeBuilder(wmsTrans.getCreateDatetime(), null, "createDatetime", result, true); - - getStringBuilderPack(wmsTrans, result); - - return result.toString(); - } - - - /** * 供应商分页查询 * * @param basVendor @@ -467,25 +419,6 @@ public class WmsHqlPack { return result; } - /** - * 供应商唯一性校验查询条件【用于添加和修改】 - * - * @param basVendor - * @return - */ - public static DdlPackBean packHqlBasVendorUnique(BasVendor basVendor) { - DdlPackBean result = new DdlPackBean(); - - DdlPreparedPack.getNumNOEqualPack(basVendor.getId(), "id", result); - DdlPreparedPack.getStringEqualPack(basVendor.getVendorNo(), "vendorNo", result); - DdlPreparedPack.getStringEqualPack(basVendor.getVendorName(), "vendorName", result); - DdlPreparedPack.getStringEqualPack(basVendor.getVendorDesc(), "vendorDesc", result); - - getStringBuilderPack(basVendor, result); - - return result; - } - public static DdlPackBean packHqlWmsOpTypeUnique(WmsOpType wmsOpType) { DdlPackBean result = new DdlPackBean(); @@ -498,38 +431,6 @@ public class WmsHqlPack { } /** - * 查询满足处理周期的作业类型 查询条件封装 - * - * @param wmsOpType - * @return - */ - public static String packHqlWmsOpTypeTime(WmsOpType wmsOpType) { - StringBuffer result = new StringBuffer(); - - getStringBuilderPack(wmsOpType, result); - result.append(" and isnull(model.lastTransTime) or timestampdiff(Minute,nvl(model.lastTransTime,'2000'),now()) >= model.cycleMins"); - return result.toString(); - } - - /** - * 作业任务数据来源 查询条件封装 - * - * @param wmsTaskSrc - * @return - */ - public static String packHqlWmsTaskSrc(WmsTaskSrc wmsTaskSrc) { - StringBuffer result = new StringBuffer(); - - //作业类型代码 - HqlPack.getStringLikerPack(wmsTaskSrc.getOpTypeCode(), "opTypeCode", result); - - getStringBuilderPack(wmsTaskSrc, result); - - return result.toString(); - } - - - /** * 客户信息 查询条件封装 * * @param basCustomer @@ -805,25 +706,25 @@ public class WmsHqlPack { * @param wmsAreaOwner 责任区分配信息 * @return 责任区分配信息 */ - public static String packHqlWmsAreaOwner(WmsAreaOwner wmsAreaOwner) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsAreaOwner(WmsAreaOwner wmsAreaOwner) { + DdlPackBean result = new DdlPackBean(); // 仓库代码 - HqlPack.getStringEqualPack(wmsAreaOwner.getWhNo(), "whNo", result); + DdlPreparedPack.getStringEqualPack(wmsAreaOwner.getWhNo(), "whNo", result); // 来源单据号 - HqlPack.getStringEqualPack(wmsAreaOwner.getZoneNo(), "zoneNo", result); + DdlPreparedPack.getStringEqualPack(wmsAreaOwner.getZoneNo(), "zoneNo", result); // 供应商编码 - HqlPack.getStringEqualPack(wmsAreaOwner.getVendorNo(), "vendorNo", result); + DdlPreparedPack.getStringEqualPack(wmsAreaOwner.getVendorNo(), "vendorNo", result); // 物料编码 - HqlPack.getStringEqualPack(wmsAreaOwner.getPartNo(), "partNo", result); + DdlPreparedPack.getStringEqualPack(wmsAreaOwner.getPartNo(), "partNo", result); // 负责人 - HqlPack.getStringEqualPack(wmsAreaOwner.getOwnerUserNo(), "ownerUserNo", result); + DdlPreparedPack.getStringEqualPack(wmsAreaOwner.getOwnerUserNo(), "ownerUserNo", result); // 是否预分配 - HqlPack.getNumEqualPack(wmsAreaOwner.getIsPreAssign(), "isPreAssign", result); + DdlPreparedPack.getNumEqualPack(wmsAreaOwner.getIsPreAssign(), "isPreAssign", result); getStringBuilderPack(wmsAreaOwner, result); - return result.toString(); + return result; } /** @@ -1373,22 +1274,6 @@ public class WmsHqlPack { } /** - * 按moveNo 取最后一笔插入的数据 - * - * @param wmsMoveSn - * @return - */ - public static String packHqlLastWmsMoveSn(WmsMoveSn wmsMoveSn) { - StringBuffer result = new StringBuffer(); - - HqlPack.getStringEqualPack(wmsMoveSn.getOrderNo(), "orderNo", result); - getStringBuilderPack(wmsMoveSn, result); - HqlPack.getOrderByPack(new Object[]{2}, new String[]{"createDatetime"}, result); - - return result.toString(); - } - - /** * 根据条件查询库存条码信息 * * @param wmsStockSn @@ -1590,19 +1475,19 @@ public class WmsHqlPack { * @param wmsTransModule * @return */ - public static String packHqlWmsTransModule(WmsTransModule wmsTransModule) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsTransModule(WmsTransModule wmsTransModule) { + DdlPackBean result = new DdlPackBean(); if (!Strings.isNullOrEmpty(wmsTransModule.getTmName())) { - HqlPack.getStringEqualPack(wmsTransModule.getTmName(), "tmName", result); + DdlPreparedPack.getStringEqualPack(wmsTransModule.getTmName(), "tmName", result); } if (!Strings.isNullOrEmpty(wmsTransModule.getCallClass())) { - HqlPack.getStringEqualPack(wmsTransModule.getCallClass(), "callClass", result); + DdlPreparedPack.getStringEqualPack(wmsTransModule.getCallClass(), "callClass", result); } if (!Strings.isNullOrEmpty(wmsTransModule.getTmDesc())) { - HqlPack.getStringLikerPack(wmsTransModule.getTmDesc(), "tmDesc", result); + DdlPreparedPack.getStringLikerPack(wmsTransModule.getTmDesc(), "tmDesc", result); } getStringBuilderPack(wmsTransModule, result); - return result.toString(); + return result; } /** From 24af646ad8beca66118c8a16889603a16a5f32ab Mon Sep 17 00:00:00 2001 From: Silliter Date: Fri, 10 May 2019 16:36:58 +0800 Subject: [PATCH 04/19] =?UTF-8?q?=E5=AE=89=E7=81=AF=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=BC=80=E5=8F=91=E7=8E=AF=E5=A2=83=E6=90=AD=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 6 ++++ .../bean/AndonAlarmType.java | 38 ++++++++++++++++++++++ .../repository/IAndonAlarmTypeRepository.java | 16 +++++++++ .../sqlpack/AndonHqlPack.java | 11 +++++++ 4 files changed, 71 insertions(+) create mode 100644 modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmType.java create mode 100644 modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonAlarmTypeRepository.java create mode 100644 modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index c31090b..ebd53c3 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -13,5 +13,11 @@ i3plus-pojo-andon jar + + + i3plus.pojo + i3plus-pojo-base + + \ No newline at end of file diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmType.java b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmType.java new file mode 100644 index 0000000..2fcbd73 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmType.java @@ -0,0 +1,38 @@ +package cn.estsh.i3plus.pojo.andon.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 : silliter.yuan + * @CreateDate : 2019-05-10 17:16 + * @Modify: + **/ +@Data +@Entity +@Table(name="ANDON_ALARM_TYPE") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value="安灯类型",description = "安灯类型") +public class AndonAlarmType extends BaseBean { + + @Column(name = "ALARM_CODE") + @ApiParam(value = "安灯类型代码") + private String alarmCode; + + @Column(name = "ALARM_NAME") + @ApiParam(value = "安灯类型名称") + private String alarmName; +} diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonAlarmTypeRepository.java b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonAlarmTypeRepository.java new file mode 100644 index 0000000..31afb4f --- /dev/null +++ b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonAlarmTypeRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.AndonAlarmType; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description :对象持久层仓用方法控制(安灯类型信息) + * @Reference : + * @Author : silliter.yuan + * @CreateDate : 2019-05-10 17:27 + * @Modify: + **/ +@Repository +public interface IAndonAlarmTypeRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java new file mode 100644 index 0000000..12b3098 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java @@ -0,0 +1,11 @@ +package cn.estsh.i3plus.pojo.andon.sqlpack; + +/** + * @Description : 安灯对象查询封装 + * @Reference : + * @Author : silliter.yuan + * @CreateDate : 2019-05-10 10:45 + * @Modify: + **/ +public class AndonHqlPack { +} From 4cf5fbc2b70a93ca9f844e23ff9def23a1ed6895 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Fri, 10 May 2019 16:57:08 +0800 Subject: [PATCH 05/19] =?UTF-8?q?#4091+=E6=B5=81=E7=A8=8B=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E5=A4=8D=E5=88=B6=E6=B5=81=E7=A8=8B+=E4=BD=9C?= =?UTF-8?q?=E4=B8=9A=E6=AD=A5=E9=AA=A4=E5=8F=82=E6=95=B0=EF=BC=8C=E4=BD=9C?= =?UTF-8?q?=E4=B8=9A=E7=BB=84=E4=BB=B6=EF=BC=8C=E4=BD=9C=E4=B8=9A=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E5=8F=82=E6=95=B0=EF=BC=8C=E4=BD=9C=E4=B8=9A=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 76 +++++++++++++++++----- .../estsh/i3plus/pojo/wms/bean/WmsActionGroup.java | 16 ----- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 3 +- 3 files changed, 62 insertions(+), 33 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index a7949c1..e8a6b83 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -139,17 +139,17 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MASTER_ORDER_STATUS { - CREATE(10, "CREATE","新建"), - RECEIPT(20, "RECEIPT","处理中"), - RECEIPT_FINISH(30, "RECEIPT_FINISH","已完成"), - CLOSED(40, "CLOSED","已关闭"), - CANCELLED(50, "CANCELLED","已取消"); + CREATE(10, "CREATE", "新建"), + RECEIPT(20, "RECEIPT", "处理中"), + RECEIPT_FINISH(30, "RECEIPT_FINISH", "已完成"), + CLOSED(40, "CLOSED", "已关闭"), + CANCELLED(50, "CANCELLED", "已取消"); private int value; private String code; private String description; - MASTER_ORDER_STATUS(int value,String code, String description) { + MASTER_ORDER_STATUS(int value, String code, String description) { this.value = value; this.code = code; this.description = description; @@ -670,6 +670,40 @@ public class WmsEnumUtil { } } + /** + * 作业组件参数：组件执行方法名称 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MODULE_METHOD_NAME { + EXECUTE("execute", "执行方法"), + GETOPTIONS("getOptions", "流程初始化方法"), + PROMPT("prompt", "初始化方法"), + GETLIST("getList", "获取列表数据"), + DOCOMPLETE("doComplete", "执行完成方法"), + SHOWINFORMATION("showInformation", "回显方法"), + INSTALL("install", "安装组件"), + UNINSTALL("unInstall", "卸载组件"); + private String value; + private String description; + + MODULE_METHOD_NAME(String value, String description) { + this.value = value; + this.description = description; + } + + public String getCode() { + return value; + } + + public String getDescription() { + return description; + } + + public String getValue() { + return value; + } + } + /** * 作业任务状态、移库单条码操作状态 @@ -1456,6 +1490,16 @@ public class WmsEnumUtil { } return tmp; } + + public static COMPONENT_TYPE switchGetValue(int val) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return null; + } } /** @@ -2109,11 +2153,11 @@ public class WmsEnumUtil { * 10=组件脚本，20=表单脚本，30=报表脚本，40=JOB脚本，50=其他脚本 */ public enum SCRIPT_TYPE { - MODUAL(10,"Modual","组件脚本"), - FORM(20,"Form","表单脚本"), - REPORT(30,"Report","报表脚本"), - JOB(40,"Job","JOB脚本"), - OTHER(50,"Other","其他脚本"); + MODUAL(10, "Modual", "组件脚本"), + FORM(20, "Form", "表单脚本"), + REPORT(30, "Report", "报表脚本"), + JOB(40, "Job", "JOB脚本"), + OTHER(50, "Other", "其他脚本"); private String description; private int value; @@ -2147,9 +2191,9 @@ public class WmsEnumUtil { * 10=Groovy, 20=Jython, 30=JavaScript, 40=Scala, 50=JRuby */ public enum LANGUAGE_TYPE { - GROOVY(1,"Groovy", 10), - PYTHON(2,"Python", 20), - JS(3,"JavaScript", 30); + GROOVY(1, "Groovy", 10), + PYTHON(2, "Python", 20), + JS(3, "JavaScript", 30); // 下面这2种语言没人会写，暂不支持 //SCALA(40,"scala"), //JRUBY(50,"jruby"); @@ -2194,9 +2238,9 @@ public class WmsEnumUtil { * 2.BUSI：业务参数 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum WMS_CONFIG_TYPE{ + public enum WMS_CONFIG_TYPE { - SYSTEM(10,"系统参数","系统参数"), + SYSTEM(10, "系统参数", "系统参数"), BUSI(20, "业务参数", "业务参数"); private int value; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java index eef67a2..c858ba4 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java @@ -108,20 +108,4 @@ public class WmsActionGroup extends BaseBean { public WmsActionGroup() { } - -// public WmsActionGroup(String agNameE, String agDescE, String agNameC, String agDescC, Integer autoInit, Long initAmId, String initAmName, Long detailsAmId, String detailsAmName, Long submitAmId, String submitAmName, Long endAmId, String endAmName) { -// this.agNameE = agNameE; -// this.agDescE = agDescE; -// this.agNameC = agNameC; -// this.agDescC = agDescC; -// this.autoInit = autoInit; -// this.initAmId = initAmId; -// this.initAmName = initAmName; -// this.detailsAmId = detailsAmId; -// this.detailsAmName = detailsAmName; -// this.submitAmId = submitAmId; -// this.submitAmName = submitAmName; -// this.endAmId = endAmId; -// this.endAmName = endAmName; -// } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index ec7c7fc..90f18cd 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -1238,7 +1238,8 @@ public class WmsHqlPack { DdlPackBean result = new DdlPackBean(); //查询参数封装 - DdlPreparedPack.getStringEqualPack(wmsActionStepType.getAtNameC(), "atNameC", result); + DdlPreparedPack.getStringLikerPack(wmsActionStepType.getAtNameC(), "atNameC", result); + DdlPreparedPack.getStringLikerPack(wmsActionStepType.getFunCallName(), "funCallName", result); getStringBuilderPack(wmsActionStepType, result); From c5093b073cf4be4b2842f7e4ac0f58800bf36e4c Mon Sep 17 00:00:00 2001 From: Silliter Date: Fri, 10 May 2019 17:08:18 +0800 Subject: [PATCH 06/19] =?UTF-8?q?=E5=AE=89=E7=81=AF=E5=AE=9E=E4=BD=93?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmType.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmType.java b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmType.java index 2fcbd73..821efb7 100644 --- a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmType.java +++ b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmType.java @@ -25,7 +25,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Api(value="安灯类型",description = "安灯类型") +@Api("安灯类型") public class AndonAlarmType extends BaseBean { @Column(name = "ALARM_CODE") From 30db0904a4577fd26c668152d8f572e44d83ccd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= Date: Fri, 10 May 2019 18:08:48 +0800 Subject: [PATCH 07/19] =?UTF-8?q?ANDON=E5=AE=9E=E4=BD=93=E5=88=9B=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn.estsh.i3plus.pojo.andon/bean/AndonPLC.java | 74 +++++++++++++++++++ .../bean/AndonPLCRecord.java | 82 ++++++++++++++++++++++ 2 files changed, 156 insertions(+) create mode 100644 modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLC.java create mode 100644 modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLCRecord.java diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLC.java b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLC.java new file mode 100644 index 0000000..ae88bf0 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLC.java @@ -0,0 +1,74 @@ +package cn.estsh.i3plus.pojo.andon.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 : ANDON_PLC控制 + * @Reference : + * @Author : hansen.ke + * @CreateDate : 2019-05-10 17:32 + * @Modify: + **/ +@Data +@Entity +@Table(name="ANDON_PLC") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api("安灯PLC控制") +public class AndonPLC extends BaseBean { + + @Column(name = "WORK_CENTER_CODE") + @ApiParam(value = "工作中心代码") + private String workCenterCode; + + @Column(name = "WORK_CENTER_NAME") + @ApiParam(value = "工作中心名称") + private String workCenterName; + + @Column(name = "WORK_CELL_CODE") + @ApiParam(value = "工作单元代码") + private String workCellCode; + + @Column(name = "WORK_CELL_NAME") + @ApiParam(value = "工作单元名称") + private String workCellName; + + @Column(name = "NODE_CODE") + @ApiParam(value = "控制节点代码") + private String nodeCode; + + @Column(name = "NODE_IP") + @ApiParam(value = "IP地址") + private String nodeIP; + + @Column(name = "CHANNEL_NAME") + @ApiParam(value = "通道名称") + private String channelName; + + @Column(name = "TAG_NAME") + @ApiParam(value = "标签名称") + private String tagName; + + @Column(name = "TAG_ADDRESS") + @ApiParam(value = "标签地址") + private String tagAddress; + + @Column(name = "TAG_TYPE") + @ApiParam(value = "标签类型") + private String tagType; + + @Column(name = "GROUP_NO") + @ApiParam(value = "分组号") + private String groupNo; +} diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLCRecord.java b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLCRecord.java new file mode 100644 index 0000000..daf03f5 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLCRecord.java @@ -0,0 +1,82 @@ +package cn.estsh.i3plus.pojo.andon.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 : ANDON_PLC监控记录 + * @Reference : + * @Author : hansen.ke + * @CreateDate : 2019-05-10 17:58 + * @Modify: + **/ +@Data +@Entity +@Table(name="ANDON_PLC_RECORD") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api("安灯PLC控制") +public class AndonPLCRecord extends BaseBean { + + @Column(name = "WORK_CENTER_CODE") + @ApiParam(value = "工作中心代码") + private String workCenterCode; + + @Column(name = "WORK_CENTER_NAME") + @ApiParam(value = "工作中心名称") + private String workCenterName; + + @Column(name = "WORK_CELL_CODE") + @ApiParam(value = "工作单元代码") + private String workCellCode; + + @Column(name = "WORK_CELL_NAME") + @ApiParam(value = "工作单元名称") + private String workCellName; + + @Column(name = "NODE_CODE") + @ApiParam(value = "控制节点代码") + private String nodeCode; + + @Column(name = "NODE_IP") + @ApiParam(value = "IP地址") + private String nodeIP; + + @Column(name = "CHANNEL_NAME") + @ApiParam(value = "通道名称") + private String channelName; + + @Column(name = "TAG_NAME") + @ApiParam(value = "标签名称") + private String tagName; + + @Column(name = "TAG_ADDRESS") + @ApiParam(value = "标签地址") + private String tagAddress; + + @Column(name = "TAG_TYPE") + @ApiParam(value = "标签类型") + private String tagType; + + @Column(name = "GROUP_NO") + @ApiParam(value = "分组号") + private String groupNo; + + @Column(name = "TAG_VALUE") + @ApiParam(value = "标签数值") + private String tagValue; + + @Column(name = "TAG_POINT") + @ApiParam(value = "传递方向") + private String tagPoint; +} From 5ef8089c02ff48646eec7cac25e9918e960ae0ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= Date: Fri, 10 May 2019 18:09:20 +0800 Subject: [PATCH 08/19] =?UTF-8?q?ANDON=E5=AE=9E=E4=BD=93=E5=88=9B=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLCRecord.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLCRecord.java b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLCRecord.java index daf03f5..4390a91 100644 --- a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLCRecord.java +++ b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLCRecord.java @@ -25,7 +25,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Api("安灯PLC控制") +@Api("安灯PLC监控记录") public class AndonPLCRecord extends BaseBean { @Column(name = "WORK_CENTER_CODE") From 81821c70a8aad2c0a83acb16f8c2588b42061abe Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Fri, 10 May 2019 19:51:29 +0800 Subject: [PATCH 09/19] =?UTF-8?q?=E7=A7=BB=E5=BA=93=E5=8D=95=20=E7=94=9F?= =?UTF-8?q?=E6=88=90=E6=9D=A1=E7=A0=81=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index adbb369..2108003 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java @@ -170,6 +170,18 @@ public class WmsDocMovementDetails extends BaseBean { @Transient public Double inputMoveQty; + @Transient + @ApiParam(value ="标准包装",example = "1") + private Double snp; + + @Transient + @ApiParam(value ="条码总数量",example = "1") + private Double detailsSnCount; + + @Transient + @ApiParam(value ="余数",example = "1") + private Double restQty; + public String getRecommondLot() { return recommondLot == null ? "无" : this.recommondLot; } From 571ad144b7af348776bdddceaa0dcd173b6399ae Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Sat, 11 May 2019 15:02:16 +0800 Subject: [PATCH 10/19] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: crish <570360737@qq.com> --- .../main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 8 ++++++-- 1 file changed, 6 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 63e0908..a014e55 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 @@ -172,15 +172,19 @@ public class MesHqlPack { if (StringUtils.isNotEmpty(mesQueueOrder.getCustFlagNoEnd() + "")) { DdlPreparedPack.getStringSmallerPack(mesQueueOrder.getCustFlagNoEnd(), "custFlagNo", packBean); } + + // 只查询创建状态的队列 DdlPreparedPack.getNumEqualPack(MesEnumUtil.QUEUE_ORDER_STATUS.NORMAL.getValue(), "status", packBean); + // 时间段查询 DdlPreparedPack.timeBuilder( mesQueueOrder.getCreateDateTimeStart(), mesQueueOrder.getCreateDateTimeEnd(), "createDatetime", packBean, true); - DdlPreparedPack.getOrderDefault(mesQueueOrder); - DdlPreparedPack.getOrderByPack(new Object[]{"2"},new String[]{mesQueueOrder.getOrderByParam()} , packBean); + // DdlPreparedPack.getOrderDefault(mesQueueOrder); + // 按照队列序列号倒序 + DdlPreparedPack.getOrderByPack(new Object[]{"2"},new String[]{"seq"} , packBean); return packBean; } } From dd477bdf942964ed0a5f5857812a53cf392ffc93 Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Mon, 13 May 2019 09:21:53 +0800 Subject: [PATCH 11/19] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=AE=A1=E5=88=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: crish <570360737@qq.com> --- .../src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 4 ++-- 1 file changed, 2 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 a014e55..ea79718 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 @@ -45,10 +45,10 @@ public class MesHqlPack { DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", packBean); if (StringUtils.isNotEmpty(mesPlanOrder.getOrderNo())) { - DdlPreparedPack.getStringEqualPack(mesPlanOrder.getOrderNo(), "orderNo", packBean); + DdlPreparedPack.getStringLikerPack(mesPlanOrder.getOrderNo(), "orderNo", packBean); } if (StringUtils.isNotEmpty(mesPlanOrder.getPartNo())) { - DdlPreparedPack.getStringEqualPack(mesPlanOrder.getPartNo(), "partNo", packBean); + DdlPreparedPack.getStringLikerPack(mesPlanOrder.getPartNo(), "partNo", packBean); } if (StringUtils.isNotEmpty(mesPlanOrder.getPlanType() + "") && mesPlanOrder.getPlanTypeVal() != 0) { DdlPreparedPack.getNumEqualPack(mesPlanOrder.getPlanType(), "planType", packBean); From 97aa0ea44c485696c33fbd72a83546212c405405 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= Date: Mon, 13 May 2019 10:27:00 +0800 Subject: [PATCH 12/19] =?UTF-8?q?ANDON=E5=AE=9E=E4=BD=93=E5=88=9B=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bean/AndonAction.java | 38 +++++++++++++++ .../bean/AndonAlarmCause.java | 42 +++++++++++++++++ .../bean/AndonAlarmResponseCfg.java | 54 ++++++++++++++++++++++ .../bean/AndonEventCause.java | 42 +++++++++++++++++ .../bean/AndonHaltType.java | 38 +++++++++++++++ 5 files changed, 214 insertions(+) create mode 100644 modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonAction.java create mode 100644 modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmCause.java create mode 100644 modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmResponseCfg.java create mode 100644 modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonEventCause.java create mode 100644 modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonHaltType.java diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonAction.java b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonAction.java new file mode 100644 index 0000000..cb8c0b6 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonAction.java @@ -0,0 +1,38 @@ +package cn.estsh.i3plus.pojo.andon.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 : ANDON_动作 + * @Reference : + * @Author : hansen.ke + * @CreateDate : 2019-05-13 9:47 + * @Modify: + **/ +@Data +@Entity +@Table(name="ANDON_ACTION") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api("ANDON_动作") +public class AndonAction extends BaseBean { + + @Column(name = "ACTION_CODE") + @ApiParam(value = "动作代码") + private String actionCode; + + @Column(name = "ACTION_NAME") + @ApiParam(value = "动作名称") + private String actionName; +} diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmCause.java b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmCause.java new file mode 100644 index 0000000..5487c78 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmCause.java @@ -0,0 +1,42 @@ +package cn.estsh.i3plus.pojo.andon.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 : ANDON_呼叫原因 + * @Reference : + * @Author : hansen.ke + * @CreateDate : 2019-05-13 9:50 + * @Modify: + **/ +@Data +@Entity +@Table(name="ANDON_ALARM_CAUSE") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api("ANDON_呼叫原因") +public class AndonAlarmCause extends BaseBean { + + @Column(name = "AC_CODE") + @ApiParam(value = "呼叫原因代码") + private String acCode; + + @Column(name = "AC_NAME") + @ApiParam(value = "呼叫原因描述") + private String acName; + + @Column(name = "PARENT_AC_CODE") + @ApiParam(value = "父阶原因代码") + private String parentAcCode; +} diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmResponseCfg.java b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmResponseCfg.java new file mode 100644 index 0000000..091ddec --- /dev/null +++ b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmResponseCfg.java @@ -0,0 +1,54 @@ +package cn.estsh.i3plus.pojo.andon.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 : ANDON_呼叫通知配置 + * @Reference : + * @Author : hansen.ke + * @CreateDate : 2019-05-13 9:53 + * @Modify: + **/ +@Data +@Entity +@Table(name="ANDON_ALARM_RESPONSE_CFG") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api("ANDON_呼叫通知配置") +public class AndonAlarmResponseCfg extends BaseBean { + + @Column(name = "ALARM_CODE") + @ApiParam(value = "安灯类型代码") + private String alarmCode; + + @Column(name = "ANDON_STATUS") + @ApiParam(value = "安灯状态") + private String andonStatus; + + @Column(name = "RP_WHERE") + @ApiParam(value = "通知条件时长") + private String rpWhere; + + @Column(name = "RP_CODE") + @ApiParam(value = "通知方式代码") + private String rpCode; + + @Column(name = "RP_OBJECT_CODE") + @ApiParam(value = "通知对象代码") + private String rpObjectCode; + + @Column(name = "RP_LEVEL") + @ApiParam(value = "通知级别") + private String rpLevel; +} diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonEventCause.java b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonEventCause.java new file mode 100644 index 0000000..1ed305d --- /dev/null +++ b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonEventCause.java @@ -0,0 +1,42 @@ +package cn.estsh.i3plus.pojo.andon.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 : ANDON_事件原因 + * @Reference : + * @Author : hansen.ke + * @CreateDate : 2019-05-13 9:40 + * @Modify: + **/ +@Data +@Entity +@Table(name="ANDON_EVENT_CAUSE") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api("ANDON_事件原因") +public class AndonEventCause extends BaseBean { + + @Column(name = "EC_CODE") + @ApiParam(value = "事件原因代码") + private String ecCode; + + @Column(name = "EC_NAME") + @ApiParam(value = "事件原因描述") + private String ecName; + + @Column(name = "PARENT_EC_CODE") + @ApiParam(value = "父阶原因代码") + private String parentEcCode; +} diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonHaltType.java b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonHaltType.java new file mode 100644 index 0000000..962309b --- /dev/null +++ b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonHaltType.java @@ -0,0 +1,38 @@ +package cn.estsh.i3plus.pojo.andon.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 : ANDON_停机类型 + * @Reference : + * @Author : hansen.ke + * @CreateDate : 2019-05-13 9:45 + * @Modify: + **/ +@Data +@Entity +@Table(name="ANDON_HALT_TYPE") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api("ANDON_停机类型") +public class AndonHaltType extends BaseBean { + + @Column(name = "HALT_CODE") + @ApiParam(value = "停机类型代码") + private String haltCode; + + @Column(name = "HALT_NAME") + @ApiParam(value = "停机类型名称") + private String haltName; +} From f89090c40ef48b9bec78927fe8ff0c0f57d5e9a1 Mon Sep 17 00:00:00 2001 From: Silliter Date: Mon, 13 May 2019 11:11:13 +0800 Subject: [PATCH 13/19] =?UTF-8?q?=E6=8C=89=E7=81=AF=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=AE=9E=E4=BD=93=E5=88=9B=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bean/AndonManageQueue.java | 219 +++++++++++++++++++++ .../bean/AndonManageRecord.java | 219 +++++++++++++++++++++ .../bean/AndonResponse.java | 38 ++++ .../bean/AndonResponseObject.java | 42 ++++ .../bean/AndonStatus.java | 38 ++++ .../repository/IAndonManagetQueueRepository.java | 16 ++ .../repository/IAndonManagetRecordRepository.java | 16 ++ .../repository/IAndonResponseObjectRepository.java | 16 ++ .../repository/IAndonResponseRepository.java | 16 ++ .../repository/IAndonStatusRepository.java | 16 ++ 10 files changed, 636 insertions(+) create mode 100644 modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java create mode 100644 modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageRecord.java create mode 100644 modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonResponse.java create mode 100644 modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonResponseObject.java create mode 100644 modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonStatus.java create mode 100644 modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonManagetQueueRepository.java create mode 100644 modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonManagetRecordRepository.java create mode 100644 modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonResponseObjectRepository.java create mode 100644 modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonResponseRepository.java create mode 100644 modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonStatusRepository.java diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java new file mode 100644 index 0000000..b241d49 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java @@ -0,0 +1,219 @@ +package cn.estsh.i3plus.pojo.andon.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; + +/** + * @Description : 安灯队列 + * @Reference : + * @Author : silliter.yuan + * @CreateDate : 2019-05-10 17:16 + * @Modify: + **/ +@Data +@Entity +@Table(name="ANDON_MANAGE_QUEUE") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api("安灯队列") +public class AndonManageQueue extends BaseBean { + + @Column(name = "ANDON_ORDER_NO") + @ApiParam(value = "安灯队列编号") + private String andonOrderNo; + + @Column(name = "ALARM_CODE") + @ApiParam(value = "安灯类型") + private String alarmCode; + + @Column(name = "ACTION_CODE") + @ApiParam(value = "安灯动作代码") + private String actionCode; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam(value = "工作中心代码") + private String workCenterCode; + + @Column(name = "WORK_CENTER_NAME_RDD") + @ApiParam(value = "工作中心名称") + private String workCenterNameRdd; + + @Column(name = "WORK_CELL_NAME_RDD") + @ApiParam(value = "工作单元名称") + private String workCellNameRdd; + + @Column(name = "WORK_CELL_CODE") + @ApiParam(value = "工作单元代码") + private String workCellCode; + + @Column(name = "EQUIPMENT_CODE") + @ApiParam(value = "设备代码") + private String equipmentCode; + + @Column(name = "EQUIPMENT_NAME_RDD") + @ApiParam(value = "设备名称") + private String equipmentNameRdd; + + @Column(name = "SHIFT_CODE") + @ApiParam(value = "班次代码") + private String shiftCode; + + @Column(name = "SHIFT_NAME_RDD") + @ApiParam(value = "班次名称") + private String shiftNameRdd; + + @Column(name = "STATUS_CODE") + @ApiParam(value = "安灯状态代码") + private String statusCode; + + @Column(name = "SEQ") + @ApiParam(value = "序号", example = "1") + private Double seq; + + @Column(name = "PRIORITY_LEVEL") + @ApiParam(value = "优先级别", example = "1") + private Integer priorityLevel; + + @Column(name="CALL_TIME",updatable = false) + @ApiParam(value = "呼叫时间") + @AnnoOutputColumn(hidden = true) + public String callTime; + + @Transient + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value="呼叫时间",example = "2018-01-01 01:00:00") + @AnnoOutputColumn(hidden = true) + public String callTimeStr; + + @Column(name="CONFIRM_TIME",updatable = false) + @ApiParam(value = "响应时间") + @AnnoOutputColumn(hidden = true) + public String confirmTime; + + @Transient + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value="响应时间",example = "2018-01-01 01:00:00") + @AnnoOutputColumn(hidden = true) + public String confirmTimeStr; + + @Column(name="RESET_TIME",updatable = false) + @ApiParam(value = "解决时间") + @AnnoOutputColumn(hidden = true) + public String resetTime; + + @Transient + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value="解决时间",example = "2018-01-01 01:00:00") + @AnnoOutputColumn(hidden = true) + public String resetTimeStr; + + @Column(name = "CALL_USER") + @ApiParam(value = "呼叫人") + private String callUser; + + @Column(name = "CONFIRM_USER") + @ApiParam(value = "响应人") + private String confirmUser; + + @Column(name = "RESET_USER") + @ApiParam(value = "解决人") + private String resetUser; + + @Column(name = "IS_SHIFT_CALL") + @ApiParam(value = "是否转呼", example = "1") + private Integer isShiftCall; + + @Column(name="SHIFT_CALL_TIME",updatable = false) + @ApiParam(value = "转呼时间") + @AnnoOutputColumn(hidden = true) + public String shiftCallTime; + + @Transient + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value="转呼时间",example = "2018-01-01 01:00:00") + @AnnoOutputColumn(hidden = true) + public String shiftCallTimeStr; + + @Column(name = "RP_OBJECT_CODE") + @ApiParam(value = "转呼对象代码") + private String rpObjectCode; + + @Column(name = "SC_RESPONSE_CODE") + @ApiParam(value = "转呼响应方式") + private String scObjectCode; + + @Column(name = "SC_RP_LEVEL") + @ApiParam(value = "转呼通知等级") + private String scRpLevel; + + @Column(name = "AC_CODE") + @ApiParam(value = "呼叫原因代码") + private String acCode; + + @Column(name = "AC_NAME_RDD") + @ApiParam(value = "呼叫原因描述") + private String acNameRdd; + + @Column(name = "AC_DESC") + @ApiParam(value = "呼叫具体原因") + private String acDesc; + + @Column(name = "EC_CODE") + @ApiParam(value = "事件原因代码") + private String ecCode; + + @Column(name = "EC_NAME_RDD") + @ApiParam(value = "事件原因描述") + private String ecNameRdd; + + @Column(name = "EC_DESC") + @ApiParam(value = "事件具体原因") + private String ec_desc; + + @Column(name = "EM_CODE") + @ApiParam(value = "事件方法代码") + private String emCode; + + @Column(name = "EM_NAME_RDD") + @ApiParam(value = "事件方法描述") + private String emNameRdd; + + @Column(name = "EM_DESC") + @ApiParam(value = "事件具体方法") + private String emDesc; + + @Column(name = "IS_HALT") + @ApiParam(value = "是否停机", example = "1") + private Integer isHalt; + + @Column(name = "HALT_CODE") + @ApiParam(value = "停机类型") + private String haltCode; + + @Column(name = "HALT_DESC") + @ApiParam(value = "停机具体原因") + private String haltDesc; + + // 是否转呼 + public Integer getIsShiftCall() { + return this.isShiftCall == null ? 0 : this.isShiftCall; + } + + // 获取优先级别 + public Integer getPriorityLevel() { + return this.priorityLevel == null ? 0 : this.priorityLevel; + } +} diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageRecord.java b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageRecord.java new file mode 100644 index 0000000..38e3bbd --- /dev/null +++ b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageRecord.java @@ -0,0 +1,219 @@ +package cn.estsh.i3plus.pojo.andon.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; + +/** + * @Description : 安灯记录 + * @Reference : + * @Author : silliter.yuan + * @CreateDate : 2019-05-10 17:16 + * @Modify: + **/ +@Data +@Entity +@Table(name="ANDON_MANAGE_RECORD") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api("安灯记录") +public class AndonManageRecord extends BaseBean { + + @Column(name = "ANDON_ORDER_NO") + @ApiParam(value = "安灯队列编号") + private String andonOrderNo; + + @Column(name = "ALARM_CODE") + @ApiParam(value = "安灯类型") + private String alarmCode; + + @Column(name = "ACTION_CODE") + @ApiParam(value = "安灯动作代码") + private String actionCode; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam(value = "工作中心代码") + private String workCenterCode; + + @Column(name = "WORK_CENTER_NAME_RDD") + @ApiParam(value = "工作中心名称") + private String workCenterNameRdd; + + @Column(name = "WORK_CELL_NAME_RDD") + @ApiParam(value = "工作单元名称") + private String workCellNameRdd; + + @Column(name = "WORK_CELL_CODE") + @ApiParam(value = "工作单元代码") + private String workCellCode; + + @Column(name = "EQUIPMENT_CODE") + @ApiParam(value = "设备代码") + private String equipmentCode; + + @Column(name = "EQUIPMENT_NAME_RDD") + @ApiParam(value = "设备名称") + private String equipmentNameRdd; + + @Column(name = "SHIFT_CODE") + @ApiParam(value = "班次代码") + private String shiftCode; + + @Column(name = "SHIFT_NAME_RDD") + @ApiParam(value = "班次名称") + private String shiftNameRdd; + + @Column(name = "STATUS_CODE") + @ApiParam(value = "安灯状态代码") + private String statusCode; + + @Column(name = "SEQ") + @ApiParam(value = "序号", example = "1") + private Double seq; + + @Column(name = "PRIORITY_LEVEL") + @ApiParam(value = "优先级别", example = "1") + private Integer priorityLevel; + + @Column(name="CALL_TIME",updatable = false) + @ApiParam(value = "呼叫时间") + @AnnoOutputColumn(hidden = true) + public String callTime; + + @Transient + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value="呼叫时间",example = "2018-01-01 01:00:00") + @AnnoOutputColumn(hidden = true) + public String callTimeStr; + + @Column(name="CONFIRM_TIME",updatable = false) + @ApiParam(value = "响应时间") + @AnnoOutputColumn(hidden = true) + public String confirmTime; + + @Transient + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value="响应时间",example = "2018-01-01 01:00:00") + @AnnoOutputColumn(hidden = true) + public String confirmTimeStr; + + @Column(name="RESET_TIME",updatable = false) + @ApiParam(value = "解决时间") + @AnnoOutputColumn(hidden = true) + public String resetTime; + + @Transient + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value="解决时间",example = "2018-01-01 01:00:00") + @AnnoOutputColumn(hidden = true) + public String resetTimeStr; + + @Column(name = "CALL_USER") + @ApiParam(value = "呼叫人") + private String callUser; + + @Column(name = "CONFIRM_USER") + @ApiParam(value = "响应人") + private String confirmUser; + + @Column(name = "RESET_USER") + @ApiParam(value = "解决人") + private String resetUser; + + @Column(name = "IS_SHIFT_CALL") + @ApiParam(value = "是否转呼", example = "1") + private Integer isShiftCall; + + @Column(name="SHIFT_CALL_TIME",updatable = false) + @ApiParam(value = "转呼时间") + @AnnoOutputColumn(hidden = true) + public String shiftCallTime; + + @Transient + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value="转呼时间",example = "2018-01-01 01:00:00") + @AnnoOutputColumn(hidden = true) + public String shiftCallTimeStr; + + @Column(name = "RP_OBJECT_CODE") + @ApiParam(value = "转呼对象代码") + private String rpObjectCode; + + @Column(name = "SC_RESPONSE_CODE") + @ApiParam(value = "转呼响应方式") + private String scObjectCode; + + @Column(name = "SC_RP_LEVEL") + @ApiParam(value = "转呼通知等级") + private String scRpLevel; + + @Column(name = "AC_CODE") + @ApiParam(value = "呼叫原因代码") + private String acCode; + + @Column(name = "AC_NAME_RDD") + @ApiParam(value = "呼叫原因描述") + private String acNameRdd; + + @Column(name = "AC_DESC") + @ApiParam(value = "呼叫具体原因") + private String acDesc; + + @Column(name = "EC_CODE") + @ApiParam(value = "事件原因代码") + private String ecCode; + + @Column(name = "EC_NAME_RDD") + @ApiParam(value = "事件原因描述") + private String ecNameRdd; + + @Column(name = "EC_DESC") + @ApiParam(value = "事件具体原因") + private String ec_desc; + + @Column(name = "EM_CODE") + @ApiParam(value = "事件方法代码") + private String emCode; + + @Column(name = "EM_NAME_RDD") + @ApiParam(value = "事件方法描述") + private String emNameRdd; + + @Column(name = "EM_DESC") + @ApiParam(value = "事件具体方法") + private String emDesc; + + @Column(name = "IS_HALT") + @ApiParam(value = "是否停机", example = "1") + private Integer isHalt; + + @Column(name = "HALT_CODE") + @ApiParam(value = "停机类型") + private String haltCode; + + @Column(name = "HALT_DESC") + @ApiParam(value = "停机具体原因") + private String haltDesc; + + // 是否转呼 + public Integer getIsShiftCall() { + return this.isShiftCall == null ? 0 : this.isShiftCall; + } + + // 获取优先级别 + public Integer getPriorityLevel() { + return this.priorityLevel == null ? 0 : this.priorityLevel; + } +} diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonResponse.java b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonResponse.java new file mode 100644 index 0000000..e3e23ba --- /dev/null +++ b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonResponse.java @@ -0,0 +1,38 @@ +package cn.estsh.i3plus.pojo.andon.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 : silliter.yuan + * @CreateDate : 2019-05-10 17:16 + * @Modify: + **/ +@Data +@Entity +@Table(name="ANDON_RESPONSE") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api("安灯通知方式") +public class AndonResponse extends BaseBean { + + @Column(name = "RESPONSE_CODE") + @ApiParam(value = "通知方式代码") + private String responseCode; + + @Column(name = "RESPONSE_NAME") + @ApiParam(value = "通知方式名称") + private String responseName; +} diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonResponseObject.java b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonResponseObject.java new file mode 100644 index 0000000..fda0737 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonResponseObject.java @@ -0,0 +1,42 @@ +package cn.estsh.i3plus.pojo.andon.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 : silliter.yuan + * @CreateDate : 2019-05-10 17:16 + * @Modify: + **/ +@Data +@Entity +@Table(name="ANDON_RESPONSE_OBJECT") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api("安灯通知对象") +public class AndonResponseObject extends BaseBean { + + @Column(name = "RP_OBJECT_CODE") + @ApiParam(value = "对象代码") + private String rpObjectCode; + + @Column(name = "RP_OBJECT_NAME") + @ApiParam(value = "对象名称") + private String rpObjectName; + + @Column(name = "RP_OBJECT_VALUE") + @ApiParam(value = "对象值") + private String rpObjectValue; +} diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonStatus.java b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonStatus.java new file mode 100644 index 0000000..a5ee2db --- /dev/null +++ b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonStatus.java @@ -0,0 +1,38 @@ +package cn.estsh.i3plus.pojo.andon.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 : silliter.yuan + * @CreateDate : 2019-05-10 17:16 + * @Modify: + **/ +@Data +@Entity +@Table(name="ANDON_STATUS") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api("安灯状态") +public class AndonStatus extends BaseBean { + + @Column(name = "STATUS_CODE") + @ApiParam(value = "状态代码") + private String statusCode; + + @Column(name = "STATUS_NAME") + @ApiParam(value = "状态名称") + private String statusName; +} diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonManagetQueueRepository.java b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonManagetQueueRepository.java new file mode 100644 index 0000000..e4027cc --- /dev/null +++ b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonManagetQueueRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.AndonManageQueue; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description :对象持久层仓用方法控制(安灯队列信息) + * @Reference : + * @Author : silliter.yuan + * @CreateDate : 2019-05-10 17:27 + * @Modify: + **/ +@Repository +public interface IAndonManagetQueueRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonManagetRecordRepository.java b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonManagetRecordRepository.java new file mode 100644 index 0000000..13623d0 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonManagetRecordRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.AndonManageRecord; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description :对象持久层仓用方法控制(安灯记录信息) + * @Reference : + * @Author : silliter.yuan + * @CreateDate : 2019-05-10 17:27 + * @Modify: + **/ +@Repository +public interface IAndonManagetRecordRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonResponseObjectRepository.java b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonResponseObjectRepository.java new file mode 100644 index 0000000..76723f9 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonResponseObjectRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.AndonResponseObject; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description :对象持久层仓用方法控制(安灯通知对象信息) + * @Reference : + * @Author : silliter.yuan + * @CreateDate : 2019-05-10 17:27 + * @Modify: + **/ +@Repository +public interface IAndonResponseObjectRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonResponseRepository.java b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonResponseRepository.java new file mode 100644 index 0000000..3c2dc3d --- /dev/null +++ b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonResponseRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.AndonResponse; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description :对象持久层仓用方法控制(安灯通知方式信息) + * @Reference : + * @Author : silliter.yuan + * @CreateDate : 2019-05-10 17:27 + * @Modify: + **/ +@Repository +public interface IAndonResponseRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonStatusRepository.java b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonStatusRepository.java new file mode 100644 index 0000000..e33d81f --- /dev/null +++ b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonStatusRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.AndonStatus; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description :对象持久层仓用方法控制(安灯状态信息) + * @Reference : + * @Author : silliter.yuan + * @CreateDate : 2019-05-10 17:27 + * @Modify: + **/ +@Repository +public interface IAndonStatusRepository extends BaseRepository { +} From f6c90bd96b3fd2381af8cd58e0c5b2d6129b195f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= Date: Mon, 13 May 2019 11:17:50 +0800 Subject: [PATCH 14/19] =?UTF-8?q?ANDON=E5=88=9B=E5=BB=BAdao?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repository/IAndonActionRepository.java | 16 ++++++++++++++++ .../repository/IAndonAlarmCauseRepository.java | 16 ++++++++++++++++ .../repository/IAndonAlarmResponseCfgRepository.java | 16 ++++++++++++++++ .../repository/IAndonEventCauseRepository.java | 16 ++++++++++++++++ .../repository/IAndonHaltTypeRepository.java | 16 ++++++++++++++++ .../repository/IAndonPLCRecordRepository.java | 16 ++++++++++++++++ .../repository/IAndonPLCRepository.java | 16 ++++++++++++++++ 7 files changed, 112 insertions(+) create mode 100644 modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonActionRepository.java create mode 100644 modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonAlarmCauseRepository.java create mode 100644 modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonAlarmResponseCfgRepository.java create mode 100644 modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonEventCauseRepository.java create mode 100644 modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonHaltTypeRepository.java create mode 100644 modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonPLCRecordRepository.java create mode 100644 modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonPLCRepository.java diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonActionRepository.java b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonActionRepository.java new file mode 100644 index 0000000..008a3ca --- /dev/null +++ b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonActionRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.AndonAction; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description : 对象持久层仓用方法控制（ANDON_动作） + * @Reference : + * @Author : hansen.ke + * @CreateDate : 2019-05-13 11:05 + * @Modify: + **/ +@Repository +public interface IAndonActionRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonAlarmCauseRepository.java b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonAlarmCauseRepository.java new file mode 100644 index 0000000..840cb42 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonAlarmCauseRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.AndonAlarmCause; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description : 对象持久层仓用方法控制（ANDON_呼叫原因） + * @Reference : + * @Author : hansen.ke + * @CreateDate : 2019-05-13 11:07 + * @Modify: + **/ +@Repository +public interface IAndonAlarmCauseRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonAlarmResponseCfgRepository.java b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonAlarmResponseCfgRepository.java new file mode 100644 index 0000000..65109cf --- /dev/null +++ b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonAlarmResponseCfgRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.AndonAlarmResponseCfg; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description : 对象持久层仓用方法控制（ANDON_呼叫通知配置） + * @Reference : + * @Author : hansen.ke + * @CreateDate : 2019-05-13 11:09 + * @Modify: + **/ +@Repository +public interface IAndonAlarmResponseCfgRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonEventCauseRepository.java b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonEventCauseRepository.java new file mode 100644 index 0000000..53817cb --- /dev/null +++ b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonEventCauseRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.AndonEventCause; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description : 对象持久层仓用方法控制（ANDON_事件原因） + * @Reference : + * @Author : hansen.ke + * @CreateDate : 2019-05-13 11:10 + * @Modify: + **/ +@Repository +public interface IAndonEventCauseRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonHaltTypeRepository.java b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonHaltTypeRepository.java new file mode 100644 index 0000000..81a68b8 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonHaltTypeRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.AndonHaltType; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description : 对象持久层仓用方法控制（ANDON_停机类型） + * @Reference : + * @Author : hansen.ke + * @CreateDate : 2019-05-13 11:12 + * @Modify: + **/ +@Repository +public interface IAndonHaltTypeRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonPLCRecordRepository.java b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonPLCRecordRepository.java new file mode 100644 index 0000000..f9838e3 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonPLCRecordRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.AndonPLCRecord; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description : 对象持久层仓用方法控制（安灯PLC监控记录） + * @Reference : + * @Author : hansen.ke + * @CreateDate : 2019-05-13 11:15 + * @Modify: + **/ +@Repository +public interface IAndonPLCRecordRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonPLCRepository.java b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonPLCRepository.java new file mode 100644 index 0000000..3358aa0 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonPLCRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.AndonPLC; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description : 对象持久层仓用方法控制（安灯PLC控制） + * @Reference : + * @Author : hansen.ke + * @CreateDate : 2019-05-13 11:13 + * @Modify: + **/ +@Repository +public interface IAndonPLCRepository extends BaseRepository { +} From a65b3d6fb2f1490ad0c95cc276a6523932ed53d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Mon, 13 May 2019 14:35:01 +0800 Subject: [PATCH 15/19] =?UTF-8?q?=E4=BA=A4=E6=98=93=E5=A4=84=E7=90=86?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=9F=BA=E7=A1=80=E6=96=B9=E6=B3=95=E7=BB=B4?= =?UTF-8?q?=E6=8A=A4+=E6=B5=81=E7=A8=8B=E9=85=8D=E7=BD=AE+=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E7=94=9F=E6=88=90=E4=BB=A3=E7=A0=81=E7=BB=93=E6=9E=84?= =?UTF-8?q?=E5=B1=82=E4=BC=98=E5=8C=96+=E4=BA=A4=E6=98=93=E5=A4=84?= =?UTF-8?q?=E7=90=86=E4=B8=BB=E7=A8=8B=E5=BA=8F=E6=9F=A5=E8=AF=A2=E7=A7=BB?= =?UTF-8?q?=E5=8A=A8=E5=8D=95=E6=9D=A1=E4=BB=B6=E4=BF=AE=E6=94=B9=E8=B0=83?= =?UTF-8?q?=E5=B7=A5=E5=8E=82=E4=BB=A3=E7=A0=81=EF=BC=88=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E9=94=99=E8=AF=AF=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java | 6 ++++++ .../i3plus/pojo/wms/bean/WmsActionGroupDetails.java | 1 + .../cn/estsh/i3plus/pojo/wms/bean/WmsActionStep.java | 3 +++ .../cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 19 +++++++++++-------- 4 files changed, 21 insertions(+), 8 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java index c858ba4..df3f6d5 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -47,6 +49,7 @@ public class WmsActionGroup extends BaseBean { @Column(name = "INIT_AM_ID") @ApiParam(value = "初始化组件编号", example = "0") + @JsonSerialize(using = ToStringSerializer.class) private Long initAmId; // @Transient @@ -55,6 +58,7 @@ public class WmsActionGroup extends BaseBean { @Column(name = "DETAILS_AM_ID") @ApiParam(value = "明细处理组件编号", example = "0") + @JsonSerialize(using = ToStringSerializer.class) private Long detailsAmId; // @Transient @@ -63,6 +67,7 @@ public class WmsActionGroup extends BaseBean { @Column(name = "SUBMIT_AM_ID") @ApiParam(value = "提交组件编号", example = "0") + @JsonSerialize(using = ToStringSerializer.class) private Long submitAmId; // @Transient @@ -71,6 +76,7 @@ public class WmsActionGroup extends BaseBean { @Column(name = "END_AM_ID") @ApiParam(value = "结束组件编号", example = "0") + @JsonSerialize(using = ToStringSerializer.class) private Long endAmId; // // @Transient diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java index d448205..54a9528 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java @@ -87,5 +87,6 @@ public class WmsActionGroupDetails extends BaseBean { @Column(name = "SHOW_AM_ID") @ApiParam(value = "回显组件方法ID", example = "1") + @JsonSerialize(using = ToStringSerializer.class) private Long showAmId; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStep.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStep.java index 4198ff5..48c4aa2 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStep.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStep.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -50,6 +52,7 @@ public class WmsActionStep extends BaseBean { @Column(name = "AT_ID") @ApiParam(value = "步骤类型编号", example = "0") + @JsonSerialize(using = ToStringSerializer.class) private Long atId; //get单独处理 diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index 1a1d4e1..0f3f1e6 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -988,7 +988,7 @@ public class WmsHqlPack { DdlPackBean result = new DdlPackBean(); //查询参数封装 - DdlPreparedPack.getInPackArray(new Object[]{WmsEnumUtil.QC_INFO_STATUS.CREATE.getValue() , + DdlPreparedPack.getInPackArray(new Object[]{WmsEnumUtil.QC_INFO_STATUS.CREATE.getValue(), WmsEnumUtil.QC_INFO_STATUS.FINISH.getValue()}, "orderStatus", result); DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isPart", result); //单号 @@ -1477,18 +1477,21 @@ public class WmsHqlPack { * @return */ public static DdlPackBean packHqlWmsTransModule(WmsTransModule wmsTransModule) { - DdlPackBean result = new DdlPackBean(); + DdlPackBean packBean = new DdlPackBean(); if (!Strings.isNullOrEmpty(wmsTransModule.getTmName())) { - DdlPreparedPack.getStringEqualPack(wmsTransModule.getTmName(), "tmName", result); + DdlPreparedPack.getStringEqualPack(wmsTransModule.getTmName(), "tmName", packBean); } if (!Strings.isNullOrEmpty(wmsTransModule.getCallClass())) { - DdlPreparedPack.getStringEqualPack(wmsTransModule.getCallClass(), "callClass", result); + DdlPreparedPack.getStringEqualPack(wmsTransModule.getCallClass(), "callClass", packBean); } if (!Strings.isNullOrEmpty(wmsTransModule.getTmDesc())) { - DdlPreparedPack.getStringLikerPack(wmsTransModule.getTmDesc(), "tmDesc", result); + DdlPreparedPack.getStringLikerPack(wmsTransModule.getTmDesc(), "tmDesc", packBean); } - getStringBuilderPack(wmsTransModule, result); - return result; + if (StringUtils.isNotBlank(wmsTransModule.orderBy())) { + packBean.setOrderByStr(wmsTransModule.orderBy()); + } + getStringBuilderPack(wmsTransModule, packBean); + return packBean; } /** @@ -1587,7 +1590,7 @@ public class WmsHqlPack { DdlPackBean result = new DdlPackBean(); //查询参数封装 - DdlPreparedPack.getInPackArray(new Object[]{WmsEnumUtil.CS_ORDER_STATUS.STARTING_INVENTORY.getValue() , + DdlPreparedPack.getInPackArray(new Object[]{WmsEnumUtil.CS_ORDER_STATUS.STARTING_INVENTORY.getValue(), WmsEnumUtil.CS_ORDER_STATUS.IN_INVENTORY.getValue()}, "orderStatus", result); DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isPart", result); DdlPreparedPack.getStringEqualPack(wmsCSOrderMaster.getOrderNo(), "orderNo", result); From 5fa2b67880701349c2e187e3441eb80140eb0820 Mon Sep 17 00:00:00 2001 From: alwaysfrin <39822157+alwaysfrin@users.noreply.github.com> Date: Mon, 13 May 2019 14:39:53 +0800 Subject: [PATCH 16/19] =?UTF-8?q?=E5=AE=89=E7=81=AF=E6=BA=90=E7=A0=81?= =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E9=94=99=E8=AF=AF=EF=BC=8C=E9=87=8D=E6=96=B0?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/{ => main}/java/cn.estsh.i3plus.pojo.andon/bean/AndonAction.java | 0 .../{ => main}/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmCause.java | 0 .../java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmResponseCfg.java | 0 .../{ => main}/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmType.java | 0 .../{ => main}/java/cn.estsh.i3plus.pojo.andon/bean/AndonEventCause.java | 0 .../{ => main}/java/cn.estsh.i3plus.pojo.andon/bean/AndonHaltType.java | 0 .../{ => main}/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java | 0 .../java/cn.estsh.i3plus.pojo.andon/bean/AndonManageRecord.java | 0 .../src/{ => main}/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLC.java | 0 .../{ => main}/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLCRecord.java | 0 .../{ => main}/java/cn.estsh.i3plus.pojo.andon/bean/AndonResponse.java | 0 .../java/cn.estsh.i3plus.pojo.andon/bean/AndonResponseObject.java | 0 .../src/{ => main}/java/cn.estsh.i3plus.pojo.andon/bean/AndonStatus.java | 0 .../cn.estsh.i3plus.pojo.andon/repository/IAndonActionRepository.java | 0 .../cn.estsh.i3plus.pojo.andon/repository/IAndonAlarmCauseRepository.java | 0 .../repository/IAndonAlarmResponseCfgRepository.java | 0 .../cn.estsh.i3plus.pojo.andon/repository/IAndonAlarmTypeRepository.java | 0 .../cn.estsh.i3plus.pojo.andon/repository/IAndonEventCauseRepository.java | 0 .../cn.estsh.i3plus.pojo.andon/repository/IAndonHaltTypeRepository.java | 0 .../repository/IAndonManagetQueueRepository.java | 0 .../repository/IAndonManagetRecordRepository.java | 0 .../cn.estsh.i3plus.pojo.andon/repository/IAndonPLCRecordRepository.java | 0 .../java/cn.estsh.i3plus.pojo.andon/repository/IAndonPLCRepository.java | 0 .../repository/IAndonResponseObjectRepository.java | 0 .../cn.estsh.i3plus.pojo.andon/repository/IAndonResponseRepository.java | 0 .../cn.estsh.i3plus.pojo.andon/repository/IAndonStatusRepository.java | 0 .../{ => main}/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java | 0 27 files changed, 0 insertions(+), 0 deletions(-) rename modules/i3plus-pojo-andon/src/{ => main}/java/cn.estsh.i3plus.pojo.andon/bean/AndonAction.java (100%) rename modules/i3plus-pojo-andon/src/{ => main}/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmCause.java (100%) rename modules/i3plus-pojo-andon/src/{ => main}/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmResponseCfg.java (100%) rename modules/i3plus-pojo-andon/src/{ => main}/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmType.java (100%) rename modules/i3plus-pojo-andon/src/{ => main}/java/cn.estsh.i3plus.pojo.andon/bean/AndonEventCause.java (100%) rename modules/i3plus-pojo-andon/src/{ => main}/java/cn.estsh.i3plus.pojo.andon/bean/AndonHaltType.java (100%) rename modules/i3plus-pojo-andon/src/{ => main}/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java (100%) rename modules/i3plus-pojo-andon/src/{ => main}/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageRecord.java (100%) rename modules/i3plus-pojo-andon/src/{ => main}/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLC.java (100%) rename modules/i3plus-pojo-andon/src/{ => main}/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLCRecord.java (100%) rename modules/i3plus-pojo-andon/src/{ => main}/java/cn.estsh.i3plus.pojo.andon/bean/AndonResponse.java (100%) rename modules/i3plus-pojo-andon/src/{ => main}/java/cn.estsh.i3plus.pojo.andon/bean/AndonResponseObject.java (100%) rename modules/i3plus-pojo-andon/src/{ => main}/java/cn.estsh.i3plus.pojo.andon/bean/AndonStatus.java (100%) rename modules/i3plus-pojo-andon/src/{ => main}/java/cn.estsh.i3plus.pojo.andon/repository/IAndonActionRepository.java (100%) rename modules/i3plus-pojo-andon/src/{ => main}/java/cn.estsh.i3plus.pojo.andon/repository/IAndonAlarmCauseRepository.java (100%) rename modules/i3plus-pojo-andon/src/{ => main}/java/cn.estsh.i3plus.pojo.andon/repository/IAndonAlarmResponseCfgRepository.java (100%) rename modules/i3plus-pojo-andon/src/{ => main}/java/cn.estsh.i3plus.pojo.andon/repository/IAndonAlarmTypeRepository.java (100%) rename modules/i3plus-pojo-andon/src/{ => main}/java/cn.estsh.i3plus.pojo.andon/repository/IAndonEventCauseRepository.java (100%) rename modules/i3plus-pojo-andon/src/{ => main}/java/cn.estsh.i3plus.pojo.andon/repository/IAndonHaltTypeRepository.java (100%) rename modules/i3plus-pojo-andon/src/{ => main}/java/cn.estsh.i3plus.pojo.andon/repository/IAndonManagetQueueRepository.java (100%) rename modules/i3plus-pojo-andon/src/{ => main}/java/cn.estsh.i3plus.pojo.andon/repository/IAndonManagetRecordRepository.java (100%) rename modules/i3plus-pojo-andon/src/{ => main}/java/cn.estsh.i3plus.pojo.andon/repository/IAndonPLCRecordRepository.java (100%) rename modules/i3plus-pojo-andon/src/{ => main}/java/cn.estsh.i3plus.pojo.andon/repository/IAndonPLCRepository.java (100%) rename modules/i3plus-pojo-andon/src/{ => main}/java/cn.estsh.i3plus.pojo.andon/repository/IAndonResponseObjectRepository.java (100%) rename modules/i3plus-pojo-andon/src/{ => main}/java/cn.estsh.i3plus.pojo.andon/repository/IAndonResponseRepository.java (100%) rename modules/i3plus-pojo-andon/src/{ => main}/java/cn.estsh.i3plus.pojo.andon/repository/IAndonStatusRepository.java (100%) rename modules/i3plus-pojo-andon/src/{ => main}/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java (100%) diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonAction.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAction.java similarity index 100% rename from modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonAction.java rename to modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAction.java diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmCause.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmCause.java similarity index 100% rename from modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmCause.java rename to modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmCause.java diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmResponseCfg.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmResponseCfg.java similarity index 100% rename from modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmResponseCfg.java rename to modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmResponseCfg.java diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmType.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmType.java similarity index 100% rename from modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmType.java rename to modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmType.java diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonEventCause.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonEventCause.java similarity index 100% rename from modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonEventCause.java rename to modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonEventCause.java diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonHaltType.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonHaltType.java similarity index 100% rename from modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonHaltType.java rename to modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonHaltType.java diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java similarity index 100% rename from modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java rename to modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageRecord.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageRecord.java similarity index 100% rename from modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageRecord.java rename to modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageRecord.java diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLC.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLC.java similarity index 100% rename from modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLC.java rename to modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLC.java diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLCRecord.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLCRecord.java similarity index 100% rename from modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLCRecord.java rename to modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLCRecord.java diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonResponse.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonResponse.java similarity index 100% rename from modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonResponse.java rename to modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonResponse.java diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonResponseObject.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonResponseObject.java similarity index 100% rename from modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonResponseObject.java rename to modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonResponseObject.java diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonStatus.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonStatus.java similarity index 100% rename from modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonStatus.java rename to modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonStatus.java diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonActionRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonActionRepository.java similarity index 100% rename from modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonActionRepository.java rename to modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonActionRepository.java diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonAlarmCauseRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonAlarmCauseRepository.java similarity index 100% rename from modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonAlarmCauseRepository.java rename to modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonAlarmCauseRepository.java diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonAlarmResponseCfgRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonAlarmResponseCfgRepository.java similarity index 100% rename from modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonAlarmResponseCfgRepository.java rename to modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonAlarmResponseCfgRepository.java diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonAlarmTypeRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonAlarmTypeRepository.java similarity index 100% rename from modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonAlarmTypeRepository.java rename to modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonAlarmTypeRepository.java diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonEventCauseRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonEventCauseRepository.java similarity index 100% rename from modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonEventCauseRepository.java rename to modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonEventCauseRepository.java diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonHaltTypeRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonHaltTypeRepository.java similarity index 100% rename from modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonHaltTypeRepository.java rename to modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonHaltTypeRepository.java diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonManagetQueueRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonManagetQueueRepository.java similarity index 100% rename from modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonManagetQueueRepository.java rename to modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonManagetQueueRepository.java diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonManagetRecordRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonManagetRecordRepository.java similarity index 100% rename from modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonManagetRecordRepository.java rename to modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonManagetRecordRepository.java diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonPLCRecordRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonPLCRecordRepository.java similarity index 100% rename from modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonPLCRecordRepository.java rename to modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonPLCRecordRepository.java diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonPLCRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonPLCRepository.java similarity index 100% rename from modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonPLCRepository.java rename to modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonPLCRepository.java diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonResponseObjectRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonResponseObjectRepository.java similarity index 100% rename from modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonResponseObjectRepository.java rename to modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonResponseObjectRepository.java diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonResponseRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonResponseRepository.java similarity index 100% rename from modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonResponseRepository.java rename to modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonResponseRepository.java diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonStatusRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonStatusRepository.java similarity index 100% rename from modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonStatusRepository.java rename to modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonStatusRepository.java diff --git a/modules/i3plus-pojo-andon/src/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 similarity index 100% rename from modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java rename to modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java From b1f513d7866f75e63fcf7aff1b9d7488573fd3f5 Mon Sep 17 00:00:00 2001 From: "yiming.gu" Date: Mon, 13 May 2019 15:13:24 +0800 Subject: [PATCH 17/19] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=AE=BE=E5=A4=87pojo?= =?UTF-8?q?=EF=BC=8C=E7=BB=84=E7=BB=87=E6=A8=A1=E5=9E=8Bmodel?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/bean/MesArea.java | 19 +++++ .../estsh/i3plus/pojo/mes/bean/MesEquipment.java | 59 +++++++++++++++ .../cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java | 18 +++++ .../estsh/i3plus/pojo/mes/bean/MesWorkCenter.java | 18 +++++ .../estsh/i3plus/pojo/mes/model/ProdOrgModel.java | 63 ++++++++++++++++ .../mes/repository/MesEquipmentRepository.java | 16 ++++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 86 +++++++++++++++++++++- modules/i3plus-pojo-model/pom.xml | 4 + .../i3plus/pojo/model/mes/SysOrganizeModel.java | 23 ++++++ 9 files changed, 302 insertions(+), 4 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipment.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdOrgModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquipmentRepository.java create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/SysOrganizeModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesArea.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesArea.java index 411b45c..1592590 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesArea.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesArea.java @@ -2,6 +2,8 @@ package cn.estsh.i3plus.pojo.mes.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -12,6 +14,8 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; +import java.util.List; /** * @Description :生产区域 @@ -35,4 +39,19 @@ public class MesArea extends BaseBean { @Column(name="AREA_NAME") @ApiParam("区域名称") private String areaName; + + @Transient + @ApiParam(value ="子集列表") + private List childTreeList; + + @Transient + @ApiParam(value ="名称") + private String name; + + // 默认值 -1 + @Transient + @ApiParam(value ="父节点" , access ="父节点" ,example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long parentId; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipment.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipment.java new file mode 100644 index 0000000..a7b1e75 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipment.java @@ -0,0 +1,59 @@ +package cn.estsh.i3plus.pojo.mes.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; + +/** + * @Description :生产区域 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_EQUIPMENT") +@Api("生产设备") +public class MesEquipment extends BaseBean { + @Column(name="EQUIPMENT_CODE") + @ApiParam("设备代码") + private String equipmentCode; + + @Column(name="EQUIPMENT_NAME") + @ApiParam("设备名称") + private String equipmentName; + + @Column(name="STATUS") + @ApiParam("设备状态") + private String status; + + @Column(name="WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Transient + @ApiParam(value ="名称") + private String name; + + // 默认值 -1 + @Transient + @ApiParam(value ="父节点" , access ="父节点" ,example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long parentId; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java index 9a42ad8..9969c7c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.mes.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -11,6 +13,8 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; +import java.util.List; /** * @Description :工作单元 @@ -42,4 +46,18 @@ public class MesWorkCell extends BaseBean { @Column(name = "AREA_CODE") @ApiParam("生产区域代码") private String areaCode; + + @Transient + @ApiParam(value ="子集列表") + private List childTreeList; + + @Transient + @ApiParam(value ="名称") + private String name; + + // 默认值 -1 + @Transient + @ApiParam(value ="父节点" , access ="父节点" ,example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long parentId; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java index e293fe0..6e21747 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.mes.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -11,6 +13,8 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; +import java.util.List; /** * @Description :工作中心 @@ -46,4 +50,18 @@ public class MesWorkCenter extends BaseBean { @Column(name = "AREA_CODE") @ApiParam("生产区域代码") private String areaCode; + + @Transient + @ApiParam(value ="子集列表") + private List childTreeList; + + @Transient + @ApiParam(value ="名称") + private String name; + + // 默认值 -1 + @Transient + @ApiParam(value ="父节点" , access ="父节点" ,example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long parentId; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdOrgModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdOrgModel.java new file mode 100644 index 0000000..56d40ff --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdOrgModel.java @@ -0,0 +1,63 @@ +package cn.estsh.i3plus.pojo.mes.model; + +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.Entity; + +/** + * @Description: + * @Reference: + * @Author: yiming.gu + * @CreateDate:2019-04-18-14:16 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api("生产区域") +public class ProdOrgModel extends BaseBean { + + @ApiParam("区域名称") + private String areaName; + + @ApiParam("区域代码") + private String areaCode; + + @ApiParam("工作中心代码") + private String workCenterCode; + + @ApiParam("工作中心名称") + private String workCenterName; + + @ApiParam("ERP工作中心") + private String erpWorkCenter; + + @ApiParam("工作版本") + private String workVer; + + @ApiParam("工作单元代码") + private String workCellCode; + + @ApiParam("工作单元名称") + private String workCellName; + + @ApiParam("设备代码") + private String equipmentCode; + + @ApiParam("设备名称") + private String equipmentName; + + @ApiParam("设备状态") + private String status; + + @ApiParam("当前级") + private Integer level; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquipmentRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquipmentRepository.java new file mode 100644 index 0000000..b5a0329 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquipmentRepository.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.MesEquipment; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesEquipmentRepository 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 63e0908..3efc847 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 @@ -5,10 +5,7 @@ import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.MesEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; -import cn.estsh.i3plus.pojo.mes.bean.MesPart; -import cn.estsh.i3plus.pojo.mes.bean.MesPlanOrder; -import cn.estsh.i3plus.pojo.mes.bean.MesQueueOrder; -import cn.estsh.i3plus.pojo.mes.bean.MesWorkOrder; +import cn.estsh.i3plus.pojo.mes.bean.*; import org.apache.commons.lang3.StringUtils; /** @@ -183,4 +180,85 @@ public class MesHqlPack { DdlPreparedPack.getOrderByPack(new Object[]{"2"},new String[]{mesQueueOrder.getOrderByParam()} , packBean); return packBean; } + + /** + * 通用查询条件 + * @param organizeCode + * @return + */ + public static DdlPackBean getAllBaseDataByNormalPro(BaseBean baseBean, String organizeCode) { + DdlPackBean packBean = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", packBean); + DdlPreparedPack.getNumEqualPack(baseBean.getIsValid(), "isValid", packBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", packBean); + return packBean; + } + + /** + * MES区域信息查询条件封装 + * @param mesArea + * @return + */ + public static DdlPackBean getMesArea(MesArea mesArea, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesArea, organizeCode); + if (StringUtils.isNotEmpty(mesArea.getAreaCode())) { + DdlPreparedPack.getStringEqualPack(mesArea.getAreaCode(), "areaCode", packBean); + } + + return packBean; + } + + /** + * MES工作中心信息查询条件封装 + * @param mesWorkCenter + * @return + */ + public static DdlPackBean getMesWorkCenter(MesWorkCenter mesWorkCenter, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesWorkCenter, organizeCode); + if (StringUtils.isNotEmpty(mesWorkCenter.getWorkCenterCode())) { + DdlPreparedPack.getStringEqualPack(mesWorkCenter.getWorkCenterCode(), "workCenterCode", packBean); + } + if (StringUtils.isNotEmpty(mesWorkCenter.getAreaCode())){ + DdlPreparedPack.getStringEqualPack(mesWorkCenter.getAreaCode(), "areaCode", packBean); + } + + return packBean; + } + + /** + * MES工作单元信息查询条件封装 + * @param mesWorkCell + * @return + */ + public static DdlPackBean getMesWorkCell(MesWorkCell mesWorkCell, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesWorkCell, organizeCode); + if (StringUtils.isNotEmpty(mesWorkCell.getWorkCenterCode())) { + DdlPreparedPack.getStringEqualPack(mesWorkCell.getWorkCenterCode(), "workCenterCode", packBean); + } + if (StringUtils.isNotEmpty(mesWorkCell.getAreaCode())){ + DdlPreparedPack.getStringEqualPack(mesWorkCell.getAreaCode(), "areaCode", packBean); + } + if (StringUtils.isNotEmpty(mesWorkCell.getWorkCellCode())){ + DdlPreparedPack.getStringEqualPack(mesWorkCell.getWorkCellCode(), "workCellCode", packBean); + } + + return packBean; + } + + /** + * MES设备信息查询条件封装 + * @param mesEquipment + * @return + */ + public static DdlPackBean getMesEquipment(MesEquipment mesEquipment, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesEquipment, organizeCode); + if (StringUtils.isNotEmpty(mesEquipment.getWorkCellCode())){ + DdlPreparedPack.getStringEqualPack(mesEquipment.getWorkCellCode(), "workCellCode", packBean); + } + if (StringUtils.isNotEmpty(mesEquipment.getEquipmentCode())){ + DdlPreparedPack.getStringEqualPack(mesEquipment.getEquipmentCode(), "equipmentCode", packBean); + } + + return packBean; + } } diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index 642c9a6..7250b00 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -42,6 +42,10 @@ i3plus.pojo i3plus-pojo-form + + i3plus.pojo + i3plus-pojo-mes + diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/SysOrganizeModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/SysOrganizeModel.java new file mode 100644 index 0000000..6880ac3 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/SysOrganizeModel.java @@ -0,0 +1,23 @@ +package cn.estsh.i3plus.pojo.model.mes; + +import cn.estsh.i3plus.pojo.mes.bean.MesArea; +import cn.estsh.i3plus.pojo.platform.bean.SysOrganize; +import io.swagger.annotations.ApiParam; + +import javax.persistence.Transient; +import java.util.List; + +public class SysOrganizeModel extends SysOrganize{ + + @Transient + @ApiParam(value ="子集列表") + private List childTreeList; + + public List getChildTreeList() { + return childTreeList; + } + + public void setChildTreeList(List childTreeList) { + this.childTreeList = childTreeList; + } +} From 68a66c67b0ec478cd2e651d9def04cd3b2b7aaba Mon Sep 17 00:00:00 2001 From: "yiming.gu" Date: Mon, 13 May 2019 15:35:10 +0800 Subject: [PATCH 18/19] =?UTF-8?q?=E8=AE=BE=E5=A4=87pojo=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E4=B8=AD=E5=BF=83=E4=BB=A3=E7=A0=81=EF=BC=8C?= =?UTF-8?q?=E5=8C=BA=E5=9F=9F=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn.estsh.i3plus.pojo.andon/bean/MesArea.java | 57 ++++++++++++++++++ .../bean/MesEquipment.java | 67 ++++++++++++++++++++++ .../bean/MesWorkCell.java | 63 ++++++++++++++++++++ .../bean/MesWorkCenter.java | 67 ++++++++++++++++++++++ .../repository/MesAreaRepository.java | 16 ++++++ .../repository/MesEquipmentRepository.java | 16 ++++++ .../repository/MesWorkCellRepository.java | 16 ++++++ .../repository/MesWorkCenterRepository.java | 16 ++++++ .../estsh/i3plus/pojo/mes/bean/MesEquipment.java | 8 +++ 9 files changed, 326 insertions(+) create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesArea.java create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesEquipment.java create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesWorkCell.java create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesWorkCenter.java create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/MesAreaRepository.java create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/MesEquipmentRepository.java create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/MesWorkCellRepository.java create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/MesWorkCenterRepository.java diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesArea.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesArea.java new file mode 100644 index 0000000..2241c79 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesArea.java @@ -0,0 +1,57 @@ +package cn.estsh.i3plus.pojo.andon.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; +import java.util.List; + +/** + * @Description :生产区域 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_AREA") +@Api("生产区域") +public class MesArea extends BaseBean { + @Column(name="AREA_CODE") + @ApiParam("区域代码") + private String areaCode; + + @Column(name="AREA_NAME") + @ApiParam("区域名称") + private String areaName; + + @Transient + @ApiParam(value ="子集列表") + private List childTreeList; + + @Transient + @ApiParam(value ="名称") + private String name; + + // 默认值 -1 + @Transient + @ApiParam(value ="父节点" , access ="父节点" ,example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long parentId; + +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesEquipment.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesEquipment.java new file mode 100644 index 0000000..7959144 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesEquipment.java @@ -0,0 +1,67 @@ +package cn.estsh.i3plus.pojo.andon.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; + +/** + * @Description :生产区域 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_EQUIPMENT") +@Api("生产设备") +public class MesEquipment extends BaseBean { + @Column(name="EQUIPMENT_CODE") + @ApiParam("设备代码") + private String equipmentCode; + + @Column(name="EQUIPMENT_NAME") + @ApiParam("设备名称") + private String equipmentName; + + @Column(name="STATUS") + @ApiParam("设备状态") + private String status; + + @Column(name="WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name="WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name="AREA_CODE") + @ApiParam("区域代码") + private String areaCode; + + @Transient + @ApiParam(value ="名称") + private String name; + + // 默认值 -1 + @Transient + @ApiParam(value ="父节点" , access ="父节点" ,example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long parentId; +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesWorkCell.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesWorkCell.java new file mode 100644 index 0000000..112dc97 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesWorkCell.java @@ -0,0 +1,63 @@ +package cn.estsh.i3plus.pojo.andon.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; +import java.util.List; + +/** + * @Description :工作单元 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_WORK_CELL") +@Api("工作单元") +public class MesWorkCell extends BaseBean { + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name = "WORK_CELL_NAME") + @ApiParam("工作单元名称") + private String workCellName; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心") + private String workCenterCode; + + @Column(name = "AREA_CODE") + @ApiParam("生产区域代码") + private String areaCode; + + @Transient + @ApiParam(value ="子集列表") + private List childTreeList; + + @Transient + @ApiParam(value ="名称") + private String name; + + // 默认值 -1 + @Transient + @ApiParam(value ="父节点" , access ="父节点" ,example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long parentId; +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesWorkCenter.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesWorkCenter.java new file mode 100644 index 0000000..ab85f95 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesWorkCenter.java @@ -0,0 +1,67 @@ +package cn.estsh.i3plus.pojo.andon.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; +import java.util.List; + +/** + * @Description :工作中心 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_WORK_CENTER") +@Api("工作中心") +public class MesWorkCenter extends BaseBean { + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "WORK_CENTER_NAME") + @ApiParam("工作中心名称") + private String workCenterName; + + @Column(name = "ERP_WORK_CENTER") + @ApiParam("ERP工作中心") + private String erpWorkCenter; + + @Column(name = "WORK_VER") + @ApiParam("工作版本") + private String workVer; + + @Column(name = "AREA_CODE") + @ApiParam("生产区域代码") + private String areaCode; + + @Transient + @ApiParam(value ="子集列表") + private List childTreeList; + + @Transient + @ApiParam(value ="名称") + private String name; + + // 默认值 -1 + @Transient + @ApiParam(value ="父节点" , access ="父节点" ,example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long parentId; +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/MesAreaRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/MesAreaRepository.java new file mode 100644 index 0000000..f4e8bb7 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/MesAreaRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.MesArea; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesAreaRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/MesEquipmentRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/MesEquipmentRepository.java new file mode 100644 index 0000000..caba161 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/MesEquipmentRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.MesEquipment; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesEquipmentRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/MesWorkCellRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/MesWorkCellRepository.java new file mode 100644 index 0000000..320270f --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/MesWorkCellRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.MesWorkCell; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesWorkCellRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/MesWorkCenterRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/MesWorkCenterRepository.java new file mode 100644 index 0000000..63f1233 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/MesWorkCenterRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.MesWorkCenter; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesWorkCenterRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipment.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipment.java index a7b1e75..ee94479 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipment.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipment.java @@ -47,6 +47,14 @@ public class MesEquipment extends BaseBean { @ApiParam("工作单元代码") private String workCellCode; + @Column(name="WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name="AREA_CODE") + @ApiParam("区域代码") + private String areaCode; + @Transient @ApiParam(value ="名称") private String name; From 060fa564da59a4bc2130bfa54931a4711eb1f345 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= Date: Mon, 13 May 2019 16:11:53 +0800 Subject: [PATCH 19/19] =?UTF-8?q?=E6=9B=B4=E6=96=B0AndonHqlPack?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bean/MesWorkCenter.java | 7 +++ .../sqlpack/AndonHqlPack.java | 55 ++++++++++++++++++++++ 2 files changed, 62 insertions(+) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesWorkCenter.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesWorkCenter.java index ab85f95..2fc7aec 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesWorkCenter.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesWorkCenter.java @@ -64,4 +64,11 @@ public class MesWorkCenter extends BaseBean { @ApiParam(value ="父节点" , access ="父节点" ,example = "-1") @JsonSerialize(using = ToStringSerializer.class) private Long parentId; + + public MesWorkCenter(String organizeCode) { + this.organizeCode = organizeCode; + } + + public MesWorkCenter() { + } } 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 12b3098..34e5258 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 @@ -1,5 +1,13 @@ package cn.estsh.i3plus.pojo.andon.sqlpack; +import cn.estsh.i3plus.pojo.andon.bean.MesWorkCell; +import cn.estsh.i3plus.pojo.andon.bean.MesWorkCenter; +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.tool.DdlPreparedPack; +import org.apache.commons.lang3.StringUtils; + /** * @Description : 安灯对象查询封装 * @Reference : @@ -8,4 +16,51 @@ package cn.estsh.i3plus.pojo.andon.sqlpack; * @Modify: **/ public class AndonHqlPack { + /** + * 封装公用查询参数 + * + * @param bean 实体对象 + * @param hqlStr 查询语句 + * @return 封装完成的查询语句 + */ + public static DdlPackBean getStringBuilderPack(BaseBean bean, DdlPackBean hqlStr) { + + // 判断工厂代码是否为空 + if (StringUtils.isNotBlank(bean.getOrganizeCode())) { + DdlPreparedPack.getStringEqualPack(bean.getOrganizeCode(), "organizeCode", hqlStr); + } + + // 封装有效状态和删除状态 + DdlPreparedPack.getNumEqualPack(bean.getIsValid(), "isValid", hqlStr); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", hqlStr); + + return hqlStr; + } + + /** + * 按条件查询工作中心 + * @param mesWorkCenter + * @return + */ + public static DdlPackBean packHqlMesWorkCenter(MesWorkCenter mesWorkCenter){ + DdlPackBean result = new DdlPackBean(); + + getStringBuilderPack(mesWorkCenter, result); + + return result; + } + + /** + * 按条件查询工作单元（工位） + * @param mesWorkCell + * @return + */ + public static DdlPackBean packHqlMesWorkCell(MesWorkCell mesWorkCell){ + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringEqualPack(mesWorkCell.getWorkCenterCode(), "workCenterCode", result); + getStringBuilderPack(mesWorkCell, result); + + return result; + } }