From a54d711d95717b261a4917e0a6162d123a94d3ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Tue, 22 Oct 2019 15:44:34 +0800 Subject: [PATCH 01/35] =?UTF-8?q?#1085=20BOM=E5=AF=BC=E5=85=A5=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/WmsBomTemplate.java | 71 ++++++++++++++++++++++ 1 file changed, 71 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomTemplate.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomTemplate.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomTemplate.java new file mode 100644 index 0000000..2ef6b8c --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomTemplate.java @@ -0,0 +1,71 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** +* @Description : 物料清单模板 +* @Reference : +* @author: jessica.chen +* @date: 2019/10/22 17:10 +* @Modify: +*/ + +@Data +@Api(value="领料单模板",description = "领料单模板") +public class WmsBomTemplate extends BaseBean { + + private static final long serialVersionUID = 2167743108452607611L; + + @ApiParam(value = "父物料号") + @AnnoOutputColumn + private String partNo; + + @ApiParam(value = "父物料描述") + @AnnoOutputColumn + private String partName; + + @ApiParam(value = "父计量单位") + @AnnoOutputColumn + private String unit; + + @ApiParam(value = "父级数量") + @AnnoOutputColumn + private Double qty; + + @ApiParam(value = "子物料号") + @AnnoOutputColumn + private String itemPartNo; + + @ApiParam(value = "子物料描述") + @AnnoOutputColumn + private String itemPartName; + + @ApiParam(value = "子计量单位") + @AnnoOutputColumn + private String itemUnit; + + @ApiParam(value = "子用量") + @AnnoOutputColumn + private Double itemQty; + + @ApiParam(value = "BOM编号") + @AnnoOutputColumn + private String bomNum; + + @ApiParam(value = "BOM版本号") + @AnnoOutputColumn + private String bomVersion; + + @ApiParam(value = "有效起始日期") + @AnnoOutputColumn + private String effStartTime; + + @ApiParam(value = "有效截止日期") + @AnnoOutputColumn + private String effEndTime; + +} From a9045ed4038a501fdb1e06fbc9a20f19ac645d95 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Tue, 22 Oct 2019 16:05:35 +0800 Subject: [PATCH 02/35] bug 5953 --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java index 1477d82..b2c81ff 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java @@ -116,6 +116,10 @@ public class WmsPOMaster extends BaseBean { @ApiParam("集装箱号") public String containerNo; + @Column(name = "PRIOR_RC") + @ApiParam("预收货") + public Integer priorRC; + @Transient @ApiParam(value = "工厂名称") public String organizeName; 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 6d3a0dd..46d6355 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 @@ -2383,8 +2383,8 @@ public class WmsHqlPack { DdlPackBean result = new DdlPackBean(); - DdlPreparedPack.getStringEqualPack(wmsRouting.getRoutingCode(), "routingCode", result); - DdlPreparedPack.getStringEqualPack(wmsRouting.getRoutingName(), "routingName", result); + DdlPreparedPack.getStringLeftLikerPack(wmsRouting.getRoutingCode(), "routingCode", result); + DdlPreparedPack.getStringLikerPack(wmsRouting.getRoutingName(), "routingName", result); // DdlPreparedPack.getInPack(wmsRouting.getIsValid(), "isValid", result); DdlPreparedPack.getInPack(wmsRouting.getIsDeleted(), "isDeleted", result); getStringBuilderPack(wmsRouting, result); From 07749b50ec532a8a74b989d9b5091f0aa580edc0 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Tue, 22 Oct 2019 20:27:28 +0800 Subject: [PATCH 03/35] =?UTF-8?q?[=E9=9C=80=E6=B1=82=EF=BC=9A1086=EF=BC=8C?= =?UTF-8?q?=20mes=E8=AE=BE=E5=A4=87=E7=82=B9=E6=A3=80=E4=BF=9D=E5=85=BB?= =?UTF-8?q?=E4=BD=9C=E4=B8=9A]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/bean/MesEquTask.java | 6 +- .../pojo/mes/bean/MesEquTaskStandardRecord.java | 73 ++++++++++++++++++++++ .../pojo/mes/model/MesEquTaskDetailModel.java | 8 +++ .../MesEquTaskStandardRecordRepository.java | 16 +++++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 23 +++++++ 5 files changed, 125 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandardRecord.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskStandardRecordRepository.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTask.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTask.java index 52022c0..8ad11ab 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTask.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTask.java @@ -40,7 +40,7 @@ public class MesEquTask extends BaseBean { private Integer taskType; @Column(name = "TASK_STATUS") - @ApiParam("作业状态") + @ApiParam("任务状态") private Integer taskStatus; @Column(name = "WORK_CENTER_CODE") @@ -80,6 +80,10 @@ public class MesEquTask extends BaseBean { private String planTimeEnd; @Transient + @ApiParam(value = "用于设备点检保养维修作业页面开窗查询任务，点检保养=1，维修=2") + private String pageType; + + @Transient @ApiParam(value ="明细列表") private List mesEquTaskDetailList; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandardRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandardRecord.java new file mode 100644 index 0000000..651fd4d --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandardRecord.java @@ -0,0 +1,73 @@ +package cn.estsh.i3plus.pojo.mes.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; + +/** + * @Description :设备点检保养作业记录 + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-10-11 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_EQU_TASK_STANDARD_RECORD") +@Api("设备点检保养作业记录") +public class MesEquTaskStandardRecord extends BaseBean { + + @Column(name = "TASK_NO") + @ApiParam("作业任务编号") + private String taskNo; + + @Column(name = "TASK_TYPE") + @ApiParam("作业类型") + private Integer taskType; + + @Column(name = "EQUIPMENT_CODE") + @ApiParam("设备代码") + private String equipmentCode; + + @Column(name = "EQUIPMENT_NAME") + @ApiParam("设备名称") + private String equipmentName; + + @Column(name = "ACTION_ITEM") + @ApiParam("操作项") + private String actionItem; + + @Column(name = "ACTION_STANDARD") + @ApiParam("操作标准") + private String actionStandard; + + @Column(name = "ACTION_GUIDE") + @ApiParam("操作指导") + private String actionGuide; + + @Column(name = "CHECK_RESULT") + @ApiParam("判定结果") + private Integer checkResult; + + @Column(name = "FINAL_RESULT") + @ApiParam("整体结果") + private Integer finalResult; + + @Column(name = "MEMO") + @ApiParam("备注") + private String memo; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskDetailModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskDetailModel.java index e870983..febc640 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskDetailModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskDetailModel.java @@ -1,9 +1,11 @@ package cn.estsh.i3plus.pojo.mes.model; +import cn.estsh.i3plus.pojo.mes.bean.MesEquTaskStandardRecord; import io.swagger.annotations.ApiParam; import lombok.Data; import java.io.Serializable; +import java.util.List; @Data public class MesEquTaskDetailModel implements Serializable { @@ -70,6 +72,12 @@ public class MesEquTaskDetailModel implements Serializable { @ApiParam("作业类型") private String taskTypeName; + @ApiParam("设备点检保养记录修改标识") + private Boolean isUpdate; + + @ApiParam("设备点检保养记录") + private List equTaskStandardRecordList; + public MesEquTaskDetailModel() { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskStandardRecordRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskStandardRecordRepository.java new file mode 100644 index 0000000..97fdb8f --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskStandardRecordRepository.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.MesEquTaskStandardRecord; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-10-11 + * @Modify: + **/ +@Repository +public interface MesEquTaskStandardRecordRepository 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 e641869..6887621 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 @@ -1530,4 +1530,27 @@ public class MesHqlPack { } return packBean; } + + /** + * 按条件分页查询mes设备点检保养维修作业 + * @param mesEquTaskDetail + * @param organizeCode + * @return + */ + public static DdlPackBean getMesEquTaskDetailByTaskNo(MesEquTaskDetail mesEquTaskDetail, String organizeCode) { + DdlPackBean packBean = getMesAllData(organizeCode); + if (!StringUtils.isEmpty(mesEquTaskDetail.getTaskNo())) { + DdlPreparedPack.getStringEqualPack(mesEquTaskDetail.getTaskNo(), "taskNo", packBean); + } + if (!StringUtils.isEmpty(mesEquTaskDetail.getEquipmentCode())) { + DdlPreparedPack.getStringLikerPack(mesEquTaskDetail.getEquipmentCode(), "equipmentCode", packBean); + } + if (!StringUtils.isEmpty(mesEquTaskDetail.getActionStatus())) { + DdlPreparedPack.getNumEqualPack(mesEquTaskDetail.getActionStatus(), "actionStatus", packBean); + } + if (!StringUtils.isEmpty(mesEquTaskDetail.getFinalResult())) { + DdlPreparedPack.getNumEqualPack(mesEquTaskDetail.getFinalResult(), "finalResult", packBean); + } + return packBean; + } } From 5956d5a08e3f7bf55054b0530e2ef8a954877b45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Tue, 22 Oct 2019 21:29:52 +0800 Subject: [PATCH 04/35] =?UTF-8?q?=E5=86=B2=E9=94=80=EF=BC=9A=E9=9C=80?= =?UTF-8?q?=E6=B1=82=E5=8F=98=E6=9B=B4=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/model/wms/WmsWriteOffModel.java | 5 +++-- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java | 7 ++++++- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java | 8 -------- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsWriteOffModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsWriteOffModel.java index bc8af3b..fce57f7 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsWriteOffModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsWriteOffModel.java @@ -1,6 +1,6 @@ package cn.estsh.i3plus.pojo.model.wms; -import cn.estsh.i3plus.pojo.wms.bean.WmsMoveSn; +import cn.estsh.i3plus.pojo.wms.bean.WmsMoveDetails; import lombok.Data; import java.io.Serializable; @@ -18,5 +18,6 @@ public class WmsWriteOffModel implements Serializable { private static final long serialVersionUID = -5490167040159056107L; private String locateNo; private List snList; - private List summaryList; + private List summaryList; + private String organizeCode; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java index 0cd2e2f..76aad42 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java @@ -225,7 +225,12 @@ public class WmsMoveDetails extends BaseBean { public Long getFinishedCounts() { return finishedCounts == null ? 0L : this.finishedCounts; } - + public WmsMoveDetails(String partNo, String partNameRdd, String unit, Double transQty) { + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.unit = unit; + this.transQty = transQty; + } public WmsMoveDetails(String organizeCode, String partNo, String partNameRdd, String workCenterCode, String fPartNo, String fPartName, String unit, Double qty, String createDateTime, String sn, String srcZoneNo) { this.organizeCode = organizeCode; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java index f4fdad9..de05dbf 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java @@ -202,14 +202,6 @@ public class WmsMoveSn extends BaseBean { public WmsMoveSn() { } - public WmsMoveSn(String partNo, String partNameRdd, String unit, String lotNo, Double qty) { - this.partNo = partNo; - this.partNameRdd = partNameRdd; - this.unit = unit; - this.lotNo = lotNo; - this.qty = qty; - } - public Long getWaitingCounts() { return waitingCounts == null ? 0L : this.waitingCounts; } From 25f11781c1d87e90c03b1239dd8396eeef9cf429 Mon Sep 17 00:00:00 2001 From: "changjiang.gao" Date: Wed, 23 Oct 2019 09:17:18 +0800 Subject: [PATCH 05/35] =?UTF-8?q?=E7=9B=98=E7=82=B9=E5=B7=AE=E5=BC=82?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/iotio/WmsCSOrderDetailsModel.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/iotio/WmsCSOrderDetailsModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/iotio/WmsCSOrderDetailsModel.java index 1ed0a34..9a5fb95 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/iotio/WmsCSOrderDetailsModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/iotio/WmsCSOrderDetailsModel.java @@ -34,9 +34,15 @@ public class WmsCSOrderDetailsModel implements Serializable { @ApiParam("仓库编码") public String whNo; + @ApiParam("源仓库编码") + public String srcWhNo; + @ApiParam("区域编码") public String zoneNo; + @ApiParam("源存储区编码") + public String srcZoneNo; + @ApiParam("状态") public String wmStatus; From e8f8c941c9aa00f3114aef2676464e47f92f43ca Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Wed, 23 Oct 2019 10:29:57 +0800 Subject: [PATCH 06/35] =?UTF-8?q?LAC=20=E6=8C=87=E4=BB=A4=E9=9B=86?= =?UTF-8?q?=E7=B1=BB=E5=9E=8BCRUD=E6=8E=A5=E5=8F=A3=E5=AE=8C=E6=88=90=20LA?= =?UTF-8?q?C=20=E4=BB=BB=E5=8A=A1=E7=B1=BB=E5=9E=8BCRUD=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-lac/pom.xml | 6 ++ .../pojo/lac/bean/LacCommandStackRecord.java | 91 ++++++++++++++++++ .../i3plus/pojo/lac/bean/LacCommandStackType.java | 44 +++++++++ .../cn/estsh/i3plus/pojo/lac/bean/LacLogTask.java | 106 +++++++++++++++++++++ .../i3plus/pojo/lac/bean/LacLogTaskDetail.java | 94 ++++++++++++++++++ .../cn/estsh/i3plus/pojo/lac/bean/LacTaskType.java | 42 ++++++++ .../LacCommandStackRecordRepository.java | 14 +++ .../repository/LacCommandStackTypeRepository.java | 15 +++ .../lac/repository/LacLogTaskDetailRepository.java | 15 +++ .../pojo/lac/repository/LacLogTaskRepository.java | 15 +++ .../pojo/lac/repository/LacTaskTypeRepository.java | 15 +++ .../estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java | 47 +++++++++ 12 files changed, 504 insertions(+) create mode 100644 modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackRecord.java create mode 100644 modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackType.java create mode 100644 modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTask.java create mode 100644 modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTaskDetail.java create mode 100644 modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacTaskType.java create mode 100644 modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacCommandStackRecordRepository.java create mode 100644 modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacCommandStackTypeRepository.java create mode 100644 modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacLogTaskDetailRepository.java create mode 100644 modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacLogTaskRepository.java create mode 100644 modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacTaskTypeRepository.java create mode 100644 modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 3681eb6..ffcac19 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -13,5 +13,11 @@ i3plus-pojo-lac jar + + + i3plus.pojo + i3plus-pojo-base + + \ No newline at end of file diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackRecord.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackRecord.java new file mode 100644 index 0000000..4a864be --- /dev/null +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackRecord.java @@ -0,0 +1,91 @@ +package cn.estsh.i3plus.pojo.lac.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.Lob; +import javax.persistence.Table; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-10-18 下午6:04 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="LAC_COMMAND_STACK_RECORD") +@Api(value="适配记录",description = "适配记录") +public class LacCommandStackRecord extends BaseBean { + + private static final long serialVersionUID = -2775980024345181459L; + + @Column(name="commandStackId") + @ApiParam(value ="指令集ID" , example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long commandStackId; + + @Column(name="COMMAND_STACK_NAME_RDD") + @ApiParam(value ="指令集名称") + private String commandStackNameRdd; + + @Column(name="COMMAND_STACK_CODE_RDD") + @ApiParam(value ="指令集代码") + private String commandStackCodeRdd; + + @Column(name="COMMAND_STACK_TYPE_ID") + @ApiParam(value ="指令集类型") + @JsonSerialize(using = ToStringSerializer.class) + private Long commandStackTypeId; + + @Column(name="STEP_INDEX") + @ApiParam(value ="当前步骤") + private Integer stepIndex; + + @Column(name="STEP_NUM") + @ApiParam(value ="步骤总数") + private Integer stepNum; + + @Column(name="TASK_COMPLETE_NUM") + @ApiParam(value ="任务完成数量") + private Integer taskCompleteNum; + + @Column(name="TASK_NUM") + @ApiParam(value ="任务总数") + private Integer taskNum; + + @Lob + @Column(name="INPUT_PARAMETER") + @ApiParam(value ="执行入参") + private String inputParameter; + + @Column(name="STACK_START_TIME") + @ApiParam(value ="执行开始时间") + private String stackStartTime; + + @Column(name="STACK_END_TIME") + @ApiParam(value ="执行结束时间") + private String stackEndTime; + + @Column(name="STACK_SPEND") + @ApiParam(value ="执行耗时") + private Integer stackSpend; + + @Column(name="STACK_STATUS") + @ApiParam(value ="执行状态") + private Integer stackStatus; + +} diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackType.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackType.java new file mode 100644 index 0000000..431e878 --- /dev/null +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackType.java @@ -0,0 +1,44 @@ +package cn.estsh.i3plus.pojo.lac.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 : wei.peng + * @CreateDate : 19-10-22 下午3:29 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="LAC_INSTRUCTION_TYPE") +@Api(value="指令集类型",description = "指令集类型") +public class LacCommandStackType extends BaseBean { + + + @Column(name="TYPE_NAME") + @ApiParam(value ="类型名称") + private String typeName; + + @Column(name="TYPE_REF_NUM") + @ApiParam(value ="适配器使用数量") + private Integer typeRefNum; + + @Column(name="TYPE_DESCRIPTION") + @ApiParam(value ="类型描述") + private String typeDescription; + +} diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTask.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTask.java new file mode 100644 index 0000000..daab86e --- /dev/null +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTask.java @@ -0,0 +1,106 @@ +package cn.estsh.i3plus.pojo.lac.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.Lob; +import javax.persistence.Table; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-10-18 下午6:04 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="LAC_LOG_TASK") +@Api(value="适配任务记录",description = "适配任务记录") +public class LacLogTask extends BaseBean { + + private static final long serialVersionUID = 674009105885048131L; + @Column(name="commandStackId") + @ApiParam(value ="指令集ID" , example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long commandStackId; + + @Column(name="COMMAND_STACK_NAME_RDD") + @ApiParam(value ="指令集名称") + private String commandStackNameRdd; + + @Column(name="COMMAND_STACK_CODE_RDD") + @ApiParam(value ="指令集代码") + private String commandStackCodeRdd; + + @Column(name="COMMAND_STACK_TYPE_ID") + @ApiParam(value ="指令集类型") + @JsonSerialize(using = ToStringSerializer.class) + private Long commandStackTypeId; + + @Column(name="STEP_ID") + @ApiParam(value ="步骤ID" , example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long stepId; + + @Column(name="STEP_NAME_RDD") + @ApiParam(value ="步骤名称") + private String stepNameRdd; + + @Column(name="STEP_SEQUENCE") + @ApiParam(value ="步骤顺序") + private String stepSequence; + + @Column(name="TASK_ID") + @ApiParam(value ="任务ID" , example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long taskId; + + @Column(name="TASK_NAME_RDD") + @ApiParam(value ="任务名称") + private String taskNameRdd; + + @Column(name="TASK_NAME_TYPE") + @ApiParam(value ="任务类型") + @JsonSerialize(using = ToStringSerializer.class) + private Long taskNameType; + + @Column(name="adapterId") + @ApiParam(value ="适配器ID" , example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long adapterId; + + @Lob + @Column(name="INPUT_PARAMETER") + @ApiParam(value ="任务入参") + private String inputParameter; + + @Column(name="TASK_START_TIME") + @ApiParam(value ="任务开始时间") + private String taskStartTime; + + @Column(name="TASK_END_TIME") + @ApiParam(value ="任务结束时间") + private String taskEndTime; + + @Column(name="TASK_SPEND") + @ApiParam(value ="任务耗时") + private Integer taskSpend; + + @Column(name="TASK_STATUS") + @ApiParam(value ="任务状态") + private Integer taskStatus; + +} diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTaskDetail.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTaskDetail.java new file mode 100644 index 0000000..3a3f05e --- /dev/null +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacLogTaskDetail.java @@ -0,0 +1,94 @@ +package cn.estsh.i3plus.pojo.lac.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.Lob; +import javax.persistence.Table; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-10-18 下午6:04 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="LAC_LOG_TASK_DETAIL") +@Api(value="适配任务记录明细",description = "适配任务记录明细") +public class LacLogTaskDetail extends BaseBean { + + + private static final long serialVersionUID = -4918694502072594064L; + @Column(name="commandStackId") + @ApiParam(value ="指令集ID" , example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long commandStackId; + + @Column(name="COMMAND_STACK_TYPE_ID") + @ApiParam(value ="指令集类型") + @JsonSerialize(using = ToStringSerializer.class) + private Long commandStackTypeId; + + @Column(name="STEP_ID") + @ApiParam(value ="步骤ID" , example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long stepId; + + @Column(name="TASK_ID") + @ApiParam(value ="任务ID" , example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long taskId; + + @Column(name="TASK_NAME_TYPE") + @ApiParam(value ="任务类型") + @JsonSerialize(using = ToStringSerializer.class) + private Long taskNameType; + + @Column(name="adapterId") + @ApiParam(value ="适配器ID" , example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long adapterId; + + @Column(name="TASK_START_TIME") + @ApiParam(value ="任务开始时间") + private String taskStartTime; + + @Column(name="TASK_END_TIME") + @ApiParam(value ="任务结束时间") + private String taskEndTime; + + @Lob + @Column(name="INPUT_PARAMETER") + @ApiParam(value ="任务入参") + private String inputParameter; + + @Lob + @Column(name="INPUT_PARAMETER_BODY") + @ApiParam(value ="任务入参处理完成后") + private String inputParameterBody; + + @Lob + @Column(name="OUTPUT_PARAMETER") + @ApiParam(value ="任务出参") + private String outputParameter; + + @Lob + @Column(name="OUTPUT_PARAMETER_BODY") + @ApiParam(value ="任务出参处理后") + private String outputParameterBody; + +} diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacTaskType.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacTaskType.java new file mode 100644 index 0000000..688f8ec --- /dev/null +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacTaskType.java @@ -0,0 +1,42 @@ +package cn.estsh.i3plus.pojo.lac.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 : wei.peng + * @CreateDate : 19-10-22 下午3:32 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="LAC_TASK_TYPE") +@Api(value="任务类型",description = "任务类型") +public class LacTaskType extends BaseBean { + + @Column(name="TASK_NAME") + @ApiParam(value ="类型名称") + private String taskName; + + @Column(name="TASK_REF_NUM") + @ApiParam(value ="适配器使用数量") + private Integer taskRefNum; + + @Column(name="TASK_DESCRIPTION") + @ApiParam(value ="类型描述") + private String taskDescription; +} diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacCommandStackRecordRepository.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacCommandStackRecordRepository.java new file mode 100644 index 0000000..f19b6af --- /dev/null +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacCommandStackRecordRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.lac.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.lac.bean.LacCommandStackRecord; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-10-22 下午5:19 + * @Modify: + **/ +public interface LacCommandStackRecordRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacCommandStackTypeRepository.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacCommandStackTypeRepository.java new file mode 100644 index 0000000..fc85fd6 --- /dev/null +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacCommandStackTypeRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.lac.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.lac.bean.LacCommandStackType; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-10-22 下午5:19 + * @Modify: + + **/ +public interface LacCommandStackTypeRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacLogTaskDetailRepository.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacLogTaskDetailRepository.java new file mode 100644 index 0000000..cd6e570 --- /dev/null +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacLogTaskDetailRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.lac.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.lac.bean.LacLogTaskDetail; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-10-22 下午5:19 + * @Modify: + + **/ +public interface LacLogTaskDetailRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacLogTaskRepository.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacLogTaskRepository.java new file mode 100644 index 0000000..846acec --- /dev/null +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacLogTaskRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.lac.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.lac.bean.LacLogTask; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-10-22 下午5:19 + * @Modify: + + **/ +public interface LacLogTaskRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacTaskTypeRepository.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacTaskTypeRepository.java new file mode 100644 index 0000000..9cddec2 --- /dev/null +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/repository/LacTaskTypeRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.lac.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.lac.bean.LacTaskType; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-10-22 下午5:19 + * @Modify: + + **/ +public interface LacTaskTypeRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java new file mode 100644 index 0000000..2c5dbff --- /dev/null +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java @@ -0,0 +1,47 @@ +package cn.estsh.i3plus.pojo.lac.sqlpack; + +import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; +import cn.estsh.i3plus.pojo.lac.bean.*; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-10-22 下午5:34 + * @Modify: + **/ +public class LacHqlPack { + + private LacHqlPack() { + } + + public static DdlPackBean packHqlLacTaskType(LacTaskType bean){ + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); + + return ddlPackBean; + } + + public static DdlPackBean packHqlLacLogTaskDetail(LacLogTaskDetail bean){ + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); + + return ddlPackBean; + } + + public static DdlPackBean packHqlLacLogTask(LacLogTask bean){ + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); + + return ddlPackBean; + } + + public static DdlPackBean packHqlLacCommandStackType(LacCommandStackType bean){ + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); + + return ddlPackBean; + } + + public static DdlPackBean packHqlLacCommandStackRecord(LacCommandStackRecord bean){ + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); + + return ddlPackBean; + } +} From 5e78c31a708d143ad05c8b97ce1a417d29d1a481 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Wed, 23 Oct 2019 10:34:22 +0800 Subject: [PATCH 07/35] =?UTF-8?q?LAC=20=E5=90=8D=E7=A7=B0=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index 0294208..8f92da4 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -31,7 +31,7 @@ public class CommonEnumUtil { JOBFLOW(23,"block-jobflow","智能作业流"), SOFTSWITCH(24,"block-softswitch","软件适配器"), HARDSWITCH(25,"block-hardswitch","硬件适配器"), - LAC(26,"link-connect","连接适配器"), + LAC(26,"lac","连接适配器"), ANDON(27,"andon","安灯"), CENTER(99,"icloud-server","注册中心"), SURFACE(98,"i3surface","对外服务"), From 6816c7b5661f235d0f65141d4ee13ed112e152f6 Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 23 Oct 2019 10:49:47 +0800 Subject: [PATCH 08/35] =?UTF-8?q?1=EF=BC=9A=E6=96=B0=E5=A2=9E=E5=AE=9E?= =?UTF-8?q?=E7=8E=B0=E7=94=9F=E4=BA=A7=E6=97=B6=E9=97=B4=E7=9A=84=E8=AE=A1?= =?UTF-8?q?=E7=AE=97=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/aps/bean/AssistResourceSetTime.java | 22 ++++ .../estsh/i3plus/pojo/aps/bean/DynamicSetTime.java | 22 ++++ .../cn/estsh/i3plus/pojo/aps/bean/FurnacePlan.java | 28 +++++ .../i3plus/pojo/aps/bean/MaterialSetTime.java | 22 ++++ .../estsh/i3plus/pojo/aps/bean/OperResource.java | 8 +- .../cn/estsh/i3plus/pojo/aps/bean/Resource.java | 36 ++++--- .../cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java | 83 +++++++++++++-- .../estsh/i3plus/pojo/aps/bean/WorkResource.java | 8 +- .../estsh/i3plus/pojo/aps/common/BeanRelation.java | 118 +++++++++++++++++++++ .../i3plus/pojo/aps/enums/DYNAMIC_SET_CALC.java | 7 ++ .../i3plus/pojo/aps/enums/DYNAMIC_SET_TYPE.java | 7 ++ .../i3plus/pojo/aps/enums/EFFICIENCY_EFFECT.java | 18 ++++ .../i3plus/pojo/aps/enums/RESOURCE_LOCK_TYPE.java | 7 ++ .../i3plus/pojo/aps/enums/TIME_ROUND_TYPE.java | 1 - .../i3plus/pojo/aps/enums/WORK_SORT_RULE.java | 1 - .../i3plus/pojo/aps/holders/EFurnacePlan.java | 5 + .../estsh/i3plus/pojo/aps/holders/EWorkPlan.java | 7 +- .../AssistResourceSetTimeRepository.java | 9 ++ .../aps/repository/DynamicSetTimeRepository.java | 9 ++ .../pojo/aps/repository/FurnacePlanRepository.java | 9 ++ .../aps/repository/MaterialSetTimeRepository.java | 9 ++ .../src/main/resources/relations/FurnacePlan.xml | 5 + .../src/main/resources/relations/Work.xml | 2 + .../src/main/resources/relations/WorkPlan.xml | 8 +- 24 files changed, 414 insertions(+), 37 deletions(-) create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/AssistResourceSetTime.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DynamicSetTime.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnacePlan.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialSetTime.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/DYNAMIC_SET_CALC.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/DYNAMIC_SET_TYPE.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/EFFICIENCY_EFFECT.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RESOURCE_LOCK_TYPE.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EFurnacePlan.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/AssistResourceSetTimeRepository.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/DynamicSetTimeRepository.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/FurnacePlanRepository.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/MaterialSetTimeRepository.java create mode 100644 modules/i3plus-pojo-aps/src/main/resources/relations/FurnacePlan.xml diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/AssistResourceSetTime.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/AssistResourceSetTime.java new file mode 100644 index 0000000..000001d --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/AssistResourceSetTime.java @@ -0,0 +1,22 @@ +package cn.estsh.i3plus.pojo.aps.bean; + +import cn.estsh.i3plus.pojo.aps.common.BaseAPS; +import io.swagger.annotations.Api; +import lombok.Data; + +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description :动态设置时间与副资源相关的配置 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-09-22 + * @Modify: + **/ +@Data +@Entity +@Table(name = "APS_ASSIST_RESOURCE_SET_TIME") +@Api("副资源设置时间") +public class AssistResourceSetTime extends BaseAPS { +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DynamicSetTime.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DynamicSetTime.java new file mode 100644 index 0000000..60a6f84 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DynamicSetTime.java @@ -0,0 +1,22 @@ +package cn.estsh.i3plus.pojo.aps.bean; + +import cn.estsh.i3plus.pojo.aps.common.BaseAPS; +import io.swagger.annotations.Api; +import lombok.Data; + +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description :动态设置时间设置 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-09-22 + * @Modify: + **/ +@Data +@Entity +@Table(name = "APS_DYNAMIC_SET_TIME") +@Api("动态设置时间") +public class DynamicSetTime extends BaseAPS { +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnacePlan.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnacePlan.java new file mode 100644 index 0000000..0d0a2fa --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnacePlan.java @@ -0,0 +1,28 @@ +package cn.estsh.i3plus.pojo.aps.bean; + +import cn.estsh.i3plus.pojo.aps.common.BaseAPS; +import io.swagger.annotations.Api; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description :炉资源计划信息，用来关联组在一起的工作计划 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-10-22 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="APS_FURNACE_PLAN") +@Api("炉资源计划") +public class FurnacePlan extends BaseAPS { +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialSetTime.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialSetTime.java new file mode 100644 index 0000000..7ec01f9 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialSetTime.java @@ -0,0 +1,22 @@ +package cn.estsh.i3plus.pojo.aps.bean; + +import cn.estsh.i3plus.pojo.aps.common.BaseAPS; +import io.swagger.annotations.Api; +import lombok.Data; + +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description :动态设置时间与物料相关的配置 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-09-22 + * @Modify: + **/ +@Data +@Entity +@Table(name = "APS_MATERIAL_SET_TIME") +@Api("物料设置时间") +public class MaterialSetTime extends BaseAPS { +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperResource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperResource.java index 4957a0e..483dac0 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperResource.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperResource.java @@ -35,9 +35,9 @@ public class OperResource extends BaseAPS { @ApiParam(value ="前设置时间") private String prevTime; - @Column(name="MANUF_TIME") + @Column(name="PRODUCE_TIME") @ApiParam(value ="生产时间") - private String manufTime; + private String produceTime; @Column(name="POST_TIME") @ApiParam(value ="后设置时间") @@ -47,9 +47,9 @@ public class OperResource extends BaseAPS { @ApiParam(value ="最大前设置中断时间") private String maxPrevSdTime; - @Column(name="MAX_MANUF_SD_TIME") + @Column(name="MAX_PRODUCE_SD_TIME") @ApiParam(value ="最大生产中断时间") - private String maxManufSdTime; + private String maxProduceSdTime; @Column(name="MAX_POST_SD_TIME") @ApiParam(value ="最大后设置中断时间") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java index 5949b15..2a95d89 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.aps.bean; import cn.estsh.i3plus.pojo.aps.common.BaseCode; import cn.estsh.i3plus.pojo.aps.enums.RESOURCE_CLASS; +import cn.estsh.i3plus.pojo.aps.enums.RESOURCE_LOCK_TYPE; import cn.estsh.i3plus.pojo.aps.enums.RESOURCE_TYPE; import cn.estsh.i3plus.pojo.aps.enums.TIME_ROUND_TYPE; import io.swagger.annotations.Api; @@ -48,37 +49,37 @@ public class Resource extends BaseCode { @ApiParam(value ="后缓冲时间") private String postBuffer; - @Column(name="MAX_MANUF_BATCH") + @Column(name="MAX_PRODUCE_BATCH") @ApiParam(value ="最大生产批量") - private Double maxManufBatch; + private Double maxProduceBatch; - @Column(name="MANUF_ADJ_UNIT_TM") - @ApiParam(value ="生产时间尾数调整") - private String manufAdjUnitTm; + @Column(name="TIME_TAIL_ADJUST") + @ApiParam(value ="时间尾数调整") + private String timeTailAdjust; - @Column(name="MANUF_ADJ_UNIT") - @ApiParam(value ="生产时刻尾数调整") - private String manufAdjUnit; + @Column(name="TIME_ADJUST") + @ApiParam(value ="时间调整") + private String timeAdjust; @Column(name="MAX_PREV_SD_TIME") @ApiParam(value ="最大前设置中断时间") private String maxPrevSdTime; - @Column(name="MAX_MANUF_SD_TIME") + @Column(name="MAX_PRODUCE_SD_TIME") @ApiParam(value ="最大生产中断时间") - private String maxManufSdTime; + private String maxProduceSdTime; @Column(name="MAX_POST_SD_TIME") @ApiParam(value ="最大后设置中断时间") private String maxPostSdTime; @Column(name="ROUND_TYPE") - @ApiParam(value ="时间圆整类型") + @ApiParam(value ="时间与时间尾数圆整类型") private TIME_ROUND_TYPE roundType; - @Column(name="MANUF_EFFECT") - @ApiParam(value ="生产效率影响") - private Integer manufEffect; + @Column(name="EFFICIENCY_EFFECT") + @ApiParam(value ="效率影响类型") + private Integer EfficiencyEffect; @Column(name="TIME_ROUND") @ApiParam(value ="时间圆整影响") @@ -88,4 +89,11 @@ public class Resource extends BaseCode { @ApiParam(value ="时间尾数影响") private Integer timeTailRound; + @Column(name="LOCK_TYPE") + @ApiParam(value ="锁定类型") + private RESOURCE_LOCK_TYPE lockType; + + @Column(name="LOCK_TIME") + @ApiParam(value ="锁定时间长度") + private String lockTime; } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java index 546b590..08be72e 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java @@ -5,14 +5,17 @@ import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EWorkPlan; import cn.estsh.i3plus.pojo.aps.holders.EWorkRelation; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; +import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import java.util.Date; +import java.util.List; /** * @Description :工作计划 @@ -29,24 +32,70 @@ import java.util.Date; @Table(name="APS_WORK_PLAN") @Api("工作计划") public class WorkPlan extends BaseAPS { - private Date prevSetStart; + @Column(name="PREV_SET_BEGIN") + @ApiParam(value ="前设置开始时间") + private Date prevSetBegin; + + @Column(name="PREV_SET_END") + @ApiParam(value ="前设置结束时间") private Date prevSetEnd; - private String prevSetTime; - private Date produceStart; + + @Column(name="PREV_SET_TIME") + @ApiParam(value ="前设置时间") + private Long prevSetTime; + + @Column(name="PRODUCE_BEGIN") + @ApiParam(value ="生产开始时间") + private Date produceBegin; + + @Column(name="PRODUCE_END") + @ApiParam(value ="生产结束时间") private Date produceEnd; - private String produceTime; - private Date postSetStart; + + @Column(name="PRODUCE_TIME") + @ApiParam(value ="生产时间") + private Long produceTime; + + @Column(name="POST_SET_BEGIN") + @ApiParam(value ="后设置开始时间") + private Date postSetBegin; + + @Column(name="POST_SET_END") + @ApiParam(value ="后设置结束时间") private Date postSetEnd; - private String postSetTime; - private Date lockStart; + + @Column(name="POST_SET_TIME") + @ApiParam(value ="后设置时间") + private Long postSetTime; + + @Column(name="LOCK_BEGIN") + @ApiParam(value ="锁定开始时间") + private Date lockBegin; + + @Column(name="LOCK_END") + @ApiParam(value ="锁定结束时间") private Date lockEnd; - private String lockTime; - private Date edgeTime; + @Column(name="LOCK_TIME") + @ApiParam(value ="锁定时间") + private Long lockTime; + @Column(name="WORK_ID") + @ApiParam(value ="工作对象id") private Long workId; + + @Column(name="RESOURCE_ID") + @ApiParam(value ="资源对象id") private Long resourceId; + @Column(name="WORK_RESOURCE_ID") + @ApiParam(value ="工作资源对象id") + private Long workResourceId; + + @Column(name="MAIN_PLAN_ID") + @ApiParam(value ="主计划对象id") + private Long mainPlanId; + public Work getWork() { return BeanRelation.get(this, EWorkPlan.Work); } public void setWork(Work work) { @@ -60,4 +109,20 @@ public class WorkPlan extends BaseAPS { this.resourceId = resource != null ? resource.getId() : 0l; BeanRelation.set(this, EWorkPlan.Resource, resource); } + + public WorkResource getWorkResource() { return BeanRelation.get(this, EWorkPlan.WorkResource); } + + public void setWorkResource(WorkResource workResource) { + this.workResourceId = workResource != null ? workResource.getId() : 0l; + BeanRelation.set(this, EWorkPlan.WorkResource, workResource); + } + + public WorkPlan getMainPlan() { return BeanRelation.get(this, EWorkPlan.MainPlan); } + + public void setMainPlan(WorkPlan plan) { + this.mainPlanId = plan != null ? plan.getId() : 0l; + BeanRelation.set(this, EWorkPlan.MainPlan, plan); + } + + public List getAssPlans() { return BeanRelation.list(this, EWorkPlan.AssPlans); } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkResource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkResource.java index d500003..f4266ec 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkResource.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkResource.java @@ -34,9 +34,9 @@ public class WorkResource extends BaseAPS { @ApiParam(value ="前设置时间") private Long prevTime; - @Column(name="MANUF_TIME") + @Column(name="PRODUCE_TIME") @ApiParam(value ="制造时间") - private Long manufTime; + private Long produceTime; @Column(name="POST_TIME") @ApiParam(value ="后设置时间") @@ -50,9 +50,9 @@ public class WorkResource extends BaseAPS { @ApiParam(value ="最大前设置中断时间") private String maxPrevSdTime; - @Column(name="MAX_MANUF_SD_TIME") + @Column(name="MAX_PRODUCE_SD_TIME") @ApiParam(value ="最大制造中断时间") - private String maxManufSdTime; + private String maxProduceSdTime; @Column(name="MAX_POST_SD_TIME") @ApiParam(value ="最大后设置中断时间") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java index 6c7e206..86df02c 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java @@ -69,6 +69,13 @@ public class BeanRelation { return temp; } + /** + * 获取关联对象 + * @param bean 实体对象 + * @param holder 关联路径 + * @param 返回关联对象的实体类型 + * @return 若存在多个关联则只取第一个。 + */ public static T get(BaseBean bean, Enum holder) { List beans = (List)get(bean).get(holder); if (beans == null || beans.isEmpty()) { @@ -77,10 +84,27 @@ public class BeanRelation { return beans.get(0); } + /** + * 获取关联对象 + * @param bean 实体对象 + * @param holder 第一个关联路径 + * @param args 后续关联路径 + * @param 返回关联对象的实体类型 + * @return 若存在多个关联则只取第一个。 + */ public static T get(BaseBean bean, Enum holder, Enum... args) { return get(bean, null, holder, args); } + /** + * 根据筛选条件获取关联对象 + * @param bean 实体对象 + * @param pred Lambda表达式，用来筛选关联对象，返回true则符合筛选条件 + * @param holder 第一个关联路径 + * @param args 后续关联路径 + * @param 返回关联对象的实体类型 + * @return 只找第一个符合筛选条件的关联对象。 + */ public static T get(BaseBean bean, Predicate pred, Enum holder, Enum... args) { List nextBeans = list(bean, holder); for (BaseBean nextEntity : nextBeans) { @@ -111,6 +135,13 @@ public class BeanRelation { return null; } + /** + * 获取关联对象集合 + * @param bean 实体对象 + * @param holder 关联路径 + * @param 返回关联对象的实体类型 + * @return 返回的List集合非拷贝的，外界不能对其修改。 + */ public static List list(BaseBean bean, Enum holder) { List beans = (List)get(bean).get(holder); if (beans == null) { @@ -119,10 +150,27 @@ public class BeanRelation { return beans; } + /** + * 获取关联对象集合 + * @param bean 实体对象 + * @param holder 第一个关联路径 + * @param args 后续关联路径 + * @param 返回关联对象的实体类型 + * @return 返回的List集合为拷贝的，外界可以对其修改。 + */ public static List list(BaseBean bean, Enum holder, Enum... args) { return list(bean, null, holder, args); } + /** + * 获取符合筛选条件的关联对象集合 + * @param bean 实体对象 + * @param pred Lambda筛选表达式，返回true为筛选出来的对象。 + * @param holder 第一个关联路径 + * @param args 后续关联路径 + * @param 返回关联对象的实体类型 + * @return 返回的List集合为拷贝的，外界可以对其修改。 + */ public static List list(BaseBean bean, Predicate pred, Enum holder, Enum... args) { List result = new ArrayList<>(); List nextBeans = list(bean, holder); @@ -157,6 +205,38 @@ public class BeanRelation { } } + public static List lastList(BaseBean entity, Enum... args) { + List result = new ArrayList(); + lastListImpl(result, entity, null, args, 0); + return result; + } + + public static List lastList(BaseBean entity, Predicate filter, Enum... args) { + List result = new ArrayList(); + lastListImpl(result, entity, filter, args, 0); + return result; + } + + @SuppressWarnings("unchecked") + private final static boolean lastListImpl(List result, BaseBean entity, Predicate filter, + Enum[] args, int index) { + if (index >= args.length) { + index = 0; + } + + boolean bNotLast = true; + List relaEntities = list(entity, args[index]); + for (BaseBean relaEntity : relaEntities) { + if (lastListImpl(result, relaEntity, filter, args, index + 1)) { + result.add((T)relaEntity); + bNotLast = false; + } + } + return index == 0 && bNotLast; + } + + + /** * 设值两个对象之间的关联 * @@ -282,4 +362,42 @@ public class BeanRelation { } } } + + /** + * 按指定路径，递归调用lambda表达式，当lambda表达式返回false或路径存在循环则退出递归。 + * @param bean + * @param fun + * @param holders + * @param + */ + public static void recursion(BaseBean bean, Predicate fun, Enum... holders) { + if (holders.length == 0) { + return; + } + recursionImpl(bean, fun, holders, 0); + } + + /** + * 按指定路径，递归调用实现。采用广度优先搜索。 + * @param bean + * @param fun + * @param holders + * @param index + * @param + */ + @SuppressWarnings("unchecked") + private final static void recursionImpl(BaseBean bean, Predicate fun, + Enum[] holders, int index) { + if (index >= holders.length) { + if (!fun.test((T) bean)) { + return; + } + index = 0; + } + + List relaBeans = list(bean, holders[index]); + for (BaseBean relaBean : relaBeans) { + recursionImpl(relaBean, fun, holders, index + 1); + } + } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/DYNAMIC_SET_CALC.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/DYNAMIC_SET_CALC.java new file mode 100644 index 0000000..acf8ac8 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/DYNAMIC_SET_CALC.java @@ -0,0 +1,7 @@ +package cn.estsh.i3plus.pojo.aps.enums; + +public enum DYNAMIC_SET_CALC { + MIN, // 取最小值 + MAX, // 取最大值 + SUM // 求和 +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/DYNAMIC_SET_TYPE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/DYNAMIC_SET_TYPE.java new file mode 100644 index 0000000..0453942 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/DYNAMIC_SET_TYPE.java @@ -0,0 +1,7 @@ +package cn.estsh.i3plus.pojo.aps.enums; + +public enum DYNAMIC_SET_TYPE { + PREV_SET, // 只对前设置影响 + POST_SET, // 只对后设置影响 + ALL // 对前后设置都产生影响 +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/EFFICIENCY_EFFECT.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/EFFICIENCY_EFFECT.java new file mode 100644 index 0000000..40f73ba --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/EFFICIENCY_EFFECT.java @@ -0,0 +1,18 @@ +package cn.estsh.i3plus.pojo.aps.enums; + +public enum EFFICIENCY_EFFECT { + NONE(0), + PREV_SET(1), + PRODUCE(2), + POST_SET(4); + + private int _value; + + EFFICIENCY_EFFECT(int value){ + _value = value; + } + + public int value() { + return this._value; + } +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RESOURCE_LOCK_TYPE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RESOURCE_LOCK_TYPE.java new file mode 100644 index 0000000..cb37621 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RESOURCE_LOCK_TYPE.java @@ -0,0 +1,7 @@ +package cn.estsh.i3plus.pojo.aps.enums; + +public enum RESOURCE_LOCK_TYPE { + NONE, // 不锁定 + PRODUCE_BEGIN, // 与后工序生产开始时刻有关 + PRODUCE_END // 与后工序生产结束时刻有关 +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/TIME_ROUND_TYPE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/TIME_ROUND_TYPE.java index b9d7cc3..0233691 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/TIME_ROUND_TYPE.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/TIME_ROUND_TYPE.java @@ -8,7 +8,6 @@ package cn.estsh.i3plus.pojo.aps.enums; * @Modify: **/ public enum TIME_ROUND_TYPE { - NONE, // 不圆整 UP, // 向上 DOWN, // 向下 ROUNDING // 四舍五入 diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_SORT_RULE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_SORT_RULE.java index 99a6d77..bdaa913 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_SORT_RULE.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_SORT_RULE.java @@ -15,7 +15,6 @@ public enum WORK_SORT_RULE { ORDER_COUNT, // 订单数量 ORDER_RECEIVE_DATE,// 订单接单日期 ORDER_LET_SUB_EST,// 订单交货期与订单最早开始时刻之差 - ORDER_PRESSURE, // 订单紧迫程度 ORDER_SURPLUS, // 订单余裕度 NOPLAN_OPERATION_SIZE,// 残留工序数 REMAIN_PRODUCE_TIME, // 残留生产时间 diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EFurnacePlan.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EFurnacePlan.java new file mode 100644 index 0000000..098fa63 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EFurnacePlan.java @@ -0,0 +1,5 @@ +package cn.estsh.i3plus.pojo.aps.holders; + +public enum EFurnacePlan { + WorkPlans +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkPlan.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkPlan.java index f288a42..490bddc 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkPlan.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkPlan.java @@ -3,5 +3,10 @@ package cn.estsh.i3plus.pojo.aps.holders; public enum EWorkPlan { Work, Resource, - AssPlans // 关联的为副资源的工作计划 + WorkResource, + MainPlan, // 关联的为主资源的工作计划 + AssPlans, // 关联的为副资源的工作计划 + PrevPlan, + PostPlan, + FurnacePlan, } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/AssistResourceSetTimeRepository.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/AssistResourceSetTimeRepository.java new file mode 100644 index 0000000..090a521 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/AssistResourceSetTimeRepository.java @@ -0,0 +1,9 @@ +package cn.estsh.i3plus.pojo.aps.repository; + +import cn.estsh.i3plus.pojo.aps.bean.AssistResourceSetTime; +import org.springframework.data.repository.CrudRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface AssistResourceSetTimeRepository extends CrudRepository { +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/DynamicSetTimeRepository.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/DynamicSetTimeRepository.java new file mode 100644 index 0000000..3a6d491 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/DynamicSetTimeRepository.java @@ -0,0 +1,9 @@ +package cn.estsh.i3plus.pojo.aps.repository; + +import cn.estsh.i3plus.pojo.aps.bean.DynamicSetTime; +import org.springframework.data.repository.CrudRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface DynamicSetTimeRepository extends CrudRepository { +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/FurnacePlanRepository.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/FurnacePlanRepository.java new file mode 100644 index 0000000..b86b0c3 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/FurnacePlanRepository.java @@ -0,0 +1,9 @@ +package cn.estsh.i3plus.pojo.aps.repository; + +import cn.estsh.i3plus.pojo.aps.bean.FurnacePlan; +import org.springframework.data.repository.CrudRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface FurnacePlanRepository extends CrudRepository { +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/MaterialSetTimeRepository.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/MaterialSetTimeRepository.java new file mode 100644 index 0000000..6a7bb51 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/MaterialSetTimeRepository.java @@ -0,0 +1,9 @@ +package cn.estsh.i3plus.pojo.aps.repository; + +import cn.estsh.i3plus.pojo.aps.bean.MaterialSetTime; +import org.springframework.data.repository.CrudRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface MaterialSetTimeRepository extends CrudRepository { +} diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/FurnacePlan.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/FurnacePlan.xml new file mode 100644 index 0000000..49f17bd --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/FurnacePlan.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml index bd8ea37..ef8abd5 100644 --- a/modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml @@ -12,6 +12,8 @@ + + \ No newline at end of file diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/WorkPlan.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/WorkPlan.xml index 219bf07..7569fa1 100644 --- a/modules/i3plus-pojo-aps/src/main/resources/relations/WorkPlan.xml +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/WorkPlan.xml @@ -1,9 +1,11 @@ - - - + + + + + \ No newline at end of file From 6b9c7b3ced7545d011570072ddd885abcce8f864 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Wed, 23 Oct 2019 15:28:43 +0800 Subject: [PATCH 09/35] =?UTF-8?q?=E3=80=90VDA=E5=BA=93=E5=AD=98=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E7=9B=98=E7=82=B9=E3=80=91=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java | 12 ++++++++---- .../cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java | 4 ++++ 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java index a1832ae..85d93c7 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java @@ -107,6 +107,10 @@ public class WmsCSFactTrans extends BaseBean { @ApiParam("是否范围内") public Integer isScope; + @Column(name = "VENDOR_NO") + @ApiParam(value = "供应商编码") + public String vendorNo; + @Transient @ApiParam(value = "实盘箱数", example = "1") public Long countBoxQty; @@ -163,9 +167,9 @@ public class WmsCSFactTrans extends BaseBean { this.zoneNo = zoneNo; this.partNo = partNo; this.partNameRdd = partNameRdd; - + } - - - + + + } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java index 5addb05..bcbb261 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java @@ -101,6 +101,10 @@ public class WmsCSOrderDetails extends BaseBean { @AnnoOutputColumn(refClass = WmsEnumUtil.CS_TRANS_STATUS.class,refForeignKey = "value",value = "description") public Integer transStatus; + @Column(name = "VENDOR_NO") + @ApiParam(value = "供应商编码") + public String vendorNo; + @Transient @ApiParam(value = "实盘数量", example = "1") public Double factQty; From d5a45176d07855ed5fad0f433fc5fb22d18db211 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Wed, 23 Oct 2019 17:24:09 +0800 Subject: [PATCH 10/35] =?UTF-8?q?LAC=20=E4=BB=BB=E5=8A=A1=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E3=80=81=E6=8C=87=E4=BB=A4=E9=9B=86=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=20=E5=AF=B9=E8=B1=A1=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/lac/bean/LacCommandStackType.java | 2 +- .../main/java/cn/estsh/i3plus/pojo/lac/bean/LacTaskType.java | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackType.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackType.java index 431e878..c08c908 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackType.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackType.java @@ -24,7 +24,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="LAC_INSTRUCTION_TYPE") +@Table(name="LAC_COMMAND_STACK_TYPE") @Api(value="指令集类型",description = "指令集类型") public class LacCommandStackType extends BaseBean { diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacTaskType.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacTaskType.java index 688f8ec..32a5f3c 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacTaskType.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacTaskType.java @@ -28,15 +28,15 @@ import javax.persistence.Table; @Api(value="任务类型",description = "任务类型") public class LacTaskType extends BaseBean { - @Column(name="TASK_NAME") + @Column(name="TYPE_NAME") @ApiParam(value ="类型名称") - private String taskName; + private String typeName; - @Column(name="TASK_REF_NUM") + @Column(name="TYPE_REF_NUM") @ApiParam(value ="适配器使用数量") - private Integer taskRefNum; + private Integer typeRefNum; - @Column(name="TASK_DESCRIPTION") + @Column(name="TYPE_DESCRIPTION") @ApiParam(value ="类型描述") - private String taskDescription; + private String typeDescription; } From 752476b3dfb5188a262c1ec717bd7eab9e6844ab Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Wed, 23 Oct 2019 20:11:39 +0800 Subject: [PATCH 11/35] =?UTF-8?q?[=E9=9C=80=E6=B1=821086=EF=BC=8C=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E7=82=B9=E6=A3=80=E4=BF=9D=E5=85=BB=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=EF=BC=8C=E7=AC=AC2=E6=AC=A1=E6=8F=90=E4=BA=A4]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetail.java | 6 ++++++ .../java/cn/estsh/i3plus/pojo/mes/model/EquTaskNotifyUserModel.java | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetail.java index f25404e..5a14ad7 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetail.java @@ -12,6 +12,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 :设备作业任务明细 @@ -57,5 +59,9 @@ public class MesEquTaskDetail extends BaseBean { @ApiParam("维修标识") private Integer repairFlag; + @Transient + @ApiParam(value ="点检保养记录") + private List equTaskStandardRecordList; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EquTaskNotifyUserModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EquTaskNotifyUserModel.java index d93bbd5..e26b0c3 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EquTaskNotifyUserModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EquTaskNotifyUserModel.java @@ -31,7 +31,7 @@ import java.util.List; @Api("用户信息model") public class EquTaskNotifyUserModel extends BaseBean { - @ApiParam(value ="人员ID") + @ApiParam(value ="账户ID") private Long userId; @Column(name="USER_NAME_RDD") From 09cff08e1e1b04ad5f2f225ecffbe6c77dd5042f Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Wed, 23 Oct 2019 20:59:44 +0800 Subject: [PATCH 12/35] =?UTF-8?q?[=E9=9C=80=E6=B1=821086=EF=BC=8C=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E7=82=B9=E6=A3=80=E4=BF=9D=E5=85=BB=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=EF=BC=8C=E7=AC=AC2=E6=AC=A1=E6=8F=90=E4=BA=A4]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 893994e..15ae3e1 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -330,7 +330,7 @@ public class MesEnumUtil { public enum MES_EQU_TASK_NOTIFY_CFG_PATTERN { EMAIL(10, "邮件"), - USERPHONE(10, "手机号"); + USERPHONE(20, "手机号"); private int value; private String description; From 0c016485518e4fb08bfee0c0e963afefef4b13b1 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 24 Oct 2019 13:25:24 +0800 Subject: [PATCH 13/35] =?UTF-8?q?=E3=80=90=E9=9C=80=E6=B1=82=EF=BC=9A1088?= =?UTF-8?q?=EF=BC=8C=E8=AE=BE=E5=A4=87=E7=BB=B4=E4=BF=AE=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/bean/MesEquTaskDetail.java | 21 ++++++- .../pojo/mes/bean/MesEquTaskRepairRecord.java | 68 ++++++++++++++++++++++ .../MesEquTaskRepairRecordRepository.java | 16 +++++ 3 files changed, 104 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskRepairRecord.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskRepairRecordRepository.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetail.java index 5a14ad7..dfd7e1b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetail.java @@ -60,8 +60,27 @@ public class MesEquTaskDetail extends BaseBean { private Integer repairFlag; @Transient - @ApiParam(value ="点检保养记录") + @ApiParam(value = "点检保养记录") private List equTaskStandardRecordList; + @Transient + @ApiParam(value = "工位") + private String workCellCode; + + @Transient + @ApiParam(value = "生产线") + private String workCenterCode; + + @Transient + @ApiParam(value = "故障现象") + private String fpCode; + + @Transient + @ApiParam(value = "故障原因") + private String fcCode; + + @Transient + @ApiParam(value = "处理方法") + private String fmCode; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskRepairRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskRepairRecord.java new file mode 100644 index 0000000..f5720a9 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskRepairRecord.java @@ -0,0 +1,68 @@ +package cn.estsh.i3plus.pojo.mes.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description :设备维修作业记录 + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-10-11 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_EQU_TASK_REPAIR_RECORD") +@Api("设备维修作业记录") +public class MesEquTaskRepairRecord extends BaseBean { + + @Column(name = "TASK_NO") + @ApiParam("作业任务编号") + private String taskNo; + + @Column(name = "TASK_TYPE") + @ApiParam("作业类型") + private Integer taskType; + + @Column(name = "EQUIPMENT_CODE") + @ApiParam("设备代码") + private String equipmentCode; + + @Column(name = "EQUIPMENT_NAME") + @ApiParam("设备名称") + private String equipmentName; + + @Column(name = "FP_CODE") + @ApiParam("故障现象") + private String fpCode; + + @Column(name = "FC_CODE") + @ApiParam("故障原因") + private String fcCode; + + @Column(name = "FM_CODE") + @ApiParam("处理方法") + private String fmCode; + + @Column(name = "FINAL_RESULT") + @ApiParam("整体结果") + private Integer finalResult; + + @Column(name = "MEMO") + @ApiParam("备注") + private String memo; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskRepairRecordRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskRepairRecordRepository.java new file mode 100644 index 0000000..f4c1308 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskRepairRecordRepository.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.MesEquTaskRepairRecord; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-10-11 + * @Modify: + **/ +@Repository +public interface MesEquTaskRepairRecordRepository extends BaseRepository { +} From 1f9fc9f2800381dcd9704444570e7d2832163b82 Mon Sep 17 00:00:00 2001 From: Jason Date: Thu, 24 Oct 2019 17:24:29 +0800 Subject: [PATCH 14/35] =?UTF-8?q?1=EF=BC=9A=E6=96=B0=E5=A2=9E=E5=AE=9E?= =?UTF-8?q?=E7=8E=B0=E7=94=9F=E4=BA=A7=E6=97=B6=E9=97=B4=E7=9A=84=E8=AE=A1?= =?UTF-8?q?=E7=AE=97=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/aps/bean/AssistResourceSetTime.java | 26 ++++++++++++++++ .../estsh/i3plus/pojo/aps/bean/DynamicSetTime.java | 35 ++++++++++++++++++++++ .../i3plus/pojo/aps/bean/MaterialSetTime.java | 21 +++++++++++++ 3 files changed, 82 insertions(+) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/AssistResourceSetTime.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/AssistResourceSetTime.java index 000001d..43a7d40 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/AssistResourceSetTime.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/AssistResourceSetTime.java @@ -1,9 +1,12 @@ package cn.estsh.i3plus.pojo.aps.bean; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; +import cn.estsh.i3plus.pojo.aps.enums.USE_TYPE; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; import lombok.Data; +import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; @@ -19,4 +22,27 @@ import javax.persistence.Table; @Table(name = "APS_ASSIST_RESOURCE_SET_TIME") @Api("副资源设置时间") public class AssistResourceSetTime extends BaseAPS { + @Column(name="RES_CODE") + @ApiParam(value ="资源编码") + private String resCode; + + @Column(name="TYPE") + @ApiParam(value ="副资源使用类型") + private USE_TYPE type; + + @Column(name="PREV_RESOURCE") + @ApiParam(value ="前资源编码") + private String prevResource; + + @Column(name="POST_RESOURCE") + @ApiParam(value ="后资源编码") + private String postResource; + + @Column(name="TIME") + @ApiParam(value ="设置时间") + private String time; + + @Column(name="PRIORITY") + @ApiParam(value ="优先级") + private int priority; } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DynamicSetTime.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DynamicSetTime.java index 60a6f84..cef57c9 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DynamicSetTime.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DynamicSetTime.java @@ -1,9 +1,13 @@ package cn.estsh.i3plus.pojo.aps.bean; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; +import cn.estsh.i3plus.pojo.aps.enums.DYNAMIC_SET_CALC; +import cn.estsh.i3plus.pojo.aps.enums.DYNAMIC_SET_TYPE; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; import lombok.Data; +import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; @@ -19,4 +23,35 @@ import javax.persistence.Table; @Table(name = "APS_DYNAMIC_SET_TIME") @Api("动态设置时间") public class DynamicSetTime extends BaseAPS { + @Column(name="RES_CODE") + @ApiParam(value ="资源代码") + private String resCode; + + @Column(name="TYPE") + @ApiParam(value ="应用工作计划类型") + private DYNAMIC_SET_TYPE type; + + @Column(name="CONSIDER_ASS_RES") + @ApiParam(value ="是否启用副资源动态设置时间") + private Boolean considerAssRes; + + @Column(name="CONSIDER_MATERIAL") + @ApiParam(value ="是否启用物料动态设置时间") + private Boolean considerMaterial; + + @Column(name="ASS_RES_CALC") + @ApiParam(value ="副资源动态设置计算方式") + private DYNAMIC_SET_CALC assResCalc; + + @Column(name="MATERIAL_CALC") + @ApiParam(value ="物料动态设置时间计算方式") + private DYNAMIC_SET_CALC materialCalc; + + @Column(name="STATIC_CALC") + @ApiParam(value ="与静态设置时间计算方式") + private DYNAMIC_SET_CALC staticCalc; + + @Column(name="PRIORITY") + @ApiParam(value ="优先级") + private int priority; } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialSetTime.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialSetTime.java index 7ec01f9..d437b48 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialSetTime.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialSetTime.java @@ -2,8 +2,10 @@ package cn.estsh.i3plus.pojo.aps.bean; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; import lombok.Data; +import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; @@ -19,4 +21,23 @@ import javax.persistence.Table; @Table(name = "APS_MATERIAL_SET_TIME") @Api("物料设置时间") public class MaterialSetTime extends BaseAPS { + @Column(name="RES_CODE") + @ApiParam(value ="资源编码") + private String resCode; + + @Column(name="PREV_MATERIAL") + @ApiParam(value ="前物料编码") + private String prevMaterial; + + @Column(name="POST_MATERIAL") + @ApiParam(value ="后物料编码") + private String postMaterial; + + @Column(name="TIME") + @ApiParam(value ="设置时间") + private String time; + + @Column(name="PRIORITY") + @ApiParam(value ="优先级") + private int priority; } From 0824a58ead0ad6f5a80513251b1cdbf7ba6908bf Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Thu, 24 Oct 2019 21:03:08 +0800 Subject: [PATCH 15/35] =?UTF-8?q?=E5=AE=89=E7=81=AF=E5=AE=9A=E6=97=B6?= =?UTF-8?q?=E8=87=AA=E5=A4=84=E7=90=86job,=20=E5=B9=BF=E6=92=AD=E6=92=AD?= =?UTF-8?q?=E6=8A=A5=E5=86=85=E5=AE=B9=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalCfg.java | 6 ++++++ .../main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java | 1 + 2 files changed, 7 insertions(+) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalCfg.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalCfg.java index ffdeef2..819f768 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalCfg.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalCfg.java @@ -13,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 : ANDON_自处理配置 @@ -67,4 +69,8 @@ public class AndonDisposalCfg extends BaseBean { @Column(name = "FLOW_MEMO") @ApiParam(value = "审批意见") private String flowMemo; + + @Transient + @ApiParam(value = "审批意见集合") + private Integer[] flowStatusArray; } 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 833ebed..15572d5 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 @@ -388,6 +388,7 @@ public class AndonHqlPack { DdlPreparedPack.getStringEqualPack(andonDisposalCfg.getWorkCellCode(),"workCellCode", result); DdlPreparedPack.getStringEqualPack(andonDisposalCfg.getAlarmCode(),"alarmCode", result); DdlPreparedPack.getStringEqualPack(andonDisposalCfg.getAcCode(),"acCode", result); + DdlPreparedPack.getInPackArray(andonDisposalCfg.getFlowStatusArray(), "flowStatus", result); DdlPreparedPack.getNumEqualPack(andonDisposalCfg.getFlowStatus(),"flowStatus", result); getStringBuilderPack(andonDisposalCfg, result); From a880160f3d57665249d517aeabb9eb912a1d45f0 Mon Sep 17 00:00:00 2001 From: "changjiang.gao" Date: Fri, 25 Oct 2019 10:28:46 +0800 Subject: [PATCH 16/35] =?UTF-8?q?=E3=80=90=E6=8E=A5=E5=8F=A3=E6=98=A0?= =?UTF-8?q?=E5=B0=84=E3=80=91bug=206104?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/wms/dbinterface/WmsInterfaceDataMapper.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java index ac86f7e..b55e892 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java @@ -30,12 +30,12 @@ public class WmsInterfaceDataMapper extends BaseBean { * 排序编号 */ @Column(name = "SEQ") - public int seq; + public Integer seq; /** * 来源表的每次查询记录数，防止大量数据造成内存溢出 */ @Column(name = "SRC_GET_LIMIT") - public int srcGetLimit; + public Integer srcGetLimit; /** * 接口数据源编号（在动态表单中配置） */ @@ -132,23 +132,23 @@ public class WmsInterfaceDataMapper extends BaseBean { * 调用脚本方法获取数据 */ @Column(name = "USE_SCRIPT_PULL") - public int useScriptPull; + public Integer useScriptPull; /** * 调用脚本方法保存数据 */ - @Column(name = "USE_SCRIPT_PUSH") - public int useScriptPush; + @Column(name = "USE_SCRIPT_PUSH") + public Integer useScriptPush; /** * 调用脚本方法更新同步标志 */ @Column(name = "USE_SCRIPT_MARK") - public int useScriptMark; + public Integer useScriptMark; /** * 调用脚本方法过滤数据（查询来源数据后过滤） */ @Column(name = "USE_SCRIPT_FILTER") - public int useScriptFilter; + public Integer useScriptFilter; } From caf6dc17ab366beba3d6282ef8fdabfb91320260 Mon Sep 17 00:00:00 2001 From: qianhs Date: Fri, 25 Oct 2019 10:52:15 +0800 Subject: [PATCH 17/35] =?UTF-8?q?=E3=80=90NC=E5=86=BB=E7=BB=93=E3=80=91nc?= =?UTF-8?q?=E5=86=BB=E7=BB=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 1 + 1 file changed, 1 insertion(+) 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 822a771..332fe96 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 @@ -797,6 +797,7 @@ public class WmsEnumUtil { VDAREPORT("VDAREPORT", "VDA生产报工"), VDA_FINISH_GOODS("VDA_FINISH_GOODS", "VDA生产快速入库"), VDA_PICKING_GOODS("VDA_PICKING_GOODS", "VDA生产领料"), + VDA_NC_FREEZE("VDA_NC_FREEZE", "VDA_NC冻结"), VDA_ONE_PICKING_GOODS("VDA_ONE_PICKING_GOODS", "VDA单箱领料"); private String value; From a537daee62ffcdf16521a4a0190ad3d60315246d Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Fri, 25 Oct 2019 10:55:53 +0800 Subject: [PATCH 18/35] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E4=B8=8D=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E6=9C=89=E6=95=88=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java index 457b27d..5ed2462 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java @@ -67,7 +67,7 @@ public abstract class BaseBean implements Serializable { @Column(name="IS_VALID") @ApiParam(value = "有效性",example = "1") - @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description", hidden = true) public Integer isValid; //CommonEnumUtil.IS_VAILD; @Column(name="IS_DELETED") From e5b5891d2311bbf8b938fae62e47ad06f5b4ef25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Fri, 25 Oct 2019 11:48:02 +0800 Subject: [PATCH 19/35] =?UTF-8?q?bom=E4=BF=A1=E6=81=AF=E4=B8=AD=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=86=97=E4=BD=99=E5=AD=97=E7=AC=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java | 13 +++++++++++++ .../cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 16 ++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java index dfdad1f..01b1fea 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java @@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description : @@ -84,6 +85,18 @@ public class WmsBom extends BaseBean { @Column(name = "EFF_END_TIME") private String effEndTime; + @ApiParam(value = "目标存储区") + @Transient + public String destZoneNo; + + @ApiParam(value = "交易类型") + @Transient + public String transTypeCode; + + @ApiParam(value = "线路代码") + @Transient + public String routingCode; + public Double getQty() { return this.qty == null ? 0 : this.qty.doubleValue(); } 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 46d6355..d30e639 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 @@ -2460,4 +2460,20 @@ public class WmsHqlPack { return result; } + + /** + * 根据父物料查询子物料的bom信息 + * + * @param wmsBom + * @return + */ + public static DdlPackBean packHqlWmsBomByItemPartNo(WmsBom wmsBom) { + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringLikerPack(wmsBom.getPartNo(), "partNo", result); + + getStringBuilderPack(wmsBom, result); + + return result; + } } From 4c6f0b0d5716bb73c7d5711de3fc1beb88aa31d6 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Fri, 25 Oct 2019 13:00:37 +0800 Subject: [PATCH 20/35] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20CRUD=20Base?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackRecord.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackRecord.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackRecord.java index 4a864be..7a42440 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackRecord.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackRecord.java @@ -88,4 +88,8 @@ public class LacCommandStackRecord extends BaseBean { @ApiParam(value ="执行状态") private Integer stackStatus; + @Column(name="EXECUTION_DESCRIPTION") + @ApiParam(value ="执行说明") + private String executionDescription; + } From ca0cf21a7c5277fb720ac2ff57ab89a803842bb0 Mon Sep 17 00:00:00 2001 From: lpx Date: Fri, 25 Oct 2019 13:21:40 +0800 Subject: [PATCH 21/35] =?UTF-8?q?=E3=80=90NC=E8=A7=A3=E5=86=BB-4.2=20?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=A4=8D=E7=94=A8=E3=80=91PR12-01~PR12-02?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 332fe96..9546754 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 @@ -798,7 +798,8 @@ public class WmsEnumUtil { VDA_FINISH_GOODS("VDA_FINISH_GOODS", "VDA生产快速入库"), VDA_PICKING_GOODS("VDA_PICKING_GOODS", "VDA生产领料"), VDA_NC_FREEZE("VDA_NC_FREEZE", "VDA_NC冻结"), - VDA_ONE_PICKING_GOODS("VDA_ONE_PICKING_GOODS", "VDA单箱领料"); + VDA_ONE_PICKING_GOODS("VDA_ONE_PICKING_GOODS", "VDA单箱领料"), + VDA_NC_UN_FREEZE("VDA_NC_UN_FREEZE", "VDA_NC解冻"); private String value; private String description; From 16162542ba495392a633775bd93764f39e59e8c5 Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 25 Oct 2019 13:47:02 +0800 Subject: [PATCH 22/35] =?UTF-8?q?1=EF=BC=9A=E4=BF=AE=E6=94=B9listByPage?= =?UTF-8?q?=E7=94=B1GET=E6=96=B9=E6=B3=95=E4=B8=BAPOST=E6=96=B9=E6=B3=95?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java | 8 +++---- .../cn/estsh/i3plus/pojo/aps/enums/PLAN_TYPE.java | 15 +++++++++++++ .../cn/estsh/i3plus/pojo/aps/model/APSPager.java | 26 +++++++++++++++++++++- 3 files changed, 44 insertions(+), 5 deletions(-) create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/PLAN_TYPE.java diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java index 08be72e..95b5a20 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java @@ -42,7 +42,7 @@ public class WorkPlan extends BaseAPS { @Column(name="PREV_SET_TIME") @ApiParam(value ="前设置时间") - private Long prevSetTime; + private Integer prevSetTime; @Column(name="PRODUCE_BEGIN") @ApiParam(value ="生产开始时间") @@ -54,7 +54,7 @@ public class WorkPlan extends BaseAPS { @Column(name="PRODUCE_TIME") @ApiParam(value ="生产时间") - private Long produceTime; + private Integer produceTime; @Column(name="POST_SET_BEGIN") @ApiParam(value ="后设置开始时间") @@ -66,7 +66,7 @@ public class WorkPlan extends BaseAPS { @Column(name="POST_SET_TIME") @ApiParam(value ="后设置时间") - private Long postSetTime; + private Integer postSetTime; @Column(name="LOCK_BEGIN") @ApiParam(value ="锁定开始时间") @@ -78,7 +78,7 @@ public class WorkPlan extends BaseAPS { @Column(name="LOCK_TIME") @ApiParam(value ="锁定时间") - private Long lockTime; + private Integer lockTime; @Column(name="WORK_ID") @ApiParam(value ="工作对象id") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/PLAN_TYPE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/PLAN_TYPE.java new file mode 100644 index 0000000..8218c5b --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/PLAN_TYPE.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.aps.enums; + +/** + * @Description :工作计划包含的时间类型 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-09-17 + * @Modify: + **/ +public enum PLAN_TYPE { + PREV_SET, + PRODUCE, + POST_SET, + LOCK +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/APSPager.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/APSPager.java index 2cc398b..97f2c22 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/APSPager.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/APSPager.java @@ -3,8 +3,32 @@ package cn.estsh.i3plus.pojo.aps.model; import cn.estsh.i3plus.pojo.base.common.Pager; import lombok.Data; +import java.util.List; + @Data public class APSPager extends Pager { + public static class SortData { + // 排序对象 + private String name; + // 排序类型，1为升序，0为降序 + private int orderType; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public int getOrderType() { + return orderType; + } + + public void setOrderType(int orderType) { + this.orderType = orderType; + } + } private String filter; - private String sort; + private List sorts; } From 2906667856cc9805b34bfb6d951072b066287cea Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Fri, 25 Oct 2019 15:01:00 +0800 Subject: [PATCH 23/35] =?UTF-8?q?mes=E5=AE=9A=E6=97=B6=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E5=AE=89=E7=81=AF=E5=AE=89=E7=81=AF=E4=BB=BB=E5=8A=A1=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../model/andon/AndonManageQueueSyncModel.java | 27 ++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/andon/AndonManageQueueSyncModel.java diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/andon/AndonManageQueueSyncModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/andon/AndonManageQueueSyncModel.java new file mode 100644 index 0000000..cf2a454 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/andon/AndonManageQueueSyncModel.java @@ -0,0 +1,27 @@ +package cn.estsh.i3plus.pojo.model.andon; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description: mes定时获取安灯安灯任务信息请求DTO + * @Reference: + * @Author: Crish + * @CreateDate:2019-10-25-14:40 + * @Modify: + **/ +@Data +public class AndonManageQueueSyncModel{ + + @ApiParam("同步时间") + private String syscTime; + + @ApiParam("安灯状态") + private List statusList; + + @ApiParam("组织代码") + private String organizeCode; +} From a90aa8498f435f3b83b96a53af376a7dc0d71504 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Fri, 25 Oct 2019 15:39:53 +0800 Subject: [PATCH 24/35] =?UTF-8?q?=E5=AE=9E=E4=BD=93=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E7=B1=BB=E5=9E=8B=E3=80=90int=E3=80=91?= =?UTF-8?q?=E6=94=B9=E6=88=90=E3=80=90Integer=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java index ac86f7e..33e46a0 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java @@ -30,12 +30,12 @@ public class WmsInterfaceDataMapper extends BaseBean { * 排序编号 */ @Column(name = "SEQ") - public int seq; + public Integer seq; /** * 来源表的每次查询记录数，防止大量数据造成内存溢出 */ @Column(name = "SRC_GET_LIMIT") - public int srcGetLimit; + public Integer srcGetLimit; /** * 接口数据源编号（在动态表单中配置） */ @@ -132,23 +132,23 @@ public class WmsInterfaceDataMapper extends BaseBean { * 调用脚本方法获取数据 */ @Column(name = "USE_SCRIPT_PULL") - public int useScriptPull; + public Integer useScriptPull; /** * 调用脚本方法保存数据 */ @Column(name = "USE_SCRIPT_PUSH") - public int useScriptPush; + public Integer useScriptPush; /** * 调用脚本方法更新同步标志 */ @Column(name = "USE_SCRIPT_MARK") - public int useScriptMark; + public Integer useScriptMark; /** * 调用脚本方法过滤数据（查询来源数据后过滤） */ @Column(name = "USE_SCRIPT_FILTER") - public int useScriptFilter; + public Integer useScriptFilter; } From 3e9cc950178934473329c0caa3fd24d77cb45c47 Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Fri, 25 Oct 2019 15:50:29 +0800 Subject: [PATCH 25/35] =?UTF-8?q?pojo-model=E5=8A=A0=E5=85=A5andon-pojo?= =?UTF-8?q?=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-model/pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index 39a7704..7f12b9c 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -36,6 +36,11 @@ i3plus.pojo + i3plus-pojo-andon + + + + i3plus.pojo i3plus-pojo-wms From 00e849a62edbd9e6a7350a256874ca97e17d4613 Mon Sep 17 00:00:00 2001 From: jokelone Date: Fri, 25 Oct 2019 20:00:06 +0800 Subject: [PATCH 26/35] =?UTF-8?q?(1089=20=E8=BF=87=E7=A8=8B=E8=B4=A8?= =?UTF-8?q?=E9=87=8F=E6=A3=80=E6=B5=8B=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=EF=BC=9B1090=20=E8=BF=94=E5=8E=82=E8=BF=94=E4=BF=AE=E5=9F=BA?= =?UTF-8?q?=E7=A1=80=E6=95=B0=E6=8D=AE)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 189 +++++++++++++++++++-- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 162 ++++++++++++++++++ .../estsh/i3plus/pojo/mes/pcn/bean/MesDefect.java | 10 ++ .../i3plus/pojo/mes/pcn/bean/MesDefectRecord.java | 7 +- .../pojo/mes/pcn/bean/MesDismantleRecord.java | 2 +- .../pojo/mes/pcn/bean/MesProdBindRecord.java | 2 +- .../i3plus/pojo/mes/pcn/bean/MesQcCheckData.java | 2 +- .../estsh/i3plus/pojo/mes/pcn/bean/MesRepair.java | 2 +- .../i3plus/pojo/mes/pcn/bean/MesRepairRecord.java | 16 +- .../i3plus/pojo/mes/pcn/bean/MesScrapRecord.java | 4 +- .../i3plus/pojo/mes/pcn/bean/MesWorkCell.java | 2 +- .../i3plus/pojo/mes/pcn/model/MesDefectModel.java | 31 ++++ .../i3plus/pojo/mes/pcn/model/MesPartBomModel.java | 36 ---- .../pojo/mes/pcn/model/MesProcessBomModel.java | 61 +++++++ .../pojo/mes/pcn/model/MesProdBindRecordModel.java | 59 +++++++ .../cn/estsh/i3plus/pojo/mes/bean/MesRepair.java | 2 +- .../i3plus/pojo/mes/bean/MesRepairRecord.java | 2 +- .../estsh/i3plus/pojo/mes/bean/MesScrapRecord.java | 2 +- .../cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java | 2 +- 19 files changed, 526 insertions(+), 67 deletions(-) create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesDefectModel.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesPartBomModel.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProcessBomModel.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProdBindRecordModel.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 15ae3e1..1d8aa2a 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -12,6 +12,159 @@ import com.fasterxml.jackson.annotation.JsonFormat; public class MesEnumUtil { /** + * mes 图片面位 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_SIDE_LOCATION { + + A_SIDE(10, "A面"), + B_SIDE(20, "B面"), + C_SIDE(30, "C面"), + D_SIDE(40, "D面"); + + private int value; + private String description; + + MES_SIDE_LOCATION(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + } + + /** + * mes缺陷类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_DEFECT_TYPE { + + DEFECT_TYPE1(10, "缺陷类型1"), + DEFECT_TYPE2(20, "缺陷类型2"), + DEFECT_TYPE3(30, "缺陷类型3"); + + private int value; + private String description; + + MES_DEFECT_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + } + + /** + * mes类型信息，业务类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_TYPE_CFG_BUSIN_TYPE { + + BUSIN_TYPE1(10, "业务类型1"), + BUSIN_TYPE2(20, "业务类型2"), + BUSIN_TYPE3(30, "业务类型3"); + + private int value; + private String description; + + MES_TYPE_CFG_BUSIN_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + } + + /** + * mes缺陷原因类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_DEFECT_CAUSE_TYPE { + + QUALITY_DEFECTS(10, "质量缺陷"), + PROCESS_DEFECTS(20, "工艺缺陷"), + EQUIPMENT_DEFECT(30, "设备缺陷"); + + private int value; + private String description; + + MES_DEFECT_CAUSE_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + } + + /** * mes设备作业任务明细-执行状态 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) @@ -452,8 +605,8 @@ public class MesEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MES_WORK_CELL_TYPE { - NORMAL(1, "正常"), - REWORK(2, "返修"); + NORMAL(10, "正常"), + REWORK(20, "返修"); private int value; private String description; @@ -500,8 +653,8 @@ public class MesEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MES_ACTION_TYPE { - BIND(1, "绑定"), - UNTYING(2, "解绑"); + BIND(10, "绑定"), + UNTYING(20, "解绑"); private int value; private String description; @@ -548,8 +701,8 @@ public class MesEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MES_IS_KEY { - IS_KEY(1, "是"), - NO_KEY(2, "否"); + IS_KEY(10, "是"), + NO_KEY(20, "否"); private int value; private String description; @@ -596,8 +749,8 @@ public class MesEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MES_REPAIR_STATUS { - REPAIRED(1, "已维修"), - NO_REPAIR(2, "待维修"); + REPAIRED(10, "已维修"), + NO_REPAIR(20, "待维修"); private int value; private String description; @@ -644,11 +797,11 @@ public class MesEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MES_OPERATE_TYPE { - WORKSTATION_SCAN(1, "工位扫描"), - QUALITY_JUDGEMENT(2, "质量判定"), - MATERIAL_DISMANTLING(3, "物料拆解"), - REWORK(4, "返修作业"), - WORKSTATION_MONITORING(5, "工位监控"); + WORKSTATION_SCAN(10, "工位扫描"), + QUALITY_JUDGEMENT(20, "质量判定"), + MATERIAL_DISMANTLING(30, "物料拆解"), + REWORK(40, "返修作业"), + WORKSTATION_MONITORING(50, "工位监控"); private int value; private String description; @@ -1323,9 +1476,7 @@ public class MesEnumUtil { public enum PASS_FAIL { PASS(1, "合格"), - FAIL(2, "不合格"), - SCRAP(3, "报废"), - DISMANTLED(4, "已拆解"); + FAIL(2, "不合格"); private int value; private String description; @@ -1796,7 +1947,8 @@ public class MesEnumUtil { QUALIFIED(10, "合格"), DEFECTED(20, "不合格"), - SCRAPED(30, "报废"); + SCRAPED(30, "报废"), + DISMANTLED(40, "已拆解"); private int value; private String description; @@ -2104,7 +2256,8 @@ public class MesEnumUtil { UPDATE_SYNC_TIME(50, "UPDATE_SYNC_TIME"), PCN_PULL(60, "PCN_PULL"), PCN_PUSH(70, "PCN_PUSH"), - FDFS_DOWNLOAD(80, "FDFS_DOWNLOAD"); + FDFS_DOWNLOAD(80, "FDFS_DOWNLOAD"), + REWORK_REPAIR(90, "REWORK_REPAIR"); private int value; private String description; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index 34ce4d8..c6a96dc 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -13,6 +13,168 @@ import org.apache.commons.lang3.StringUtils; public class MesPcnEnumUtil { /** + * mes缺陷原因类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_DEFECT_CAUSE_TYPE { + + QUALITY_DEFECTS(10, "质量缺陷"), + PROCESS_DEFECTS(20, "工艺缺陷"), + EQUIPMENT_DEFECT(30, "设备缺陷"); + + private int value; + private String description; + + MES_DEFECT_CAUSE_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + } + + + /** + * mes 图片面位 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_SIDE_LOCATION { + + A_SIDE(10, "A面"), + B_SIDE(20, "B面"), + C_SIDE(30, "C面"), + D_SIDE(40, "D面"); + + private int value; + private String description; + + MES_SIDE_LOCATION(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + } + + /** + * mes 维修状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_REPAIR_STATUS { + + REPAIRED(10, "已维修"), + NO_REPAIR(20, "待维修"); + + private int value; + private String description; + + MES_REPAIR_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + } + + /** + * mes过程质量检测类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_QC_CHECK_TYPE { + + FIRST_CHECK(10, "首检"), + ON_SITE_CHECK(20, "巡检"), + END_CHECK(30, "尾检"); + + private int value; + private String description; + + MES_QC_CHECK_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static Integer descriptionOfValue(String description) { + Integer tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(description)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + + /** * mes-pcn定时任务状态 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefect.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefect.java index 09d4d3d..fa5a461 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefect.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefect.java @@ -11,6 +11,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: @@ -39,4 +41,12 @@ public class MesDefect extends BaseBean { @Column(name = "DEFECT_TYPE") @ApiParam("缺陷类型") private String defectType; + + @Transient + @ApiParam("缺陷位置") + private String defectLocation; + + @Transient + @ApiParam("缺陷类型子集") + private List mesDefectList; } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefectRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefectRecord.java index 72d0b14..53f4b36 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefectRecord.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefectRecord.java @@ -11,6 +11,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: @@ -49,7 +51,7 @@ public class MesDefectRecord extends BaseBean { @Column(name="DEFECT_LOCATION") @ApiParam("缺陷位置") - private Integer defectLocation; + private String defectLocation; @Column(name="REPAIR_STATUS") @ApiParam("维修状态") @@ -66,4 +68,7 @@ public class MesDefectRecord extends BaseBean { @Column(name="MEMO") @ApiParam("备注") private String memo; + + @Transient + private List mesDefectList; } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDismantleRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDismantleRecord.java index a114b7a..2775754 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDismantleRecord.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDismantleRecord.java @@ -82,5 +82,5 @@ public class MesDismantleRecord extends BaseBean { @Column(name = "MEMO") @ApiParam("备注") - private String meno; + private String memo; } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdBindRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdBindRecord.java index d708cb3..abb7861 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdBindRecord.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdBindRecord.java @@ -87,7 +87,7 @@ public class MesProdBindRecord extends BaseBean { @Column(name = "IS_KEY") @ApiParam(value = "是否关键件") - private String isKey; + private Integer isKey; @Column(name = "ACTION_TYPE") @ApiParam(value = "动作类型") diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckData.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckData.java index 43d8681..26bccb6 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckData.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckData.java @@ -80,7 +80,7 @@ public class MesQcCheckData extends BaseBean { @Column(name = "QTY") @ApiParam("产品数量") - private String qty; + private Integer qty; @Column(name = "MEMO") @ApiParam("备注") diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRepair.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRepair.java index 77c5220..9753ac8 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRepair.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRepair.java @@ -34,7 +34,7 @@ public class MesRepair extends BaseBean { @Column(name = "REPAIR_NAME") @ApiParam("维修名称") - private String repariName; + private String repairName; @Column(name = "REPAIR_TYPE") @ApiParam("维修类型") diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRepairRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRepairRecord.java index a3ce644..92c37be 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRepairRecord.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRepairRecord.java @@ -11,6 +11,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: @@ -82,5 +84,17 @@ public class MesRepairRecord extends BaseBean { @Column(name = "MEMO") @ApiParam("备注") - private String meno; + private String memo; + + @Transient + @ApiParam("备注") + private String spareMemo; + + @Transient + @ApiParam("不良记录id") + private Long defectRecordId; + + @Transient + @ApiParam("缺陷集合") + private List mesDefectList; } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesScrapRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesScrapRecord.java index e83ca89..2c60f7a 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesScrapRecord.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesScrapRecord.java @@ -46,7 +46,7 @@ public class MesScrapRecord extends BaseBean { @Column(name = "SCRAP_CODE") @ApiParam("报废代码") - private String repairCode; + private String scrapCode; @Column(name = "SCRAP_NAME") @ApiParam("报废名称") @@ -66,5 +66,5 @@ public class MesScrapRecord extends BaseBean { @Column(name = "MEMO") @ApiParam("备注") - private String meno; + private String memo; } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCell.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCell.java index 753c9cb..efcf8fd 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCell.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCell.java @@ -45,5 +45,5 @@ public class MesWorkCell extends BaseBean { @Column(name = "WORK_CELL_TYPE") @ApiParam("工位类型") - private String workCellType; + private Integer workCellType; } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesDefectModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesDefectModel.java new file mode 100644 index 0000000..b9acba1 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesDefectModel.java @@ -0,0 +1,31 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesDefect; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import javax.persistence.Transient; +import java.util.List; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\24 22:04 + * @Modify: + **/ +@Data +public class MesDefectModel { + + private String defectCode; + + @ApiParam("缺陷名称") + private String defectName; + + @ApiParam("缺陷类型") + private String defectType; + + @Transient + @ApiParam("缺陷分类子集") + private List mesDefectList; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesPartBomModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesPartBomModel.java deleted file mode 100644 index 0f0fccd..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesPartBomModel.java +++ /dev/null @@ -1,36 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.Data; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\10\18 19:15 - * @Modify: - **/ -@Data -@Api("mes 物料BOM") -public class MesPartBomModel { - - @ApiParam("物料编号") - private String partNo; - - @ApiParam("物料名称") - private String partName; - - @ApiParam("数量") - private Integer qty; - - public MesPartBomModel() { - - } - - public MesPartBomModel(String partNo, String partName, Integer qty) { - this.partNo = partNo; - this.partName = partName; - this.qty = qty; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProcessBomModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProcessBomModel.java new file mode 100644 index 0000000..11940aa --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProcessBomModel.java @@ -0,0 +1,61 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\24 22:04 + * @Modify: + **/ +@Data +public class MesProcessBomModel { + + private Long id; + @ApiParam("子物料编码") + private String itemPartNo; + @ApiParam("子物料名称") + private String itemPartName; + @ApiParam("产品数量") + private Double qty; + private Integer isValid; + private Integer isDeleted; + private String organizeCode; + private Integer isFeed; + private String workCenterCode; + private String workCellCode; + @ApiParam("拆解数") + private Double dismantleQty; + + @ApiParam("产品物料编码") + private String parentPartNo; + @ApiParam("产品物料名称") + private String parentPartName; + @ApiParam("合格数") + private Integer okQty; + @ApiParam("缺失数") + private Integer missQty; + @ApiParam("报废数") + private Integer scrapQty; + + public MesProcessBomModel() { + + } + + public MesProcessBomModel(Long id, String itemPartNo, String itemPartName, Double qty, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String parentPartNo, String parentPartName) { + this.id = id; + this.itemPartNo = itemPartNo; + this.itemPartName = itemPartName; + this.qty = qty; + this.isValid = isValid; + this.isDeleted = isDeleted; + this.organizeCode = organizeCode; + this.isFeed = isFeed; + this.workCenterCode = workCenterCode; + this.workCellCode = workCellCode; + this.parentPartNo = parentPartNo; + this.parentPartName = parentPartName; + } +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProdBindRecordModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProdBindRecordModel.java new file mode 100644 index 0000000..9dece32 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProdBindRecordModel.java @@ -0,0 +1,59 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\24 22:05 + * @Modify: + **/ +@Data +public class MesProdBindRecordModel { + private Long id; + private String itemPartNo; + private String itemPartName; + private Double qty; + private Integer isValid; + private Integer isDeleted; + private String organizeCode; + private Integer isFeed; + private String workCenterCode; + private String workCellCode; + private String kpSn; + @ApiParam("拆解数") + private Double dismantleQty; + + @ApiParam("产品物料编码") + private String parentPartNo; + @ApiParam("产品物料名称") + private String parentPartName; + @ApiParam("合格数") + private Integer okQty; + @ApiParam("缺失数") + private Integer missQty; + @ApiParam("报废数") + private Integer scrapQty; + public MesProdBindRecordModel() { + + } + + public MesProdBindRecordModel(Long id, String itemPartNo, String itemPartName, Double qty, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String kpSn, String parentPartNo, String parentPartName, Double dismantleQty) { + this.id = id; + this.itemPartNo = itemPartNo; + this.itemPartName = itemPartName; + this.qty = qty; + this.isValid = isValid; + this.isDeleted = isDeleted; + this.organizeCode = organizeCode; + this.isFeed = isFeed; + this.workCenterCode = workCenterCode; + this.workCellCode = workCellCode; + this.kpSn = kpSn; + this.parentPartNo = parentPartNo; + this.parentPartName = parentPartName; + this.dismantleQty = dismantleQty; + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRepair.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRepair.java index 98709ec..08f1544 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRepair.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRepair.java @@ -38,5 +38,5 @@ public class MesRepair extends BaseBean { @Column(name = "REPAIR_TYPE") @ApiParam("维修类型") - private Integer repairType; + private String repairType; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRepairRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRepairRecord.java index ba6331c..5e3e15f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRepairRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRepairRecord.java @@ -82,5 +82,5 @@ public class MesRepairRecord extends BaseBean { @Column(name = "MEMO") @ApiParam("备注") - private String meno; + private String memo; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScrapRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScrapRecord.java index 4dd7e2c..22086da 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScrapRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScrapRecord.java @@ -62,5 +62,5 @@ public class MesScrapRecord extends BaseBean { @Column(name = "MEMO") @ApiParam("备注") - private String meno; + private String memo; } 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 68ef0b4..b0992b6 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 @@ -49,7 +49,7 @@ public class MesWorkCell extends BaseBean { @Column(name = "WORK_CELL_TYPE") @ApiParam("工位类型") - private String workCellType; + private Integer workCellType; @Transient @ApiParam(value = "子集列表") From d87d81e34ab8c8b30fb57942f02bb3966f3f8e78 Mon Sep 17 00:00:00 2001 From: jiajack Date: Sat, 26 Oct 2019 11:14:53 +0800 Subject: [PATCH 27/35] =?UTF-8?q?=E3=80=90=E4=BA=A7=E7=BA=BF=E8=BF=90?= =?UTF-8?q?=E8=A1=8C=E6=83=85=E5=86=B5=E3=80=91-BI=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/model/ProductBiModel.java | 77 ++++++++++++++++++++++ .../pojo/mes/model/ProductBiSeriesModel.java | 24 +++++++ 2 files changed, 101 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductBiModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductBiSeriesModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductBiModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductBiModel.java new file mode 100644 index 0000000..a7a613f --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductBiModel.java @@ -0,0 +1,77 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description : 用于产线运行情况数据 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-10-22 + * @Modify: + **/ +@Data +public class ProductBiModel { + @ApiParam("工作中心代码") + private String workCenterCode; + + @ApiParam("工作中心名称") + private String workCenterName; + + @ApiParam("生产区域代码") + private String areaCode; + + @ApiParam("运行状态") + private Integer runningStatus; + + @ApiParam(value = "物料号") + private String partNo; + + @ApiParam(value = "物料名称") + private String partName; + + @ApiParam(value = "计划数量") + private double planQty; + + @ApiParam(value = "产量") + private double outputQty; + + @ApiParam(value = "完成率") + private double CompleteRate; + + @ApiParam(value = "合格数量") + private double passQty; + + @ApiParam(value = "不良数量") + private double ngQty; + + @ApiParam(value = "合格率") + private double passRate; + + @ApiParam(value = "不良率") + private double ngRate; + + @ApiParam("客户代码") + private String customerCode; + + @ApiParam("客户名称") + private String customerName; + + @ApiParam("x坐标内容") + private List xAxis; + + @ApiParam("图表显示的数据") + private List series; + + public double getCompleteRate() { + if(this.planQty != 0) { + this.CompleteRate = outputQty / planQty; + } else { + this.CompleteRate = 0; + } + return this.CompleteRate; + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductBiSeriesModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductBiSeriesModel.java new file mode 100644 index 0000000..d7b15f8 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductBiSeriesModel.java @@ -0,0 +1,24 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description : 用于产线运行情况数据 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-10-22 + * @Modify: + **/ +@Data +public class ProductBiSeriesModel { + @ApiParam("名称") + private String name; + @ApiParam("类型") + private String type; + @ApiParam("显示的数据") + private List data; +} From aef7f7a9480c2e50d749162d9a0efb82c2dc7a5d Mon Sep 17 00:00:00 2001 From: jiajack Date: Sat, 26 Oct 2019 11:15:34 +0800 Subject: [PATCH 28/35] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=8F=AD=E6=AC=A1?= =?UTF-8?q?=E9=A1=BA=E5=BA=8F=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShift.java | 12 ++++++++++++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesShift.java | 12 ++++++++++++ 2 files changed, 24 insertions(+) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShift.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShift.java index 37adc09..577fa77 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShift.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShift.java @@ -47,4 +47,16 @@ public class MesShift extends BaseBean { @Column(name="WORK_TIMES") @ApiParam("作业时长") private Double workTimes; + + @Column(name="SHIFT_SEQ") + @ApiParam("班次顺序") + private Integer shiftSeq; + + public int getShiftSeqVal() { + return this.shiftSeq == null ? 0 : this.shiftSeq; + } + + public double getWorkTimesVal() { + return this.workTimes == null ? 0.0d : this.workTimes; + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShift.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShift.java index 9c4f50a..0eb9772 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShift.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShift.java @@ -47,4 +47,16 @@ public class MesShift extends BaseBean { @Column(name="WORK_TIMES") @ApiParam("作业时长") private Double workTimes; + + @Column(name="SHIFT_SEQ") + @ApiParam("班次顺序") + private Integer shiftSeq; + + public int getShiftSeqVal() { + return this.shiftSeq == null ? 0 : this.shiftSeq; + } + + public double getWorkTimesVal() { + return this.workTimes == null ? 0.0d : this.workTimes; + } } From 9bdae2ad135507ef26bd453793e75844d0afd0b3 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Sat, 26 Oct 2019 13:35:57 +0800 Subject: [PATCH 29/35] =?UTF-8?q?=E3=80=90=E9=9C=80=E6=B1=82=EF=BC=9A1086?= =?UTF-8?q?=EF=BC=8C=E8=AE=BE=E5=A4=87=E7=82=B9=E6=A3=80=E4=BF=9D=E5=85=BB?= =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandardRecord.java | 4 ++++ .../java/cn/estsh/i3plus/pojo/mes/model/EquTaskNotifyUserModel.java | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandardRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandardRecord.java index 651fd4d..82bb4aa 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandardRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandardRecord.java @@ -58,6 +58,10 @@ public class MesEquTaskStandardRecord extends BaseBean { @ApiParam("操作指导") private String actionGuide; + @Column(name = "CHECK_VALUE") + @ApiParam("检测值") + private String checkValue; + @Column(name = "CHECK_RESULT") @ApiParam("判定结果") private Integer checkResult; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EquTaskNotifyUserModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EquTaskNotifyUserModel.java index e26b0c3..49202fa 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EquTaskNotifyUserModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EquTaskNotifyUserModel.java @@ -32,7 +32,7 @@ import java.util.List; public class EquTaskNotifyUserModel extends BaseBean { @ApiParam(value ="账户ID") - private Long userId; + private Long userInfoId; @Column(name="USER_NAME_RDD") @ApiParam(value ="用户名称" , access ="账号名称") From 8d10a46953ea9c06f6194531d276d1e462718a9b Mon Sep 17 00:00:00 2001 From: jokelone Date: Sat, 26 Oct 2019 16:57:45 +0800 Subject: [PATCH 30/35] =?UTF-8?q?(1092=20MesProdBindRecordModel=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=9C=89=E5=8F=82=E6=9E=84=E9=80=A0=E6=96=B9=E6=B3=95?= =?UTF-8?q?)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/mes/pcn/model/MesProdBindRecordModel.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProdBindRecordModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProdBindRecordModel.java index 9dece32..aaa7497 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProdBindRecordModel.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProdBindRecordModel.java @@ -56,4 +56,20 @@ public class MesProdBindRecordModel { this.parentPartName = parentPartName; this.dismantleQty = dismantleQty; } + + public MesProdBindRecordModel(Long id, String itemPartNo, String itemPartName, Double qty, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String kpSn, String parentPartNo, String parentPartName) { + this.id = id; + this.itemPartNo = itemPartNo; + this.itemPartName = itemPartName; + this.qty = qty; + this.isValid = isValid; + this.isDeleted = isDeleted; + this.organizeCode = organizeCode; + this.isFeed = isFeed; + this.workCenterCode = workCenterCode; + this.workCellCode = workCellCode; + this.kpSn = kpSn; + this.parentPartNo = parentPartNo; + this.parentPartName = parentPartName; + } } From 56996126be34f7d5c3068161d157518ed754be4e Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Sat, 26 Oct 2019 18:43:53 +0800 Subject: [PATCH 31/35] =?UTF-8?q?=E3=80=90=E9=9C=80=E6=B1=82=EF=BC=9A1101?= =?UTF-8?q?=EF=BC=8Cmes=E5=90=8C=E6=AD=A5=E8=AE=BE=E5=A4=87=E5=AE=89?= =?UTF-8?q?=E7=81=AF=E7=BB=B4=E4=BF=AE=E4=BB=BB=E5=8A=A1=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 37 ++++++++++ .../i3plus/pojo/mes/model/AndonEquRepairModel.java | 86 ++++++++++++++++++++++ 2 files changed, 123 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/AndonEquRepairModel.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 1d8aa2a..856f7c2 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -203,6 +203,43 @@ public class MesEnumUtil { } /** + * mes设备作业任务明细-判定结果 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_EQU_TASK_DETAIL_CHECK_RESULT { + + YES(10, "合格"), + NO(20, "不合格"); + + private int value; + private String description; + + MES_EQU_TASK_DETAIL_CHECK_RESULT(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + } + + /** * mes设备作业任务明细-整体结果 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/AndonEquRepairModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/AndonEquRepairModel.java new file mode 100644 index 0000000..ed95336 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/AndonEquRepairModel.java @@ -0,0 +1,86 @@ +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.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @Description : mes同步设备安灯维修任务model + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-05-10 17:16 + * @Modify: + **/ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Api("mes同步设备安灯维修任务model") +public class AndonEquRepairModel extends BaseBean { + + @ApiParam(value = "安灯队列编号") + public String andonOrderNo; + + @ApiParam(value = "工作中心代码") + public String workCenterCode; + + @ApiParam(value = "工作中心名称") + public String workCenterNameRdd; + + @ApiParam(value = "工作单元名称") + public String workCellNameRdd; + + @ApiParam(value = "工作单元代码") + public String workCellCode; + + @ApiParam(value = "设备代码") + public String equipmentCode; + + @ApiParam(value = "设备名称") + public String equipmentNameRdd; + + @ApiParam(value = "安灯状态代码") + public String statusCode; + + @ApiParam(value="解决时间",example = "2018-01-01 01:00:00") + public String resetTime; + + @ApiParam(value = "呼叫原因代码") + public String acCode; + + @ApiParam(value = "呼叫原因描述") + public String acNameRdd; + + @ApiParam(value = "呼叫具体原因") + public String acDesc; + + @ApiParam(value = "事件原因代码") + public String ecCode; + + @ApiParam(value = "事件原因描述") + public String ecNameRdd; + + @ApiParam(value = "事件具体原因") + public String ecDesc; + + @ApiParam(value = "事件方法代码") + public String emCode; + + @ApiParam(value = "事件方法描述") + public String emNameRdd; + + @ApiParam(value = "事件具体方法") + public String emDesc; + + @ApiParam(value = "事件现象代码") + private String epmCode; + + @ApiParam(value = "事件现象描述") + private String epmNameRdd; + + @ApiParam(value = "组织名称") + private String organizeNameRdd; + +} From 7d8b8664cc7350b23fe9f5e2859970601801a54a Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Sat, 26 Oct 2019 19:42:44 +0800 Subject: [PATCH 32/35] =?UTF-8?q?=E9=97=AE=E9=A2=98=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/andon/bean/AndonAlarmCause.java | 5 ++- .../pojo/andon/bean/AndonAlarmDetailType.java | 6 ++-- .../pojo/andon/bean/AndonCellAlarmCause.java | 8 ++--- .../pojo/andon/bean/AndonCellEventCause.java | 7 ++-- .../pojo/andon/bean/AndonCellEventMethod.java | 8 ++--- .../i3plus/pojo/andon/bean/AndonEventCause.java | 5 ++- .../i3plus/pojo/andon/bean/AndonEventMethod.java | 5 ++- .../pojo/andon/bean/AndonEventPhenoMenon.java | 2 ++ .../cn/estsh/i3plus/pojo/andon/bean/AndonPLC.java | 6 ++-- .../i3plus/pojo/andon/sqlpack/AndonHqlPack.java | 38 ++++++++-------------- .../cn/estsh/i3plus/pojo/base/bean/BaseBean.java | 2 +- 11 files changed, 46 insertions(+), 46 deletions(-) diff --git a/modules/i3plus-pojo-andon/src/main/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 index 0f46e3b..749eae4 100644 --- a/modules/i3plus-pojo-andon/src/main/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 @@ -28,7 +28,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Api("ANDON_呼叫原因") +@Api(value = "ANDON_呼叫原因") public class AndonAlarmCause extends BaseBean { @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description") @@ -40,6 +40,7 @@ public class AndonAlarmCause extends BaseBean { @ApiParam(value = "呼叫原因代码") private String acCode; + @AnnoOutputColumn(hidden = true) @Column(name = "PARENT_AC_CODE") @ApiParam(value = "父阶原因代码") private String parentAcCode; @@ -48,10 +49,12 @@ public class AndonAlarmCause extends BaseBean { @ApiParam(value = "呼叫原因描述") private String acName; + @AnnoOutputColumn(hidden = true) @Transient @ApiParam(value = "工作中心") private String workCenterCode; + @AnnoOutputColumn(hidden = true) @Transient @ApiParam(value = "工作单元") private String workCellCode; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmDetailType.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmDetailType.java index b92a876..1ec4182 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmDetailType.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmDetailType.java @@ -31,15 +31,15 @@ import javax.persistence.Table; public class AndonAlarmDetailType extends BaseBean { @Column(name = "ALARM_DETAIL_CODE") - @ApiParam(value = "安灯类型代码") + @ApiParam(value = "安灯子类型编码") private String alarmDetailCode; @Column(name = "ALARM_DETAIL_NAME") - @ApiParam(value = "安灯类型名称") + @ApiParam(value = "安灯子类型名称") private String alarmDetailName; @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description") @Column(name = "ALARM_CODE") - @ApiParam(value = "安灯类型代码") + @ApiParam(value = "安灯类型") private String alarmCode; } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellAlarmCause.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellAlarmCause.java index 87b497a..d79eb4b 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellAlarmCause.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellAlarmCause.java @@ -29,22 +29,20 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Api("ANDON_工作单元呼叫原因配置") public class AndonCellAlarmCause extends BaseBean { - @Column(name = "WORK_CENTER_CODE") @ApiParam(value = "工作中心代码") private String workCenterCode; @Column(name = "WORK_CELL_CODE") - @ApiParam(value = "工作单元代码") + @ApiParam(value = "工位代码") private String workCellCode; + @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class, refForeignKey = "value",value = "description") @Column(name = "ALARM_CODE") @ApiParam(value = "安灯类型") private String alarmCode; @Column(name = "AC_CODE") - @ApiParam(value = "呼叫原因代码") + @ApiParam(value = "事件描述") private String acCode; - - } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventCause.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventCause.java index afef3d0..4f04613 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventCause.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventCause.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.andon.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -33,15 +35,16 @@ public class AndonCellEventCause extends BaseBean { private String workCenterCode; @Column(name = "WORK_CELL_CODE") - @ApiParam(value = "工作单元代码") + @ApiParam(value = "工位代码") private String workCellCode; + @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description") @Column(name = "ALARM_CODE") @ApiParam(value = "安灯类型") private String alarmCode; @Column(name = "EC_CODE") - @ApiParam(value = "事件原因代码") + @ApiParam(value = "事件原因") private String ecCode; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventMethod.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventMethod.java index 2553c7c..b2f933c 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventMethod.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventMethod.java @@ -29,22 +29,20 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Api("ANDON_工作单元处理方法配置") public class AndonCellEventMethod extends BaseBean { - @Column(name = "WORK_CENTER_CODE") @ApiParam(value = "工作中心代码") private String workCenterCode; @Column(name = "WORK_CELL_CODE") - @ApiParam(value = "工作单元代码") + @ApiParam(value = "工位代码") private String workCellCode; + @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description") @Column(name = "ALARM_CODE") @ApiParam(value = "安灯类型") private String alarmCode; @Column(name = "EM_CODE") - @ApiParam(value = "事件方法代码") + @ApiParam(value = "处理方法") private String emCode; - - } diff --git a/modules/i3plus-pojo-andon/src/main/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 index f5f0469..2491043 100644 --- a/modules/i3plus-pojo-andon/src/main/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 @@ -28,7 +28,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Api("ANDON_事件原因") +@Api(value = "ANDON_事件原因") public class AndonEventCause extends BaseBean { @Column(name = "EC_CODE") @@ -41,6 +41,7 @@ public class AndonEventCause extends BaseBean { @Column(name = "PARENT_EC_CODE") @ApiParam(value = "父阶原因代码") + @AnnoOutputColumn(hidden = true) private String parentEcCode; @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description") @@ -50,9 +51,11 @@ public class AndonEventCause extends BaseBean { @Transient @ApiParam(value = "工作中心") + @AnnoOutputColumn(hidden = true) private String workCenterCode; @Transient @ApiParam(value = "工作单元") + @AnnoOutputColumn(hidden = true) private String workCellCode; } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonEventMethod.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonEventMethod.java index ccd2315..f681bb6 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonEventMethod.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonEventMethod.java @@ -28,7 +28,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Api("ANDON_事件处理方法") +@Api(value = "ANDON_事件处理方法") public class AndonEventMethod extends BaseBean { @Column(name = "EM_CODE") @@ -39,6 +39,7 @@ public class AndonEventMethod extends BaseBean { @ApiParam(value = "事件方法描述") private String emName; + @AnnoOutputColumn(hidden = true) @Column(name = "PARENT_EM_CODE") @ApiParam(value = "父阶方法代码") private String parentEmCode; @@ -48,10 +49,12 @@ public class AndonEventMethod extends BaseBean { @ApiParam(value = "安灯类型") private String alarmCode; + @AnnoOutputColumn(hidden = true) @Transient @ApiParam(value = "工作中心") private String workCenterCode; + @AnnoOutputColumn(hidden = true) @Transient @ApiParam(value = "工作单元") private String workCellCode; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonEventPhenoMenon.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonEventPhenoMenon.java index 0580ab0..43877a3 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonEventPhenoMenon.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonEventPhenoMenon.java @@ -44,10 +44,12 @@ public class AndonEventPhenoMenon extends BaseBean { @ApiParam(value = "安灯类型") private String alarmCode; + @AnnoOutputColumn(hidden = true) @Transient @ApiParam(value = "工作中心") private String workCenterCode; + @AnnoOutputColumn(hidden = true) @Transient @ApiParam(value = "工作单元") private String workCellCode; diff --git a/modules/i3plus-pojo-andon/src/main/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 index 748105e..c18cf07 100644 --- a/modules/i3plus-pojo-andon/src/main/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 @@ -36,7 +36,7 @@ public class AndonPLC extends BaseBean { private String workCenterCode; @Column(name = "WORK_CELL_CODE") - @ApiParam(value = "工作单元代码") + @ApiParam(value = "工位代码") private String workCellCode; @Column(name = "NODE_CODE") @@ -52,7 +52,7 @@ public class AndonPLC extends BaseBean { private String channelName; @Column(name = "TAG_NAME") - @ApiParam(value = "标签名称") + @ApiParam(value = "标签名字") private String tagName; @Column(name = "TAG_ADDRESS") @@ -79,7 +79,7 @@ public class AndonPLC extends BaseBean { @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description") @Column(name = "IS_ALARM_STATUS") - @ApiParam(value = "是否按灯状态", example = "1") + @ApiParam(value = "是否按灯", example = "1") private Integer isAlarmStatus; public int getIsAlarmStatusVal(){ 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 15572d5..dd08d20 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 @@ -279,13 +279,10 @@ public class AndonHqlPack { */ public static DdlPackBean packHqlAndonAlarmCauseLike(AndonAlarmCause andonAlarmCause){ DdlPackBean result = new DdlPackBean(); - DdlPreparedPack.getStringEqualPack(andonAlarmCause.getAlarmCode(), "alarmCode", result); DdlPreparedPack.getStringLikerPack(andonAlarmCause.getAcCode(),"acCode", result); DdlPreparedPack.getStringLikerPack(andonAlarmCause.getAcName(),"acName", result); - getStringBuilderPack(andonAlarmCause, result); - return result; } @@ -296,10 +293,8 @@ public class AndonHqlPack { */ public static DdlPackBean packHqlAndonAlarmEventMethod(AndonEventMethod andonEventMethod){ DdlPackBean result = new DdlPackBean(); - DdlPreparedPack.getStringEqualPack(andonEventMethod.getAlarmCode(), "alarmCode", result); getStringBuilderPack(andonEventMethod, result); - return result; } @@ -310,10 +305,8 @@ public class AndonHqlPack { */ public static DdlPackBean packHqlAndonEventCause(AndonEventCause andonEventCause){ DdlPackBean result = new DdlPackBean(); - DdlPreparedPack.getStringEqualPack(andonEventCause.getAlarmCode(), "alarmCode", result); getStringBuilderPack(andonEventCause, result); - return result; } @@ -365,7 +358,6 @@ public class AndonHqlPack { if(StringUtils.isNotBlank(andonManageQueue.getCallTimeStart()) || StringUtils.isNotBlank(andonManageQueue.getCallTimeEnd())){ DdlPreparedPack.timeBuilder(andonManageQueue.getCallTimeStart(), andonManageQueue.getCallTimeEnd(), "callTime", result, true); } - getStringBuilderPack(andonManageQueue, result); // 根据优先级倒序，序号升序排序 // DdlPreparedPack.getOrderByPack(new Object[]{2, 1}, @@ -627,9 +619,7 @@ public class AndonHqlPack { DdlPreparedPack.getStringEqualPack(andonResponseObject.getRpObjectCode(), "rpObjectCode", result); DdlPreparedPack.getStringEqualPack(andonResponseObject.getRpObjectName(), "rpObjectName", result); DdlPreparedPack.getStringLikerPack(andonResponseObject.getRpObjectValue(), "rpObjectValue", result); - getStringBuilderPack(andonResponseObject, result); - return result; } @@ -640,13 +630,10 @@ public class AndonHqlPack { */ public static DdlPackBean packAndonEventCause(AndonEventCause andonEventCause) { DdlPackBean result = new DdlPackBean(); - DdlPreparedPack.getStringEqualPack(andonEventCause.getAlarmCode(), "alarmCode", result); DdlPreparedPack.getStringLikerPack(andonEventCause.getEcCode(), "ecCode", result); DdlPreparedPack.getStringLikerPack(andonEventCause.getEcName(), "ecName", result); - getStringBuilderPack(andonEventCause, result); - return result; } @@ -673,6 +660,11 @@ public class AndonHqlPack { DdlPreparedPack.getStringLikerPack(eventPhenoMenon.getEpmCode(), "epmCode", result); DdlPreparedPack.getStringLikerPack(eventPhenoMenon.getEpmName(), "epmName", result); DdlPreparedPack.getStringEqualPack(eventPhenoMenon.getAlarmCode(), "alarmCode", result); + DdlPreparedPack.getOrderByPack( + new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, + new String[]{eventPhenoMenon.getOrderByParam()}, + result + ); getStringBuilderPack(eventPhenoMenon, result); @@ -681,18 +673,15 @@ public class AndonHqlPack { /** * ANDON_ 事件处理方法 - * @param eventPhenoMenon + * @param eventMethod * @return */ - public static DdlPackBean packAndonEventMethod(AndonEventMethod eventPhenoMenon) { + public static DdlPackBean packAndonEventMethod(AndonEventMethod eventMethod) { DdlPackBean result = new DdlPackBean(); - - DdlPreparedPack.getStringEqualPack(eventPhenoMenon.getAlarmCode(), "alarmCode", result); - DdlPreparedPack.getStringLikerPack(eventPhenoMenon.getEmName(), "emName", result); - DdlPreparedPack.getStringLikerPack(eventPhenoMenon.getEmCode(), "emCode", result); - - getStringBuilderPack(eventPhenoMenon, result); - + DdlPreparedPack.getStringEqualPack(eventMethod.getAlarmCode(), "alarmCode", result); + DdlPreparedPack.getStringLikerPack(eventMethod.getEmName(), "emName", result); + DdlPreparedPack.getStringLikerPack(eventMethod.getEmCode(), "emCode", result); + getStringBuilderPack(eventMethod, result); return result; } @@ -703,13 +692,14 @@ public class AndonHqlPack { */ public static DdlPackBean packAndonPLC(AndonPLC plc) { DdlPackBean result = new DdlPackBean(); - DdlPreparedPack.getStringEqualPack(plc.getAlarmCode(), "alarmCode", result); DdlPreparedPack.getStringLikerPack(plc.getTagAddress(),"tagAddress",result); DdlPreparedPack.getStringLikerPack(plc.getTagName(),"tagName",result); DdlPreparedPack.getStringEqualPack(plc.getChannelName(),"channelName",result); DdlPreparedPack.getStringEqualPack(plc.getGroupNo(),"groupNo",result); - + DdlPreparedPack.getStringEqualPack(plc.getWorkCenterCode(), "workCenterCode", result); + DdlPreparedPack.getStringEqualPack(plc.getWorkCellCode(), "workCellCode", result); + DdlPreparedPack.getStringEqualPack(plc.getAlarmCode(), "alarmCode", result); getStringBuilderPack(plc, result); return result; } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java index 5ed2462..3950979 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java @@ -67,7 +67,7 @@ public abstract class BaseBean implements Serializable { @Column(name="IS_VALID") @ApiParam(value = "有效性",example = "1") - @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description", hidden = true) + @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description", hidden = true) public Integer isValid; //CommonEnumUtil.IS_VAILD; @Column(name="IS_DELETED") From 6902c794721baa273159f10fd13816e2ce08b67c Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Sun, 27 Oct 2019 11:51:18 +0800 Subject: [PATCH 33/35] =?UTF-8?q?=E9=97=AE=E9=A2=98=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/andon/bean/AndonAlarmResponseCfg.java | 11 ++++++----- .../cn/estsh/i3plus/pojo/andon/bean/AndonDisposalCfg.java | 11 ++++++----- .../main/java/cn/estsh/i3plus/pojo/andon/bean/AndonPLC.java | 8 ++++---- .../cn/estsh/i3plus/pojo/andon/bean/AndonResponseObject.java | 6 +++--- .../java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java | 3 +-- .../cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java | 10 ++++++++++ 6 files changed, 30 insertions(+), 19 deletions(-) diff --git a/modules/i3plus-pojo-andon/src/main/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 index a6824e0..e0bbc8e 100644 --- a/modules/i3plus-pojo-andon/src/main/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 @@ -32,16 +32,16 @@ public class AndonAlarmResponseCfg extends BaseBean { @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description") @Column(name = "ALARM_CODE") - @ApiParam(value = "安灯类型代码") + @ApiParam(value = "安灯类型") private String alarmCode; - @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_STATUS.class,refForeignKey = "value",value = "description") + @AnnoOutputColumn(refClass = AndonEnumUtil.ANDON_ACTION_TAG.class,refForeignKey = "code",value = "description") @Column(name = "ANDON_STATUS") @ApiParam(value = "安灯状态") private String andonStatus; @Column(name = "RP_WHERE") - @ApiParam(value = "通知条件时长") + @ApiParam(value = "通知时间") private String rpWhere; @AnnoOutputColumn(refClass = AndonEnumUtil.NOTICE_MESSAGE_SEND_TYPE.class,refForeignKey = "value",value = "description") @@ -50,7 +50,7 @@ public class AndonAlarmResponseCfg extends BaseBean { private String rpCode; @Column(name = "RP_OBJECT_CODE") - @ApiParam(value = "通知对象代码") + @ApiParam(value = "通知对象") private String rpObjectCode; @AnnoOutputColumn(refClass = AndonEnumUtil.NOTICE_MESSAGE_SEND_LEVEL.class,refForeignKey = "value",value = "description") @@ -59,9 +59,10 @@ public class AndonAlarmResponseCfg extends BaseBean { private String rpLevel; @Column(name = "WORK_CENTER_CODE") - @ApiParam(value = "工作中心代码") + @ApiParam(value = "工作中心") private String workCenterCode; + @AnnoOutputColumn(hidden = true) @Column(name = "WORK_CENTER_NAME_RDD") @ApiParam(value = "工作中心名称") private String workCenterNameRdd; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalCfg.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalCfg.java index 819f768..9f8d287 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalCfg.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalCfg.java @@ -37,24 +37,24 @@ public class AndonDisposalCfg extends BaseBean { private String workCenterCode; @Column(name = "WORK_CELL_CODE") - @ApiParam(value = "工作单元代码") + @ApiParam(value = "工位代码") private String workCellCode; @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description") @Column(name = "ALARM_CODE") - @ApiParam(value = "安灯类型代码") + @ApiParam(value = "安灯类型") private String alarmCode; @Column(name = "AC_CODE") - @ApiParam(value = "呼叫原因代码") + @ApiParam(value = "事件描述编码") private String acCode; @Column(name = "AC_NAME_RDD") - @ApiParam(value = "呼叫原因描述") + @ApiParam(value = "事件描述名称") private String acNameRdd; @Column(name = "EM_CODE") - @ApiParam(value = "事件方法代码") + @ApiParam(value = "处理方法") private String emCode; @Column(name = "EM_NAME_RDD") @@ -72,5 +72,6 @@ public class AndonDisposalCfg extends BaseBean { @Transient @ApiParam(value = "审批意见集合") + @AnnoOutputColumn(hidden = true) private Integer[] flowStatusArray; } diff --git a/modules/i3plus-pojo-andon/src/main/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 index c18cf07..2a8d9ad 100644 --- a/modules/i3plus-pojo-andon/src/main/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 @@ -32,7 +32,7 @@ import javax.persistence.Table; public class AndonPLC extends BaseBean { @Column(name = "WORK_CENTER_CODE") - @ApiParam(value = "工作中心代码") + @ApiParam(value = "工作中心") private String workCenterCode; @Column(name = "WORK_CELL_CODE") @@ -40,7 +40,7 @@ public class AndonPLC extends BaseBean { private String workCellCode; @Column(name = "NODE_CODE") - @ApiParam(value = "控制节点代码") + @ApiParam(value = "控制节点编码") private String nodeCode; @Column(name = "NODE_IP") @@ -67,7 +67,7 @@ public class AndonPLC extends BaseBean { @ApiParam(value = "分组号") private String groupNo; - @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description") +// @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description") @Column(name = "ALARM_CODE") @ApiParam(value = "安灯类型") private String alarmCode; @@ -79,7 +79,7 @@ public class AndonPLC extends BaseBean { @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description") @Column(name = "IS_ALARM_STATUS") - @ApiParam(value = "是否按灯", example = "1") + @ApiParam(value = "是否安灯") private Integer isAlarmStatus; public int getIsAlarmStatusVal(){ diff --git a/modules/i3plus-pojo-andon/src/main/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 index fda0737..9cdb336 100644 --- a/modules/i3plus-pojo-andon/src/main/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 @@ -29,14 +29,14 @@ import javax.persistence.Table; public class AndonResponseObject extends BaseBean { @Column(name = "RP_OBJECT_CODE") - @ApiParam(value = "对象代码") + @ApiParam(value = "通知对象对象编码") private String rpObjectCode; @Column(name = "RP_OBJECT_NAME") - @ApiParam(value = "对象名称") + @ApiParam(value = "通知对象名称") private String rpObjectName; @Column(name = "RP_OBJECT_VALUE") - @ApiParam(value = "对象值") + @ApiParam(value = "通知对象值") private String rpObjectValue; } 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 dd08d20..5d13427 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 @@ -533,14 +533,13 @@ public class AndonHqlPack { */ public static DdlPackBean packAndonAlarmResponseCfg(AndonAlarmResponseCfg responseCfg) { DdlPackBean result = new DdlPackBean(); - DdlPreparedPack.getStringEqualPack(responseCfg.getAlarmCode(), "alarmCode", result); DdlPreparedPack.getStringEqualPack(responseCfg.getAndonStatus(), "andonStatus", result); DdlPreparedPack.getStringEqualPack(responseCfg.getRpLevel(), "rpLevel", result); DdlPreparedPack.getStringEqualPack(responseCfg.getWorkCenterCode(), "workCenterCode", result); DdlPreparedPack.getStringEqualPack(responseCfg.getRpObjectCode(), "rpObjectCode", result); DdlPreparedPack.getStringEqualPack(responseCfg.getOrganizeCode(), "organizeCode", result); - + DdlPreparedPack.getStringEqualPack(responseCfg.getRpCode(), "rpCode", result); getStringBuilderPack(responseCfg, result); return result; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java index 230f235..bbd3eb5 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java @@ -453,6 +453,16 @@ public class AndonEnumUtil { } return tmp; } + + public static String descriptionOfCode(String val) { + String tmp = ""; + for (int i = 0; i < values().length; i++) { + if (StringUtils.equalsIgnoreCase(values()[i].description, val)) { + tmp = values()[i].code; + } + } + return tmp; + } } From 4eaa8b5b177a35769f6cea9d7103afbcd1acefad Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Sun, 27 Oct 2019 12:26:52 +0800 Subject: [PATCH 34/35] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonHaltType.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-andon/src/main/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 index 962309b..3c89d14 100644 --- a/modules/i3plus-pojo-andon/src/main/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 @@ -29,7 +29,7 @@ import javax.persistence.Table; public class AndonHaltType extends BaseBean { @Column(name = "HALT_CODE") - @ApiParam(value = "停机类型代码") + @ApiParam(value = "停机类型编码") private String haltCode; @Column(name = "HALT_NAME") diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java index 3950979..08085ad 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java @@ -74,7 +74,7 @@ public abstract class BaseBean implements Serializable { @ApiParam(value = "是否已删除",example = "2") @AnnoOutputColumn(hidden = true) //逻辑删除，软删除 - public Integer isDeleted; //CommonEnumUtil.TRUE_OR_FALSE + public Integer isDeleted; //CommonEnumUtil.TRUE_OR_FALSEA @Column(name="CREATE_USER",updatable = false) @ApiParam(value = "创建用户") From 1e0f0c706cb37934bd447f3390907965e164dacc Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Sun, 27 Oct 2019 17:40:21 +0800 Subject: [PATCH 35/35] =?UTF-8?q?=E5=AE=89=E7=81=AF=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/andon/bean/AndonKnowledgeBase.java | 1 - .../cn/estsh/i3plus/pojo/andon/bean/AndonPLC.java | 4 +- .../pojo/andon/bean/AndonResponseObject.java | 7 +++ .../i3plus/pojo/andon/sqlpack/AndonHqlPack.java | 17 +++++++ .../i3plus/pojo/base/enumutil/AndonEnumUtil.java | 52 ++++++++++++++++++++++ 5 files changed, 78 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonKnowledgeBase.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonKnowledgeBase.java index 835046b..ff4853d 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonKnowledgeBase.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonKnowledgeBase.java @@ -34,5 +34,4 @@ public class AndonKnowledgeBase extends BaseManageQueue { @Column(name = "FLOW_MEMO") @ApiParam(value = "审批意见") private String flowMemo; - } diff --git a/modules/i3plus-pojo-andon/src/main/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 index 2a8d9ad..828a12a 100644 --- a/modules/i3plus-pojo-andon/src/main/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 @@ -67,7 +67,7 @@ public class AndonPLC extends BaseBean { @ApiParam(value = "分组号") private String groupNo; -// @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description") + @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description") @Column(name = "ALARM_CODE") @ApiParam(value = "安灯类型") private String alarmCode; @@ -77,7 +77,7 @@ public class AndonPLC extends BaseBean { @ApiParam(value = "标签业务类型") private String tagBusinessType; - @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description") + @AnnoOutputColumn(refClass = AndonEnumUtil.IS_ALARM_STATUS.class,refForeignKey = "value",value = "description") @Column(name = "IS_ALARM_STATUS") @ApiParam(value = "是否安灯") private Integer isAlarmStatus; diff --git a/modules/i3plus-pojo-andon/src/main/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 index 9cdb336..b2ad1a2 100644 --- a/modules/i3plus-pojo-andon/src/main/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 @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.andon.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -11,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description : 安灯通知对象 @@ -39,4 +41,9 @@ public class AndonResponseObject extends BaseBean { @Column(name = "RP_OBJECT_VALUE") @ApiParam(value = "通知对象值") private String rpObjectValue; + + @AnnoOutputColumn(hidden = true) + @Transient + @ApiParam(value = "通知对象") + private String rpObjectValueRdd; } 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 5d13427..547a389 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 @@ -341,6 +341,23 @@ public class AndonHqlPack { * @param andonManageQueue * @return */ + public static DdlPackBean packHqlAndonManageQueueUseByPlc(AndonManageQueue andonManageQueue, Object[] obj){ + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(andonManageQueue.getOrganizeCode(), "organizeCode", result); + DdlPreparedPack.getStringEqualPack(andonManageQueue.getWorkCellCode(), "workCellCode", result); + DdlPreparedPack.getStringEqualPack(andonManageQueue.getWorkCenterCode(), "workCenterCode", result); + DdlPreparedPack.getStringEqualPack(andonManageQueue.getEquipmentCode(), "equipmentCode", result); + DdlPreparedPack.getInPackArray(obj, "statusCode", result); + DdlPreparedPack.getStringEqualPack(andonManageQueue.getAlarmCode(), "alarmCode", result); + getStringBuilderPack(andonManageQueue, result); + return result; + } + + /** + * 按条件查询按灯队列信息 + * @param andonManageQueue + * @return + */ public static DdlPackBean packHqlAndonManageQueue(AndonManageQueue andonManageQueue, Object[] obj){ DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringEqualPack(andonManageQueue.getOrganizeCode(), "organizeCode", result); diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java index bbd3eb5..b27a4a3 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java @@ -292,6 +292,58 @@ public class AndonEnumUtil { } /** + * 处理标识 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum IS_ALARM_STATUS { + TRUE(10, "是"), FALSE(20, "否"); + + private int value; + private String description; + + private IS_ALARM_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getValueStr() { + return value + ""; + } + + public String getDescription() { + return description; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static String valueOfDescription(int val) {return valueOf(val);} + public static int descriptionOfValue(String desc) {return descOf(desc);} + } + + + /** * 按灯状态 * 10-是，20-否 */