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/14] =?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/14] 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/14] =?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/14] =?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/14] =?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/14] =?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/14] =?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/14] =?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/14] =?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/14] =?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/14] =?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/14] =?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/14] =?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/14] =?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; }