From 34e76f59ce6e156e15b1a315cc5a7e5ab9cd9b00 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 2 Mar 2020 13:44:59 +0800 Subject: [PATCH 01/91] ptl --- .../pojo/ptl/model/PtlMonitorControlModel.java | 30 ++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/PtlMonitorControlModel.java diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/PtlMonitorControlModel.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/PtlMonitorControlModel.java new file mode 100644 index 0000000..40a5e14 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/PtlMonitorControlModel.java @@ -0,0 +1,30 @@ +package cn.estsh.i3plus.pojo.ptl.model; + +import cn.estsh.i3plus.pojo.ptl.bean.PtlControl; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description : 亮灯监听Model + * @Reference : + * @Author : wangjie + * @CreateDate : 2020-03-02 13:27 + * @Modify: + **/ +@Data +@Api("亮灯监听Model") +public class PtlMonitorControlModel implements Serializable { + + @ApiParam("区域代码") + public String areaNo; + + @ApiParam("区域名称") + public String areaName; + + @ApiParam("控制器集合") + public List ptlControlList; +} From 5892f87bdc86f7c69b42d2271a3ff59a25514975 Mon Sep 17 00:00:00 2001 From: luweihao Date: Mon, 2 Mar 2020 14:05:33 +0800 Subject: [PATCH 02/91] =?UTF-8?q?task=20`1425`=20pcn=20pojo=20=E8=BF=81?= =?UTF-8?q?=E7=A7=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesArea.java | 19 + .../pojo/mes/pcn/bean/MesProductEncodeCfg.java | 1 - .../i3plus/pojo/mes/pcn/bean/MesRouteProcess.java | 1 + .../pojo/mes/pcn/bean/MesRouteProcessCell.java | 1 + .../i3plus/pojo/mes/pcn/bean/MesShiftRest.java | 1 + .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesTime.java | 2 +- .../i3plus/pojo/mes/pcn/bean/MesTorqueDetail.java | 2 +- .../estsh/i3plus/pojo/mes/pcn/bean/MesTypeCfg.java | 2 +- .../estsh/i3plus/pojo/mes/pcn/bean/MesWcCheck.java | 2 +- .../i3plus/pojo/mes/pcn/bean/MesWcCheckRecord.java | 2 +- .../i3plus/pojo/mes/pcn/bean/MesWorkCell.java | 1 + .../pojo/mes/pcn/bean/MesWorkCellMonitorLog.java | 2 +- .../i3plus/pojo/mes/pcn/bean/MesWorkCellParam.java | 2 +- .../pojo/mes/pcn/bean/MesWorkCellParamCfg.java | 1 + .../i3plus/pojo/mes/pcn/bean/MesWorkCellPoint.java | 2 +- .../i3plus/pojo/mes/pcn/bean/MesWorkCenter.java | 1 + .../i3plus/pojo/mes/pcn/bean/MesWorkOrder.java | 4 +- .../i3plus/pojo/mes/pcn/bean/MesWorkOrderLog.java | 1 + .../pojo/mes/pcn/model/MesButtonFlagModel.java | 17 +- .../java/cn/estsh/i3plus/pojo/mes/bean/MesBom.java | 5 +- .../cn/estsh/i3plus/pojo/mes/bean/MesCustomer.java | 2 +- .../estsh/i3plus/pojo/mes/bean/MesDatasource.java | 9 +- .../cn/estsh/i3plus/pojo/mes/bean/MesDefect.java | 24 ++ .../estsh/i3plus/pojo/mes/bean/MesDefectCause.java | 2 +- .../i3plus/pojo/mes/bean/MesDefectRecord.java | 10 +- .../i3plus/pojo/mes/bean/MesDismantleRecord.java | 25 +- .../cn/estsh/i3plus/pojo/mes/bean/MesEsop.java | 2 +- .../cn/estsh/i3plus/pojo/mes/bean/MesEvent.java | 1 + .../estsh/i3plus/pojo/mes/bean/MesEventAction.java | 1 + .../cn/estsh/i3plus/pojo/mes/bean/MesFiCfg.java | 2 +- .../cn/estsh/i3plus/pojo/mes/bean/MesFile.java | 2 +- .../cn/estsh/i3plus/pojo/mes/bean/MesKpData.java | 9 +- .../i3plus/pojo/mes/bean/MesLabelTemplate.java | 2 +- .../pojo/mes/bean/MesLabelTemplateParam.java | 2 +- .../cn/estsh/i3plus/pojo/mes/bean/MesMethod.java | 1 + .../estsh/i3plus/pojo/mes/bean/MesMonitorTask.java | 2 +- .../i3plus/pojo/mes/bean/MesMonitorTaskDetail.java | 2 +- .../estsh/i3plus/pojo/mes/bean/MesNumberRule.java | 3 +- .../i3plus/pojo/mes/bean/MesNumberSerialno.java | 8 +- .../estsh/i3plus/pojo/mes/bean/MesObjectCfg.java | 6 +- .../i3plus/pojo/mes/bean/MesPLCConfigure.java | 1 + .../cn/estsh/i3plus/pojo/mes/bean/MesPackage.java | 15 + .../i3plus/pojo/mes/bean/MesPackageDetail.java | 6 +- .../i3plus/pojo/mes/bean/MesPackageTravel.java | 2 +- .../cn/estsh/i3plus/pojo/mes/bean/MesPart.java | 13 +- .../i3plus/pojo/mes/bean/MesPartCategory.java | 1 + .../estsh/i3plus/pojo/mes/bean/MesPatternJis.java | 4 +- .../java/cn/estsh/i3plus/pojo/mes/bean/MesPcn.java | 1 + .../i3plus/pojo/mes/bean/MesPcnConnectLog.java | 1 + .../estsh/i3plus/pojo/mes/bean/MesPcnSyncCfg.java | 3 +- .../i3plus/pojo/mes/bean/MesPcnSyncErrorLog.java | 1 + .../i3plus/pojo/mes/bean/MesPcnSysUserOffline.java | 72 ++++ .../cn/estsh/i3plus/pojo/mes/bean/MesPcnTask.java | 2 +- .../estsh/i3plus/pojo/mes/bean/MesPcnTaskLog.java | 53 +++ .../estsh/i3plus/pojo/mes/bean/MesPlanOrder.java | 1 + .../java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java | 2 +- .../cn/estsh/i3plus/pojo/mes/bean/MesProcess.java | 1 + .../i3plus/pojo/mes/bean/MesProdBindRecord.java | 8 +- .../cn/estsh/i3plus/pojo/mes/bean/MesProdCfg.java | 1 + .../i3plus/pojo/mes/bean/MesProdCfgDetail.java | 1 + .../cn/estsh/i3plus/pojo/mes/bean/MesProdPack.java | 2 +- .../i3plus/pojo/mes/bean/MesProdRouteCfg.java | 1 + .../i3plus/pojo/mes/bean/MesProduceCategory.java | 2 +- .../pojo/mes/bean/MesProduceCtgyPicture.java | 16 +- .../estsh/i3plus/pojo/mes/bean/MesProduceSn.java | 8 +- .../i3plus/pojo/mes/bean/MesProduceSnTravel.java | 1 + .../i3plus/pojo/mes/bean/MesProductEncodeCfg.java | 2 +- .../estsh/i3plus/pojo/mes/bean/MesQcCheckData.java | 10 +- .../i3plus/pojo/mes/bean/MesQcCheckStandard.java | 40 +- .../cn/estsh/i3plus/pojo/mes/bean/MesQueueJis.java | 7 +- .../i3plus/pojo/mes/bean/MesQueueJisDetail.java | 4 +- .../estsh/i3plus/pojo/mes/bean/MesQueueOrder.java | 5 +- .../i3plus/pojo/mes/bean/MesQueueOrderDetail.java | 12 +- .../estsh/i3plus/pojo/mes/bean/MesRawPartSn.java | 1 + .../cn/estsh/i3plus/pojo/mes/bean/MesRepair.java | 1 + .../i3plus/pojo/mes/bean/MesRepairRecord.java | 20 +- .../cn/estsh/i3plus/pojo/mes/bean/MesRoute.java | 1 + .../i3plus/pojo/mes/bean/MesRouteProcess.java | 1 + .../i3plus/pojo/mes/bean/MesRouteProcessCell.java | 1 + .../cn/estsh/i3plus/pojo/mes/bean/MesScrap.java | 3 +- .../estsh/i3plus/pojo/mes/bean/MesScrapRecord.java | 4 +- .../cn/estsh/i3plus/pojo/mes/bean/MesShift.java | 1 + .../estsh/i3plus/pojo/mes/bean/MesShiftGroup.java | 1 + .../estsh/i3plus/pojo/mes/bean/MesShiftRest.java | 1 + .../estsh/i3plus/pojo/mes/bean/MesStationBom.java | 14 +- .../cn/estsh/i3plus/pojo/mes/bean/MesStep.java | 52 +++ .../estsh/i3plus/pojo/mes/bean/MesStepParam.java | 5 +- .../cn/estsh/i3plus/pojo/mes/bean/MesTime.java | 40 ++ .../i3plus/pojo/mes/bean/MesTorqueDetail.java | 97 +++++ .../cn/estsh/i3plus/pojo/mes/bean/MesTypeCfg.java | 2 +- .../cn/estsh/i3plus/pojo/mes/bean/MesWcCheck.java | 2 +- .../i3plus/pojo/mes/bean/MesWcCheckRecord.java | 4 +- .../estsh/i3plus/pojo/mes/bean/MesWcEquipment.java | 2 +- .../cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java | 1 + .../pojo/mes/bean/MesWorkCellMonitorLog.java | 10 +- .../i3plus/pojo/mes/bean/MesWorkCellParam.java | 2 +- .../i3plus/pojo/mes/bean/MesWorkCellParamCfg.java | 1 + .../i3plus/pojo/mes/bean/MesWorkCellPoint.java | 2 +- .../estsh/i3plus/pojo/mes/bean/MesWorkCenter.java | 1 + .../estsh/i3plus/pojo/mes/bean/MesWorkOrder.java | 13 +- .../i3plus/pojo/mes/bean/MesWorkOrderLog.java | 1 + ...ionRequestBean.java => ActionRequestModel.java} | 9 +- .../cn/estsh/i3plus/pojo/mes/model/AttrBean.java | 17 + .../cn/estsh/i3plus/pojo/mes/model/ButtonBean.java | 22 ++ .../pojo/mes/model/DataAcquisitionModel.java | 35 ++ .../estsh/i3plus/pojo/mes/model/DefectModel.java | 48 +++ .../i3plus/pojo/mes/model/GenSerialNoModel.java | 5 - .../i3plus/pojo/mes/model/MesDefectModel.java | 35 ++ .../pojo/mes/model/MesProdBindRecordModel.java | 125 ++++++ .../i3plus/pojo/mes/model/MesStationBomModel.java | 75 ++++ .../i3plus/pojo/mes/model/PLCInteracticeModel.java | 48 +++ .../i3plus/pojo/mes}/model/PlcCacheKeyModel.java | 4 +- .../i3plus/pojo/mes/model/ProdPackageModel.java | 78 ++++ .../pojo/mes/model/QcCheckStandardModel.java | 25 ++ .../estsh/i3plus/pojo/mes/model/QueueJisModel.java | 90 +++++ .../i3plus/pojo/mes/model/QueueOrderModel.java | 25 +- .../estsh/i3plus/pojo/mes/model/RequestModel.java | 47 ++- .../i3plus/pojo/mes/model/SnPrintDataModel.java | 27 ++ .../estsh/i3plus/pojo/mes/model/SnPrintModel.java | 27 ++ .../i3plus/pojo/mes/model/StationBomModel.java | 29 ++ .../i3plus/pojo/mes/model/StationResultBean.java | 55 +++ .../i3plus/pojo/mes/model/StepParamsModel.java | 1 - .../i3plus/pojo/mes/model/StepPrintSnModel.java | 75 ++++ .../cn/estsh/i3plus/pojo/mes/model/StepResult.java | 69 ++++ .../estsh/i3plus/pojo/mes/model/TorqueModel.java | 71 ++++ .../estsh/i3plus/pojo/mes/model/WcCheckModel.java | 65 ++++ .../pojo/mes/repository/MesCellFeedRepository.java | 14 + .../repository/MesDismantleRecordRepository.java | 14 + .../repository/MesPcnSysUserOfflineRepository.java | 16 + .../mes/repository/MesPcnTaskLogRepository.java | 16 + .../mes/repository/MesScrapRecordRepository.java | 14 + .../pojo/mes/repository/MesTimeRepository.java | 10 + .../mes/repository/MesTorqueDetailRepository.java | 16 + .../MesWorkCellMonitorLogRepository.java | 13 + .../repositorymongo/MesProductDataRepository.java | 15 - .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 2 +- .../i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java | 425 +++++++++++++++++++++ 137 files changed, 2276 insertions(+), 153 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSysUserOffline.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnTaskLog.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTime.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTorqueDetail.java rename modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/{ActionRequestBean.java => ActionRequestModel.java} (77%) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/AttrBean.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonBean.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DataAcquisitionModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DefectModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesDefectModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesProdBindRecordModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesStationBomModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PLCInteracticeModel.java rename modules/{i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn => i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes}/model/PlcCacheKeyModel.java (81%) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPackageModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcCheckStandardModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJisModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintDataModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationBomModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationResultBean.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepResult.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TorqueModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/WcCheckModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesCellFeedRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDismantleRecordRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPcnSysUserOfflineRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPcnTaskLogRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesScrapRecordRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesTimeRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesTorqueDetailRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellMonitorLogRepository.java delete mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repositorymongo/MesProductDataRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesArea.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesArea.java index 85de33f..d1910a3 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesArea.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesArea.java @@ -2,6 +2,8 @@ package cn.estsh.i3plus.pojo.mes.pcn.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -12,7 +14,9 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; import java.io.Serializable; +import java.util.List; /** * @Description :生产区域 @@ -37,4 +41,19 @@ public class MesArea extends BaseBean implements Serializable { @Column(name = "AREA_NAME") @ApiParam("区域名称") private String areaName; + + @Transient + @ApiParam(value = "子集列表") + private List childTreeList; + + @Transient + @ApiParam(value = "名称") + private String name; + + // 默认值 -1 + @Transient + @ApiParam(value = "父节点", access = "父节点", example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long parentId; + } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProductEncodeCfg.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProductEncodeCfg.java index 0b7744f..b1b3d8c 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProductEncodeCfg.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProductEncodeCfg.java @@ -11,7 +11,6 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; -import javax.persistence.Transient; import java.io.Serializable; /** diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRouteProcess.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRouteProcess.java index 11ba452..556d26f 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRouteProcess.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRouteProcess.java @@ -29,6 +29,7 @@ import java.io.Serializable; @Api("流程工序关系") public class MesRouteProcess extends BaseBean implements Serializable { private static final long serialVersionUID = 3477334942090180010L; + @Column(name = "ROUTE_CODE") @ApiParam("流程代码") private String routeCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRouteProcessCell.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRouteProcessCell.java index b1da58f..5907cec 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRouteProcessCell.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRouteProcessCell.java @@ -29,6 +29,7 @@ import java.io.Serializable; @Api("工序工作单元对照") public class MesRouteProcessCell extends BaseBean implements Serializable { private static final long serialVersionUID = -703779336699805482L; + @Column(name = "ROUTE_CODE") @ApiParam("流程代码") private String routeCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShiftRest.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShiftRest.java index 9b5cd41..a7c1232 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShiftRest.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShiftRest.java @@ -30,6 +30,7 @@ import java.io.Serializable; @Api("班次休息信息") public class MesShiftRest extends BaseBean implements Serializable { private static final long serialVersionUID = -8712815093203320523L; + @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心代码") private String workCenterCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTime.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTime.java index 47c1867..0d30d54 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTime.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTime.java @@ -22,8 +22,8 @@ import java.io.Serializable; @Table(name = "MES_TIME") @Api("工步参数") public class MesTime extends BaseBean implements Serializable { - private static final long serialVersionUID = 1562011791394529076L; + @Column(name = "MODULE") @ApiParam("组件") private String module; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTorqueDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTorqueDetail.java index 43a0b61..b6071b9 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTorqueDetail.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTorqueDetail.java @@ -29,8 +29,8 @@ import java.io.Serializable; @Table(name = "MES_TORQUE_DETAIL") @Api("扭矩信息记录表") public class MesTorqueDetail extends BaseBean implements Serializable { - private static final long serialVersionUID = 2900363253333046861L; + @Column(name = "SN") @ApiParam("过程条码") private String serialNumber; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTypeCfg.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTypeCfg.java index b7d0b46..506ed2a 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTypeCfg.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTypeCfg.java @@ -28,8 +28,8 @@ import java.io.Serializable; @Table(name = "MES_TYPE_CFG") @Api("类型信息表") public class MesTypeCfg extends BaseBean implements Serializable { - private static final long serialVersionUID = -1699612238800419597L; + @Column(name = "TYPE_CODE") @ApiParam("类型代码") private String typeCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcCheck.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcCheck.java index f958bd1..a089f0a 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcCheck.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcCheck.java @@ -27,8 +27,8 @@ import java.io.Serializable; @Table(name = "MES_WC_CHECK") @Api("开线检查") public class MesWcCheck extends BaseBean implements Serializable { - private static final long serialVersionUID = 8057329890155185557L; + @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心") private String workCenterCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcCheckRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcCheckRecord.java index e03e8e2..fbf5699 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcCheckRecord.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcCheckRecord.java @@ -30,8 +30,8 @@ import java.io.Serializable; }) @Api("开线检查记录") public class MesWcCheckRecord extends BaseBean implements Serializable { - private static final long serialVersionUID = -2173902677953303765L; + @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心") private String workCenterCode; 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 d6740f7..e9bd56b 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 @@ -29,6 +29,7 @@ import java.io.Serializable; @Api("工作单元") public class MesWorkCell extends BaseBean implements Serializable { private static final long serialVersionUID = -493313481197504121L; + @Column(name = "WORK_CELL_CODE") @ApiParam("工作单元代码") private String workCellCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellMonitorLog.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellMonitorLog.java index 8047c46..2200ceb 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellMonitorLog.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellMonitorLog.java @@ -27,8 +27,8 @@ import java.io.Serializable; }) @Api("工位监控异常信息") public class MesWorkCellMonitorLog extends BaseBean implements Serializable { - private static final long serialVersionUID = -5634446206963213556L; + @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心") private String workCenterCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellParam.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellParam.java index 87a0f2e..2249726 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellParam.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellParam.java @@ -28,8 +28,8 @@ import java.io.Serializable; @Table(name = "MES_WORK_CELL_PARAM") @Api("mes工作单元参数") public class MesWorkCellParam extends BaseBean implements Serializable { - private static final long serialVersionUID = -3659425774085368499L; + @Column(name = "PARAM_CODE") @ApiParam("参数代码") private String paramCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellParamCfg.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellParamCfg.java index c0d5a20..a434107 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellParamCfg.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellParamCfg.java @@ -29,6 +29,7 @@ import java.io.Serializable; @Api("工作单元参数配置") public class MesWorkCellParamCfg extends BaseBean implements Serializable { private static final long serialVersionUID = 1739991089354361293L; + @Column(name = "WORK_CELL_CODE") @ApiParam("工作单元代码") private String workCellCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellPoint.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellPoint.java index 74c2a09..0329add 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellPoint.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellPoint.java @@ -28,8 +28,8 @@ import java.io.Serializable; @Table(name = "MES_WORK_CELL_POINT") @Api("工站队列") public class MesWorkCellPoint extends BaseBean implements Serializable { - private static final long serialVersionUID = 2881841596678871526L; + @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心") private String workCenterCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCenter.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCenter.java index 4ba402c..3d35275 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCenter.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCenter.java @@ -29,6 +29,7 @@ import java.io.Serializable; @Api("工作中心") public class MesWorkCenter extends BaseBean implements Serializable { private static final long serialVersionUID = -1119897685621371682L; + @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心代码") private String workCenterCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java index 956a931..c4443eb 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java @@ -27,11 +27,11 @@ import java.io.Serializable; @Table(name = "MES_WORK_ORDER", indexes = {@Index(columnList = "ORDER_NO") }, uniqueConstraints = { @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO", "PART_NO"}) -} -) +}) @Api("生产工单") public class MesWorkOrder extends BaseBean implements Serializable { private static final long serialVersionUID = 8065877030194822855L; + @Column(name = "ORDER_NO", nullable = false) @ApiParam("工单号") private String orderNo; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrderLog.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrderLog.java index e06560c..caba23a 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrderLog.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrderLog.java @@ -30,6 +30,7 @@ import java.io.Serializable; @Api("生产工单日志") public class MesWorkOrderLog extends BaseBean implements Serializable { private static final long serialVersionUID = -7018645997937147427L; + @Column(name = "ORDER_NO") @ApiParam("工单号") private String orderNo; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesButtonFlagModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesButtonFlagModel.java index aac3eea..7883204 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesButtonFlagModel.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesButtonFlagModel.java @@ -17,12 +17,21 @@ import java.io.Serializable; @Data @NoArgsConstructor @AllArgsConstructor -@Api("pcn页面按钮控制model") +@Api("mes页面按钮控制model") public class MesButtonFlagModel implements Serializable { @ApiParam("修改按钮") private boolean updateButton; + @ApiParam("按配置修改按钮") + private boolean updateButtonConfig; + + @ApiParam("下达按钮") + private boolean transmitButton; + +// @ApiParam("测试动态下达按钮") +// private boolean dynamicTransmitButtonTest; + @ApiParam("启动按钮") private boolean startUpButton; @@ -38,5 +47,11 @@ public class MesButtonFlagModel implements Serializable { @ApiParam("完成按钮") private boolean completeButton; + @ApiParam("关闭按钮-提醒") + private boolean closeButtonNoticeFlag; + + @ApiParam("维修任务按钮") + private boolean repairButton; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBom.java index f2bf9b4..8298ef7 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBom.java @@ -10,6 +10,7 @@ import lombok.EqualsAndHashCode; import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; +import org.springframework.format.annotation.DateTimeFormat; import javax.persistence.Column; import javax.persistence.Entity; @@ -72,12 +73,12 @@ public class MesBom extends BaseBean implements Serializable { @Column(name = "EFF_START_TIME") @ApiParam(value = "生效时间") -// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private String effStartTime; @Column(name = "EFF_END_TIME") @ApiParam(value = "失效时间") -// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private String effEndTime; public double getQtyVal() { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomer.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomer.java index cbd6a59..1328e56 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomer.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomer.java @@ -27,7 +27,7 @@ import java.io.Serializable; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name = "MES_CUSTOMER") -@Api("客户产线代码") +@Api("客户信息") public class MesCustomer extends BaseBean implements Serializable { private static final long serialVersionUID = 6049359006918853570L; @Column(name = "CUSTOMER_CODE") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDatasource.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDatasource.java index cfea1ba..b603553 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDatasource.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDatasource.java @@ -58,16 +58,15 @@ public class MesDatasource extends BaseBean implements Serializable { @ApiParam("密码") private String dsPassword; + @Column(name = "DS_DB_NAME") + @ApiParam("数据库名称") + private String dsDbName; + @Column(name = "EQUIPMENT_CODE") @ApiParam("设备代码") private String equipmentCode; - @Column(name = "DS_DB_NAMsE") - @ApiParam("数据库名称") - private String dsDbName; - @Transient @ApiParam("设备名称") private String equipmentName; - } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefect.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefect.java index 9157fa8..fddbb26 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefect.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefect.java @@ -11,7 +11,9 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; import java.io.Serializable; +import java.util.List; /** * @Description: @@ -41,4 +43,26 @@ public class MesDefect extends BaseBean implements Serializable { @Column(name = "DEFECT_TYPE") @ApiParam("缺陷类型") private String defectType; + + @Transient + @ApiParam("缺陷类型名称") + private String defectTypeName; + + @Transient + @ApiParam("缺陷位置") + private String defectLocation; + + @Transient + @ApiParam("缺陷类型子集") + private List mesDefectList; + public MesDefect() { + + } + + public MesDefect(String defectCode, String defectName, String defectType, String defectTypeName) { + this.defectCode = defectCode; + this.defectName = defectName; + this.defectType = defectType; + this.defectTypeName = defectTypeName; + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectCause.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectCause.java index fb28c44..abc53be 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectCause.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectCause.java @@ -28,8 +28,8 @@ import java.io.Serializable; @Table(name = "MES_DEFECT_CAUSE") @Api("缺陷原因表") public class MesDefectCause extends BaseBean implements Serializable { - private static final long serialVersionUID = -4078847071878784152L; + @Column(name = "DC_CODE") @ApiParam("缺陷原因代码") private String dcCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java index d034489..1b9a071 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java @@ -8,12 +8,10 @@ import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Index; -import javax.persistence.Table; +import javax.persistence.*; import java.io.Serializable; import java.util.Date; +import java.util.List; /** * @Description: @@ -34,6 +32,7 @@ import java.util.Date; @Api("不良信息记录表") public class MesDefectRecord extends BaseBean implements Serializable { private static final long serialVersionUID = -6672562641463628050L; + @Column(name = "SERIAL_NUMBER") @ApiParam("产品条码") private String serialNumber; @@ -78,6 +77,9 @@ public class MesDefectRecord extends BaseBean implements Serializable { @ApiParam("备注") private String memo; + @Transient + private List mesDefectList; + public int getRepairStatusVal() { return this.repairStatus == null ? 0 : this.repairStatus; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDismantleRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDismantleRecord.java index 6fff826..0be20a3 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDismantleRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDismantleRecord.java @@ -8,11 +8,9 @@ import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Index; -import javax.persistence.Table; +import javax.persistence.*; import java.io.Serializable; +import java.math.BigDecimal; /** * @Description: @@ -60,11 +58,11 @@ public class MesDismantleRecord extends BaseBean implements Serializable { @Column(name = "QTY") @ApiParam("产品数量") - private Integer qty; + private Double qty; @Column(name = "DISMANTLE_QTY") @ApiParam("拆解数") - private Integer dismantleQty; + private BigDecimal dismantleQty; @Column(name = "ITEM_PART_NO") @ApiParam("子物料编码") @@ -76,17 +74,24 @@ public class MesDismantleRecord extends BaseBean implements Serializable { @Column(name = "OK_QTY") @ApiParam("合格数") - private Integer okQty; + private BigDecimal okQty; @Column(name = "MISS_QTY") @ApiParam("缺失数") - private Integer missQty; + private BigDecimal missQty; @Column(name = "SCRAP_QTY") @ApiParam("报废数") - private Integer scrapQty; + private BigDecimal scrapQty; @Column(name = "MEMO") @ApiParam("备注") - private String meno; + private String memo; + + @Column(name = "LOT_NO") + @ApiParam("关联批次") + private String lotNo; + + @Transient + private String serialNumber; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEsop.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEsop.java index 723251f..1234ffb 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEsop.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEsop.java @@ -28,8 +28,8 @@ import java.io.Serializable; @Table(name = "MES_ESOP") @Api("作业指导书信息表(ODS)") public class MesEsop extends BaseBean implements Serializable { - private static final long serialVersionUID = -2025246159538929513L; + @Column(name = "PART_NO") @ApiParam("零件号") private String partNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEvent.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEvent.java index c8905c5..ae69773 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEvent.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEvent.java @@ -30,6 +30,7 @@ import java.io.Serializable; @Api("系统业务事件") public class MesEvent extends BaseBean implements Serializable { private static final long serialVersionUID = -2941486161983912085L; + @Column(name = "EVENT_CODE") @ApiParam("事件代码") private String eventCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEventAction.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEventAction.java index 51b0507..6e6c529 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEventAction.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEventAction.java @@ -34,6 +34,7 @@ import java.io.Serializable; @Api("系统业务事件动作") public class MesEventAction extends BaseBean implements Serializable { private static final long serialVersionUID = 1188871471049646861L; + @Column(name = "EVENT_CODE") @ApiParam("事件代码") private String eventCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFiCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFiCfg.java index 24228ca..e3982b1 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFiCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFiCfg.java @@ -27,8 +27,8 @@ import java.io.Serializable; @Table(name = "MES_FI_CFG") @Api("首检件配置") public class MesFiCfg extends BaseBean implements Serializable { - private static final long serialVersionUID = 6919161447256638470L; + @Column(name = "WORK_CENTER_CODE") @ApiParam("产线") private String workCenterCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFile.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFile.java index 9df7aa3..e5e7b26 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFile.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFile.java @@ -27,8 +27,8 @@ import java.io.Serializable; @Table(name = "MES_FILE") @Api("文件表") public class MesFile extends BaseBean implements Serializable { - private static final long serialVersionUID = 5057339077996828057L; + @Column(name = "FILE_NAME") @ApiParam("文件名称") private String fileName; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpData.java index f3bd22c..7c0abc6 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpData.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpData.java @@ -15,10 +15,10 @@ import javax.persistence.Transient; import java.io.Serializable; /** - * @Description: - * @Reference: - * @Author: yiming.gu - * @CreateDate:2019-05-21 + * @Description :物料关键数据 + * @Reference : + * @Author : crish + * @CreateDate : 2019-05-15 * @Modify: **/ @Data @@ -30,6 +30,7 @@ import java.io.Serializable; @Api("物料关键数据关系") public class MesKpData extends BaseBean implements Serializable { private static final long serialVersionUID = 8243089140216459544L; + @Column(name = "PART_NO") @ApiParam("物料号") private String partNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplate.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplate.java index ffac585..7555717 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplate.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplate.java @@ -27,8 +27,8 @@ import java.util.List; @Table(name = "MES_LABEL_TEMPLATE") @Api(value = "打印模板", description = "打印模板") public class MesLabelTemplate extends BaseBean implements Serializable { - private static final long serialVersionUID = 5371856566557305323L; + @Column(name = "TEMPLATE_CODE") @ApiParam(value = "模板代码") private String templateCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplateParam.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplateParam.java index c106bb2..5b17a07 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplateParam.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplateParam.java @@ -28,8 +28,8 @@ import java.io.Serializable; @Table(name = "MES_LABEL_TEMPLATE_PARAM") @Api(value = "打印模板参数", description = "打印模板参数") public class MesLabelTemplateParam extends BaseBean implements Serializable { - private static final long serialVersionUID = 6476163540527157643L; + @Column(name = "TEMPLATE_ID") @ApiParam(value = "模板ID", access = "模板ID", example = "-1") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMethod.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMethod.java index 604d661..4b08276 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMethod.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMethod.java @@ -30,6 +30,7 @@ import java.io.Serializable; @Api("系统业务方法") public class MesMethod extends BaseBean implements Serializable { private static final long serialVersionUID = -3254086662292709833L; + @Column(name = "METHOD_CODE") @ApiParam("方法代码") private String methodCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMonitorTask.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMonitorTask.java index 3025972..13b98ce 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMonitorTask.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMonitorTask.java @@ -27,8 +27,8 @@ import java.io.Serializable; @Table(name = "MES_MONITOR_TASK") @Api("监听任务") public class MesMonitorTask extends BaseBean implements Serializable { - private static final long serialVersionUID = 4606062283853607814L; + @Column(name = "TASK_NO") @ApiParam("任务编号") private String taskNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMonitorTaskDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMonitorTaskDetail.java index c2ef72e..2752dac 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMonitorTaskDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMonitorTaskDetail.java @@ -28,8 +28,8 @@ import java.io.Serializable; @Table(name = "MES_MONITOR_TASK_DETAIL") @Api("监听任务明细") public class MesMonitorTaskDetail extends BaseBean implements Serializable { - private static final long serialVersionUID = -8703163858851139587L; + @Column(name = "TASK_NO") @ApiParam("任务编号") private String taskNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesNumberRule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesNumberRule.java index cac557d..9ff7458 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesNumberRule.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesNumberRule.java @@ -19,7 +19,6 @@ import java.io.Serializable; * @CreateDate: 2019/8/22 5:59 PM * @Description: **/ - @Data @Entity @DynamicInsert @@ -28,8 +27,8 @@ import java.io.Serializable; @Table(name = "MES_NUMBER_RULE") @Api("条码生成规则") public class MesNumberRule extends BaseBean implements Serializable { - private static final long serialVersionUID = -7547623897602721464L; + @Column(name = "RULE_CODE") @ApiParam("规则代码") private String ruleCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesNumberSerialno.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesNumberSerialno.java index d4551a2..d717036 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesNumberSerialno.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesNumberSerialno.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Version; import java.io.Serializable; /** @@ -27,8 +28,8 @@ import java.io.Serializable; @Table(name = "MES_NUMBER_SERIALNO") @Api("编码序号") public class MesNumberSerialno extends BaseBean implements Serializable { - private static final long serialVersionUID = -6004402998083665263L; + @Column(name = "CURRENT_NUMBER_PREFIX") @ApiParam("当前编号前缀") private String currentNumberPrefix; @@ -40,4 +41,9 @@ public class MesNumberSerialno extends BaseBean implements Serializable { @Column(name = "CURRENT_NUMBER") @ApiParam("当前编号") private String currentNumber; + + @Version + @Column(name = "LOCK_VERSION") + @ApiParam(value = "乐观锁", example = "1") + public transient Integer lockVersion; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java index dfe9551..9f25f06 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java @@ -28,8 +28,8 @@ import java.io.Serializable; @Table(name = "MES_OBJECT_CFG") @Api("对象结构") public class MesObjectCfg extends BaseBean implements Serializable { - private static final long serialVersionUID = 55753384888695913L; + @Column(name = "OBJECT_CODE") @ApiParam("对象代码") private String objectCode; @@ -55,11 +55,11 @@ public class MesObjectCfg extends BaseBean implements Serializable { private String pojoAttr; @Column(name = "IS_SAVE") - @ApiParam("是否存储") + @ApiParam("是否保存 1存 2不存") private Integer isSave; @Transient - @ApiParam("是否存储") + @ApiParam("是否存储名") private String isSaveName; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPLCConfigure.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPLCConfigure.java index f54e7b6..d752e8c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPLCConfigure.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPLCConfigure.java @@ -31,6 +31,7 @@ import java.io.Serializable; @Deprecated public class MesPLCConfigure extends BaseBean implements Serializable { private static final long serialVersionUID = 2609782937477343108L; + @Column(name = "IP") @ApiParam("设备ip") private String ipAddress; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java index 79fe8cb..ea3a703 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java @@ -29,6 +29,7 @@ import java.io.Serializable; @Api("包装规格") public class MesPackage extends BaseBean implements Serializable { private static final long serialVersionUID = 5275923991324889995L; + @Column(name = "PACKAGE_NO", nullable = false) @ApiParam("包装编号") private String packageNo; @@ -101,4 +102,18 @@ public class MesPackage extends BaseBean implements Serializable { @ApiParam("打印状态文字") private String printStrStatus; + @Transient + @ApiParam("打印缓存id") + private String printId; + + public MesPackage() { + } + + public MesPackage(String packageNo, String partNo, String partNameRdd, Double qty, Double packSpecQty) { + this.packageNo = packageNo; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.qty = qty; + this.packSpecQty = packSpecQty; + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java index 5c44dcd..6da48a8 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java @@ -28,8 +28,8 @@ import java.io.Serializable; }) @Api("包装规格明细") public class MesPackageDetail extends BaseBean implements Serializable { - private static final long serialVersionUID = 6980459490465566975L; + @Column(name = "PACKAGE_NO", nullable = false) @ApiParam("包装编码") private String packageNo; @@ -39,11 +39,11 @@ public class MesPackageDetail extends BaseBean implements Serializable { private String serialNumber; @Column(name = "PART_NO") - @ApiParam("物料号") + @ApiParam("物料编号") private String partNo; @Column(name = "PART_NAME_RDD") - @ApiParam("产品条码") + @ApiParam("物料名称") private String partNameRdd; @Column(name = "PACKAGE_NO2") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java index 19434f5..1b9e494 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java @@ -28,8 +28,8 @@ import java.io.Serializable; @Table(name = "MES_PACKAGE_TRAVEL", indexes = {@Index(columnList = "PACKAGE_NO")}) @Api("包装履历表") public class MesPackageTravel extends BaseBean implements Serializable { - private static final long serialVersionUID = -6425620221708201986L; + @Column(name = "PACKAGE_NO") @ApiParam("包装编码") private String packageNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java index 3b117e8..b326a99 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java @@ -31,6 +31,7 @@ import java.io.Serializable; @Api("物料信息") public class MesPart extends BaseBean implements Serializable { private static final long serialVersionUID = -7731182105899332283L; + @Column(name = "PART_NO") @ApiParam("零件号") private String partNo; @@ -75,10 +76,6 @@ public class MesPart extends BaseBean implements Serializable { @ApiParam("产品类型代码") private String produceCategoryCode; - @Transient - @ApiParam("产品类型名称") - private String produceCategoryName; - @Column(name = "PROCESS_MATCH_TYPE") @ApiParam("过程编码匹配类型") private Integer processMatchType; @@ -92,6 +89,10 @@ public class MesPart extends BaseBean implements Serializable { private Integer productMatchType; @Transient + @ApiParam("产品类型名称") + private String produceCategoryName; + + @Transient @ApiParam("过程编码匹配类型名称") private String processMatchTypeName; @@ -102,4 +103,8 @@ public class MesPart extends BaseBean implements Serializable { @Transient @ApiParam("产品编码匹配类型") private String productMatchTypeName; + + @Transient + @ApiParam("分类名称") + private String categoryName; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCategory.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCategory.java index f356754..9553053 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCategory.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCategory.java @@ -30,6 +30,7 @@ import java.io.Serializable; @Api("零件种类") public class MesPartCategory extends BaseBean implements Serializable { private static final long serialVersionUID = 106841156414035968L; + @Column(name = "CATEGORY_CODE") @ApiParam("分类代码") private String categoryCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPatternJis.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPatternJis.java index 62553f7..ef7ae49 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPatternJis.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPatternJis.java @@ -30,8 +30,8 @@ import java.io.Serializable; @Table(name = "MES_PATTERN_JIS") @Api("JIS发运模式") public class MesPatternJis extends BaseBean implements Serializable { - private static final long serialVersionUID = 216398440591829755L; + @Column(name = "PATTERN_NO") @ApiParam("模式编号") private String patternNo; @@ -45,7 +45,7 @@ public class MesPatternJis extends BaseBean implements Serializable { private Integer queueNo; @Column(name = "HANDLE_NO") - @ApiParam("一次处理队列数") + @ApiParam("一次处理套数") private Integer handleNo; @Column(name = "PATTERN_DESC") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcn.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcn.java index bc3f570..445fe79 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcn.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcn.java @@ -29,6 +29,7 @@ import java.io.Serializable; @Api("PCN节点") public class MesPcn extends BaseBean implements Serializable { private static final long serialVersionUID = -9150091413555406397L; + @Column(name = "PCN_CODE") @ApiParam("PCN代码") private String pcnCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnConnectLog.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnConnectLog.java index 7e00e8e..94a4da7 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnConnectLog.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnConnectLog.java @@ -29,6 +29,7 @@ import java.io.Serializable; @Api("PCN节点连接日志") public class MesPcnConnectLog extends BaseBean implements Serializable { private static final long serialVersionUID = 2756240593256441951L; + @Column(name = "PCN_CODE") @ApiParam("PCN代码") private String pcnCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncCfg.java index 2f33165..cc636ce 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncCfg.java @@ -30,7 +30,6 @@ import java.io.Serializable; @Table(name = "MES_PCN_SYNC_CFG") @Api("MES_PCN_同步配置") public class MesPcnSyncCfg extends BaseBean implements Serializable { - private static final long serialVersionUID = 7270930330576127126L; @Column(name = "PCN_CODE") @@ -58,7 +57,7 @@ public class MesPcnSyncCfg extends BaseBean implements Serializable { private String syncTime; @Column(name = "SYNC_PATTERN") - @ApiParam("同步方式 2、新增 1、修改") + @ApiParam("同步方式 2.新增 1.修改") private Integer syncPattern; @Column(name = "SYNC_TYPE") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncErrorLog.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncErrorLog.java index 5c98174..2b79271 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncErrorLog.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncErrorLog.java @@ -30,6 +30,7 @@ import java.io.Serializable; @Api("MES_PCN同步异常日志") public class MesPcnSyncErrorLog extends BaseBean implements Serializable { private static final long serialVersionUID = -6031591772505958774L; + @Column(name = "PCN_CODE") @ApiParam("PCN代码") private String pcnCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSysUserOffline.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSysUserOffline.java new file mode 100644 index 0000000..dc26568 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSysUserOffline.java @@ -0,0 +1,72 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Lob; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description : 账号离线登陆表 + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-09-01 11:02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PCN_SYS_USER_OFFLINE") +@Api(value = "账号离线登陆表", description = "账号离线登陆表。") +public class MesPcnSysUserOffline extends BaseBean implements Serializable { + + private static final long serialVersionUID = 7617353154826718154L; + @Column(name = "USER_ID") + @ApiParam(value = "人员ID", example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long userId; + + @Column(name = "USER_CODE") + @ApiParam(value = "用户编号", access = "用户编号") + private String userCode; + + @Column(name = "USER_NAME") + @ApiParam(value = "用户名称", access = "账号名称") + private String userName; + + @Column(name = "LOGIN_NAME") + @ApiParam(value = "登陆名称", access = "登陆名称") + private String loginName; + + @Column(name="USER_TYPE") + @ApiParam(value ="账号类型（枚举，待定）" , example ="-1") + private Integer userType; + + @Lob + @Column(name="LOGIN_INFO") + @ApiParam(value ="登陆信息" , access ="登陆信息") + private String loginInfo; + + @Lob + @Column(name="MENU_LIST") + @ApiParam(value ="菜单" , access ="菜单") + private String menuList; + + @Lob + @Column(name="MODULE_LIST") + @ApiParam(value ="模块" , access ="模块") + private String moduleList; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnTask.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnTask.java index 6217557..83f9049 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnTask.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnTask.java @@ -29,8 +29,8 @@ import java.io.Serializable; @Table(name = "MES_PCN_TASK") @Api("mes-pcn定时任务工作清单") public class MesPcnTask extends BaseBean implements Serializable { - private static final long serialVersionUID = 4129717677965409395L; + @Column(name = "TASK_CODE") @ApiParam("任务代码") private String taskCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnTaskLog.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnTaskLog.java new file mode 100644 index 0000000..d483cd6 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnTaskLog.java @@ -0,0 +1,53 @@ +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 java.io.Serializable; + +/** + * @Description :mes-pcn定时任务工作清单同步记录 + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-08-27 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PCN_TASK_LOG") +@Api("mes-pcn定时任务工作清单同步记录") +public class MesPcnTaskLog extends BaseBean implements Serializable { + private static final long serialVersionUID = -784806389462540310L; + + @Column(name = "SYNC_TIME_START") + @ApiParam("同步数据开始时间") + private String syncTimeStart; + + @Column(name = "SYNC_TIME_END") + @ApiParam("同步数据截止时间") + private String syncTimeEnd; + + @Column(name = "SYNC_STATUS") + @ApiParam("同步状态") + private Integer syncStatus; + + @Column(name = "ERROR_CONTENT") + @ApiParam("异常内容") + private Long errorContent; + + public int getSyncStatusVal() { + return this.syncStatus == null ? 0 : this.syncStatus; + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java index 01be425..d5f6ed3 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java @@ -31,6 +31,7 @@ import java.io.Serializable; @Api("生产主计划") public class MesPlanOrder extends BaseBean implements Serializable { private static final long serialVersionUID = 6773005820598583458L; + @Column(name = "ORDER_NO", nullable = false) @ApiParam("生产计划单号") private String orderNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java index 7d9c0b6..942809f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java @@ -30,8 +30,8 @@ import java.io.Serializable; @Table(name = "MES_PLC") @Api("PLC配置表") public class MesPlc extends BaseBean implements Serializable { - private static final long serialVersionUID = -7172265186837551268L; + @Column(name = "PLC_CODE") @ApiParam("PLC代码") private String plcCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProcess.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProcess.java index a60fa3d..bc05708 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProcess.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProcess.java @@ -29,6 +29,7 @@ import java.io.Serializable; @Api("工序") public class MesProcess extends BaseBean implements Serializable { private static final long serialVersionUID = -615476712907856558L; + @Column(name = "PROCESS_CODE") @ApiParam("工序代码") private String processCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java index 9f84b79..9d048c0 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java @@ -8,7 +8,6 @@ import lombok.EqualsAndHashCode; import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import org.springframework.format.annotation.DateTimeFormat; import javax.persistence.*; import java.io.Serializable; @@ -36,6 +35,7 @@ import java.io.Serializable; @Api("产品绑定记录表") public class MesProdBindRecord extends BaseBean implements Serializable { private static final long serialVersionUID = -6984193022328810942L; + // 联合唯一索引必须加:, nullable = false @Column(name = "SERIAL_NUMBER", nullable = false) @ApiParam(value = "产品条码") @@ -79,11 +79,11 @@ public class MesProdBindRecord extends BaseBean implements Serializable { private String supplierCode; @Column(name = "LOT_NO") - @ApiParam + @ApiParam("关联批次") private String lotNo; @Column(name = "IS_FEED") - @ApiParam + @ApiParam("是否投料配置") private Integer isFeed; @Column(name = "VERSION") @@ -100,7 +100,7 @@ public class MesProdBindRecord extends BaseBean implements Serializable { @Column(name = "ACTION_TYPE") @ApiParam(value = "动作类型") - private String actionType; + private Integer actionType; @ApiParam(value = "是否绑定关键件名称") private String isBindKeyName; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfg.java index f77984a..34389f0 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfg.java @@ -30,6 +30,7 @@ import java.io.Serializable; @Api("产品配置") public class MesProdCfg extends BaseBean implements Serializable { private static final long serialVersionUID = -1301835558902463754L; + @Column(name = "PROD_CFG_CODE") @ApiParam("产品配置代码") private String prodCfgCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfgDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfgDetail.java index 151a929..f769488 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfgDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfgDetail.java @@ -31,6 +31,7 @@ import java.io.Serializable; @Api("产品配置明细") public class MesProdCfgDetail extends BaseBean implements Serializable { private static final long serialVersionUID = -5678006170645940563L; + @Column(name = "PROD_CFG_CODE") @ApiParam("产品配置代码") private String prodCfgCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdPack.java index f5438ae..80fd5fd 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdPack.java @@ -27,8 +27,8 @@ import java.io.Serializable; @Table(name = "MES_PROD_PACK") @Api("产品包装关系") public class MesProdPack extends BaseBean implements Serializable { - private static final long serialVersionUID = -5748484568201154400L; + @Column(name = "PART_NO") @ApiParam("物料号") private String partNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteCfg.java index d33cc8e..0285bb7 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteCfg.java @@ -29,6 +29,7 @@ import java.io.Serializable; @Api("产品类流程配置表") public class MesProdRouteCfg extends BaseBean implements Serializable { private static final long serialVersionUID = -3903152693262813917L; + @Column(name = "PART_NO") @ApiParam("物料号") private String partNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCategory.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCategory.java index 622dc1f..fdf53da 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCategory.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCategory.java @@ -28,8 +28,8 @@ import java.io.Serializable; @Table(name = "MES_PRODUCE_CATEGORY") @Api("系统业务动作") public class MesProduceCategory extends BaseBean implements Serializable { - private static final long serialVersionUID = -992595557921651448L; + @Column(name = "PRODUCE_CTGY_CODE") @ApiParam("产品类型代码") private String produceCategoryCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCtgyPicture.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCtgyPicture.java index 4a8a103..ba53ce5 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCtgyPicture.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCtgyPicture.java @@ -29,8 +29,8 @@ import java.io.Serializable; @Table(name = "MES_PRODUCE_CTGY_PICTURE") @Api("产品类型图片表") public class MesProduceCtgyPicture extends BaseBean implements Serializable { - private static final long serialVersionUID = 4199856772441042802L; + @Column(name = "PRODUCE_CTGY_CODE") @ApiParam("产品类型代码") private String produceCtgyCode; @@ -43,7 +43,21 @@ public class MesProduceCtgyPicture extends BaseBean implements Serializable { @ApiParam("文件id") private Long fileId; + @Column(name = "PICTURE_URL") + @ApiParam("图片URL") + private String pictureUrl; + @Transient @ApiParam("文件原名称") private String fileOriginName; + + @Transient + @ApiParam("文件名称") + private String fileName; + + @Transient + @ApiParam("文件URL") + private String fileUrl; + + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java index 2f6fe5e..7bf1165 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java @@ -33,8 +33,8 @@ import java.math.BigDecimal; }) @Api("产品条码表") public class MesProduceSn extends BaseBean implements Serializable { - private static final long serialVersionUID = -1630924042562178494L; + @Column(name = "SERIAL_NUMBER", nullable = false) @ApiParam("过程条码") private String serialNumber; @@ -72,11 +72,11 @@ public class MesProduceSn extends BaseBean implements Serializable { private Integer printStatus; @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心代码") + @ApiParam("生产线") private String workCenterCode; @Column(name = "WORK_CELL_CODE") - @ApiParam("工作单元代码") + @ApiParam("工位") private String workCellCode; @Column(name = "ROUTE_CODE") @@ -120,7 +120,7 @@ public class MesProduceSn extends BaseBean implements Serializable { private String custCode; @Column(name = "SN_TYPE") - @ApiParam("条码类型") + @ApiParam("条码类型 10=正常 20=首检件") private Integer snType; @Column(name = "TRAY_NO") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java index ef63c50..fb90102 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java @@ -33,6 +33,7 @@ import java.io.Serializable; @Api("产品条码履历表") public class MesProduceSnTravel extends BaseBean implements Serializable { private static final long serialVersionUID = -1807953720033107108L; + @Column(name = "SERIAL_NUMBER") @ApiParam("过程条码") private String serialNumber; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductEncodeCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductEncodeCfg.java index 83bd787..0622673 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductEncodeCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductEncodeCfg.java @@ -29,8 +29,8 @@ import java.io.Serializable; @Table(name = "MES_PRODUCT_ENCODE_CFG") @Api("产品编码配置") public class MesProductEncodeCfg extends BaseBean implements Serializable { - private static final long serialVersionUID = 5608141802461306170L; + @Column(name = "CODE_TYPE") @ApiParam("编码类型") private Integer codeType; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckData.java index 743751a..a068cce 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckData.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckData.java @@ -31,8 +31,8 @@ import java.util.List; }) @Api("质量过程检测数据") public class MesQcCheckData extends BaseBean implements Serializable { - private static final long serialVersionUID = -8044433561607606170L; + @Column(name = "CHECK_ID") @ApiParam("检测id") private String checkId; @@ -116,4 +116,12 @@ public class MesQcCheckData extends BaseBean implements Serializable { @Transient @ApiParam("工作单元名称") private String workCellName; + + @Transient + @ApiParam("产品条码") + private String serialNumber; + + @Transient + @ApiParam("过程质量检测数据") + private List mesQcCheckStandardList; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java index b4f6388..0bc3879 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java @@ -13,6 +13,7 @@ import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; import java.io.Serializable; +import java.util.List; /** * @Description: @@ -29,8 +30,8 @@ import java.io.Serializable; @Table(name = "MES_QC_CHECK_STANDARD") @Api("质量检测标准") public class MesQcCheckStandard extends BaseBean implements Serializable { - private static final long serialVersionUID = 3977375527789854590L; + @Column(name = "PART_NO") @ApiParam("物料编码") private String partNo; @@ -63,6 +64,18 @@ public class MesQcCheckStandard extends BaseBean implements Serializable { @ApiParam("频率") private String checkFrequency; + @Transient + @ApiParam("物料名称") + private String partName; + + @Transient + @ApiParam("检测结果") + private String checkResult; + + @Transient + @ApiParam("检测值") + private String checkValue; + @Column(name = "CHECK_ITEM_TYPE") @ApiParam("检测项类型") private String checkItemType; @@ -71,4 +84,29 @@ public class MesQcCheckStandard extends BaseBean implements Serializable { @ApiParam("检测类型名称") private String checkTypeName; + @Transient + @ApiParam("检测项类型名称") + private String checkItemTypeName; + + @Transient + private List childQcList; + + public MesQcCheckStandard() { + } + + public MesQcCheckStandard(Long id, String partNo, String workCenterCode, String workCellCode, Integer checkType, String checkItem, String checkStandard + , String checkGuide, String checkFrequency, String partName, String checkItemType, String checkItemTypeName) { + this.id = id; + this.partNo = partNo; + this.workCenterCode = workCenterCode; + this.workCellCode = workCellCode; + this.checkType = checkType; + this.checkItem = checkItem; + this.checkStandard = checkStandard; + this.checkGuide = checkGuide; + this.checkFrequency = checkFrequency; + this.partName = partName; + this.checkItemType = checkItemType; + this.checkItemTypeName = checkItemTypeName; + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJis.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJis.java index a2d6034..249fd29 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJis.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJis.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; import java.io.Serializable; /** @@ -29,8 +30,8 @@ import java.io.Serializable; @Table(name = "MES_QUEUE_JIS") @Api("JIS发运队列") public class MesQueueJis extends BaseBean implements Serializable { - private static final long serialVersionUID = -2712958514118946868L; + @Column(name = "JIS_NO") @ApiParam("主队列编号") private String jisNo; @@ -63,4 +64,8 @@ public class MesQueueJis extends BaseBean implements Serializable { @ApiParam("工作单元代码") private String workCellCode; + @Transient + @ApiParam("颜色") + private String color; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJisDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJisDetail.java index f3defbd..5ac2924 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJisDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJisDetail.java @@ -29,8 +29,8 @@ import java.io.Serializable; @Table(name = "MES_QUEUE_JIS_DETAIL") @Api("JIS发运队列明细") public class MesQueueJisDetail extends BaseBean implements Serializable { - private static final long serialVersionUID = -3242843412307565585L; + @Column(name = "JIS_NO") @ApiParam("主队列编号") private String jisNo; @@ -52,7 +52,7 @@ public class MesQueueJisDetail extends BaseBean implements Serializable { private Integer status; @Column(name = "FINAL_STATUS") - @ApiParam("发运整体状态") + @ApiParam("明细整体状态") private Integer finalStatus; @Column(name = "SERIAL_NUMBER") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java index 8b8a70c..159aa03 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java @@ -1,7 +1,6 @@ package cn.estsh.i3plus.pojo.mes.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.base.enumutil.MesEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -11,9 +10,6 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; import java.io.Serializable; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; /** * @Description: @@ -35,6 +31,7 @@ import java.util.List; @Api("生产队列主表") public class MesQueueOrder extends BaseBean implements Serializable { private static final long serialVersionUID = -7459452106180601417L; + @Column(name = "ORDER_NO", nullable = false) @ApiParam("主队列编号") private String orderNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java index 589f92e..cb39dc8 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java @@ -31,6 +31,7 @@ import java.io.Serializable; @Api("生产队列明细") public class MesQueueOrderDetail extends BaseBean implements Serializable { private static final long serialVersionUID = 7840873844253353896L; + @Column(name = "ORDER_NO", nullable = false) @ApiParam("主队列编号") private String orderNo; @@ -61,7 +62,7 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable { @Column(name = "WORK_TYPE") @ApiParam("生产类型") - private String workOrderType; + private String workType; @Column(name = "PRODUCE_CATEGORY_CODE") @ApiParam("产品类型代码") @@ -90,4 +91,13 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable { public int getStatusVal() { return this.status == null ? 0 : this.status; } + + public MesQueueOrderDetail() { + } + + public MesQueueOrderDetail(Double queueSeq, Double seq, String serialNumber) { + this.queueSeq = queueSeq; + this.seq = seq; + this.serialNumber = serialNumber; + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRawPartSn.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRawPartSn.java index cf7ee95..ee3e3b5 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRawPartSn.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRawPartSn.java @@ -31,6 +31,7 @@ import java.io.Serializable; @Api("原材料信息") public class MesRawPartSn extends BaseBean implements Serializable { private static final long serialVersionUID = 1590983555938105569L; + @Column(name = "PART_NO") @ApiParam("物料号") private String partNo; 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 d2514e3..4c75791 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 @@ -30,6 +30,7 @@ import java.io.Serializable; @Api("维修") public class MesRepair extends BaseBean implements Serializable { private static final long serialVersionUID = 5304257976947321917L; + @Column(name = "REPAIR_CODE") @ApiParam("维修代码") private String repairCode; 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 0026eeb..d717a56 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 @@ -8,11 +8,9 @@ import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Index; -import javax.persistence.Table; +import javax.persistence.*; import java.io.Serializable; +import java.util.List; /** * @Description: @@ -33,8 +31,8 @@ import java.io.Serializable; }) @Api("维修信息记录表") public class MesRepairRecord extends BaseBean implements Serializable { - private static final long serialVersionUID = -1758374702271940323L; + @Column(name = "SERIAL_NUMBER") @ApiParam("产品条码") private String serialNumber; @@ -90,4 +88,16 @@ public class MesRepairRecord extends BaseBean implements Serializable { @Column(name = "MEMO") @ApiParam("备注") 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/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRoute.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRoute.java index ca98cbe..bea56af 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRoute.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRoute.java @@ -30,6 +30,7 @@ import java.io.Serializable; @Api("流程表") public class MesRoute extends BaseBean implements Serializable { private static final long serialVersionUID = -3616935751787295145L; + @Column(name = "ROUTE_CODE") @ApiParam("流程代码") private String routeCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcess.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcess.java index d24696d..fa6d9dd 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcess.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcess.java @@ -29,6 +29,7 @@ import java.io.Serializable; @Api("流程工序关系") public class MesRouteProcess extends BaseBean implements Serializable { private static final long serialVersionUID = -1248219638779313299L; + @Column(name = "ROUTE_CODE") @ApiParam("流程代码") private String routeCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessCell.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessCell.java index 0e3e719..b677ede 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessCell.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessCell.java @@ -30,6 +30,7 @@ import java.io.Serializable; @Api("工序工作单元对照") public class MesRouteProcessCell extends BaseBean implements Serializable { private static final long serialVersionUID = 4823057491756814599L; + @Column(name = "ROUTE_CODE") @ApiParam("流程代码") private String routeCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScrap.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScrap.java index 81a7105..0478394 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScrap.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScrap.java @@ -30,6 +30,7 @@ import java.io.Serializable; @Api("报废原因") public class MesScrap extends BaseBean implements Serializable { private static final long serialVersionUID = 2850681183524213132L; + @Column(name = "SCRAP_CODE") @ApiParam("报废代码") private String scrapCode; @@ -38,7 +39,7 @@ public class MesScrap extends BaseBean implements Serializable { @ApiParam("报废名称") private String scrapName; - @Column(name="SCRAP_TYPE") + @Column(name = "SCRAP_TYPE") @ApiParam("报废类型") private String scrapType; 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 6129a7b..bb4cb77 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 @@ -31,8 +31,8 @@ import java.io.Serializable; }) @Api("报废信息记录表") public class MesScrapRecord extends BaseBean implements Serializable { - private static final long serialVersionUID = -5451178133547076360L; + @Column(name = "SERIAL_NUMBER") @ApiParam("产品条码") private String serialNumber; @@ -51,7 +51,7 @@ public class MesScrapRecord extends BaseBean implements Serializable { @Column(name = "SCRAP_CODE") @ApiParam("报废代码") - private String repairCode; + private String scrapCode; @Column(name = "SCRAP_NAME") @ApiParam("报废名称") 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 34f25ed..3fd79bb 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 @@ -30,6 +30,7 @@ import java.io.Serializable; @Api("班次信息") public class MesShift extends BaseBean implements Serializable { private static final long serialVersionUID = 4001070186534674096L; + @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心代码") private String workCenterCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftGroup.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftGroup.java index 1d7c663..6a01945 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftGroup.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftGroup.java @@ -29,6 +29,7 @@ import java.io.Serializable; @Api("班组") public class MesShiftGroup extends BaseBean implements Serializable { private static final long serialVersionUID = 3409573116624543569L; + @Column(name = "GROUP_CODE") @ApiParam("班组代码") private String groupCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftRest.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftRest.java index c7e212a..ef567e2 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftRest.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftRest.java @@ -30,6 +30,7 @@ import java.io.Serializable; @Api("班次休息信息") public class MesShiftRest extends BaseBean implements Serializable { private static final long serialVersionUID = 5486276486536860088L; + @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心代码") private String workCenterCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java index 0ad8795..bab6d9c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java @@ -32,6 +32,7 @@ import java.io.Serializable; @Api("工位物料清单") public class MesStationBom extends BaseBean implements Serializable { private static final long serialVersionUID = 1817387724628691734L; + @Column(name = "PART_NO") @ApiParam("零件号") private String partNo; @@ -69,7 +70,6 @@ public class MesStationBom extends BaseBean implements Serializable { @ApiParam(value = "是否检查") private Integer isCheck; - @Column(name = "IS_FEED") @ApiParam(value = "是否投料配置") private Integer isFeed; @@ -91,6 +91,14 @@ public class MesStationBom extends BaseBean implements Serializable { private Double boundQty; @Transient + @ApiParam("关键件代码") + private String keyBarCode; + + @Transient + @ApiParam("产品条码") + private String serialNumber; + + @Transient @ApiParam(value = "是否可重复名称") private String isRepeatName; @@ -126,6 +134,10 @@ public class MesStationBom extends BaseBean implements Serializable { return this.isBind == null ? false : this.isBind; } + public double getBoundQtyVal() { + return this.boundQty == null ? 0.0d : this.boundQty; + } + @Override public String toString() { return "MesStationBom{" + diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStep.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStep.java index 32fa323..bad1874 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStep.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStep.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; import java.io.Serializable; /** @@ -29,6 +30,7 @@ import java.io.Serializable; @Api("工步") public class MesStep extends BaseBean implements Serializable { private static final long serialVersionUID = -1106608189453496947L; + @Column(name = "STEP_CODE") @ApiParam("工步代码") private String stepCode; @@ -48,4 +50,54 @@ public class MesStep extends BaseBean implements Serializable { @Column(name = "STEP_OBJECT") @ApiParam("工步对象") private String stepObject; + + /** + * 工位扫描业务所需使用字段 + */ + @Transient + @ApiParam("流程代码") + private String routeCode; + + /** + * 工位扫描业务所需使用字段 + */ + @Transient + @ApiParam("工序代码") + private String processCode; + + /** + * 工位扫描业务所需使用字段 + */ + @Transient + @ApiParam("工步顺序") + private Integer stepSeq; + + /** + * 工位扫描业务所需使用字段 + */ + @Transient + @ApiParam("工步执行完毕") + private boolean isComplete; + + /** + * 工位扫描业务所需使用字段 + */ + @Transient + @ApiParam("工步是否跳过") + private boolean isJump; + + public MesStep() { + } + + public MesStep(String stepCode, String stepName, String stepText, String stepType, String stepObject, + String routeCode, String processCode, Integer stepSeq) { + this.stepCode = stepCode; + this.stepName = stepName; + this.stepText = stepText; + this.stepType = stepType; + this.stepObject = stepObject; + this.routeCode = routeCode; + this.processCode = processCode; + this.stepSeq = stepSeq; + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepParam.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepParam.java index b2ca5cf..237df3e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepParam.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepParam.java @@ -29,6 +29,7 @@ import java.io.Serializable; @Api("工步参数") public class MesStepParam extends BaseBean implements Serializable { private static final long serialVersionUID = 6709455994477993263L; + @Column(name = "STEP_CODE") @ApiParam("工步代码") private String stepCode; @@ -44,8 +45,8 @@ public class MesStepParam extends BaseBean implements Serializable { @Column(name = "PARAM_NAME") @ApiParam("参数名称") private String paramName; - //text select + @Column(name = "PARAM_ATTRIBUTE") - @ApiParam("参数属性") + @ApiParam("参数属性 text select") private String paramAttribute; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTime.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTime.java new file mode 100644 index 0000000..326dafe --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTime.java @@ -0,0 +1,40 @@ +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 java.io.Serializable; + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_TIME") +@Api("工步参数") +public class MesTime extends BaseBean implements Serializable { + private static final long serialVersionUID = 1562011791394529076L; + + @Column(name = "MODULE") + @ApiParam("组件") + private String module; + + @Column(name = "ELAPSE") + @ApiParam("耗时") + private Long elapse; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工位") + private String workCellCode; + + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTorqueDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTorqueDetail.java new file mode 100644 index 0000000..570ffd1 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTorqueDetail.java @@ -0,0 +1,97 @@ +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 java.io.Serializable; + +/** + * @Description :扭矩信息记录表 + * @Reference : + * @Author : Crish + * @CreateDate : 2019-05-17 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_TORQUE_DETAIL") +@Api("扭矩信息记录表") +public class MesTorqueDetail extends BaseBean implements Serializable { + private static final long serialVersionUID = 2900363253333046861L; + + @Column(name = "SN") + @ApiParam("过程条码") + private String serialNumber; + + @Column(name = "UPPER_LIMIT") + @ApiParam("最大值") + private Double upperLimit; + + @Column(name = "LOWER_LIMIT") + @ApiParam("最小值") + private Double lowerLimit; + + @Column(name = "TORQUE_DETAIL_VALUE") + @ApiParam("扭矩值") + private Double torqueValue; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元") + private String workCellCode; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心") + private String workCenterCode; + + @Column(name = "AREA_CODE") + @ApiParam("区域代码") + private String areaCode; + + @Column(name = "ok") + @ApiParam("扭矩是否合格") + private String ok; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "p_set") + @ApiParam("螺丝枪PSET设置值") + private String deviceSetValue; + + @Column(name = "MAXANGLE") + @ApiParam("最大扭矩") + private String maxAngle; + + @Column(name = "MINANGLE") + @ApiParam("最小扭矩") + private String minAngel; + + @Column(name = "FINALANGLE") + @ApiParam("最终扭矩") + private Integer finalAngle; + + @Column(name = "WORK_ORDER_NO") + @ApiParam("工单号") + private String workOrderNo; + + @Column(name = "KEY_DATA_CODE") + @ApiParam("关键数据代码") + private String keyDataCode; + + @Column(name = "RESULT_MSG") + @ApiParam("扭矩判定结果") + private String resultMsg; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTypeCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTypeCfg.java index a1a92cd..9f87ea7 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTypeCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTypeCfg.java @@ -28,8 +28,8 @@ import java.io.Serializable; @Table(name = "MES_TYPE_CFG") @Api("类型信息表") public class MesTypeCfg extends BaseBean implements Serializable { - private static final long serialVersionUID = 7666533200631763797L; + @Column(name = "TYPE_CODE") @ApiParam("类型代码") private String typeCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCheck.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCheck.java index ff626d1..7d83053 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCheck.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCheck.java @@ -28,8 +28,8 @@ import java.io.Serializable; @Table(name = "MES_WC_CHECK") @Api("开线检查") public class MesWcCheck extends BaseBean implements Serializable { - private static final long serialVersionUID = 7937744978114334701L; + @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心") private String workCenterCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCheckRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCheckRecord.java index 5d7bced..534e549 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCheckRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCheckRecord.java @@ -30,8 +30,8 @@ import java.io.Serializable; }) @Api("开线检查记录") public class MesWcCheckRecord extends BaseBean implements Serializable { - private static final long serialVersionUID = 6919654845394560128L; + @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心") private String workCenterCode; @@ -77,7 +77,7 @@ public class MesWcCheckRecord extends BaseBean implements Serializable { private String groupCode; @Column(name = "OVERALL_RESULT") - @ApiParam + @ApiParam("总体结果") private Integer overAllResult; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcEquipment.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcEquipment.java index cb619b7..a3ab8a2 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcEquipment.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcEquipment.java @@ -27,8 +27,8 @@ import java.io.Serializable; @Table(name = "MES_WC_EQUIPMENT") @Api("工作单元设备关系表") public class MesWcEquipment extends BaseBean implements Serializable { - private static final long serialVersionUID = 188390912605665500L; + @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心代码") private String workCenterCode; 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 2f0533a..f275899 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 @@ -33,6 +33,7 @@ import java.util.List; @Api("工作单元") public class MesWorkCell extends BaseBean implements Serializable { private static final long serialVersionUID = 8552890090536989486L; + @Column(name = "WORK_CELL_CODE") @ApiParam("工作单元代码") private String workCellCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellMonitorLog.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellMonitorLog.java index 06dc991..92bcaf8 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellMonitorLog.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellMonitorLog.java @@ -9,10 +9,7 @@ import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Index; -import javax.persistence.Table; +import javax.persistence.*; import java.io.Serializable; /** @@ -30,8 +27,8 @@ import java.io.Serializable; }) @Api("工位监控异常信息") public class MesWorkCellMonitorLog extends BaseBean implements Serializable { - private static final long serialVersionUID = 1432794181428753903L; + @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心") private String workCenterCode; @@ -44,7 +41,7 @@ public class MesWorkCellMonitorLog extends BaseBean implements Serializable { @ApiParam("物料号") private String partNo; - @Column(name = "workOrderNo") + @Column(name = "WORK_ORDER_NO") @ApiParam("工单") private String workOrderNo; @@ -60,6 +57,7 @@ public class MesWorkCellMonitorLog extends BaseBean implements Serializable { @ApiParam("流程") private String routeCOde; + @Lob @Column(name = "MESSAGE") @ApiParam("异常信息") private String message; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellParam.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellParam.java index eb03cdc..c5aaec2 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellParam.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellParam.java @@ -29,8 +29,8 @@ import java.io.Serializable; @Table(name = "MES_WORK_CELL_PARAM") @Api("mes工作单元参数") public class MesWorkCellParam extends BaseBean implements Serializable { - private static final long serialVersionUID = 1017369816822438021L; + @Column(name = "PARAM_CODE") @ApiParam("参数代码") private String paramCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellParamCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellParamCfg.java index 8c33b9c..2b85a2b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellParamCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellParamCfg.java @@ -30,6 +30,7 @@ import java.io.Serializable; @Api("工作单元参数配置") public class MesWorkCellParamCfg extends BaseBean implements Serializable { private static final long serialVersionUID = -8507576103087989740L; + @Column(name = "WORK_CELL_CODE") @ApiParam("工作单元代码") private String workCellCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPoint.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPoint.java index ed04956..cd8463a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPoint.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPoint.java @@ -32,8 +32,8 @@ import java.util.List; @Table(name = "MES_WORK_CELL_POINT") @Api("工站队列") public class MesWorkCellPoint extends BaseBean implements Serializable { - private static final long serialVersionUID = -6817903235638554748L; + @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心") private String workCenterCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java index f57305a..33cb908 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java @@ -33,6 +33,7 @@ import java.util.List; @Api("工作中心") public class MesWorkCenter extends BaseBean implements Serializable { private static final long serialVersionUID = 5583253625290231595L; + @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心代码") private String workCenterCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java index 7633f77..535d711 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java @@ -24,14 +24,14 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_WORK_ORDER", indexes = { - @Index(columnList = "ORDER_NO") -}, uniqueConstraints = { - @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO", "PART_NO"}) -}) +@Table(name = "MES_WORK_ORDER", indexes = {@Index(columnList = "ORDER_NO")}, + uniqueConstraints = { + @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO", "PART_NO"}) + }) @Api("生产工单") public class MesWorkOrder extends BaseBean implements Serializable { private static final long serialVersionUID = -3566003375267865064L; + @Column(name = "ORDER_NO", nullable = false) @ApiParam("工单号") private String orderNo; @@ -215,6 +215,9 @@ public class MesWorkOrder extends BaseBean implements Serializable { @ApiParam(value = "下达按钮编号") public String buttonCode; + @Transient + @ApiParam("批量打包开窗页面查询工单=1") + private String pageType; public double getQtyVal() { return this.qty == null ? 0.0d : this.qty; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrderLog.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrderLog.java index 1f91275..6366551 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrderLog.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrderLog.java @@ -30,6 +30,7 @@ import java.io.Serializable; @Api("生产工单日志") public class MesWorkOrderLog extends BaseBean implements Serializable { private static final long serialVersionUID = -5859382100462830988L; + @Column(name = "ORDER_NO") @ApiParam("工单号") private String orderNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ActionRequestBean.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ActionRequestModel.java similarity index 77% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ActionRequestBean.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ActionRequestModel.java index 3c022ef..97b9adc 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ActionRequestBean.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ActionRequestModel.java @@ -15,7 +15,7 @@ import java.util.Map; * @Modify: **/ @Data -public class ActionRequestBean implements Serializable { +public class ActionRequestModel implements Serializable { @ApiParam("事件代码") @Deprecated @@ -25,14 +25,17 @@ public class ActionRequestBean implements Serializable { public String buttonCode; @ApiParam("单个结果") - public Obj resultObject; + public T resultObject; @ApiParam("List请求集") - public List resultList; + public List resultList; @ApiParam("Map请求集") public Map resultMap; @ApiParam("module代码") public Integer moduleCode; + + @ApiParam("目的状态") + private Integer destStatus; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/AttrBean.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/AttrBean.java new file mode 100644 index 0000000..16c5353 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/AttrBean.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +@Data +public class AttrBean implements Serializable { + + @ApiParam("属性名称") + private String attrName; + + @ApiParam("属性名称别名") + private String attrNameAlias; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonBean.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonBean.java new file mode 100644 index 0000000..47a4f4f --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonBean.java @@ -0,0 +1,22 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +@Data +public class ButtonBean implements Serializable { + @ApiParam(value = "按钮代码") + private String buttonCode; + + @ApiParam(value = "按钮名称") + private String buttonName; + + // 执行类方法,sql,或者标记 + @ApiParam(value = "执行内容") + private String methodContent; + + @ApiParam(value = "按钮描述") + private String buttonDesc; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DataAcquisitionModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DataAcquisitionModel.java new file mode 100644 index 0000000..0837b72 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DataAcquisitionModel.java @@ -0,0 +1,35 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : + * @Reference : + * @Author : zcg + * @Date : 2020/1/10 0010 - 15:28 + */ +@Data +@Api("数据采集Model") +public class DataAcquisitionModel { + + @ApiParam("对象代码") + private String objectCode; + + @ApiParam("对象名称") + private String objectName; + + @ApiParam("字段代码") + private String fieldCode; + + @ApiParam("字段名称") + private String fieldName; + + @ApiParam("字段值") + private String fieldValue; +// +// @ApiParam("组号") +// private String groupNo; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DefectModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DefectModel.java new file mode 100644 index 0000000..749de7f --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DefectModel.java @@ -0,0 +1,48 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\28 19:50 + * @Modify: + **/ +@Data +public class DefectModel { + + private Long id; + + @ApiParam("缺陷代码") + private String defectCode; + + @ApiParam("缺陷名称") + private String defectName; + + @ApiParam("缺陷类型") + private String defectType; + + @ApiParam("缺陷类型名称") + private String defectTypeName; + + @ApiParam("缺陷位置") + private String defectLocation; + + @ApiParam("缺陷类型子集") + private List mesDefectList; + public DefectModel() { + + } + + public DefectModel(Long id, String defectCode, String defectName, String defectType, String defectTypeName) { + this.id = id; + this.defectCode = defectCode; + this.defectName = defectName; + this.defectType = defectType; + this.defectTypeName = defectTypeName; + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java index 5313cb0..845d2bf 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java @@ -1,17 +1,12 @@ package cn.estsh.i3plus.pojo.mes.model; -import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.mes.bean.MesNumberRule; -import cn.estsh.i3plus.pojo.mes.bean.MesNumberSerialno; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import javax.persistence.Column; - /** * @Author: Wynne.Lu * @CreateDate: 2019/8/23 11:42 AM diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesDefectModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesDefectModel.java new file mode 100644 index 0000000..c656489 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesDefectModel.java @@ -0,0 +1,35 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.mes.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 String defectTypeName; + + @Transient + @ApiParam("缺陷分类子集") + private List mesDefectList; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesProdBindRecordModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesProdBindRecordModel.java new file mode 100644 index 0000000..e41b5ce --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesProdBindRecordModel.java @@ -0,0 +1,125 @@ +package cn.estsh.i3plus.pojo.mes.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; + @ApiParam("创建时间") + private String createUser; + @ApiParam("创建时间") + private String createDatetime; + @ApiParam("修改人") + private String modifyUser; + @ApiParam("修改时间") + private String modifyDatetime; + @ApiParam("产品条码") + private String serialNumber; + @ApiParam("关联批次") + private String lotNo; + public MesProdBindRecordModel() { + + } + + public MesProdBindRecordModel(Long id, String itemPartNo, String itemPartName, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String kpSn, String parentPartNo, String parentPartName, Double dismantleQty, String lotNo) { + this.id = id; + this.itemPartNo = itemPartNo; + this.itemPartName = itemPartName; + 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; + this.lotNo = lotNo; + } + + 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, String lotNo) { + 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.lotNo = lotNo; + } + + 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, String createUser, String createDatetime, String modifyUser, String modifyDatetime, String serialNumber, String lotNo) { + 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.createUser = createUser; + this.createDatetime = createDatetime; + this.modifyUser = modifyUser; + this.modifyDatetime = modifyDatetime; + this.serialNumber = serialNumber; + this.lotNo = lotNo; + } + + public MesProdBindRecordModel(String itemPartNo, Double qty, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String kpSn, String parentPartNo, String serialNumber, String lotNo) { + this.itemPartNo = itemPartNo; + 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.serialNumber = serialNumber; + this.lotNo = lotNo; + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesStationBomModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesStationBomModel.java new file mode 100644 index 0000000..e0f1f6f --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesStationBomModel.java @@ -0,0 +1,75 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\24 22:04 + * @Modify: + **/ +@Data +public class MesStationBomModel { + + 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 MesStationBomModel() { + + } + + public MesStationBomModel(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; + } + + public MesStationBomModel(String itemPartNo, String itemPartName, Double qty, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String parentPartNo, String parentPartName) { + 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/src/main/java/cn/estsh/i3plus/pojo/mes/model/PLCInteracticeModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PLCInteracticeModel.java new file mode 100644 index 0000000..4563b9c --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PLCInteracticeModel.java @@ -0,0 +1,48 @@ +package cn.estsh.i3plus.pojo.mes.model; + + +import io.swagger.annotations.Api; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/9/25 7:41 PM + * @Description: + **/ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Api("PLC交互model") +public class PLCInteracticeModel { + + private String serverIp; + + private String serverPort; + + private String mwContext; + + private String protocol; + + private String plcCode; + + private String dataType; + + private String userName; + + private String password; + + private Integer enabled; + + private String realm; + + private String tag; + + private String value; + + private String comment; + + private String authenKey; + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/PlcCacheKeyModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PlcCacheKeyModel.java similarity index 81% rename from modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/PlcCacheKeyModel.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PlcCacheKeyModel.java index 1c11d71..15a6667 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/PlcCacheKeyModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PlcCacheKeyModel.java @@ -1,10 +1,8 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; +package cn.estsh.i3plus.pojo.mes.model; import io.swagger.annotations.Api; -import lombok.AllArgsConstructor; import lombok.Data; -import lombok.NoArgsConstructor; /** * @Author: Wynne.Lu diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPackageModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPackageModel.java new file mode 100644 index 0000000..b9662c7 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPackageModel.java @@ -0,0 +1,78 @@ +package cn.estsh.i3plus.pojo.mes.model; + + +import cn.estsh.i3plus.pojo.mes.bean.MesPackage; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +/** + * @Author: wangjie + * @CreateDate: 2019/9/23 8:06 PM + * @Description: + **/ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Api("产品包装model") +public class ProdPackageModel { + + @ApiParam("工单号") + private String workOrderNo; + + @ApiParam("生产线") + private String workCenterCode; + + @ApiParam("客户代码") + private String custCode; + + @ApiParam("班次") + private String shiftCode; + + @ApiParam("班次名称") + private String shiftName; + + @ApiParam("物料号") + private String partNo; + + @ApiParam("物料名称") + private String partNameRdd; + + @ApiParam("单位") + private String unit; + + @ApiParam("工单数量") + private Double workOrderQty; + + @ApiParam("完成数量") + private Double completeQty; + + @ApiParam("包装规格数量") + private Double packSpecQty; + + @ApiParam("包装规格") + private String packSpec; + + @ApiParam("数量") + private Double qty; + + @ApiParam("特殊批次") + private String fixLotNo; + + @ApiParam("包装集合") + private List packageList; + + @ApiParam("打印状态文字") + private String printStrStatus; + + @ApiParam("包装层级名称") + private String packLevelName; + + @ApiParam("是否封箱名称") + private String isSealedName; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcCheckStandardModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcCheckStandardModel.java new file mode 100644 index 0000000..04d0d00 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcCheckStandardModel.java @@ -0,0 +1,25 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.mes.bean.MesQcCheckStandard; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2020\1\13 17:23 + * @Modify: + **/ +@Data +public class QcCheckStandardModel { + + private Long id; + + @ApiParam("列头") + private String title; + + private List resultList; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJisModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJisModel.java new file mode 100644 index 0000000..1ba9f4e --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJisModel.java @@ -0,0 +1,90 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.base.enumutil.MesPcnEnumUtil; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +@Data +public class QueueJisModel implements Serializable { + + @ApiParam("主队列编号") + private String jisNo; + + @ApiParam("vin") + private String vinCode; + + @ApiParam("车号") + private String carNo; + + @ApiParam("排序") + private Double seq; + + @ApiParam("状态") + private Integer status; + + @ApiParam("产品配置代码") + private String prodCfgCode; + + @ApiParam("物料号") + private String partNo; + + @ApiParam("物料名称") + private String partNameRdd; + + @ApiParam("产品类型代码") + private String produceCategoryCode; + + @ApiParam("明细状态") + private Integer detailStatus; + + @ApiParam("产品条码") + private String serialNumber; + + @ApiParam("明细整体状态") + private Integer finalStatus; + + @ApiParam("状态名称") + private String statusName; + + @ApiParam("明细状态名称") + private String detailStatusName; + + @ApiParam("明细整体状态名称") + private String finalStatusName; + + @ApiParam("颜色") + private String color; + + public String getStatusName() { + return MesPcnEnumUtil.JIS_QUEUE_STATUS.valueOfDescription(this.status); + } + + public String getDetailStatusName() { + return MesPcnEnumUtil.JIS_QUEUE_STATUS.valueOfDescription(this.detailStatus); + } + + public String getFinalStatusName() { + return MesPcnEnumUtil.JIS_QUEUE_STATUS.valueOfDescription(this.finalStatus); + } + + public QueueJisModel() { + } + + public QueueJisModel(String jisNo, String vinCode, String carNo, Double seq, Integer status, String prodCfgCode, String partNo, String partNameRdd, String produceCategoryCode, Integer detailStatus, String serialNumber, Integer finalStatus) { + this.jisNo = jisNo; + this.vinCode = vinCode; + this.carNo = carNo; + this.seq = seq; + this.status = status; + this.prodCfgCode = prodCfgCode; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.produceCategoryCode = produceCategoryCode; + this.detailStatus = detailStatus; + this.serialNumber = serialNumber; + this.finalStatus = finalStatus; + } + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java index 5c9e79c..9acf8a7 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java @@ -6,7 +6,6 @@ import lombok.Data; import javax.persistence.Transient; import java.io.Serializable; -import java.util.List; /** * @Description : JIT队列列表Model @@ -18,6 +17,7 @@ import java.util.List; @Data @Api("JIT队列列表Model") public class QueueOrderModel implements Serializable { + private Long id; @ApiParam("队列序号") public Double queueSeq; @ApiParam("队列明细序号") @@ -41,6 +41,14 @@ public class QueueOrderModel implements Serializable { @Transient @ApiParam("显示颜色") private String color; + @ApiParam("工厂代码") + private String organizeCode; + @ApiParam("展示行数") + private Integer prodNum; + @ApiParam("产线") + private String workCenterCode; + @ApiParam("工位") + private String workCellCode; public QueueOrderModel() { } @@ -58,4 +66,19 @@ public class QueueOrderModel implements Serializable { this.snStatus = snStatus; this.workType = workType; } + + public QueueOrderModel(Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, + String serialNumber, String partNo, String partNameRdd, Integer snStatus, String workType) { + this.id = id; + this.queueSeq = queueSeq; + this.queDetailSeq = queDetailSeq; + this.custFlagNo = custFlagNo; + this.prodCfgNameRdd = prodCfgNameRdd; + this.categoryNameRdd = categoryNameRdd; + this.serialNumber = serialNumber; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.snStatus = snStatus; + this.workType = workType; + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/RequestModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/RequestModel.java index 1bada8a..73200ff 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/RequestModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/RequestModel.java @@ -1,9 +1,6 @@ package cn.estsh.i3plus.pojo.mes.model; -import cn.estsh.i3plus.pojo.mes.bean.MesPart; -import cn.estsh.i3plus.pojo.mes.bean.MesPlanOrder; -import cn.estsh.i3plus.pojo.mes.bean.MesQueueOrder; -import cn.estsh.i3plus.pojo.mes.bean.MesWorkOrder; +import cn.estsh.i3plus.pojo.mes.bean.*; import java.util.List; @@ -16,6 +13,12 @@ import java.util.List; **/ public class RequestModel { + private List mesDefectRecordList; // 不良/缺陷记录数据集 + + private List mesRepairRecordList; // 维修记录数据集 + + private List dismantleRecordList; // 拆解记录数据集 + private List workOrderList; // 工单数据集 private List partList; // 物料数据集 @@ -34,7 +37,9 @@ public class RequestModel { private List orderNoList;//工单编号 - private List requestBeanList;//工单下达 + private List requestBeanList;//工单下达 + + private ActionRequestModel actionRequestBean;//工单状态 public RequestModel(List queueOrderList, Double currentSeq, Double nextSeq) { this.queueOrderList = queueOrderList; @@ -53,6 +58,30 @@ public class RequestModel { this.partList = partList; } + public List getMesDefectRecordList() { + return mesDefectRecordList; + } + + public void setMesDefectRecordList(List mesDefectRecordList) { + this.mesDefectRecordList = mesDefectRecordList; + } + + public List getMesRepairRecordList() { + return mesRepairRecordList; + } + + public void setMesRepairRecordList(List mesRepairRecordList) { + this.mesRepairRecordList = mesRepairRecordList; + } + + public List getDismantleRecordList() { + return dismantleRecordList; + } + + public void setDismantleRecordList(List dismantleRecordList) { + this.dismantleRecordList = dismantleRecordList; + } + public List getWorkOrderList() { return workOrderList; } @@ -96,11 +125,15 @@ public class RequestModel { return orderNoList; } - public void setRequestBeanList(List requestBeanList) { + public void setRequestBeanList(List requestBeanList) { this.requestBeanList = requestBeanList; } - public List getRequestBeanList() { return requestBeanList; } + public List getRequestBeanList() { return requestBeanList; } + + public void setActionRequestBean(ActionRequestModel actionRequestBean) { this.actionRequestBean = actionRequestBean; } + + public ActionRequestModel getActionRequestBean() { return actionRequestBean; } public Double getCurrentSeq() { return currentSeq == null ? 0.0d : currentSeq; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintDataModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintDataModel.java new file mode 100644 index 0000000..257a159 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintDataModel.java @@ -0,0 +1,27 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.mes.bean.MesLabelTemplate; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description: 打印信息封装 + * @Reference: + * @Author: wangjie + * @CreateDate:2019-08-27-13:24 + * @Modify: + **/ +@Data +@Api("打印信息封装") +public class SnPrintDataModel { + + @ApiParam("打印数据") + private List valueList; + + @ApiParam("打印模板及参数") + private MesLabelTemplate labelTemplate; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintModel.java new file mode 100644 index 0000000..1144967 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SnPrintModel.java @@ -0,0 +1,27 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description: 打印信息汇总 + * @Reference: + * @Author: wangjie + * @CreateDate:2019-08-27-13:24 + * @Modify: + **/ +@Data +@Api("打印信息汇总") +public class SnPrintModel extends StepPrintSnModel { + + @ApiParam("过程条码") + private SnPrintDataModel serialPrintDataModel; + + @ApiParam("产品条码") + private SnPrintDataModel prodPrintDataModel; + + @ApiParam("包装条码") + private SnPrintDataModel packPrintDataModel; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationBomModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationBomModel.java new file mode 100644 index 0000000..41addbf --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationBomModel.java @@ -0,0 +1,29 @@ +package cn.estsh.i3plus.pojo.mes.model; + + +import cn.estsh.i3plus.pojo.mes.bean.MesStationBom; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/9/21 3:11 PM + * @Description: + **/ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Api("工位BOM model") +public class StationBomModel extends MesStationBom { + + @ApiParam("上料数量") + private Long cellFeedQty; + + @ApiParam("是否上料数量满足") + private Boolean isFeedSatisfied; + + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationResultBean.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationResultBean.java new file mode 100644 index 0000000..bf849fe --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationResultBean.java @@ -0,0 +1,55 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; +import java.util.Map; + +/** + * @Description : 工位结果bean + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-24 + * @Modify: + **/ +@Data +public class StationResultBean implements Serializable { + + /** + * 根据客户端所需数据结构，约定不同数据类型,message:信息、stepList:工步列表、stepContent：工步内容、 + * moduleContent组件内容,taskComplete整个扫描完成 + */ + @ApiParam("业务类型") + private String busiType; + + /** + * 对于相同业务类型的数据，区分不同数据类型。 + * 比如：包含table-表格，text-正常文本，expText-异常文本，button-按钮， + * image-图片 + */ + @ApiParam("数据类型") + private String dataType; + + @ApiParam("执行结果信息") + private String message; + + @ApiParam("List结果集") + private List resultList; + + @ApiParam("结果对象") + private Object resultObj; + + @ApiParam("Map结果集") + public Map resultMap; + + @ApiParam("List结果集的属性") + private List dataAttrList; + + @ApiParam("图片路径") + private String imageUrl; + + @ApiParam("多个数据集") + private List> stationResultBeans; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepParamsModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepParamsModel.java index 2a90b5e..a2464b7 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepParamsModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepParamsModel.java @@ -6,7 +6,6 @@ import io.swagger.annotations.ApiParam; import lombok.Data; import java.io.Serializable; -import java.util.List; import java.util.Map; /** diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java new file mode 100644 index 0000000..2004603 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java @@ -0,0 +1,75 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.mes.bean.MesProduceSn; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description: 打印条码工步， 打印信息模板 + * @Reference: + * @Author: Crish + * @CreateDate:2019-08-27-13:24 + * @Modify: + **/ +@Data +@Api("打印信息模板") +public class StepPrintSnModel extends MesProduceSn { + @ApiParam("打印描述") + private String printDesc; + + @ApiParam("条码") + private String barCode; + + @ApiParam("物料号") + private String partNo; + + @ApiParam("批次号") + private String batchNo; + + @ApiParam("箱数量") + private String boxQty; + + @ApiParam("订单号") + private String orderNo; + + @ApiParam("生产日期") + private String productionTime; + + @ApiParam("包装编码") + private String packageNo; + + @ApiParam("包装规格") + private String packageSpec; + + @ApiParam("供应商") + private String supplier; + + @ApiParam("客户名称") + private String customerName; + + @ApiParam("客户零件号") + private String customerPartNo; + + @ApiParam("客户物料名称") + private String customerPartName; + + @ApiParam("物料名称") + private String partNameRdd; + + @ApiParam("单位") + private String unit; + + @ApiParam("特殊批号") + private String fixLotNo; + + @ApiParam("生产工单号") + private String workOrderNo; + + @ApiParam("生产线代码") + private String workCenterCode; + + @ApiParam("包装层级 1-第一层，2-第二层，3-第三层，4-第四层") + private Integer packLevel; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepResult.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepResult.java new file mode 100644 index 0000000..22d2fa3 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepResult.java @@ -0,0 +1,69 @@ +package cn.estsh.i3plus.pojo.mes.model; + + +import io.swagger.annotations.Api; +import lombok.Data; + +import java.util.Collection; + +@Data +@Api("工步返回信息") +public class StepResult { + + private boolean isCompleted; + + private T data; + + private Collection dataCollection; + + private String msg; + + public static StepResult getSuccessComplete() { + return new StepResult(true,""); + } + + public static StepResult getNonComplete() { + return new StepResult(false,""); + } + + public static StepResult getSuccessComplete(String msg) { + return new StepResult(true, msg); + } + + public static StepResult getNonComplete(String msg) { + return new StepResult(false, msg); + } + + public static StepResult getSuccessData(T data, String msg) { + return new StepResult<>(true, data, msg); + } + + public static StepResult getSuccessData(Collection data, String msg) { + return new StepResult(true, data, msg); + } + + private StepResult() { + } + + private StepResult(boolean isCompleted) { + this.isCompleted = isCompleted; + } + + private StepResult(boolean isCompleted, String msg) { + this.isCompleted = isCompleted; + this.msg = msg; + } + + public StepResult(boolean isCompleted, T data, String msg) { + this.isCompleted = isCompleted; + this.data = data; + this.msg = msg; + } + + public StepResult(boolean isCompleted, Collection dataCollection, String msg) { + this.isCompleted = isCompleted; + this.dataCollection = dataCollection; + this.msg = msg; + } + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TorqueModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TorqueModel.java new file mode 100644 index 0000000..53a3e0c --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TorqueModel.java @@ -0,0 +1,71 @@ +package cn.estsh.i3plus.pojo.mes.model; + +/** + * @Description: + * @Reference: + * @Author: Crish + * @CreateDate:2019-06-03-11:44 + * @Modify: + **/ + +public class TorqueModel { + private Long id; + + private Double upperLimit; + + private Double lowerLimit; + + private Double torqueValue; + + private boolean ok; + + private String color; + + public boolean isOk() { + return ok; + } + + public void setOk(boolean ok) { + this.ok = ok; + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Double getUpperLimit() { + return upperLimit; + } + + public void setUpperLimit(Double upperLimit) { + this.upperLimit = (upperLimit == null ? 0 : upperLimit); + } + + public Double getLowerLimit() { + return lowerLimit; + } + + public void setLowerLimit(Double lowerLimit) { + this.lowerLimit = (lowerLimit == null ? 0 : lowerLimit); + } + + public Double getTorqueValue() { + return torqueValue; + } + + public void setTorqueValue(Double torqueValue) { + this.torqueValue = (torqueValue == null ? 0 : torqueValue); + } + + public String getColor() { + return color; + } + + public void setColor(String color) { + this.color = color; + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/WcCheckModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/WcCheckModel.java new file mode 100644 index 0000000..e7c08e8 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/WcCheckModel.java @@ -0,0 +1,65 @@ +package cn.estsh.i3plus.pojo.mes.model; + + +import cn.estsh.i3plus.pojo.base.enumutil.MesPcnEnumUtil; +import cn.estsh.i3plus.pojo.mes.bean.MesWcCheckRecord; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/9/23 8:06 PM + * @Description: + **/ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Api("开线管控model") +public class WcCheckModel { + + @ApiParam("工作中心") + private String workCenterCode; + + @ApiParam("工单") + private String workOrder; + + @ApiParam("产品号") + private String partNo; + + @ApiParam("是否通过") + private Integer isPass; + + @ApiParam("开线信号") + private Integer onlineSignal; + + @ApiParam("开线对象") + MesWcCheckRecord onlineSignalEqu; + + @ApiParam("需要展示的数据") + private Map titleMap; + + @ApiParam("对象list和列关系") + private Map> dataColumnRelation; + + @ApiParam("重构map") + private Map> dataMap; + + public WcCheckModel initialWcCheckModel() { + WcCheckModel wcCheckModel = new WcCheckModel(); + wcCheckModel.setOnlineSignal(MesPcnEnumUtil.ONLINE_SIGNAL.NON_CHECK.getValue()); + wcCheckModel.setIsPass(MesPcnEnumUtil.IS_WCCHECK_PASS.NON_PASS.getValue()); + onlineSignalEqu = new MesWcCheckRecord(); + wcCheckModel.setTitleMap(new LinkedHashMap<>()); + wcCheckModel.setDataMap(new LinkedHashMap<>()); + wcCheckModel.setDataColumnRelation(new LinkedHashMap<>()); + return wcCheckModel; + } + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesCellFeedRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesCellFeedRepository.java new file mode 100644 index 0000000..fc75844 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesCellFeedRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesCellFeed; +import org.springframework.stereotype.Repository; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/9/18 10:05 AM + * @Description: + **/ +@Repository +public interface MesCellFeedRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDismantleRecordRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDismantleRecordRepository.java new file mode 100644 index 0000000..a602139 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDismantleRecordRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesDismantleRecord; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\16 20:06 + * @Modify: + **/ +public interface MesDismantleRecordRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPcnSysUserOfflineRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPcnSysUserOfflineRepository.java new file mode 100644 index 0000000..50b1858 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPcnSysUserOfflineRepository.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.MesPcnSysUserOffline; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-09-02 + * @Modify: + **/ +@Repository +public interface MesPcnSysUserOfflineRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPcnTaskLogRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPcnTaskLogRepository.java new file mode 100644 index 0000000..eb90ab6 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPcnTaskLogRepository.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.MesPcnTaskLog; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-08-27 + * @Modify: + **/ +@Repository +public interface MesPcnTaskLogRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesScrapRecordRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesScrapRecordRepository.java new file mode 100644 index 0000000..596245a --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesScrapRecordRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesScrapRecord; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\16 20:07 + * @Modify: + **/ +public interface MesScrapRecordRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesTimeRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesTimeRepository.java new file mode 100644 index 0000000..5ba359e --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesTimeRepository.java @@ -0,0 +1,10 @@ +package cn.estsh.i3plus.pojo.mes.repository; + + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesTime; +import org.springframework.stereotype.Repository; + +@Repository +public interface MesTimeRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesTorqueDetailRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesTorqueDetailRepository.java new file mode 100644 index 0000000..8c1a0d1 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesTorqueDetailRepository.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.MesTorqueDetail; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesTorqueDetailRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellMonitorLogRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellMonitorLogRepository.java new file mode 100644 index 0000000..1298b5c --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellMonitorLogRepository.java @@ -0,0 +1,13 @@ +package cn.estsh.i3plus.pojo.mes.repository; + + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesWorkCellMonitorLog; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/9/27 1:58 PM + * @Description: + **/ +public interface MesWorkCellMonitorLogRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repositorymongo/MesProductDataRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repositorymongo/MesProductDataRepository.java deleted file mode 100644 index 2f615de..0000000 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repositorymongo/MesProductDataRepository.java +++ /dev/null @@ -1,15 +0,0 @@ -//package cn.estsh.i3plus.pojo.mes.repositorymongo; -// -// -//import cn.estsh.i3plus.pojo.base.jpa.dao.BaseMongoRepository; -//import cn.estsh.i3plus.pojo.mes.bean.MesProductData; -//import org.springframework.stereotype.Repository; -// -///** -// * @Author: Wynne.Lu -// * @CreateDate: 2019/12/25 1:30 下午 -// * @Description: -// **/ -//@Repository -//public interface MesProductDataRepository extends BaseMongoRepository { -//} 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 9a46d75..3670819 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 @@ -1889,7 +1889,7 @@ public class MesHqlPack { DdlPreparedPack.getNumEqualPack(mesProdBindRecord.getIsBindKey(), "isBindKey", packBean); } if (mesProdBindRecord.getActionType() != null) { - DdlPreparedPack.getStringLikerPack(mesProdBindRecord.getActionType(), "actionType", packBean); + DdlPreparedPack.getNumEqualPack(mesProdBindRecord.getActionType(), "actionType", packBean); } if (!StringUtils.isEmpty(mesProdBindRecord.getSupplierCode())) { DdlPreparedPack.getStringLikerPack(mesProdBindRecord.getSupplierCode(), "supplierCode", packBean); diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java new file mode 100644 index 0000000..3ab2c36 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java @@ -0,0 +1,425 @@ +package cn.estsh.i3plus.pojo.mes.sqlpack; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.MesPcnEnumUtil; +import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; +import cn.estsh.i3plus.pojo.mes.bean.*; +import org.springframework.util.StringUtils; + +/** + * @Description: + * @Reference: Mes 条件封装 + * @Author: Crish + * @CreateDate:2019-04-22-14:58 + * @Modify: + **/ +public class MesPcnHqlPack { + + + /** + * 系统业务动作 + * + * @param organizeCode + * @return + */ + public static DdlPackBean getMesAllData(String organizeCode) { + DdlPackBean packBean = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", packBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", packBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean); + return packBean; + } + + /** + * 通用查询条件 + * + * @param organizeCode + * @return + */ + public static DdlPackBean getAllBaseData(String organizeCode) { + DdlPackBean packBean = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", packBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", packBean); + return packBean; + } + + /** + * 通用查询条件 + * + * @param organizeCode + * @return + */ + public static DdlPackBean getAllBaseDataByNormalPro(BaseBean baseBean, String organizeCode) { + DdlPackBean packBean = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", packBean); + DdlPreparedPack.getNumEqualPack(baseBean.getIsValid(), "isValid", packBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", packBean); + return packBean; + } + + /** + * MES PCN系统配置信息条件查询 + * + * @param mesConfig + * @return + */ + public static DdlPackBean getMesConfig(MesConfig mesConfig, String organizeCode) { + DdlPackBean packBean = getAllBaseData(organizeCode); + if (!StringUtils.isEmpty(mesConfig.getCfgCode())) { + DdlPreparedPack.getStringLikerPack(mesConfig.getCfgCode(), "cfgCode", packBean); + } + if (!StringUtils.isEmpty(mesConfig.getCfgName())) { + DdlPreparedPack.getStringLikerPack(mesConfig.getCfgName(), "cfgName", packBean); + } + if (!StringUtils.isEmpty(mesConfig.getIsValid())) { + DdlPreparedPack.getNumEqualPack(mesConfig.getIsValid(), "isValid", packBean); + } + return packBean; + } + + /** + * 根据打印模板的模板代码查询模板信息 + * + * @param mesLabelTemplate + * @return + */ + public static DdlPackBean getLabelTemplate( MesLabelTemplate mesLabelTemplate) { + DdlPackBean packBean = DdlPackBean.getDdlPackBean(); + DdlPreparedPack.getStringEqualPack(mesLabelTemplate.getTemplateCode(), "templateCode", packBean); + return packBean; + } + + /** + * 获取工作中心下所有的投料数据 + * + * @param mesCellFeed + * @param org + * @return + */ + public static DdlPackBean getMesCellFeed(MesCellFeed mesCellFeed, String org) { + DdlPackBean packBean = getAllBaseData(org); + DdlPreparedPack.getStringEqualPack(mesCellFeed.getWorkCenterCode(), "workCenterCode", packBean); + DdlPreparedPack.getNumberBiggerPack(0, "rawQty", packBean); + return packBean; + } + + + /** + * 获取原材料扫描信息的对应工序BOM + * + * @param stationBom + * @param rawPartSn + * @return + */ + public static DdlPackBean getStationBomRawPartSn(MesStationBom stationBom, MesRawPartSn rawPartSn) { + DdlPackBean packBean = getAllBaseData(stationBom.getOrganizeCode()); + DdlPreparedPack.getStringEqualPack(stationBom.getWorkCenterCode(), "workCenterCode", packBean); + DdlPreparedPack.getStringEqualPack(stationBom.getWorkCellCode(), "workCellCode", packBean); + DdlPreparedPack.getStringEqualPack(stationBom.getPartNo(), "partNo", packBean); + DdlPreparedPack.getNumEqualPack(MesPcnEnumUtil.PROCESS_BOM_ISFEED.FEED.getValue(), "isFeed", packBean); + DdlPreparedPack.getStringEqualPack(rawPartSn.getPartNo(), "itemPartNo", packBean); + return packBean; + } + + /** + * 生产工单查询条件封装 + * + * @param mesWorkOrder + * @return + */ + public static DdlPackBean getWorkOrderCondition(MesWorkOrder mesWorkOrder, String organizeCode) { + DdlPackBean packBean = getAllBaseData(organizeCode); + if (!StringUtils.isEmpty(mesWorkOrder.getOrderNo())) { + DdlPreparedPack.getStringLikerPack(mesWorkOrder.getOrderNo(), "orderNo", packBean); + } + if (!StringUtils.isEmpty(mesWorkOrder.getPartNo())) { + DdlPreparedPack.getStringLikerPack(mesWorkOrder.getPartNo(), "partNo", packBean); + } + if (!StringUtils.isEmpty(mesWorkOrder.getWorkOrderStatus()) && mesWorkOrder.getWorkOrderStatusVal() != 0) { + DdlPreparedPack.getNumEqualPack(mesWorkOrder.getWorkOrderStatus(), "workOrderStatus", packBean); + } else { + if (!StringUtils.isEmpty(mesWorkOrder.getPageType()) && "1".equals(mesWorkOrder.getPageType())) { + DdlPreparedPack.getInPackArray(new Object[]{MesPcnEnumUtil.WORK_ORDER_STATUS.OPEN.getValue(), MesPcnEnumUtil.WORK_ORDER_STATUS.PAUSE.getValue(), + MesPcnEnumUtil.WORK_ORDER_STATUS.COMPLETE.getValue()}, "workOrderStatus", packBean); + } + } + if (!StringUtils.isEmpty(mesWorkOrder.getWorkCenterCode())) { + DdlPreparedPack.getStringEqualPack(mesWorkOrder.getWorkCenterCode(), "workCenterCode", packBean); + } + if (!StringUtils.isEmpty(mesWorkOrder.getApprovalStatus())) { + DdlPreparedPack.getNumEqualPack(mesWorkOrder.getApprovalStatus(), "approvalStatus", packBean); + } + if (!StringUtils.isEmpty(mesWorkOrder.getWorkOrderType() + "") && mesWorkOrder.getWorkOrderTypeVal() != 0) { + DdlPreparedPack.getNumEqualPack(mesWorkOrder.getWorkOrderType(), "workOrderType", packBean); + } + if (!StringUtils.isEmpty(mesWorkOrder.getCustOrderNo())) { + DdlPreparedPack.getStringLikerPack(mesWorkOrder.getCustOrderNo(), "custOrderNo", packBean); + } + if (!StringUtils.isEmpty(mesWorkOrder.getPlanOrderNo())) { + DdlPreparedPack.getStringLikerPack(mesWorkOrder.getPlanOrderNo(), "planOrderNo", packBean); + } + if (!StringUtils.isEmpty(mesWorkOrder.getCreateUser())) { + DdlPreparedPack.getStringLikerPack(mesWorkOrder.getCreateUser(), "createUser", packBean); + } + if (!StringUtils.isEmpty(mesWorkOrder.getIsValid())) { + DdlPreparedPack.getNumEqualPack(mesWorkOrder.getIsValid(), "isValid", packBean); + } + + // 时间段查询 + if (!StringUtils.isEmpty(mesWorkOrder.getStartTimeStart()) || !StringUtils.isEmpty(mesWorkOrder.getStartTimeEnd())) { + DdlPreparedPack.timeBuilder( + mesWorkOrder.getStartTimeStart(), + mesWorkOrder.getStartTimeEnd(), + "startTime", packBean, true); + } + if (!StringUtils.isEmpty(mesWorkOrder.getEndTimeStart()) || !StringUtils.isEmpty(mesWorkOrder.getEndTimeEnd())) { + DdlPreparedPack.timeBuilder( + mesWorkOrder.getEndTimeStart(), + mesWorkOrder.getEndTimeEnd(), + "endTime", packBean, true); + } + if (!StringUtils.isEmpty(mesWorkOrder.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesWorkOrder.getCreateDateTimeEnd())) { + DdlPreparedPack.timeBuilder( + mesWorkOrder.getCreateDateTimeStart(), + mesWorkOrder.getCreateDateTimeEnd(), + "createDatetime", packBean, true); + } + return packBean; + } + + /** + * 物料信息查询条件封装 + * + * @param mesPart + * @return + */ + public static DdlPackBean getPartCondition(MesPart mesPart, String organizeCode) { + DdlPackBean packBean = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", packBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", packBean); + + if (!StringUtils.isEmpty(mesPart.getPartNo())) { + DdlPreparedPack.getStringLikerPack(mesPart.getPartNo(), "partNo", packBean); + } + if (!StringUtils.isEmpty(mesPart.getPartName())) { + DdlPreparedPack.getStringLikerPack(mesPart.getPartName(), "partName", packBean); + } + if (!StringUtils.isEmpty(mesPart.getCategoryCode1())) { + DdlPreparedPack.getStringEqualPack(mesPart.getCategoryCode1(), "categoryCode1", packBean); + } + if (!StringUtils.isEmpty(mesPart.getCategoryCode2())) { + DdlPreparedPack.getStringEqualPack(mesPart.getCategoryCode2(), "categoryCode2", packBean); + } + if (!StringUtils.isEmpty(mesPart.getCategoryCode3())) { + DdlPreparedPack.getStringEqualPack(mesPart.getCategoryCode3(), "categoryCode3", packBean); + } + return packBean; + } + + /** + * MES 客户信息查询条件封装 + * + * @param customer + * @return + */ + public static DdlPackBean getMesCustomer(MesCustomer customer, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(customer, organizeCode); + if (!StringUtils.isEmpty(customer.getCustomerCode())) { + DdlPreparedPack.getStringLikerPack(customer.getCustomerCode(), "customerCode", packBean); + } + if (!StringUtils.isEmpty(customer.getCustomerName())) { + DdlPreparedPack.getStringLikerPack(customer.getCustomerName(), "customerName", packBean); + } + + return packBean; + } + + /** + * MES PCN系维修信息条件查询 + * + * @param mesRepair + * @return + */ + public static DdlPackBean getMesRepair(MesRepair mesRepair, String organizeCode) { + DdlPackBean packBean = getAllBaseData(organizeCode); + if (!StringUtils.isEmpty(mesRepair.getRepairCode())) { + DdlPreparedPack.getStringLikerPack(mesRepair.getRepairCode(), "repairCode", packBean); + } + if (!StringUtils.isEmpty(mesRepair.getRepairName())) { + DdlPreparedPack.getStringLikerPack(mesRepair.getRepairName(), "repairName", packBean); + } + if (!StringUtils.isEmpty(mesRepair.getRepairType())) { + DdlPreparedPack.getNumEqualPack(mesRepair.getRepairType(), "repairType", packBean); + } + return packBean; + } + + /** + * MES PCN系维修信息条件查询 + * + * @param mesScrap + * @return + */ + public static DdlPackBean getMesScrap(MesScrap mesScrap, String organizeCode) { + DdlPackBean packBean = getAllBaseData(organizeCode); + if (!StringUtils.isEmpty(mesScrap.getScrapCode())) { + DdlPreparedPack.getStringLikerPack(mesScrap.getScrapCode(), "scrapCode", packBean); + } + if (!StringUtils.isEmpty(mesScrap.getScrapName())) { + DdlPreparedPack.getStringLikerPack(mesScrap.getScrapName(), "scrapName", packBean); + } + if (!StringUtils.isEmpty(mesScrap.getScrapType())) { + DdlPreparedPack.getStringLikerPack(mesScrap.getScrapType(), "scrapType", packBean); + } + return packBean; + } + + /** + * MES PCN缺陷原因信息条件查询 + * + * @param mesDefectCause + * @return + */ + public static DdlPackBean getMesDefectCause(MesDefectCause mesDefectCause, String organizeCode) { + DdlPackBean packBean = getAllBaseData(organizeCode); + if (!StringUtils.isEmpty(mesDefectCause.getDcCode())) { + DdlPreparedPack.getStringLikerPack(mesDefectCause.getDcCode(), "dcCode", packBean); + } + if (!StringUtils.isEmpty(mesDefectCause.getDcName())) { + DdlPreparedPack.getStringLikerPack(mesDefectCause.getDcName(), "dcName", packBean); + } + if (!StringUtils.isEmpty(mesDefectCause.getDcType())) { + DdlPreparedPack.getNumEqualPack(mesDefectCause.getDcType(), "dcType", packBean); + } + return packBean; + } + + /** + * 按条件分页查询产品条码补打印数据 + * @param mesProduceSn + * @return + */ + public static DdlPackBean getProdSnPrint(MesProduceSn mesProduceSn) { + DdlPackBean packBean = getAllBaseData(mesProduceSn.getOrganizeCode()); + if (!StringUtils.isEmpty(mesProduceSn.getSerialNumber())) { + DdlPreparedPack.getStringLikerPack(mesProduceSn.getSerialNumber(), "serialNumber", packBean); + } + + if (!StringUtils.isEmpty(mesProduceSn.getProductSn())) { + DdlPreparedPack.getStringLikerPack(mesProduceSn.getProductSn(), "productSn", packBean); + } + + if (!StringUtils.isEmpty(mesProduceSn.getPartNo())) { + DdlPreparedPack.getStringLikerPack(mesProduceSn.getPartNo(), "partNo", packBean); + } + + if (!StringUtils.isEmpty(mesProduceSn.getSnStatus())) { + DdlPreparedPack.getNumEqualPack(mesProduceSn.getSnStatus(), "snStatus", packBean); + } + + // 时间段查询 + if (!StringUtils.isEmpty(mesProduceSn.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesProduceSn.getCreateDateTimeEnd())) { + DdlPreparedPack.timeBuilder( + mesProduceSn.getCreateDateTimeStart(), + mesProduceSn.getCreateDateTimeEnd(), + "createDatetime", packBean, true); + } + if (!StringUtils.isEmpty(mesProduceSn.getOutWorkCenterTimeStart()) || !StringUtils.isEmpty(mesProduceSn.getOutWorkCenterTimeEnd())) { + DdlPreparedPack.timeBuilder( + mesProduceSn.getOutWorkCenterTimeStart(), + mesProduceSn.getOutWorkCenterTimeEnd(), + "outWorkCenterTime", packBean, true); + } + return packBean; + } + + /** + * 按条件分页查询包装条码补打印数据 + * @param mesPackage + * @return + */ + public static DdlPackBean getPackageSnPrint(MesPackage mesPackage) { + + DdlPackBean packBean = getAllBaseData(mesPackage.getOrganizeCode()); + if (!StringUtils.isEmpty(mesPackage.getPartNo())) { + DdlPreparedPack.getStringLikerPack(mesPackage.getPartNo(), "partNo", packBean); + } + + if (!StringUtils.isEmpty(mesPackage.getPackLevel())) { + DdlPreparedPack.getNumEqualPack(mesPackage.getPackLevel(), "packLevel", packBean); + } + + if (!StringUtils.isEmpty(mesPackage.getPackageNo())) { + DdlPreparedPack.getStringLikerPack(mesPackage.getPackageNo(), "packageNo", packBean); + } + + if (!StringUtils.isEmpty(mesPackage.getWorkCenterCode())) { + DdlPreparedPack.getStringLikerPack(mesPackage.getWorkCenterCode(), "workCenterCode", packBean); + } + + // 时间段查询 + DdlPreparedPack.timeBuilder( + mesPackage.getCreateDateTimeStart(), + mesPackage.getCreateDateTimeEnd(), + "createDatetime", packBean, true); + + return packBean; + } + + + /** + * MES班组信息查询条件封装 + * + * @param shiftGroup + * @param organizeCode + * @return + */ + public static DdlPackBean getMesShiftGroup(MesShiftGroup shiftGroup, String organizeCode) { + + DdlPackBean packBean = getAllBaseDataByNormalPro(shiftGroup, organizeCode); + if (!StringUtils.isEmpty(shiftGroup.getGroupCode())) { + DdlPreparedPack.getStringLikerPack(shiftGroup.getGroupCode(), "groupCode", packBean); + } + if (!StringUtils.isEmpty(shiftGroup.getGroupName())) { + DdlPreparedPack.getStringLikerPack(shiftGroup.getGroupName(), "groupName", packBean); + } + if (!StringUtils.isEmpty(shiftGroup.getWorkCenterCode())) { + DdlPreparedPack.getStringLikerPack(shiftGroup.getWorkCenterCode(), "workCenterCode", packBean); + } + return packBean; + } + + public static DdlPackBean getMesEventByButtonCode(String buttonCode, String org) { + DdlPackBean packBean = getAllBaseData(org); + DdlPreparedPack.getStringEqualPack(buttonCode, "buttonCode", packBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean); + return packBean; + } + + + + /** + * 按条件分页查询类型信息数据 + * @param typeCfg + * @return + */ + public static DdlPackBean getTypeCfg(MesTypeCfg typeCfg) { + + DdlPackBean packBean = getAllBaseData(typeCfg.getOrganizeCode()); + if (!StringUtils.isEmpty(typeCfg.getBusinessTypeCode())) { + DdlPreparedPack.getStringLikerPack(typeCfg.getBusinessTypeCode(), "businessTypeCode", packBean); + } + if (!StringUtils.isEmpty(typeCfg.getBusinessTypeName())) { + DdlPreparedPack.getStringLikerPack(typeCfg.getBusinessTypeName(), "businessTypeName", packBean); + } + if (!StringUtils.isEmpty(typeCfg.getTypeCode())) { + DdlPreparedPack.getStringLikerPack(typeCfg.getTypeCode(), "typeCode", packBean); + } + + return packBean; + } +} From 51d666b5bcfc45b6057f50aca0b498759724a283 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Mon, 2 Mar 2020 15:28:18 +0800 Subject: [PATCH 03/91] =?UTF-8?q?=E5=BC=80=E5=8F=91PTL--PCN=E8=8A=82?= =?UTF-8?q?=E7=82=B9=E7=BB=B4=E6=8A=A4,=E5=90=8C=E6=AD=A5=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E5=92=8C=E5=AF=B9=E8=B1=A1=E6=98=A0=E5=B0=84=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/PtlEnumUtil.java | 124 +++++++++++++++++++++ .../cn/estsh/i3plus/pojo/ptl/bean/PtlNode.java | 87 +++++++++++++++ .../estsh/i3plus/pojo/ptl/bean/PtlObjectDao.java | 41 +++++++ .../estsh/i3plus/pojo/ptl/bean/PtlPcnSyncCfg.java | 111 ++++++++++++++++++ .../pojo/ptl/repository/PtlNodeRepository.java | 16 +++ .../ptl/repository/PtlObjectDaoRepository.java | 16 +++ .../ptl/repository/PtlPcnSyncCfgRepository.java | 16 +++ .../estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java | 83 ++++++++++++-- 8 files changed, 485 insertions(+), 9 deletions(-) create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlNode.java create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlObjectDao.java create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnSyncCfg.java create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlNodeRepository.java create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlObjectDaoRepository.java create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlPcnSyncCfgRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java index 072df9e..3897219 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java @@ -423,4 +423,128 @@ public class PtlEnumUtil { return tmp; } } + + /** + * PCN同步PTL主数据同步类型枚举 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SYNC_TYPE { + + GET_PTL_DATA(1, "pcn获取Ptl数据"), + DATA_TO_PTL(2, "pcn推送数据至ptl"); + + private int value; + private String description; + + SYNC_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; + } + } + + /** + * PCN同步PTL主数据同步方式枚举 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SYNC_PATTERN { + + UPDATE(1, "修改"), + INSERT(2, "新增"); + + private int value; + private String description; + + SYNC_PATTERN(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; + } + } + + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum TRUE_OR_FALSE { + TRUE(1, "是"), + FALSE(2, "否"); + + private int value; + private String description; + + TRUE_OR_FALSE(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; + } + } } diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlNode.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlNode.java new file mode 100644 index 0000000..fd3a0d9 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlNode.java @@ -0,0 +1,87 @@ +package cn.estsh.i3plus.pojo.ptl.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 java.io.Serializable; + +/** + * @Description: + * @Reference: + * @Author: adair.song + * @CreateDate:2019-04-22-17:20 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "PTL_PCN_NODE") +@Api("PCN节点") +public class PtlNode extends BaseBean implements Serializable { + private static final long serialVersionUID = -9140094723555406392L; + @Column(name = "PCN_CODE") + @ApiParam("PCN代码") + private String pcnCode; + + @Column(name = "PCN_NAME") + @ApiParam("PCN节点名称") + private String pcnName; + + @Column(name = "AREA_NO") + @ApiParam("区域") + private String areaNo; + + @Column(name = "AREA_NAME") + @ApiParam("区域名称") + private String areaName; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心") + private String workCenterCode; + + @Column(name = "WORK_CENTER_NAME") + @ApiParam("工作中心名称") + private String workCenterName; + + @Column(name = "PCN_VERSION") + @ApiParam("PCN版本") + private String pcnVersion; + + @Column(name = "CONNECT_IP") + @ApiParam("连接IP") + private String connectIp; + + @Column(name = "CONNECT_COUNT") + @ApiParam("连接次数") + private Integer connectCount; + + @Column(name = "IS_CONNECT") + @ApiParam("是否连接") + private Integer isConnect; + + @Column(name = "CONNECT_TIME") + @ApiParam("连接时间") + private String connectTime; + + @Column(name = "CODE_SPECIFIC") + @ApiParam("PCN特殊字段") + private String codeSpecific; + + public int getConnectCountVal() { + return this.connectCount == null ? 0 : this.connectCount; + } + + public int getIsConnectVal() { + return this.isConnect == null ? 0 : this.isConnect; + } +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlObjectDao.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlObjectDao.java new file mode 100644 index 0000000..d86d1b1 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlObjectDao.java @@ -0,0 +1,41 @@ +package cn.estsh.i3plus.pojo.ptl.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 java.io.Serializable; + +/** + * @Description :PTL_对象与dao对应关系 + * @Reference : + * @Author : adair.song + * @CreateDate : 2019-04-23 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "PTL_OBJECT_DAO") +@Api("PTL_对象与dao对应关系") +public class PtlObjectDao extends BaseBean implements Serializable { + private static final long serialVersionUID = 2286752328499060L; + @Column(name = "OBJECT_CODE") + @ApiParam("对象代码") + private String objectCode; + + @Column(name = "DAO_CLASS") + @ApiParam("dao层类名") + private String daoClass; + +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnSyncCfg.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnSyncCfg.java new file mode 100644 index 0000000..060404d --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnSyncCfg.java @@ -0,0 +1,111 @@ +package cn.estsh.i3plus.pojo.ptl.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; +import java.io.Serializable; + +/** + * @Description: + * @Reference: + * @Author: adair.song + * @CreateDate:2020-02-28 10:16 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "PTL_PCN_SYNC_CFG") +@Api("PTL_PCN_同步配置") +public class PtlPcnSyncCfg extends BaseBean implements Serializable { + + private static final long serialVersionUID = 7270948230576127126L; + + @Column(name = "PCN_CODE") + @ApiParam("PCN代码") + private String pcnCode; + + @Column(name = "OBJECT_CODE") + @ApiParam("对象代码") + private String objectCode; + + @Column(name = "OBJECT_NAME") + @ApiParam("对象名称") + private String objectName; + + @Column(name = "OBJECT_KEY") + @ApiParam("对象主键") + private String objectKey; + + @Column(name = "SYNC_FREQUENCY") + @ApiParam("同步频率") + private Integer syncFrequency; + + @Column(name = "SYNC_TIME") + @ApiParam(value = "同步时间") + private String syncTime; + + @Column(name = "SYNC_PATTERN") + @ApiParam("同步方式 1、修改 2、新增") + private Integer syncPattern; + + @Column(name = "SYNC_TYPE") + @ApiParam("同步类型 1.pcn获取PTL数据 2.pcn推送数据至PTL") + private Integer syncType; + + @Column(name = "LAST_SYNC_TIME") + @ApiParam(value = "上一同步时间") + private String lastSyncTime; + + @Column(name = "EXTRACT_GAP") + @ApiParam(value = "从数据库抽取的最大值 目前为分钟为限制") + private Integer extractGap; + + @Column(name = "EXTRACT_CONDITION") + @ApiParam(value = "从数据库抽取的条件限制") + private String extractCondition; + + @Column(name = "IS_IGNORE_ORG") + @ApiParam(value = "同步的时候是否区分工厂") + private Integer isIgnoreOrg = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(); + + @Transient + @ApiParam("同步方式") + private String syncPatternName; + + @Transient + @ApiParam("同步类型名称") + private String syncTypeName; + + @Transient + @ApiParam(value = "同步的时候是否区分工厂") + private String isIgnoreOrgName; + + public int getIsIgnoreOrgVal() { + return this.isIgnoreOrg == null ? 0 : this.isIgnoreOrg; + } + + public int getSyncFrequencyVal() { + return this.syncFrequency == null ? 0 : this.syncFrequency; + } + + public int getSyncTypeVal() { + return this.syncType == null ? 0 : this.syncType; + } + + public int getSyncPatternVal() { + return this.syncPattern == null ? 0 : this.syncPattern; + } +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlNodeRepository.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlNodeRepository.java new file mode 100644 index 0000000..d4b869c --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlNodeRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.ptl.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.ptl.bean.PtlNode; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: adair.song + * @CreateDate:2020-02-28-17:13 + * @Modify: + **/ +@Repository +public interface PtlNodeRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlObjectDaoRepository.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlObjectDaoRepository.java new file mode 100644 index 0000000..93c461d --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlObjectDaoRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.ptl.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.ptl.bean.PtlObjectDao; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: adair.song + * @CreateDate:2019-04-23 + * @Modify: + **/ +@Repository +public interface PtlObjectDaoRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlPcnSyncCfgRepository.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlPcnSyncCfgRepository.java new file mode 100644 index 0000000..0b0be41 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlPcnSyncCfgRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.ptl.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.ptl.bean.PtlPcnSyncCfg; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: yiming.gu + * @CreateDate:2019-04-24-17:13 + * @Modify: + **/ +@Repository +public interface PtlPcnSyncCfgRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java index ce00e6d..5efbb4d 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java @@ -5,17 +5,9 @@ import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; -import cn.estsh.i3plus.pojo.base.tool.HqlPack; -import cn.estsh.i3plus.pojo.ptl.bean.PtlConfig; -import cn.estsh.i3plus.pojo.ptl.bean.PtlPrinterConfigure; -import cn.estsh.i3plus.pojo.ptl.bean.PtlPrintingQueue; -import com.alibaba.fastjson.JSONObject; -import com.google.common.base.Strings; +import cn.estsh.i3plus.pojo.ptl.bean.*; import org.springframework.util.StringUtils; -import java.util.*; -import java.util.stream.Collectors; - /** * @Description : PTL对象封装 * @Reference : @@ -101,6 +93,19 @@ public class PtlHqlPack { } /** + * 通用查询条件 + * + * @param organizeCode + * @return + */ + public static DdlPackBean getAllBaseData(String organizeCode) { + DdlPackBean packBean = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", packBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", packBean); + return packBean; + } + + /** * 配置信息 * @param ptlConfig * @return @@ -118,4 +123,64 @@ public class PtlHqlPack { } return packBean; } + + + /** + * PTL-PCN节点查询条件封装 + * + * @param ptlPcn + * @param organizeCode + * @return + */ + public static DdlPackBean getPtlPcnByCondition(PtlNode ptlPcn, String organizeCode) { + DdlPackBean packBean = getAllBaseData(organizeCode); + if (!StringUtils.isEmpty(ptlPcn.getConnectIp())) { + DdlPreparedPack.getStringLikerPack(ptlPcn.getConnectIp(), "connectIp", packBean); + } + if (!StringUtils.isEmpty(ptlPcn.getPcnName())) { + DdlPreparedPack.getStringLikerPack(ptlPcn.getPcnName(), "pcnName", packBean); + } + if (!StringUtils.isEmpty(ptlPcn.getPcnCode())) { + DdlPreparedPack.getStringLikerPack(ptlPcn.getPcnCode(), "pcnCode", packBean); + } + if (!StringUtils.isEmpty(ptlPcn.getAreaNo())) { + DdlPreparedPack.getStringLikerPack(ptlPcn.getAreaNo(), "areaNo", packBean); + } + if (ptlPcn.getIsValid() != null) { + DdlPreparedPack.getNumEqualPack(ptlPcn.getIsValid(), "isValid", packBean); + } + return packBean; + } + + /** + * PTL-PCN同步配置查询条件封装 + * + * @param pcnSyncCfg + * @return + */ + public static DdlPackBean getPtlPcnSyncCfg(PtlPcnSyncCfg pcnSyncCfg, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(pcnSyncCfg, organizeCode); + DdlPreparedPack.getStringLikerPack(pcnSyncCfg.getObjectCode(), "objectCode", packBean); + DdlPreparedPack.getStringLikerPack(pcnSyncCfg.getPcnCode(), "pcnCode", packBean); + DdlPreparedPack.getNumEqualPack(pcnSyncCfg.getSyncType(), "syncType", packBean); + return packBean; + } + + /** + * PTL对象与dao对应关系查询条件封装 + * + * @param objectDao + * @return + */ + public static DdlPackBean getPtlObjectDao(PtlObjectDao objectDao, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(objectDao, organizeCode); + if (!StringUtils.isEmpty(objectDao.getObjectCode())) { + DdlPreparedPack.getStringLikerPack(objectDao.getObjectCode(), "objectCode", packBean); + } + if (!StringUtils.isEmpty(objectDao.getDaoClass())) { + DdlPreparedPack.getStringLikerPack(objectDao.getDaoClass(), "daoClass", packBean); + } + + return packBean; + } } From 0a0318d639d8969e1fd09bfaf0e58ce94f92bd07 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 2 Mar 2020 16:01:23 +0800 Subject: [PATCH 04/91] ptl --- .../i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java | 62 ++++++++++++++++++ .../i3plus/pojo/ptl/bean/PtlSysUserOffline.java | 73 ++++++++++++++++++++++ .../pojo/ptl/model/PtlMonitorControlModel.java | 6 ++ .../repository/PtlSysUserOfflineRepository.java | 16 +++++ 4 files changed, 157 insertions(+) create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlSysUserOffline.java create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlSysUserOfflineRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java index 45e5c53..cdb4071 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java @@ -1142,4 +1142,66 @@ public class PtlPcnEnumUtil { } } + /** + * 系统配置表枚举 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum CONFIG_TYPE { + FASTDFS_SAVE_PATH(10, "SAVE_PATH", ""), + NGINX_HOST(20, "NGINX_HOST", ""), + MES_STATION_SOCKET(30, "mes_station_socket", ""), + GATEWAY_IP(40, "GATEWAY_HOST", ""), + UPDATE_SYNC_TIME(50, "SYNC_DATA_URL", "UPDATE_SYNC_TIME"), + PCN_PULL(60, "SYNC_DATA_URL", "PCN_PULL"), + PCN_PUSH(70, "SYNC_DATA_URL", "PCN_PUSH"), + FDFS_DOWNLOAD(80, "SYNC_DATA_URL", "FDFS_DOWNLOAD"), + REWORK_REPAIR(90, "REWORK_REPAIR", ""), + OPC_LINK_SERVER_URL(100, "OPC_LINK", "OPC_LINK_SERVER_URL"), + OPC_LINK_USERNAME(110, "OPC_LINK", "OPC_LINK_USERNAME"), + OPC_LINK_PASSWORD(120, "OPC_LINK", "OPC_LINK_PASSWORD"), + OPC_LINK_REALM(130, "OPC_LINK", "OPC_LINK_REALM"), + OPC_LINK_CALLBACK(140, "OPC_LINK", "OPC_LINK_CALLBACK"), + SUPPLY_SWITCH(150, "SUPPLY_SWITCH", ""), + PCN_LOGIN(160, "PCN_LOGIN", ""), + PCN_MENU(170, "PCN_MENU", ""), + PCN_MODULE(180, "PCN_MODULE", ""), + PCN_LOGOUT(190, "PCN_LOGOUT", ""), + UPDATE_LOCALE_RES(200, "LOCALE_RES_URL", "LOCALE_RES_URL"), + PCN_SYS_LOCALE_LANGUAGE(210, "PCN_SYS_LOCALE_LANGUAGE", ""), + PCN_SYS_ALL_LANGUAGE(220,"PCN_SYS_ALL_LANGUAGE","PCN_SYS_ALL_LANGUAGE"), + PCN_SYS_RESOURCE_KEY_LANGUAGE(230,"PCN_SYS_RESOURCE_KEY_LANGUAGE","PCN_SYS_RESOURCE_KEY_LANGUAGE"); + + private int value; + private String code; + private String description; + + CONFIG_TYPE(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + 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; + } + } + } diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlSysUserOffline.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlSysUserOffline.java new file mode 100644 index 0000000..d07f684 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlSysUserOffline.java @@ -0,0 +1,73 @@ +package cn.estsh.i3plus.pojo.ptl.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; +import java.io.Serializable; + +/** + * @Description : 账号离线登陆表 + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-09-01 11:02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "PTL_SYS_USER_OFFLINE") +@Api(value = "账号离线登陆表", description = "账号离线登陆表。") +public class PtlSysUserOffline extends BaseBean implements Serializable { + + private static final long serialVersionUID = -6191798106333324803L; + + @Column(name = "USER_ID") + @ApiParam(value = "人员ID", example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long userId; + + @Column(name = "USER_CODE") + @ApiParam(value = "用户编号", access = "用户编号") + private String userCode; + + @Column(name = "USER_NAME") + @ApiParam(value = "用户名称", access = "账号名称") + private String userName; + + @Column(name = "LOGIN_NAME") + @ApiParam(value = "登陆名称", access = "登陆名称") + private String loginName; + + @Column(name="USER_TYPE") + @ApiParam(value ="账号类型（枚举，待定）" , example ="-1") + private Integer userType; + + @Lob + @Column(name="LOGIN_INFO") + @ApiParam(value ="登陆信息" , access ="登陆信息") + private String loginInfo; + + @Lob + @Column(name="MENU_LIST") + @ApiParam(value ="菜单" , access ="菜单") + private String menuList; + + @Lob + @Column(name="MODULE_LIST") + @ApiParam(value ="模块" , access ="模块") + private String moduleList; + +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/PtlMonitorControlModel.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/PtlMonitorControlModel.java index 40a5e14..28b0ed1 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/PtlMonitorControlModel.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/PtlMonitorControlModel.java @@ -19,6 +19,12 @@ import java.util.List; @Api("亮灯监听Model") public class PtlMonitorControlModel implements Serializable { + @ApiParam("刷新频率") + public String refreshTime; + + @ApiParam("PCN代码") + public String pcnCode; + @ApiParam("区域代码") public String areaNo; diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlSysUserOfflineRepository.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlSysUserOfflineRepository.java new file mode 100644 index 0000000..ce38550 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlSysUserOfflineRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.ptl.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.ptl.bean.PtlSysUserOffline; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-09-02 + * @Modify: + **/ +@Repository +public interface PtlSysUserOfflineRepository extends BaseRepository { +} From 8c334d2ffdc9f12b5847ba4172aae7e74e6c82f1 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 2 Mar 2020 17:46:24 +0800 Subject: [PATCH 05/91] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/ptl/bean/PtlLabelTemplate.java | 54 +++++++++++++++++++++ .../pojo/ptl/bean/PtlLabelTemplateParam.java | 55 ++++++++++++++++++++++ .../i3plus/pojo/ptl/bean/PtlPcnSyncErrorLog.java | 55 ++++++++++++++++++++++ .../PtlLabelTemplateParamRepository.java | 14 ++++++ .../ptl/repository/PtlLabelTemplateRepository.java | 14 ++++++ .../repository/PtlPcnSyncErrorLogRepository.java | 16 +++++++ 6 files changed, 208 insertions(+) create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlLabelTemplate.java create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlLabelTemplateParam.java create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnSyncErrorLog.java create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlLabelTemplateParamRepository.java create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlLabelTemplateRepository.java create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlPcnSyncErrorLogRepository.java diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlLabelTemplate.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlLabelTemplate.java new file mode 100644 index 0000000..a14a5a3 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlLabelTemplate.java @@ -0,0 +1,54 @@ +package cn.estsh.i3plus.pojo.ptl.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.*; +import java.io.Serializable; +import java.util.List; + +/** + * @Description : 打印模板 + * @Reference : + * @Author : crish + * @CreateDate : 2019-08-18 11:00 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "PTL_LABEL_TEMPLATE") +@Api(value = "打印模板", description = "打印模板") +public class PtlLabelTemplate extends BaseBean implements Serializable { + + private static final long serialVersionUID = 8287307324960885418L; + @Column(name = "TEMPLATE_CODE") + @ApiParam(value = "模板代码") + private String templateCode; + + @Column(name = "TEMPLATE_NAME") + @ApiParam(value = "模板名称") + private String templateName; + + @Lob + @Column(name = "TEMPLATE_CONTENT") + @ApiParam(value = "模板内容") + private String templateContent; + + // 参数拼接，多参数都好分隔，后台在做处理 + @ApiParam(value = "模板参数拼接") + @Transient + private String paramsPack; + + @Transient + @ApiParam(value = "模板id对应的模板参数") + private List labelTemplateParamList; + +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlLabelTemplateParam.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlLabelTemplateParam.java new file mode 100644 index 0000000..08a100e --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlLabelTemplateParam.java @@ -0,0 +1,55 @@ +package cn.estsh.i3plus.pojo.ptl.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.*; +import java.io.Serializable; + +/** + * @Description : 打印模板参数 + * @Reference : + * @Author : crish + * @CreateDate : 2019-08-18 11:00 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "PTL_LABEL_TEMPLATE_PARAM") +@Api(value = "打印模板参数", description = "打印模板参数") +public class PtlLabelTemplateParam extends BaseBean implements Serializable { + + private static final long serialVersionUID = 7292367173575992422L; + @Column(name = "TEMPLATE_ID") + @ApiParam(value = "模板ID", access = "模板ID", example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long templateId; + + @Column(name = "TEMPLATE_CODE") + @ApiParam(value = "模板代码") + private String templateCode; + + @Column(name = "TEMPLATE_PARAM") + @ApiParam(value = "模板参数") + private String templateParam; + + @Lob + @Column(name = "TEMPLATE_PARAM_TEXT") + @ApiParam(value = "模板参数描述") + private String templateParamText; + + // 参数拼接，多参数都好分隔，后台在做处理 + @ApiParam(value = "模板参数值") + @Transient + private String templateParamValue; +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnSyncErrorLog.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnSyncErrorLog.java new file mode 100644 index 0000000..110f4a8 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnSyncErrorLog.java @@ -0,0 +1,55 @@ +package cn.estsh.i3plus.pojo.ptl.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.Lob; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description: + * @Reference: + * @Author: crish + * @CreateDate:2019-08-23-17:20 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "PTL_PCN_SYNC_ERRORLOG") +@Api("PTL_PCN同步异常日志") +public class PtlPcnSyncErrorLog extends BaseBean implements Serializable { + + private static final long serialVersionUID = -8285936568677939604L; + @Column(name = "PCN_CODE") + @ApiParam("PCN代码") + private String pcnCode; + + @Column(name = "OBJECT_CODE") + @ApiParam("对象代码") + private String objectCode; + + @Column(name = "OBJECT_NAME") + @ApiParam("对象名称") + private String objectName; + + @Column(name = "ERROR_SPOT") + @ApiParam("异常位置") + private String errorSpot; + + @Lob + @Column(name = "ERROR_CONTENT") + @ApiParam("异常内容") + private String errorContent; + +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlLabelTemplateParamRepository.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlLabelTemplateParamRepository.java new file mode 100644 index 0000000..aef8d8a --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlLabelTemplateParamRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.ptl.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.ptl.bean.PtlLabelTemplateParam; + +/** + * @Description : 打印模板 + * @Reference : + * @Author : crish + * @Date : 2019-08-18 12:03:01.024 + * @Modify : + **/ +public interface PtlLabelTemplateParamRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlLabelTemplateRepository.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlLabelTemplateRepository.java new file mode 100644 index 0000000..7fd7624 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlLabelTemplateRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.ptl.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.ptl.bean.PtlLabelTemplate; + +/** + * @Description : 打印模板 + * @Reference : + * @Author : crish + * @Date : 2019-08-18 12:03:01.024 + * @Modify : + **/ +public interface PtlLabelTemplateRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlPcnSyncErrorLogRepository.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlPcnSyncErrorLogRepository.java new file mode 100644 index 0000000..d7e461f --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlPcnSyncErrorLogRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.ptl.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.ptl.bean.PtlPcnSyncErrorLog; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: crish + * @CreateDate:2019-08-23-17:13 + * @Modify: + **/ +@Repository +public interface PtlPcnSyncErrorLogRepository extends BaseRepository { +} From 767a9b98cdad5343eb85dcd45979f8c943b49be6 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Mon, 2 Mar 2020 13:33:57 +0100 Subject: [PATCH 06/91] =?UTF-8?q?=E3=80=907568=20PDA=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E5=A2=9E=E5=8A=A0=E4=B8=80=E4=B8=AA=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E6=A1=86=EF=BC=8C=E8=AE=A9=E5=91=98=E5=B7=A5=E5=8F=AF?= =?UTF-8?q?=E4=BB=A5=E9=80=89=E6=8B=A9ASN=E5=8D=95=E6=8D=AE=E6=94=B6?= =?UTF-8?q?=E8=B4=A7=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java index c667ec4..529c486 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java @@ -179,4 +179,10 @@ public class WmsPOMasterDetails extends BaseBean { this.qty = qty; this.rcQty = rcQty; } + + public WmsPOMasterDetails(String orderNo ,String erpAreaNo,String organizeCode){ + this.orderNo = orderNo; + this.erpAreaNo = erpAreaNo; + this.organizeCode = organizeCode; + } } From 83ed87a76904bc6ec94d75466f73826f59a1dd29 Mon Sep 17 00:00:00 2001 From: qianhs Date: Tue, 3 Mar 2020 11:37:50 +0800 Subject: [PATCH 07/91] =?UTF-8?q?=E3=80=90=20=09=E7=9B=98=E7=82=B9?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E8=83=BD=E5=90=A6=E7=9B=98=E7=82=B9=E5=BE=85?= =?UTF-8?q?=E8=B4=A8=E6=A3=80=E7=9A=84=E6=9D=A1=E7=A0=81=EF=BC=8C=E6=AC=A7?= =?UTF-8?q?=E6=B4=B2=E6=96=B9=E9=9D=A2=E4=B8=8D=E9=9C=80=E8=A6=81=E5=AF=B9?= =?UTF-8?q?=E8=B4=A8=E6=A3=80=E6=9D=A1=E7=A0=81=E8=BF=9B=E8=A1=8C=E5=8D=A1?= =?UTF-8?q?=E6=8E=A7=E3=80=91=E3=80=90bug7542=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCsStrategy.java | 4 ++++ .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java | 2 ++ 2 files changed, 6 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCsStrategy.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCsStrategy.java index 24bf56a..57df4a3 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCsStrategy.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCsStrategy.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; @@ -40,10 +41,13 @@ public class WmsCsStrategy extends BaseBean implements Serializable { @Column(name = "part_type") @ApiParam(value = "物料分类") + @AnnoOutputColumn(refClass = WmsEnumUtil.PART_ABC.class, refForeignKey = "value", value = "description") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, enumName = "PART_ABC") private String partType; @Column(name = "STRATEGY_TYPE") @ApiParam(value = "策略分类", example = "0") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, enumName = "CS_STRATEGY_TYPE") @AnnoOutputColumn(refClass = WmsEnumUtil.CS_STRATEGY_TYPE.class, refForeignKey = "value", value = "description") private Integer strategyType; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java index 456348c..4f60667 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; @@ -73,6 +74,7 @@ public class WmsSnOperateRecord extends BaseBean { @Column(name = "OPERATE_TYPE") @ApiParam(value = "操作类型") @AnnoOutputColumn(refClass = WmsEnumUtil.SN_OPERATE_TYPE.class, refForeignKey = "value", value = "description") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, enumName = "SN_OPERATE_TYPE") private Integer operateType; @Column(name = "ref_sn") From e1d133de616290241e59098c4359e834a2978d6e Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Tue, 3 Mar 2020 14:53:20 +0800 Subject: [PATCH 08/91] ptl enum --- .../i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java | 74 ++++++++++++++++------ 1 file changed, 53 insertions(+), 21 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java index cdb4071..42becd3 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java @@ -290,18 +290,20 @@ public class PtlPcnEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum TAG_LIGHT_COLOR_CMD { - TAG_LIGHT_COLOR_RED("00", "红"), - TAG_LIGHT_COLOR_GREEN("01", "绿"), - TAG_LIGHT_COLOR_ORANGE("02", "橙"), - TAG_LIGHT_COLOR_BLUE("03", "蓝"), - TAG_LIGHT_COLOR_PINK_RED("04", "粉红"), - TAG_LIGHT_COLOR_BLUE_GREEN("05", "蓝绿"); + TAG_LIGHT_COLOR_RED("00", 0, "红"), + TAG_LIGHT_COLOR_GREEN("01", 1, "绿"), + TAG_LIGHT_COLOR_ORANGE("02", 2, "橙"), + TAG_LIGHT_COLOR_BLUE("03", 3, "蓝"), + TAG_LIGHT_COLOR_PINK_RED("04", 4, "粉红"), + TAG_LIGHT_COLOR_BLUE_GREEN("05", 5, "蓝绿"); private String code; + private Integer value; private String description; - TAG_LIGHT_COLOR_CMD(String code, String description) { + TAG_LIGHT_COLOR_CMD(String code, Integer value, String description) { this.code = code; + this.value = value; this.description = description; } @@ -314,10 +316,24 @@ public class PtlPcnEnumUtil { return null; } + public static String valueOf(int value) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + tmp = values()[i].code; + } + } + return tmp; + } + public String getCode() { return code; } + public Integer getValue() { + return value; + } + public String getDescription() { return description; } @@ -355,24 +371,26 @@ public class PtlPcnEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum FINISH_TAG_LIGHT_MUSIC_CMD { - FINISH_TAG_LIGHT_MUSIC_00H("00", "Jingle bells"), - FINISH_TAG_LIGHT_MUSIC_01H("01", "Carmen"), - FINISH_TAG_LIGHT_MUSIC_02H("02", "Happy Chinese new year"), - FINISH_TAG_LIGHT_MUSIC_03H("03", "Edelweiss"), - FINISH_TAG_LIGHT_MUSIC_04H("04", "Going home"), - FINISH_TAG_LIGHT_MUSIC_05H("05", "PAPALA"), - FINISH_TAG_LIGHT_MUSIC_06H("06", "Classical"), - FINISH_TAG_LIGHT_MUSIC_07H("07", "Listen to the rhythm of the falling rain"), - FINISH_TAG_LIGHT_MUSIC_08H("08", "Rock and roll"), - FINISH_TAG_LIGHT_MUSIC_09H("09", "Happy birthday"), - FINISH_TAG_LIGHT_MUSIC_0AH("0A", "Do Re Me"), - FINISH_TAG_LIGHT_MUSIC_0BH("0B", "Strauss"); + FINISH_TAG_LIGHT_MUSIC_00H("00", 0, "Jingle bells"), + FINISH_TAG_LIGHT_MUSIC_01H("01", 1, "Carmen"), + FINISH_TAG_LIGHT_MUSIC_02H("02", 2, "Happy Chinese new year"), + FINISH_TAG_LIGHT_MUSIC_03H("03", 3, "Edelweiss"), + FINISH_TAG_LIGHT_MUSIC_04H("04", 4, "Going home"), + FINISH_TAG_LIGHT_MUSIC_05H("05", 5, "PAPALA"), + FINISH_TAG_LIGHT_MUSIC_06H("06", 6, "Classical"), + FINISH_TAG_LIGHT_MUSIC_07H("07", 7, "Listen to the rhythm of the falling rain"), + FINISH_TAG_LIGHT_MUSIC_08H("08", 8, "Rock and roll"), + FINISH_TAG_LIGHT_MUSIC_09H("09", 9, "Happy birthday"), + FINISH_TAG_LIGHT_MUSIC_0AH("0A", 10, "Do Re Me"), + FINISH_TAG_LIGHT_MUSIC_0BH("0B", 11, "Strauss"); private String code; + private Integer value; private String description; - FINISH_TAG_LIGHT_MUSIC_CMD(String code, String description) { + FINISH_TAG_LIGHT_MUSIC_CMD(String code, Integer value, String description) { this.code = code; + this.value = value; this.description = description; } @@ -385,10 +403,24 @@ public class PtlPcnEnumUtil { return null; } + public static String valueOf(int value) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + tmp = values()[i].code; + } + } + return tmp; + } + public String getCode() { return code; } + public Integer getValue() { + return value; + } + public String getDescription() { return description; } @@ -590,7 +622,7 @@ public class PtlPcnEnumUtil { public enum MonitorProcessMessageType { CONNECT_CONTROL_CMD(10, "CONNECT_CONTROL_CMD", "connectControlService", "连接控制器"), DISCONNECT_CONTROL_CMD(20, "DISCONNECT_CONTROL_CMD", "disconnectControlService", "断开控制器"), - EXCEPTION__DISCONNECT_CONTROL_CMD(25, "EXCEPTION__DISCONNECT_CONTROL_CMD", "disconnectControlService", "断开控制器"), + EXCEPTION__DISCONNECT_CONTROL_CMD(25, "EXCEPTION_DISCONNECT_CONTROL_CMD", "disconnectControlService", "断开控制器"), LIGHT_ON_CMD(30, "LIGHT_ON_CMD", "lightOnService", "亮灯命令"), LIGHT_OFF_CMD(40, "LIGHT_OFF_CMD", "lightOffService", "灭灯命令"), CONTROL_SIGNAL_CMD(50, "CONTROL_SIGNAL_CMD", "controlSignalService", "控制器反馈信号"), From 80d9852dd664097450434e73c035a6c33bbc830f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Tue, 3 Mar 2020 18:16:39 +0800 Subject: [PATCH 09/91] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=92=8C=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/PtlEnumUtil.java | 37 +++++++++ .../i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java | 91 ++++++++++++++++++++++ .../cn/estsh/i3plus/pojo/ptl/bean/PtlNode.java | 10 +-- .../estsh/i3plus/pojo/ptl/bean/PtlPcnSyncCfg.java | 20 ----- .../cn/estsh/i3plus/pojo/ptl/bean/PtlPcnTask.java | 90 +++++++++++++++++++++ .../estsh/i3plus/pojo/ptl/bean/PtlPcnTaskLog.java | 53 +++++++++++++ .../pojo/ptl/repository/PtlPcnTaskRepository.java | 16 ++++ .../estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java | 34 ++++++++ 8 files changed, 322 insertions(+), 29 deletions(-) create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnTask.java create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnTaskLog.java create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlPcnTaskRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java index 3897219..cd9a311 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java @@ -547,4 +547,41 @@ public class PtlEnumUtil { return tmp; } } + + /** + * ptl-pcn定时任务状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PTL_PCN_TASK_STATUS { + + OPEN(1, "开启"), + CLOSE(2, "关闭"); + + private int value; + private String description; + + PTL_PCN_TASK_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; + } + } + } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java index 42becd3..921cbf3 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java @@ -1236,4 +1236,95 @@ public class PtlPcnEnumUtil { } } + /** + * PCN同步PTL主数据同步类型枚举 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SYNC_TYPE { + + GET_PTL_DATA(1, "pcn获取Ptl数据"), + DATA_TO_PTL(2, "pcn推送数据至ptl"); + + private int value; + private String description; + + SYNC_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; + } + } + + /** + * PCN同步PTL主数据同步方式枚举 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SYNC_PATTERN { + + UPDATE(1, "修改"), + INSERT(2, "新增"); + + private int value; + private String description; + + SYNC_PATTERN(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; + } + } } diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlNode.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlNode.java index fd3a0d9..1c842e1 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlNode.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlNode.java @@ -45,14 +45,6 @@ public class PtlNode extends BaseBean implements Serializable { @ApiParam("区域名称") private String areaName; - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心") - private String workCenterCode; - - @Column(name = "WORK_CENTER_NAME") - @ApiParam("工作中心名称") - private String workCenterName; - @Column(name = "PCN_VERSION") @ApiParam("PCN版本") private String pcnVersion; @@ -74,7 +66,7 @@ public class PtlNode extends BaseBean implements Serializable { private String connectTime; @Column(name = "CODE_SPECIFIC") - @ApiParam("PCN特殊字段") + @ApiParam("编码规则特殊符") private String codeSpecific; public int getConnectCountVal() { diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnSyncCfg.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnSyncCfg.java index 060404d..6fd597a 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnSyncCfg.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnSyncCfg.java @@ -77,26 +77,6 @@ public class PtlPcnSyncCfg extends BaseBean implements Serializable { @ApiParam(value = "从数据库抽取的条件限制") private String extractCondition; - @Column(name = "IS_IGNORE_ORG") - @ApiParam(value = "同步的时候是否区分工厂") - private Integer isIgnoreOrg = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(); - - @Transient - @ApiParam("同步方式") - private String syncPatternName; - - @Transient - @ApiParam("同步类型名称") - private String syncTypeName; - - @Transient - @ApiParam(value = "同步的时候是否区分工厂") - private String isIgnoreOrgName; - - public int getIsIgnoreOrgVal() { - return this.isIgnoreOrg == null ? 0 : this.isIgnoreOrg; - } - public int getSyncFrequencyVal() { return this.syncFrequency == null ? 0 : this.syncFrequency; } diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnTask.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnTask.java new file mode 100644 index 0000000..916a9ce --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnTask.java @@ -0,0 +1,90 @@ +package cn.estsh.i3plus.pojo.ptl.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 java.io.Serializable; + +/** + * @Description :ptl-pcn定时任务工作清单 + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-08-26 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "PTL_PCN_TASK") +@Api("ptl-pcn定时任务工作清单") +public class PtlPcnTask extends BaseBean implements Serializable { + private static final long serialVersionUID = 4129714382965409395L; + + @Column(name = "TASK_CODE") + @ApiParam("任务代码") + private String taskCode; + + @Column(name = "TASK_NAME") + @ApiParam("任务名称") + private String taskName; + + @Column(name = "TASK_GROUP_NAME") + @ApiParam("任务组名称") + private String taskGroupName; + + @Column(name = "TASK_DESCRIPTION") + @ApiParam("任务描述") + private String taskDescription; + + @Column(name = "TASK_TYPE") + @ApiParam("任务类型") + private Integer taskType; + + @Column(name = "TASK_MODULE") + @ApiParam("任务模块") + private String taskModule; + + @Column(name = "TASK_CLASS") + @ApiParam("任务类名") + private String taskClass; + + @Column(name = "TASK_PACKAGE") + @ApiParam("任务包名") + private String taskPackage; + + @Column(name = "PCN_NAME") + @ApiParam("PCN节点名称") + private String pcnName; + + @Column(name = "PCN_CODE") + @ApiParam("PCN节点名称代码") + private String pcnCode; + + @Column(name = "TASK_CYCLE_EXPS") + @ApiParam("任务周期表达式") + private String taskCycleExps; + + @Column(name = "TASK_CYCLE_DESCRIPTION") + @ApiParam("任务周期描述") + private String taskCycleDescription; + + @Column(name = "TASK_PARAM") + @ApiParam("任务参数") + private String taskParam; + + public int getTaskTypeVal() { + return this.taskType == null ? 0 : this.taskType; + } + +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnTaskLog.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnTaskLog.java new file mode 100644 index 0000000..f10f0e0 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnTaskLog.java @@ -0,0 +1,53 @@ +package cn.estsh.i3plus.pojo.ptl.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 java.io.Serializable; + +/** + * @Description :ptl-pcn定时任务工作清单同步记录 + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-08-27 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "PTL_PCN_TASK_LOG") +@Api("ptl-pcn定时任务工作清单同步记录") +public class PtlPcnTaskLog extends BaseBean implements Serializable { + private static final long serialVersionUID = -784806174962540310L; + + @Column(name = "SYNC_TIME_START") + @ApiParam("同步数据开始时间") + private String syncTimeStart; + + @Column(name = "SYNC_TIME_END") + @ApiParam("同步数据截止时间") + private String syncTimeEnd; + + @Column(name = "SYNC_STATUS") + @ApiParam("同步状态") + private Integer syncStatus; + + @Column(name = "ERROR_CONTENT") + @ApiParam("异常内容") + private Long errorContent; + + public int getSyncStatusVal() { + return this.syncStatus == null ? 0 : this.syncStatus; + } +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlPcnTaskRepository.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlPcnTaskRepository.java new file mode 100644 index 0000000..7db5d90 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlPcnTaskRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.ptl.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.ptl.bean.PtlPcnTask; +import org.springframework.stereotype.Repository; + +/** + * @Description :ptl-pcn定时任务清单 + * @Reference : + * @Author : adair.song + * @CreateDate : 2020-03-03 + * @Modify: + **/ +@Repository +public interface PtlPcnTaskRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java index 5efbb4d..9e9cfcc 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java @@ -124,6 +124,22 @@ public class PtlHqlPack { return packBean; } + /** + * PTL PCN系统配置信息条件查询 + * + * @param ptlConfig + * @return + */ + public static DdlPackBean getPtlSyncConfig(PtlConfig ptlConfig, String organizeCode) { + DdlPackBean packBean = getAllBaseData(organizeCode); + DdlPreparedPack.getStringLikerPack(ptlConfig.getCfgCode(), "cfgCode", packBean); + DdlPreparedPack.getStringLikerPack(ptlConfig.getCfgName(), "cfgName", packBean); + DdlPreparedPack.getStringEqualPack(ptlConfig.getCfgKey(), "cfgKey", packBean); + DdlPreparedPack.getStringEqualPack(ptlConfig.getCfgType(), "cfgType", packBean); + DdlPreparedPack.getNumEqualPack(ptlConfig.getIsValid(), "isValid", packBean); + return packBean; + } + /** * PTL-PCN节点查询条件封装 @@ -183,4 +199,22 @@ public class PtlHqlPack { return packBean; } + + /** + * ptl-pcn定时任务清单 + * + * @param ptlPcnTask + * @param organizeCode + * @return + */ + public static DdlPackBean getPtlPcnTask(PtlPcnTask ptlPcnTask, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(ptlPcnTask, organizeCode); + if (!StringUtils.isEmpty(ptlPcnTask.getTaskCode())) { + DdlPreparedPack.getStringLikerPack(ptlPcnTask.getTaskCode(), "taskCode", packBean); + } + if (!StringUtils.isEmpty(ptlPcnTask.getTaskName())) { + DdlPreparedPack.getStringLikerPack(ptlPcnTask.getTaskName(), "taskName", packBean); + } + return packBean; + } } From 83464294bb991c7f8b6297d474389a67fd051fe6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Wed, 4 Mar 2020 09:19:13 +0800 Subject: [PATCH 10/91] =?UTF-8?q?=E3=80=90PTL=5F=E6=9E=9A=E4=B8=BE?= =?UTF-8?q?=E5=BC=95=E7=94=A8=E4=BF=AE=E6=94=B9=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java index 9e9cfcc..6e5fc7e 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.ptl.sqlpack; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.PtlPcnEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.ptl.bean.*; @@ -83,9 +84,9 @@ public class PtlHqlPack { public static DdlPackBean packHqlPtlPrintingQueueByPrintNo(PtlPrintingQueue ptlPrintingQueue) { DdlPackBean result = new DdlPackBean(); - DdlPreparedPack.getNumEqualPack(WmsEnumUtil.ETC_PRINT_STATUS.NOT_HIT.getValue(), "printStatus", result); + DdlPreparedPack.getNumEqualPack(PtlPcnEnumUtil.ETC_PRINT_STATUS.NOT_HIT.getValue(), "printStatus", result); DdlPreparedPack.getStringLikerPack(ptlPrintingQueue.getPrintNo(), "printNo", result); - DdlPreparedPack.getNumEqualPack(WmsEnumUtil.PRINT_TYPE.SN.getValue(), "printType", result); + DdlPreparedPack.getNumEqualPack(PtlPcnEnumUtil.PRINT_TYPE.PART_NO.getValue(), "printType", result); getStringBuilderPack(ptlPrintingQueue, result); From cc98e84ba43b4ab42b0a2e2453fdb00117ddeb49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Wed, 4 Mar 2020 10:14:47 +0800 Subject: [PATCH 11/91] =?UTF-8?q?=E5=8A=A8=E6=80=81=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=EF=BC=9A=E5=A2=9E=E5=8A=A0=E5=BC=80=E7=AA=97=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/annotation/DynamicField.java | 6 +++- .../i3plus/pojo/model/wms/WmsListSearchModel.java | 34 ++++++++++++++++++++++ .../cn/estsh/i3plus/pojo/ptl/bean/PtlControl.java | 11 +++++-- .../cn/estsh/i3plus/pojo/ptl/bean/PtlPart.java | 2 +- .../java/cn/estsh/i3plus/pojo/ptl/bean/PtlTag.java | 14 ++++----- .../cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java | 4 +-- .../cn/estsh/i3plus/pojo/wms/bean/WmsPart.java | 14 ++++----- .../cn/estsh/i3plus/pojo/wms/bean/WmsZones.java | 16 +++++----- .../pojo/wms/bean/dynamictable/WmsFieldInfo.java | 8 +++++ 9 files changed, 80 insertions(+), 29 deletions(-) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsListSearchModel.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/DynamicField.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/DynamicField.java index 2d18d24..3df382d 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/DynamicField.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/DynamicField.java @@ -34,5 +34,9 @@ public @interface DynamicField { // 是否跳过本字段扫描 0-不跳过，1-跳过 int isSkip() default 0; // 下拉枚举名称 - String enumName() default ""; + String entityName() default ""; + // 下拉列表显示列名称,多个列名需要根据逗号分隔 + String listColumnName() default ""; + // 下拉搜索列名称,多个列名需要根据逗号分隔 + String searchColumnName() default ""; } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsListSearchModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsListSearchModel.java new file mode 100644 index 0000000..43e219f --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsListSearchModel.java @@ -0,0 +1,34 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import cn.estsh.i3plus.pojo.base.common.Pager; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : WMS列表搜索model + * @Reference : + * @Author : silliter + * @CreateDate : 2020-01-07 14:33 + * @Modify: + **/ +@Data +public class WmsListSearchModel { + + @ApiParam(value = "开窗列表查询key") + private String searchKey; + + @ApiParam(value = "开窗列表查询value") + private String searchValue; + + @ApiParam(value = "排序参数") + private String orderByParams; + + @ApiParam(value = "分页组件") + private Pager pager; + + @ApiParam(value = "实体类名") + private String objClassName; + + @ApiParam(value = "有效性") + public Integer isValid; +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlControl.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlControl.java index 7dfbfcc..c1ca40c 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlControl.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlControl.java @@ -3,7 +3,6 @@ package cn.estsh.i3plus.pojo.ptl.bean; import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.base.enumutil.PtlEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -15,6 +14,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Version; import java.io.Serializable; /** @@ -45,7 +45,7 @@ public class PtlControl extends BaseBean implements Serializable { @Column(name = "CONTROL_TYPE") @ApiParam("控制器类型") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, enumName = "PTL_CONTROL_TYPE") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PTL_CONTROL_TYPE") private Integer controlType; @Column(name = "IP") @@ -65,7 +65,7 @@ public class PtlControl extends BaseBean implements Serializable { @Column(name = "STATUS") @ApiParam("控制器状态") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, enumName = "PTL_CONTROL_STATUS") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PTL_CONTROL_STATUS") private Integer status; @Column(name = "FREQUENCY") @@ -73,4 +73,9 @@ public class PtlControl extends BaseBean implements Serializable { @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) private Integer frequency; + @Version + @Column(name = "LOCK_VERSION") + @ApiParam(value = "乐观锁", example = "1") + public transient Integer lockVersion; + } diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPart.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPart.java index 3cd1329..8d2a609 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPart.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPart.java @@ -43,7 +43,7 @@ public class PtlPart extends BaseBean implements Serializable { @Column(name = "PART_TYPE") @ApiParam("物料类型") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, enumName = "PTL_PART_TYPE") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PTL_PART_TYPE") private String partType; @Column(name = "UNIT") diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTag.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTag.java index bb576ab..5ead0fb 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTag.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTag.java @@ -64,37 +64,37 @@ public class PtlTag extends BaseBean implements Serializable { @Column(name = "TAG_TYPE") @ApiParam("标签类型") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, enumName = "PTL_TAG_TYPE") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PTL_TAG_TYPE") private Integer tagType; @Column(name = "LIGHT_STATUS") @ApiParam("亮灯状态") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, enumName = "PTL_LIGHT_STATUS") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PTL_LIGHT_STATUS") private Integer lightStatus; @Column(name = "TAG_STATUS") @ApiParam("标签状态") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, enumName = "PTL_TAG_STATUS") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PTL_TAG_STATUS") private Integer tagStatus; @Column(name = "LIGHT_MODE") @ApiParam("亮灯方式") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, enumName = "PTL_LIGHT_MODE") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PTL_LIGHT_MODE") private Integer lightMode; @Column(name = "LIGHT_COLOR") @ApiParam("亮灯颜色") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, enumName = "PTL_LIGHT_COLOR") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PTL_LIGHT_COLOR") private Integer lightColor; @Column(name = "IS_BUZZING") @ApiParam("是否蜂鸣") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, enumName = "PTL_IS_BUZZING") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PTL_IS_BUZZING") private Integer isBuzzing; @Column(name = "MUSIC_TYPE") @ApiParam("音乐类型") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, enumName = "PTL_MUSIC_TYPE") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PTL_MUSIC_TYPE") private Integer musicType; @Column(name = "DISPLAY_CONTEXT") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java index 4eeefd9..338d1d6 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java @@ -47,7 +47,7 @@ public class WmsLocate extends BaseBean { */ @Column(name = "LOCATE_TYPE") @ApiParam(value = "库位类型") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, enumName = "LOCATE_TYPE") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, entityName = "LOCATE_TYPE") private Integer locateType; @Column(name = "WH_NO") @@ -102,7 +102,7 @@ public class WmsLocate extends BaseBean { @Column(name = "STATUS") @ApiParam(value = "库位状态", example = "-1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, enumName = "LOCATE_STATUS") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, entityName = "LOCATE_STATUS") private Integer status; @Column(name = "MAX_PACKAGE_QTY") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java index c0a9d25..42c9bf0 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java @@ -50,7 +50,7 @@ public class WmsPart extends BaseBean { @Column(name = "PART_TYPE") @ApiParam(value = "物料类型") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, enumName = "WMS_PART_TYPE") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "WMS_PART_TYPE") @AnnoOutputColumn(refClass = WmsEnumUtil.WMS_PART_TYPE_STR.class, refForeignKey = "value", value = "description") private String partType; @@ -112,7 +112,7 @@ public class WmsPart extends BaseBean { @ColumnDefault("2") @Column(name = "IQC") @ApiParam(value = "是否免检", example = "1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, enumName = "TRUE_OR_FALSE") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "TRUE_OR_FALSE") private Integer iqc; @Column(name = "MIN", columnDefinition = "decimal(18,8)") @@ -137,7 +137,7 @@ public class WmsPart extends BaseBean { @Column(name = "SN_CONTROL") @ApiParam(value = "是否条码管理", example = "1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, enumName = "TRUE_OR_FALSE") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "TRUE_OR_FALSE") private Integer snControl; @Column(name = "VENDOR_NO") @@ -182,7 +182,7 @@ public class WmsPart extends BaseBean { @Column(name = "IS_REPORT_PARTNO") @ApiParam("是否报工零件") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, enumName = "TRUE_OR_FALSE") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "TRUE_OR_FALSE") private Integer isReportPartNo; @Column(name = "REPORT_LOCATE_NO") @@ -207,7 +207,7 @@ public class WmsPart extends BaseBean { @Column(name = "IS_VALUABLE", columnDefinition = "int default 2") @ApiParam(value = "是否贵重") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, enumName = "IS_VALUABLE") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "IS_VALUABLE") @AnnoOutputColumn(refClass = WmsEnumUtil.IS_VALUABLE.class, refForeignKey = "value", value = "description") private Integer isValuable; @@ -228,12 +228,12 @@ public class WmsPart extends BaseBean { private Double verbNum; @Column(name = "IS_PROD_LOT") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, enumName = "TRUE_OR_FALSE") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "TRUE_OR_FALSE") @ApiParam(value = "是否录入生产批次", example = "1") private Integer isProdLot = 2; @Column(name = "PULL_WAY") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, enumName = "PULL_WAY_STATUS") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "PULL_WAY_STATUS") @ApiParam(value = "拉动方式", example = "0") private Integer pullWay = 0; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java index f991b51..4c9e00d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java @@ -60,32 +60,32 @@ public class WmsZones extends BaseBean { @Column(name = "IS_SON_NODE") @ApiParam(value = "是否子节点") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, enumName = "TRUE_OR_FALSE") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, entityName = "TRUE_OR_FALSE") private Integer isSonNode; @Column(name = "IS_PM") @ApiParam(value = "零件级管控", example = "2") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, enumName = "TRUE_OR_FALSE") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, entityName = "TRUE_OR_FALSE") private Integer isPm; @Column(name = "IS_LM") @ApiParam(value = "批次级管控", example = "2") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, enumName = "TRUE_OR_FALSE") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, entityName = "TRUE_OR_FALSE") private Integer isLm; @Column(name = "IS_SN") @ApiParam(value = "条码级管控", example = "1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, enumName = "TRUE_OR_FALSE") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, entityName = "TRUE_OR_FALSE") private Integer isSn; @Column(name = "IS_MIX") @ApiParam(value = "允许混淆", example = "1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, enumName = "TRUE_OR_FALSE") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, entityName = "TRUE_OR_FALSE") private Integer isMix; @Column(name = "IS_SC") @ApiParam(value = "库容检查", example = "1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, enumName = "TRUE_OR_FALSE") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, entityName = "TRUE_OR_FALSE") private Integer isSc; @Column(name = "STRATEGY") @@ -95,12 +95,12 @@ public class WmsZones extends BaseBean { @Column(name = "IS_NEGATIVE") @ApiParam(value = "允许负库存", example = "1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, enumName = "TRUE_OR_FALSE") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, entityName = "TRUE_OR_FALSE") private Integer isNegative; @Column(name = "CHECK_FIFO") @ApiParam(value = "校验先进先出", example = "1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, enumName = "TRUE_OR_FALSE") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, entityName = "TRUE_OR_FALSE") private Integer checkFifo; @Column(name = "ZONE_LENGTH", columnDefinition = "decimal(18,8)") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsFieldInfo.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsFieldInfo.java index 924d245..b46e544 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsFieldInfo.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsFieldInfo.java @@ -92,4 +92,12 @@ public class WmsFieldInfo extends BaseBean { @Column(name = "CONDITION_CONNECTOR") @ApiParam(value = "条件连接符:and/or") private String conditionConnector; + + @Column(name = "LIST_COLUMNNAME") + @ApiParam(value = "开窗列表显示列名称") + private String listColumnName; + + @Column(name = "SEARCH_COLUMNNAME") + @ApiParam(value = "开窗搜索列名称") + private String searchColumnName; } From df03827264812f81b642026b6e10a2d19d19885a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Wed, 4 Mar 2020 10:22:42 +0800 Subject: [PATCH 12/91] =?UTF-8?q?=E5=8A=A8=E6=80=81=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=EF=BC=9A=E6=B3=A8=E8=A7=A3enumName=E5=B1=9E=E6=80=A7=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E6=94=B9=E4=B8=BAentityName?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/WmsCsStrategy.java | 90 +++++++++++----------- .../i3plus/pojo/wms/bean/WmsSnOperateRecord.java | 2 +- 2 files changed, 46 insertions(+), 46 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCsStrategy.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCsStrategy.java index 57df4a3..7223d70 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCsStrategy.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCsStrategy.java @@ -31,63 +31,63 @@ import java.io.Serializable; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Api(value = "盘点策略表", description = "盘点策略表") -public class WmsCsStrategy extends BaseBean implements Serializable { +public class WmsCsStrategy extends BaseBean implements Serializable { - private static final long serialVersionUID = -1692487594678973549L; + private static final long serialVersionUID = -1692487594678973549L; - @Column(name = "STRATEGY_NAME") - @ApiParam(value = "策略名称") - private String strategyName; + @Column(name = "STRATEGY_NAME") + @ApiParam(value = "策略名称") + private String strategyName; - @Column(name = "part_type") - @ApiParam(value = "物料分类") - @AnnoOutputColumn(refClass = WmsEnumUtil.PART_ABC.class, refForeignKey = "value", value = "description") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, enumName = "PART_ABC") - private String partType; + @Column(name = "part_type") + @ApiParam(value = "物料分类") + @AnnoOutputColumn(refClass = WmsEnumUtil.PART_ABC.class, refForeignKey = "value", value = "description") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PART_ABC") + private String partType; - @Column(name = "STRATEGY_TYPE") - @ApiParam(value = "策略分类", example = "0") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, enumName = "CS_STRATEGY_TYPE") - @AnnoOutputColumn(refClass = WmsEnumUtil.CS_STRATEGY_TYPE.class, refForeignKey = "value", value = "description") - private Integer strategyType; + @Column(name = "STRATEGY_TYPE") + @ApiParam(value = "策略分类", example = "0") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "CS_STRATEGY_TYPE") + @AnnoOutputColumn(refClass = WmsEnumUtil.CS_STRATEGY_TYPE.class) + private Integer strategyType; - @Column(name = "CYCLE_RULE") - @ApiParam(value = "循环规则") - private String cycleRule; + @Column(name = "CYCLE_RULE") + @ApiParam(value = "循环规则") + private String cycleRule; - @Column(name = "START_DATE") - @ApiParam(value = "开始日期", example = "0") - private String startDate; + @Column(name = "START_DATE") + @ApiParam(value = "开始日期", example = "0") + private String startDate; - @Column(name = "END_DATE") - @ApiParam(value = "结束日期", example = "0") - private String endDate; + @Column(name = "END_DATE") + @ApiParam(value = "结束日期", example = "0") + private String endDate; - @Column(name = "NUM_MAX") - @ApiParam(value = "明细数量上限") - private Integer numMax; + @Column(name = "NUM_MAX") + @ApiParam(value = "明细数量上限") + private Integer numMax; - @Column(name = "COVERAGE_RATE") - @ApiParam(value = "抽盘覆盖率") - private Double coverageRate; + @Column(name = "COVERAGE_RATE") + @ApiParam(value = "抽盘覆盖率") + private Double coverageRate; - @Column(name = "ZONE_NOS") - @ApiParam(value = "存储区") - private String zoneNos; + @Column(name = "ZONE_NOS") + @ApiParam(value = "存储区") + private String zoneNos; - @Column(name = "LOCATES") - @ApiParam(value = "盘点库位") - private String locates; + @Column(name = "LOCATES") + @ApiParam(value = "盘点库位") + private String locates; - @Column(name = "last_run_time") - @ApiParam(value = "上次运行时间") - private String lastRunTime; + @Column(name = "last_run_time") + @ApiParam(value = "上次运行时间") + private String lastRunTime; - @Column(name = "next_run_time") - @ApiParam(value = "下次运行时间") - private String nextRunTime; + @Column(name = "next_run_time") + @ApiParam(value = "下次运行时间") + private String nextRunTime; - @Column(name = "REMAKE") - @ApiParam(value = "备注") - private String remake; + @Column(name = "REMAKE") + @ApiParam(value = "备注") + private String remake; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java index 4f60667..8827222 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java @@ -74,7 +74,7 @@ public class WmsSnOperateRecord extends BaseBean { @Column(name = "OPERATE_TYPE") @ApiParam(value = "操作类型") @AnnoOutputColumn(refClass = WmsEnumUtil.SN_OPERATE_TYPE.class, refForeignKey = "value", value = "description") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, enumName = "SN_OPERATE_TYPE") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "SN_OPERATE_TYPE") private Integer operateType; @Column(name = "ref_sn") From 0471038b9bbb6945fccc602e03bac587e77961e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Wed, 4 Mar 2020 10:26:23 +0800 Subject: [PATCH 13/91] =?UTF-8?q?sqlserver=E6=95=B0=E6=8D=AE=E5=BA=93?= =?UTF-8?q?=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java index 936d73e..103be31 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java @@ -1,23 +1,21 @@ package cn.estsh.i3plus.pojo.base.jpa.daoimpl; import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; +import cn.estsh.i3plus.pojo.base.codemaker.SnowflakeIdMaker; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; -import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.base.codemaker.SnowflakeIdMaker; -import cn.estsh.i3plus.pojo.base.util.BeanMapUtils; -import cn.estsh.i3plus.pojo.base.util.StringCastUtils; import cn.estsh.i3plus.pojo.base.util.StringUtil; import org.apache.commons.lang3.StringUtils; import org.hibernate.NonUniqueResultException; -import org.hibernate.SQLQuery; -import org.hibernate.transform.Transformers; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.data.jpa.repository.support.SimpleJpaRepository; -import javax.persistence.*; +import javax.persistence.EntityManager; +import javax.persistence.Id; +import javax.persistence.NoResultException; +import javax.persistence.Query; import java.io.Serializable; import java.lang.reflect.Field; import java.lang.reflect.Modifier; @@ -860,7 +858,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep public int findByHqlWhereCount(DdlPackBean packBean) { StringBuffer queryString = new StringBuffer(); queryString.append("select count(distinct model) from " + persistentClass.getSimpleName() - + " as model where 1=1 " + packBean.getPackedHql()); + + " as model where 1=1 " + packBean.getWhereAppend()); Query query = entityManager.createQuery(queryString.toString(), Long.class); for (String key : packBean.getHqlPreparedMap().keySet()) { From 5610a25ab79509dcdde537e2fe77f2a83f26d310 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Wed, 4 Mar 2020 13:15:15 +0800 Subject: [PATCH 14/91] =?UTF-8?q?ptl=E5=8F=8D=E9=A6=88=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java | 41 ++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java index 921cbf3..36bf1fe 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java @@ -286,6 +286,47 @@ public class PtlPcnEnumUtil { } /** + * 反馈信号子命令 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SIGNAL_CHILD_CMD { + CHILD_CMD_06H("06", 6, "正常"), + CHILD_CMD_07H("07", 7, "缺货"), + CHILD_CMD_09H("09", 9, "标签自检"), + CHILD_CMD_0AH("0A", 10, "亮灯错误"), + CHILD_CMD_0BH("0B", 11, "查询设备故障，返回设备故障"), + CHILD_CMD_0CH("0C", 12, "设备无法执行命令,用错命令"), + CHILD_CMD_0DH("0D", 13, "卡键,按键卡住"), + CHILD_CMD_0FH("0F", 15, "返回库存模式下的缺货量"), + CHILD_CMD_64H("64", 100, "熄灭情况下返回"), + CHILD_CMD_FAH("FA", 250, "设备的 F/W 模型信息"), + CHILD_CMD_FCH("FC", 252, "标签产品信息"); + + private String code; + private Integer value; + private String description; + + SIGNAL_CHILD_CMD(String code, Integer value, String description) { + this.code = code; + this.value = value; + this.description = description; + } + + public String getCode() { + return code; + } + + public Integer getValue() { + return value; + } + + public String getDescription() { + return description; + } + + } + + /** * 标签显示器亮灯颜色枚举 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) From 37d032ca24f74cff368c54931b7a97044de94712 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Wed, 4 Mar 2020 13:42:47 +0800 Subject: [PATCH 15/91] =?UTF-8?q?ptl=E5=8F=8D=E9=A6=88=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java index 36bf1fe..ea9fc99 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java @@ -286,7 +286,7 @@ public class PtlPcnEnumUtil { } /** - * 反馈信号子命令 + * 反馈信号子命令(灭灯状态) */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum SIGNAL_CHILD_CMD { @@ -312,6 +312,16 @@ public class PtlPcnEnumUtil { this.description = description; } + public static SIGNAL_CHILD_CMD getByValue(String code) { + for (SIGNAL_CHILD_CMD signalChildCmd : values()) { + if (signalChildCmd.getCode() == code) { + return signalChildCmd; + } + } + return null; + } + + public String getCode() { return code; } From abb737f265fe55b2adb582a004884409365694f3 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Wed, 4 Mar 2020 14:54:28 +0800 Subject: [PATCH 16/91] ptl --- .../cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java index ea9fc99..81ea67a 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java @@ -321,6 +321,16 @@ public class PtlPcnEnumUtil { return null; } + public static Integer codeOfValue(String code) { + Integer tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].value; + } + } + return tmp; + } + public String getCode() { return code; From 4918707fc8cd4b879536b5cd14c3ac309d8dee23 Mon Sep 17 00:00:00 2001 From: luweihao Date: Wed, 4 Mar 2020 15:23:31 +0800 Subject: [PATCH 17/91] =?UTF-8?q?bug=20`7626`=20=E5=BC=80=E7=BA=BF?= =?UTF-8?q?=E7=AE=A1=E6=8E=A7-=E6=95=B0=E6=8D=AE=E5=AD=98=E5=85=A5?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java | 2 +- .../estsh/i3plus/pojo/mes/model/CellFeedModel.java | 25 ++++++++++++++++++++++ .../i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java | 9 ++++++++ 3 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/CellFeedModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java index a775b40..41042ca 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java @@ -55,7 +55,7 @@ public class MesCellFeed extends BaseBean implements Serializable { private String rawSn; @Column(name = "RAW_QTY") - @ApiParam("特殊批次") + @ApiParam("原材料数量") private Double rawQty; @Column(name = "LOT_NO") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/CellFeedModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/CellFeedModel.java new file mode 100644 index 0000000..809f29c --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/CellFeedModel.java @@ -0,0 +1,25 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import lombok.Data; + +/** + * @author Wynne.Lu + * @date 2020/3/3 13:14 + * @desc + */ +@Data +public class CellFeedModel { + + private String workCenterCode; + + private String workCellCode; + + private String color; + + private String partNo; + + private String itemPartNo; + + private String qty; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java index 3ab2c36..a0d8eaa 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java @@ -124,6 +124,15 @@ public class MesPcnHqlPack { return packBean; } + public static DdlPackBean getStationBom(String org,String workCenter,String workCell,String partNo) { + DdlPackBean packBean = getAllBaseData(org); + DdlPreparedPack.getStringEqualPack(workCenter, "workCenterCode", packBean); + DdlPreparedPack.getStringEqualPack(workCell, "workCellCode", packBean); + DdlPreparedPack.getStringEqualPack(partNo, "partNo", packBean); + DdlPreparedPack.getNumEqualPack(MesPcnEnumUtil.PROCESS_BOM_ISFEED.FEED.getValue(), "isFeed", packBean); + return packBean; + } + /** * 生产工单查询条件封装 * From fe72dc26d94f2602bd2c31ee4be9ac9055136355 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Wed, 4 Mar 2020 08:53:23 +0100 Subject: [PATCH 18/91] =?UTF-8?q?=E3=80=90=09bug=207581=201.=E5=9C=A8?= =?UTF-8?q?=E5=90=8C=E6=89=B9=E6=AC=A1=E6=9D=A1=E7=A0=81=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E4=B8=AD=E5=A2=9E=E5=8A=A0=E4=B8=80=E4=B8=AA=E5=BA=93=E4=BD=8D?= =?UTF-8?q?=E3=80=822.=E5=90=8C=E6=89=B9=E6=AC=A1=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E5=81=9A=E5=85=A8=E5=B1=80=E5=8F=98=E9=87=8F=E5=B1=9E=E6=80=A7?= =?UTF-8?q?'=E5=8D=95=E5=BA=93=E4=BD=8D'=EF=BC=8C'=E5=8D=95=E4=BA=BA'?= =?UTF-8?q?=EF=BC=8C=E5=A6=82=E6=9E=9C=E4=B8=BA'=E5=8D=95=E5=BA=93?= =?UTF-8?q?=E4=BD=8D'=E4=BF=9D=E6=8C=81=E7=8E=B0=E5=9C=A8=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E4=B8=8D=E5=8F=98=EF=BC=8C=E5=A6=82=E6=9E=9C=E4=B8=BA?= =?UTF-8?q?'=E5=8D=95=E4=BA=BA'=E5=88=99=E6=98=BE=E7=A4=BA=E5=BD=93?= =?UTF-8?q?=E5=89=8D=E7=94=A8=E6=88=B7=E8=B4=A3=E4=BB=BB=E5=8C=BA=E4=B8=8B?= =?UTF-8?q?=E6=89=80=E6=9C=89=E5=90=8C=E6=89=B9=E6=AC=A1=E6=9D=A1=E7=A0=81?= =?UTF-8?q?(=E4=B8=8D=E9=99=90=E5=88=B6=E5=BA=93=E4=BD=8D)=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 35 ++++++++++++++++++++++ 1 file changed, 35 insertions(+) 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 e0a78cc..e7b8cd0 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 @@ -5030,4 +5030,39 @@ public class WmsEnumUtil { return valueOf(val); } } + + /** + * 同批次条码-查询范围 + * 默认为 10 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum QUERY_RANGE_TYPE { + LOCATE(10, "库位"), AREA_OWNER(20, "责任区域"); + + private int value; + private String description; + + QUERY_RANGE_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; + } + } } \ No newline at end of file From 7c77c90a3c3cbad19cba8a2ba3174dec86385a49 Mon Sep 17 00:00:00 2001 From: luweihao Date: Wed, 4 Mar 2020 16:59:06 +0800 Subject: [PATCH 19/91] =?UTF-8?q?task=20=20=E4=BD=9C=E4=B8=9A=E6=B5=81?= =?UTF-8?q?=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteCfg.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteCfg.java index 0285bb7..5fb24e8 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteCfg.java @@ -45,4 +45,8 @@ public class MesProdRouteCfg extends BaseBean implements Serializable { @Column(name = "ROUTE_TYPE") @ApiParam("流程类型 10-扫描类型 20-监控类型") private Integer routeType; + + @Column(name = "PPT_CODE") + @ApiParam("产品生产类型") + private String pptCode; } From 1428b5f0aaa5da58c980a2813da3ad21f3c14f0e Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Wed, 4 Mar 2020 17:30:21 +0800 Subject: [PATCH 20/91] ptl --- .../java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java index 81ea67a..e8890bf 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java @@ -314,7 +314,7 @@ public class PtlPcnEnumUtil { public static SIGNAL_CHILD_CMD getByValue(String code) { for (SIGNAL_CHILD_CMD signalChildCmd : values()) { - if (signalChildCmd.getCode() == code) { + if (signalChildCmd.getCode().equals(code)) { return signalChildCmd; } } @@ -370,7 +370,7 @@ public class PtlPcnEnumUtil { public static TAG_LIGHT_COLOR_CMD getByValue(String code) { for (TAG_LIGHT_COLOR_CMD tagLightColorCmd : values()) { - if (tagLightColorCmd.getCode() == code) { + if (tagLightColorCmd.getCode().equals(code)) { return tagLightColorCmd; } } @@ -457,7 +457,7 @@ public class PtlPcnEnumUtil { public static FINISH_TAG_LIGHT_MUSIC_CMD getByValue(String code) { for (FINISH_TAG_LIGHT_MUSIC_CMD finishTagLightMusicCmd : values()) { - if (finishTagLightMusicCmd.getCode() == code) { + if (finishTagLightMusicCmd.getCode().equals(code)) { return finishTagLightMusicCmd; } } @@ -520,7 +520,7 @@ public class PtlPcnEnumUtil { public static FINISH_TAG_LIGHT_VOLUME_CMD getByValue(String code) { for (FINISH_TAG_LIGHT_VOLUME_CMD finishTagLightVolumeCmd : values()) { - if (finishTagLightVolumeCmd.getCode() == code) { + if (finishTagLightVolumeCmd.getCode().equals(code)) { return finishTagLightVolumeCmd; } } From cb1e8d5310d9f548f6af82a9b5e9461326249380 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Wed, 4 Mar 2020 17:53:00 +0800 Subject: [PATCH 21/91] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=A3=80=E6=9F=A5?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E4=BC=98=E5=8C=96=20lac=E9=80=82=E9=85=8D?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E5=A4=84=E7=90=86=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java | 2 ++ 1 file changed, 2 insertions(+) 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 index fdf9175..1a691aa 100644 --- 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 @@ -186,6 +186,8 @@ public class LacHqlPack { public static DdlPackBean packHqlCheckLacTaskCheckMasterOnly(LacTaskCheck lacTaskCheck){ DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(lacTaskCheck); DdlPreparedPack.getStringEqualPack(lacTaskCheck.getTaskCheckGroup(),"taskCheckGroup",ddlPackBean); + DdlPreparedPack.getNumEqualPack(lacTaskCheck.getStepId(),"stepId",ddlPackBean); + DdlPreparedPack.getNumNOEqualPack(lacTaskCheck.getId(),"id",ddlPackBean); return ddlPackBean; } } From 21c9af2007e97c5cd1d26c8454e322d86fe1440f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Thu, 5 Mar 2020 10:37:56 +0800 Subject: [PATCH 22/91] =?UTF-8?q?=E3=80=90PTL=5F=E5=8C=BA=E6=AE=B5?= =?UTF-8?q?=E4=BA=AE=E7=81=AF=E4=BB=BB=E5=8A=A1=E6=96=B0=E5=A2=9E=E5=AE=9E?= =?UTF-8?q?=E4=BD=93=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaSectionTask.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaSectionTask.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaSectionTask.java index 8c44e69..343c84d 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaSectionTask.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaSectionTask.java @@ -84,4 +84,8 @@ public class PtlAreaSectionTask extends BaseBean implements Serializable { @Column(name = "STATUS") @ApiParam("区段任务状态") private Integer status; + + @Column(name = "SEQ") + @ApiParam("区段任务顺序号") + private Integer seq; } From e15c2b6065905afbce8a1d324db821f62206afcc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Thu, 5 Mar 2020 10:41:51 +0800 Subject: [PATCH 23/91] =?UTF-8?q?=E6=B7=BB=E5=8A=A0PTL=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java | 72 ++++++++++++++++++++++ .../pojo/ptl/bean/{PtlNode.java => PtlPcn.java} | 4 +- .../i3plus/pojo/ptl/bean/PtlPcnConnectLog.java | 56 +++++++++++++++++ .../pojo/ptl/repository/PtlNodeRepository.java | 4 +- .../ptl/repository/PtlPcnConnectLogRepository.java | 16 +++++ .../pojo/ptl/repository/PtlPcnRepository.java | 16 +++++ .../ptl/repository/PtlPcnTaskLogRepository.java | 16 +++++ .../estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java | 2 +- 8 files changed, 181 insertions(+), 5 deletions(-) rename modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/{PtlNode.java => PtlPcn.java} (95%) create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnConnectLog.java create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlPcnConnectLogRepository.java create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlPcnRepository.java create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlPcnTaskLogRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java index e8890bf..e1fad02 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java @@ -1388,4 +1388,76 @@ public class PtlPcnEnumUtil { return tmp; } } + + /** + * ptl-pcn定时任务状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PTL_PCN_TASK_STATUS { + + OPEN(1, "开启"), + CLOSE(2, "关闭"); + + private int value; + private String description; + + PTL_PCN_TASK_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-pcn定时任务同步结果状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PTL_PCN_TASK_SYNC_STATUS { + + SUCCESS(1, "ptl主服务定时任务工作清单同步成功"), + ERROR(2, "ptl主服务定时任务工作清单同步失败"); + + private int value; + private String description; + + PTL_PCN_TASK_SYNC_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; + } + } } diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlNode.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcn.java similarity index 95% rename from modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlNode.java rename to modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcn.java index 1c842e1..b9e661b 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlNode.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcn.java @@ -25,9 +25,9 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "PTL_PCN_NODE") +@Table(name = "PTL_PCN") @Api("PCN节点") -public class PtlNode extends BaseBean implements Serializable { +public class PtlPcn extends BaseBean implements Serializable { private static final long serialVersionUID = -9140094723555406392L; @Column(name = "PCN_CODE") @ApiParam("PCN代码") diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnConnectLog.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnConnectLog.java new file mode 100644 index 0000000..05d5c88 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnConnectLog.java @@ -0,0 +1,56 @@ +package cn.estsh.i3plus.pojo.ptl.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 java.io.Serializable; + +/** + * @Description: + * @Reference: + * @Author: yiming.gu + * @CreateDate:2019-04-22-17:20 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "PTL_PCN_CONNECT_LOG") +@Api("PCN节点连接日志") +public class PtlPcnConnectLog extends BaseBean implements Serializable { + private static final long serialVersionUID = 2756240593256441951L; + + @Column(name = "PCN_CODE") + @ApiParam("PCN代码") + private String pcnCode; + + @Column(name = "PCN_NAME") + @ApiParam("PCN名称") + private String pcnName; + + @Column(name = "PCN_VERSION") + @ApiParam("PCN版本") + private String pcnVersion; + + @Column(name = "CONNECT_IP") + @ApiParam("连接IP") + private String connectIp; + + @Column(name = "IS_CONNECT") + @ApiParam("是否连接") + private Integer isConnect; + + @Column(name = "REMARK") + @ApiParam("备注") + private String Remark; +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlNodeRepository.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlNodeRepository.java index d4b869c..4e8713a 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlNodeRepository.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlNodeRepository.java @@ -1,7 +1,7 @@ package cn.estsh.i3plus.pojo.ptl.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.ptl.bean.PtlNode; +import cn.estsh.i3plus.pojo.ptl.bean.PtlPcn; import org.springframework.stereotype.Repository; /** @@ -12,5 +12,5 @@ import org.springframework.stereotype.Repository; * @Modify: **/ @Repository -public interface PtlNodeRepository extends BaseRepository { +public interface PtlNodeRepository extends BaseRepository { } diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlPcnConnectLogRepository.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlPcnConnectLogRepository.java new file mode 100644 index 0000000..fb45c82 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlPcnConnectLogRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.ptl.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.ptl.bean.PtlPcnConnectLog; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: yiming.gu + * @CreateDate:2019-04-24-17:13 + * @Modify: + **/ +@Repository +public interface PtlPcnConnectLogRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlPcnRepository.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlPcnRepository.java new file mode 100644 index 0000000..6ee2933 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlPcnRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.ptl.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.ptl.bean.PtlPcn; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: yiming.gu + * @CreateDate:2019-04-24-17:13 + * @Modify: + **/ +@Repository +public interface PtlPcnRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlPcnTaskLogRepository.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlPcnTaskLogRepository.java new file mode 100644 index 0000000..149a856 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlPcnTaskLogRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.ptl.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.ptl.bean.PtlPcnTaskLog; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-08-27 + * @Modify: + **/ +@Repository +public interface PtlPcnTaskLogRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java index 6e5fc7e..3a7830f 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java @@ -149,7 +149,7 @@ public class PtlHqlPack { * @param organizeCode * @return */ - public static DdlPackBean getPtlPcnByCondition(PtlNode ptlPcn, String organizeCode) { + public static DdlPackBean getPtlPcnByCondition(PtlPcn ptlPcn, String organizeCode) { DdlPackBean packBean = getAllBaseData(organizeCode); if (!StringUtils.isEmpty(ptlPcn.getConnectIp())) { DdlPreparedPack.getStringLikerPack(ptlPcn.getConnectIp(), "connectIp", packBean); From d87f5653a945c45296b7d4cb0b8ebdaeb82f0d3c Mon Sep 17 00:00:00 2001 From: qianhs Date: Thu, 5 Mar 2020 11:32:31 +0800 Subject: [PATCH 24/91] =?UTF-8?q?1,=E4=BB=BB=E5=8A=A1=E5=91=A2=E7=AE=A1?= =?UTF-8?q?=E7=90=86=202=EF=BC=8C=E7=94=9F=E6=88=90=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/ptl/bean/PtlArea.java | 15 ++++ .../i3plus/pojo/ptl/bean/PtlAreaSectionTask.java | 4 + .../pojo/ptl/bean/PtlAreaSectionTaskDetail.java | 2 +- .../cn/estsh/i3plus/pojo/ptl/bean/PtlAreaTask.java | 4 + .../cn/estsh/i3plus/pojo/ptl/bean/PtlSection.java | 8 ++ .../estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java | 87 ++++++++++++++++++++++ 6 files changed, 119 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlArea.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlArea.java index 0ed78f0..25d55ab 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlArea.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlArea.java @@ -14,7 +14,10 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; /** * @author Wynne.Lu @@ -42,4 +45,16 @@ public class PtlArea extends BaseBean implements Serializable { @ApiParam("区域名称") private String areaName; + @Transient + @ApiParam("区段集合") + private List ptlSectionList=new ArrayList<>(); + + @Transient + @ApiParam("区域名称") + private String name; + + + public String getName() { + return areaName; + } } diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaSectionTask.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaSectionTask.java index 343c84d..bbff28a 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaSectionTask.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaSectionTask.java @@ -88,4 +88,8 @@ public class PtlAreaSectionTask extends BaseBean implements Serializable { @Column(name = "SEQ") @ApiParam("区段任务顺序号") private Integer seq; + + @Column(name = "qty") + @ApiParam("数量") + private Integer qty; } diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaSectionTaskDetail.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaSectionTaskDetail.java index 38103b1..1d04433 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaSectionTaskDetail.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaSectionTaskDetail.java @@ -28,7 +28,7 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Api("区段亮灯任务明细") public class PtlAreaSectionTaskDetail extends BaseBean implements Serializable { - private static final long serialVersionUID = -7563481752643393714L; + private static final long serialVersionUID = -7563431552643393714L; @Column(name = "SECTION_TASK_NO") @ApiParam("区段任务编号") diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaTask.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaTask.java index c2949dd..64e3c64 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaTask.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaTask.java @@ -88,4 +88,8 @@ public class PtlAreaTask extends BaseBean implements Serializable { @Column(name = "STATUS") @ApiParam("任务状态") private Integer status; + + @Column(name = "qty") + @ApiParam("数量") + private Integer qty; } diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlSection.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlSection.java index 451d554..ef380a9 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlSection.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlSection.java @@ -14,6 +14,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; import java.io.Serializable; /** @@ -52,4 +53,11 @@ public class PtlSection extends BaseBean implements Serializable { @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String areaNo; + @Transient + @ApiParam("区域名称") + private String name; + + public String getName() { + return sectionName; + } } diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java index 3a7830f..39fec2c 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java @@ -218,4 +218,91 @@ public class PtlHqlPack { } return packBean; } + + /** + * 区域任务主表 + * + * @param ptlAreaTask 区域任务主表 + * @return + */ + public static DdlPackBean packPtlAreaTask(PtlAreaTask ptlAreaTask) { + DdlPackBean result = new DdlPackBean(); + //查询参数封装 + DdlPreparedPack.getStringEqualPack(ptlAreaTask.getTaskNo(), "taskNo", result); + DdlPreparedPack.getStringEqualPack(ptlAreaTask.getPartNo(), "partNo", result); + if (org.apache.commons.lang3.StringUtils.isNotBlank(ptlAreaTask.getCreateDateTimeStart()) + && org.apache.commons.lang3.StringUtils.isNotBlank(ptlAreaTask.getCreateDateTimeEnd())) { + DdlPreparedPack.timeBuilder(ptlAreaTask.getCreateDateTimeStart(), ptlAreaTask.getCreateDateTimeEnd() + , "createDatetime", result, true); + } + DdlPreparedPack.getNumEqualPack(ptlAreaTask.getStatus(), "status", result); + DdlPreparedPack.getStringEqualPack(ptlAreaTask.getTaskType(), "taskType", result); + DdlPreparedPack.getStringEqualPack(ptlAreaTask.getOrganizeCode(), "organizeCode", result); + DdlPreparedPack.getNumEqualPack(ptlAreaTask.getIsValid(), "isValid", result); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", result); + return result; + } + + /** + * 主任务表 + * + * @param ptlMainTask 主任务表 + * @return + */ + public static DdlPackBean packPtlMainTask(PtlMainTask ptlMainTask) { + DdlPackBean result = new DdlPackBean(); + //查询参数封装 + DdlPreparedPack.getStringEqualPack(ptlMainTask.getTaskNo(), "taskNo", result); + DdlPreparedPack.getStringEqualPack(ptlMainTask.getPartNo(), "partNo", result); + if (org.apache.commons.lang3.StringUtils.isNotBlank(ptlMainTask.getCreateDateTimeStart()) + && org.apache.commons.lang3.StringUtils.isNotBlank(ptlMainTask.getCreateDateTimeEnd())) { + DdlPreparedPack.timeBuilder(ptlMainTask.getCreateDateTimeStart(), ptlMainTask.getCreateDateTimeEnd() + , "createDatetime", result, true); + } + DdlPreparedPack.getNumEqualPack(ptlMainTask.getStatus(), "status", result); + DdlPreparedPack.getStringEqualPack(ptlMainTask.getTaskType(), "taskType", result); + DdlPreparedPack.getStringEqualPack(ptlMainTask.getOrganizeCode(), "organizeCode", result); + DdlPreparedPack.getNumEqualPack(ptlMainTask.getIsValid(), "isValid", result); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", result); + return result; + } + /** + * 区段 + * + * @param ptlAreaSectionTask 区段任务 + * @return + */ + public static DdlPackBean packPtlAreaSectionTask(PtlAreaSectionTask ptlAreaSectionTask) { + DdlPackBean result = new DdlPackBean(); + //查询参数封装 + DdlPreparedPack.getStringEqualPack(ptlAreaSectionTask.getAreaTaskNo(), "areaTaskNo", result); + DdlPreparedPack.getStringEqualPack(ptlAreaSectionTask.getPartNo(), "partNo", result); + if (org.apache.commons.lang3.StringUtils.isNotBlank(ptlAreaSectionTask.getCreateDateTimeStart()) + && org.apache.commons.lang3.StringUtils.isNotBlank(ptlAreaSectionTask.getCreateDateTimeEnd())) { + DdlPreparedPack.timeBuilder(ptlAreaSectionTask.getCreateDateTimeStart(), ptlAreaSectionTask.getCreateDateTimeEnd() + , "createDatetime", result, true); + } + DdlPreparedPack.getStringEqualPack(ptlAreaSectionTask.getAreaNo(), "areaNo", result); + DdlPreparedPack.getStringEqualPack(ptlAreaSectionTask.getSectionNo(), "sectionNo", result); + DdlPreparedPack.getStringEqualPack(ptlAreaSectionTask.getOrganizeCode(), "organizeCode", result); + DdlPreparedPack.getNumEqualPack(ptlAreaSectionTask.getIsValid(), "isValid", result); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", result); + return result; + } + + /** + * 区段任务明细 + * + * @param ptlAreaSectionTaskDetail 区段任务明细 + * @return + */ + public static DdlPackBean packPtlAreaSectionTaskDetail(PtlAreaSectionTaskDetail ptlAreaSectionTaskDetail) { + DdlPackBean result = new DdlPackBean(); + //查询参数封装 + DdlPreparedPack.getStringEqualPack(ptlAreaSectionTaskDetail.getSectionTaskNo(), "sectionTaskNo", result); + DdlPreparedPack.getStringEqualPack(ptlAreaSectionTaskDetail.getOrganizeCode(), "organizeCode", result); + DdlPreparedPack.getNumEqualPack(ptlAreaSectionTaskDetail.getIsValid(), "isValid", result); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", result); + return result; + } } From 1fc4ae1ff91c8e238cc6048984b43d35dac0f538 Mon Sep 17 00:00:00 2001 From: qianhs Date: Thu, 5 Mar 2020 13:11:38 +0800 Subject: [PATCH 25/91] =?UTF-8?q?1,=E5=9B=9E=E9=80=80=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java | 276 +++++++++++++++++++++ 1 file changed, 276 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java index e1fad02..a616aec 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java @@ -1460,4 +1460,280 @@ public class PtlPcnEnumUtil { return tmp; } } + + /** + * 单据主表类型(ASN,PO,MOVE,QC) + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MASTER_ORDER_TYPE { + CREATE(10, "NORMAL", "正常"); + + private int value; + private String code; + private String description; + + MASTER_ORDER_TYPE(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + 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); + } + } + /** + * 区域任务状态(ASN,PO,MOVE,QC) + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MASTER_ORDER_STATUS { + CREATE(10, "CREATE", "创建"), + RECEIPT(20, "IN_PROGRESS", "处理中"), + RECEIPT_FINISH(30, "COMPLETED", "已完成"), + CANCELLED(40, "CANCELLED", "已取消"); + + private int value; + private String code; + private String description; + + MASTER_ORDER_STATUS(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + 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); + } + } + /** + * 区域任务类型(ASN,PO,MOVE,QC) + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum AREA_SECTION_TASK_TYPE { + CREATE(10, "CREATE", "JIT任务"), + RECEIPT(20, "IN_PROGRESS", "单据任务"), + RECEIPT_FINISH(30, "COMPLETED", "单点任务"); + + private int value; + private String code; + private String description; + + AREA_SECTION_TASK_TYPE(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + 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); + } + } + /** + * 区域任务状态(ASN,PO,MOVE,QC) + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum AREA_TASK_STATUS { + CREATE(10, "CREATE", "创建"), + RECEIPT(20, "IN_PROGRESS", "处理中"), + RECEIPT_FINISH(30, "COMPLETED", "已完成"); + + private int value; + private String code; + private String description; + + AREA_TASK_STATUS(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + 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); + } + } + + /** + * 区域任务类型(ASN,PO,MOVE,QC) + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum AREA_TASK_TYPE { + CREATE(10, "JIT_TASK", "JIT任务"), + RECEIPT(20, "DOCUMENT_TASK", "单据任务"), + RECEIPT_FINISH(30, "SINGLE_POINT_TASK", "单点任务"); + + private int value; + private String code; + private String description; + + AREA_TASK_TYPE(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + 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); + } + } } From aa403e9691a41fef873af2083de65cff5223d06a Mon Sep 17 00:00:00 2001 From: joke Date: Thu, 5 Mar 2020 13:20:43 +0800 Subject: [PATCH 26/91] =?UTF-8?q?[ptl-pcn:39=20=E6=A0=A1=E9=AA=8C=E7=89=A9?= =?UTF-8?q?=E6=96=99=E5=8F=B7]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java | 3 ++- .../src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTag.java | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java index e8890bf..81035f4 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java @@ -736,7 +736,8 @@ public class PtlPcnEnumUtil { DISCONNECT_CONTROL_CMD(20, "DISCONNECT_CONTROL_CMD", "disconnectControlService", "断开控制器"), REFRESH_CONTROL_CMD(30, "REFRESH_CONTROL_CMD", "refreshControlService", "刷新"), SCAN_CONTROL_CMD(40, "SCAN_CONTROL_CMD", "scanControlService", "扫描"), - INIT_MODULE_CONTROL_CMD(50, "INIT_MODULE_CONTROL_CMD", "initModuleControlService", "初始化页面"); + INIT_MODULE_CONTROL_CMD(50, "INIT_MODULE_CONTROL_CMD", "initModuleControlService", "初始化页面"), + GET_CONTROL_DATA_CONTROL_CMD(50, "GET_CONTROL_DATA_CONTROL_CMD", "getControlDataControlService", "获取控制器数据"); // UNLOCK_CONTROL_CMD(50, "UNLOCK_CONTROL_CMD", "unlockControlService", "解锁"), // LABEL_SELF_CHECK_CONTROL_CMD(60, "labelSelfCheck", "labelSelfCheckControlService", "标签自检"), // LIGHT_DETAIL_CONTROL_CMD(70, "LABEL_SELF_CHECK_CONTROL_CMD", "lightDetailControlService", "亮灯明细"); diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTag.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTag.java index 5ead0fb..48d3a70 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTag.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTag.java @@ -107,4 +107,9 @@ public class PtlTag extends BaseBean implements Serializable { @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) private Integer errorCount; + @Column(name = "CUSTOM_ATTRIBUTE") + @ApiParam("自定义属性") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + private String customAttribute; + } From 0c85d7132bb8a086d24179a31d34434c760739ef Mon Sep 17 00:00:00 2001 From: qianhs Date: Thu, 5 Mar 2020 13:38:27 +0800 Subject: [PATCH 27/91] =?UTF-8?q?1,=E5=9B=9E=E9=80=80=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaSectionTask.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaSectionTask.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaSectionTask.java index bbff28a..eec1146 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaSectionTask.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaSectionTask.java @@ -11,7 +11,10 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; /** * @author Wynne.Lu @@ -92,4 +95,8 @@ public class PtlAreaSectionTask extends BaseBean implements Serializable { @Column(name = "qty") @ApiParam("数量") private Integer qty; + + @ApiParam("区域任务明细") + @Transient + private List ptlAreaSectionTaskDetailList=new ArrayList<>(); } From 1e0d88fb0eecd41a33fd05b4d828bec04f342978 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Thu, 5 Mar 2020 18:30:06 +0800 Subject: [PATCH 28/91] =?UTF-8?q?=E5=8A=A8=E6=80=81=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=EF=BC=9A=E5=BC=80=E7=AA=97=E5=92=8C=E6=97=B6=E9=97=B4=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E4=BC=98=E5=8C=96+3D=E4=BB=93=E5=BA=93=E5=9F=BA?= =?UTF-8?q?=E7=A1=80=E6=95=B0=E6=8D=AE=E6=A0=A1=E9=AA=8C=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/base/annotation/DynamicField.java | 2 ++ .../src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java | 6 ------ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java | 6 ++++-- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java | 3 ++- .../cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsFieldInfo.java | 8 ++++++-- 5 files changed, 14 insertions(+), 11 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/DynamicField.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/DynamicField.java index 3df382d..4445d2f 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/DynamicField.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/DynamicField.java @@ -39,4 +39,6 @@ public @interface DynamicField { String listColumnName() default ""; // 下拉搜索列名称,多个列名需要根据逗号分隔 String searchColumnName() default ""; + // 回显列名 + String explicitColumnName() default ""; } 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 116abff..9e8bd67 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 @@ -64,19 +64,16 @@ public abstract class BaseBean implements Serializable { @Column(name="ORGANIZE_CODE", nullable = false) @ApiParam(value ="组织代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2) // @AnnoOutputColumn(hidden = true) public String organizeCode; @Column(name="IS_VALID", columnDefinition = "int default 1", nullable = false) @ApiParam(value = "有效性",example = "1") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isSkip = 1) @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description", hidden = true) public Integer isValid; //CommonEnumUtil.IS_VAILD; @Column(name="IS_DELETED", columnDefinition = "int default 2", nullable = false) @ApiParam(value = "是否已删除",example = "2") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isSkip = 1) @AnnoOutputColumn(hidden = true) //逻辑删除，软删除 public Integer isDeleted; //CommonEnumUtil.TRUE_OR_FALSEA @@ -135,13 +132,11 @@ public abstract class BaseBean implements Serializable { @Transient @ApiParam(value = "排序属性") @AnnoOutputColumn(hidden = true) - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isSkip = 1) public String orderByParam = ""; @Transient @ApiParam(value = "排序类型，1 正序，2 倒序",example = "1") @AnnoOutputColumn(hidden = true) - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isSkip = 1) //CommonEnumUtil.ASC_OR_DESC 1 asc,2 desc public transient Integer ascOrDesc = 1; @@ -158,5 +153,4 @@ public abstract class BaseBean implements Serializable { } return result; } - } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java index 338d1d6..41092ce 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java @@ -52,12 +52,14 @@ public class WmsLocate extends BaseBean { @Column(name = "WH_NO") @ApiParam(value = "仓库代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.LIST, isRequire = 2,entityName="cn.estsh.i3plus.pojo.wms.bean.WareHouse", + searchColumnName = "code,name",listColumnName = "code,name", explicitColumnName = "code") private String whNo; @Column(name = "ZONE_NO") @ApiParam(value = "存储区代码") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.LIST, isRequire = 2,entityName="cn.estsh.i3plus.pojo.wms.bean.WmsZones", + searchColumnName = "zoneNo,zoneName",listColumnName = "zoneNo,zoneName", explicitColumnName = "zoneNo") private String zoneNo; @Column(name = "FURNITURE_NO") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java index 42c9bf0..9362c05 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java @@ -147,7 +147,8 @@ public class WmsPart extends BaseBean { @Column(name = "IN_LOCATE_NO") @ApiParam(value = "默认入库库位") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.LIST, isRequire = 2,entityName="cn.estsh.i3plus.pojo.wms.bean.WmsLocate", + searchColumnName = "locateNo,locateName",listColumnName = "locateNo,locateName", explicitColumnName = "locateNo") private String inLocateNo; @Column(name = "PROD_CFG_TYPE_CODE") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsFieldInfo.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsFieldInfo.java index b46e544..0321169 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsFieldInfo.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsFieldInfo.java @@ -93,11 +93,15 @@ public class WmsFieldInfo extends BaseBean { @ApiParam(value = "条件连接符:and/or") private String conditionConnector; - @Column(name = "LIST_COLUMNNAME") + @Column(name = "LIST_COLUMN_NAME") @ApiParam(value = "开窗列表显示列名称") private String listColumnName; - @Column(name = "SEARCH_COLUMNNAME") + @Column(name = "SEARCH_COLUMN_NAME") @ApiParam(value = "开窗搜索列名称") private String searchColumnName; + + @Column(name = "EXPLICIT_COLUMN_NAME") + @ApiParam(value = "回显列名") + private String explicitColumnName; } From cd8dea18148fcf97d863bf20e857b362db131ca1 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 5 Mar 2020 20:10:59 +0800 Subject: [PATCH 29/91] ptl --- .../i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java | 14 +++++++++-- .../estsh/i3plus/pojo/ptl/model/LightOnModel.java | 27 ++++++++++++++++++++-- 2 files changed, 37 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java index bdcae3c..4642ad9 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java @@ -417,6 +417,15 @@ public class PtlPcnEnumUtil { this.description = description; } + public static TAG_LIGHT_TYPE getByValue(int value) { + for (TAG_LIGHT_TYPE tagLightType : values()) { + if (tagLightType.getValue() == value) { + return tagLightType; + } + } + return null; + } + public int getValue() { return value; } @@ -687,7 +696,8 @@ public class PtlPcnEnumUtil { LIGHT_ON_CMD(30, "LIGHT_ON_CMD", "lightOnService", "亮灯命令"), LIGHT_OFF_CMD(40, "LIGHT_OFF_CMD", "lightOffService", "灭灯命令"), CONTROL_SIGNAL_CMD(50, "CONTROL_SIGNAL_CMD", "controlSignalService", "控制器反馈信号"), - INTERFACE_SIGNAL_CMD(60, "INTERFACE_SIGNAL_CMD", "", "发送给界面actor通过websocket返回"); + INTERFACE_SIGNAL_CMD(60, "INTERFACE_SIGNAL_CMD", "", "发送给界面actor通过websocket返回"), + REFRESH_CONTROL_CMD(70, "REFRESH_CONTROL_CMD", "refreshControlService", "刷新"); private int value; private String code; @@ -737,7 +747,7 @@ public class PtlPcnEnumUtil { REFRESH_CONTROL_CMD(30, "REFRESH_CONTROL_CMD", "refreshControlService", "刷新"), SCAN_CONTROL_CMD(40, "SCAN_CONTROL_CMD", "scanControlService", "扫描"), INIT_MODULE_CONTROL_CMD(50, "INIT_MODULE_CONTROL_CMD", "initModuleControlService", "初始化页面"), - GET_CONTROL_DATA_CONTROL_CMD(50, "GET_CONTROL_DATA_CONTROL_CMD", "getControlDataControlService", "获取控制器数据"); + GET_CONTROL_DATA_CONTROL_CMD(60, "GET_CONTROL_DATA_CONTROL_CMD", "getControlDataControlService", "获取控制器数据"); // UNLOCK_CONTROL_CMD(50, "UNLOCK_CONTROL_CMD", "unlockControlService", "解锁"), // LABEL_SELF_CHECK_CONTROL_CMD(60, "labelSelfCheck", "labelSelfCheckControlService", "标签自检"), // LIGHT_DETAIL_CONTROL_CMD(70, "LABEL_SELF_CHECK_CONTROL_CMD", "lightDetailControlService", "亮灯明细"); diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/LightOnModel.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/LightOnModel.java index 549116a..ba6659f 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/LightOnModel.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/LightOnModel.java @@ -1,18 +1,41 @@ package cn.estsh.i3plus.pojo.ptl.model; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.ToString; import java.io.Serializable; /** - * @author Wynne.Lu + * @author wangjie * @date 2020/2/15 15:42 * @desc */ @Data -@ToString +@ApiModel("亮灯model") public class LightOnModel implements Serializable { private static final long serialVersionUID = -1089361557513425229L; + @ApiParam("标签地址，范围1~250,设置null即为所有标签") + private Integer tagNo; + + @ApiParam("内容：字母，数字，字符") + private String content; + + @ApiParam("颜色指令:枚举获取，TAG_LIGHT_COLOR_CMD") + private String colorCmd; + + @ApiParam("亮灯方式") + private Integer lightType; + + @ApiParam("音乐编号指令:枚举获取，FINISH_TAG_LIGHT_MUSIC_CMD") + private String musicCmd; + + @ApiParam("音量值指令:枚举获取，FINISH_TAG_LIGHT_VOLUME_CMD") + private String volumeCmd; + + @ApiParam("是否蜂鸣") + private Integer buzz; + } From 269d325549252944c4c5497b8d51fe33aa051858 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Fri, 6 Mar 2020 09:41:10 +0800 Subject: [PATCH 30/91] ptl --- .../src/main/java/cn/estsh/i3plus/pojo/ptl/model/LightOnModel.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/LightOnModel.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/LightOnModel.java index ba6659f..7dd41d4 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/LightOnModel.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/LightOnModel.java @@ -38,4 +38,10 @@ public class LightOnModel implements Serializable { @ApiParam("是否蜂鸣") private Integer buzz; + @ApiParam("是否熄灯，清除LED显示器") + private Integer ledFlag; + + @ApiParam("是否熄灯") + private Integer lightFlag; + } From fa9c02705b10c4febb6c421f4c33484cc5c1d498 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Fri, 6 Mar 2020 14:36:14 +0800 Subject: [PATCH 31/91] ptl enum --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.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/PtlPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java index 4642ad9..90092ae 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java @@ -796,7 +796,7 @@ public class PtlPcnEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WsBusiType { MONITOR_PROCESS(10, "MONITOR_PROCESS", "控制器相关"), - INTERFACE_PROCESS(10, "INTERFACE_PROCESS", "界面处理"); + INTERFACE_PROCESS(20, "INTERFACE_PROCESS", "界面处理"); private int value; private String code; From d156ffb85ad030bb65fbe9c6a0ca7ed483e1f74f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Fri, 6 Mar 2020 15:24:23 +0800 Subject: [PATCH 32/91] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=EF=BC=8C=E6=B7=BB=E5=8A=A0=E6=AD=BB=E4=BF=A1?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/ptl/annotation/ElasticSearch.java | 15 ++++++ .../estsh/i3plus/pojo/ptl/annotation/Json4Es.java | 15 ++++++ .../i3plus/pojo/ptl/bean/PtlSyncDeadLetter.java | 56 ++++++++++++++++++++++ .../i3plus/pojo/ptl/model/ProductDataModel.java | 24 ++++++++++ .../repository/PtlSyncDeadLetterRepository.java | 12 +++++ 5 files changed, 122 insertions(+) create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/annotation/ElasticSearch.java create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/annotation/Json4Es.java create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlSyncDeadLetter.java create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ProductDataModel.java create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlSyncDeadLetterRepository.java diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/annotation/ElasticSearch.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/annotation/ElasticSearch.java new file mode 100644 index 0000000..e31f9c1 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/annotation/ElasticSearch.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.ptl.annotation; + + +import java.lang.annotation.*; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/12/25 1:45 下午 + * @Description: + **/ +@Retention(RetentionPolicy.RUNTIME) +@Target({ElementType.TYPE}) +@Documented +public @interface ElasticSearch { +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/annotation/Json4Es.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/annotation/Json4Es.java new file mode 100644 index 0000000..b169b83 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/annotation/Json4Es.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.ptl.annotation; + + +import java.lang.annotation.*; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/12/25 1:45 下午 + * @Description: + **/ +@Retention(RetentionPolicy.RUNTIME) +@Target({ElementType.FIELD}) +@Documented +public @interface Json4Es { +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlSyncDeadLetter.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlSyncDeadLetter.java new file mode 100644 index 0000000..0de2878 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlSyncDeadLetter.java @@ -0,0 +1,56 @@ +package cn.estsh.i3plus.pojo.ptl.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.*; +import java.io.Serializable; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2020/02/15 1:45 PM + * @Description: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "PTL_SYNC_DEAD_LETTER", indexes = { + @Index(name = "idx_object_code_pcn", columnList = "OBJECT_CODE"), + @Index(name = "idx_object_code_pcn", columnList = "PCN_CODE") +}) +@Api("数据同步死信") +public class PtlSyncDeadLetter extends BaseBean implements Serializable { + private static final long serialVersionUID = 1151025992437433734L; + + @Column(name = "OBJECT_CODE") + @ApiParam("对象代码") + private String objectCode; + + @Column(name = "SYNC_TYPE") + @ApiParam("同步类型") + private Integer syncType; + + @Column(name = "PCN_CODE") + @ApiParam("pcn代码") + private String pcnCode; + + @Lob + @Column(name = "EX_MSG") + @ApiParam("同步数据") + private String exMsg; + + @Lob + @Column(name = "DATA") + @ApiParam("同步数据") + private String data; + + +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ProductDataModel.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ProductDataModel.java new file mode 100644 index 0000000..c4bbcd4 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ProductDataModel.java @@ -0,0 +1,24 @@ +package cn.estsh.i3plus.pojo.ptl.model; + + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@NoArgsConstructor +@AllArgsConstructor +@Api("产品包装model") +public class ProductDataModel { + + @ApiParam("字段代码") + private String fieldCode; + + @ApiParam("字段名称") + private String fieldName; + + @ApiParam("字段值") + private String fieldValue; +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlSyncDeadLetterRepository.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlSyncDeadLetterRepository.java new file mode 100644 index 0000000..5f9062a --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlSyncDeadLetterRepository.java @@ -0,0 +1,12 @@ +package cn.estsh.i3plus.pojo.ptl.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.ptl.bean.PtlSyncDeadLetter; + +/** + * @author Wynne.Lu + * @date 2020/2/18 09:19 + * @desc + */ +public interface PtlSyncDeadLetterRepository extends BaseRepository { +} From dd1e5778a9257553ad458eae582debc0dfe4cdaf Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Fri, 6 Mar 2020 15:37:26 +0800 Subject: [PATCH 33/91] ptl enum --- .../i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java | 106 ++++++++++----------- 1 file changed, 53 insertions(+), 53 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java index 90092ae..bcf68f3 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java @@ -689,10 +689,10 @@ public class PtlPcnEnumUtil { } @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum MonitorProcessMessageType { + public enum MONITOR_PROCESS_MESSAGE_TYPE { CONNECT_CONTROL_CMD(10, "CONNECT_CONTROL_CMD", "connectControlService", "连接控制器"), DISCONNECT_CONTROL_CMD(20, "DISCONNECT_CONTROL_CMD", "disconnectControlService", "断开控制器"), - EXCEPTION__DISCONNECT_CONTROL_CMD(25, "EXCEPTION_DISCONNECT_CONTROL_CMD", "disconnectControlService", "断开控制器"), + EXCEPTION_DISCONNECT_CONTROL_CMD(25, "EXCEPTION_DISCONNECT_CONTROL_CMD", "disconnectControlService", "断开控制器"), LIGHT_ON_CMD(30, "LIGHT_ON_CMD", "lightOnService", "亮灯命令"), LIGHT_OFF_CMD(40, "LIGHT_OFF_CMD", "lightOffService", "灭灯命令"), CONTROL_SIGNAL_CMD(50, "CONTROL_SIGNAL_CMD", "controlSignalService", "控制器反馈信号"), @@ -704,7 +704,7 @@ public class PtlPcnEnumUtil { private String callClass; private String description; - MonitorProcessMessageType(int value, String code, String callClass, String description) { + MONITOR_PROCESS_MESSAGE_TYPE(int value, String code, String callClass, String description) { this.value = value; this.code = code; this.callClass = callClass; @@ -727,11 +727,11 @@ public class PtlPcnEnumUtil { return description; } - public static MonitorProcessMessageType getTypeByValue(String code) { + public static MONITOR_PROCESS_MESSAGE_TYPE getTypeByValue(String code) { if (StringUtils.isEmpty(code)) { return null; } - for (MonitorProcessMessageType enums : MonitorProcessMessageType.values()) { + for (MONITOR_PROCESS_MESSAGE_TYPE enums : MONITOR_PROCESS_MESSAGE_TYPE.values()) { if (enums.getCode().equals(code)) { return enums; } @@ -741,7 +741,7 @@ public class PtlPcnEnumUtil { } @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum InterfaceSignalMessageType { + public enum INTERFACE_SIGNAL_MESSAGE_TYPE { CONNECT_CONTROL_CMD(10, "CONNECT_CONTROL_CMD", "connectControlService", "连接控制器"), DISCONNECT_CONTROL_CMD(20, "DISCONNECT_CONTROL_CMD", "disconnectControlService", "断开控制器"), REFRESH_CONTROL_CMD(30, "REFRESH_CONTROL_CMD", "refreshControlService", "刷新"), @@ -757,7 +757,7 @@ public class PtlPcnEnumUtil { private String callClass; private String description; - InterfaceSignalMessageType(int value, String code, String callClass, String description) { + INTERFACE_SIGNAL_MESSAGE_TYPE(int value, String code, String callClass, String description) { this.value = value; this.code = code; this.callClass = callClass; @@ -780,11 +780,11 @@ public class PtlPcnEnumUtil { return description; } - public static InterfaceSignalMessageType getTypeByValue(String code) { + public static INTERFACE_SIGNAL_MESSAGE_TYPE getTypeByValue(String code) { if (StringUtils.isEmpty(code)) { return null; } - for (InterfaceSignalMessageType enums : InterfaceSignalMessageType.values()) { + for (INTERFACE_SIGNAL_MESSAGE_TYPE enums : INTERFACE_SIGNAL_MESSAGE_TYPE.values()) { if (enums.getCode().equals(code)) { return enums; } @@ -793,25 +793,33 @@ public class PtlPcnEnumUtil { } } + /** + * 生成任务actor message type + */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum WsBusiType { - MONITOR_PROCESS(10, "MONITOR_PROCESS", "控制器相关"), - INTERFACE_PROCESS(20, "INTERFACE_PROCESS", "界面处理"); + public enum GEN_TASK_MESSAGE_TYPE { + GEN_TASK_CMD(10, "GEN_TASK_CMD", "", "生成任务"); private int value; private String code; + private String callClass; private String description; - WsBusiType(int value, String code, String description) { + GEN_TASK_MESSAGE_TYPE(int value, String code, String callClass, String description) { this.value = value; - this.description = description; this.code = code; + this.callClass = callClass; + this.description = description; } public int getValue() { return value; } + public String getCallClass() { + return callClass; + } + public String getCode() { return code; } @@ -819,22 +827,33 @@ public class PtlPcnEnumUtil { public String getDescription() { return description; } + + public static INTERFACE_SIGNAL_MESSAGE_TYPE getTypeByValue(String code) { + if (StringUtils.isEmpty(code)) { + return null; + } + for (INTERFACE_SIGNAL_MESSAGE_TYPE enums : INTERFACE_SIGNAL_MESSAGE_TYPE.values()) { + if (enums.getCode().equals(code)) { + return enums; + } + } + return null; + } } @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum WsDataType { - TEXT(10, "TEXT", "正常信息"), - EXP_TEXT(20, "EXP_TEXT", "异常信息"), - TABLE(30, "TABLE", "表格"); + public enum WsBusiType { + MONITOR_PROCESS(10, "MONITOR_PROCESS", "控制器相关"), + INTERFACE_PROCESS(20, "INTERFACE_PROCESS", "界面处理"); private int value; private String code; private String description; - WsDataType(int value, String code, String description) { + WsBusiType(int value, String code, String description) { this.value = value; - this.code = code; this.description = description; + this.code = code; } public int getValue() { @@ -851,16 +870,16 @@ public class PtlPcnEnumUtil { } @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum STATUS_TYPE { - START(10, "START", "开始状态"), - FINISH(20, "FINISH", "完成状态"), - TERMINATE(30, "TERMINATE", "中断状态"); + public enum WsDataType { + TEXT(10, "TEXT", "正常信息"), + EXP_TEXT(20, "EXP_TEXT", "异常信息"), + TABLE(30, "TABLE", "表格"); private int value; private String code; private String description; - STATUS_TYPE(int value, String code, String description) { + WsDataType(int value, String code, String description) { this.value = value; this.code = code; this.description = description; @@ -880,15 +899,16 @@ public class PtlPcnEnumUtil { } @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum AREA_SECTION_TASK_DETAIL_STATUS { - CREATE(10, "CREATE", "创建"), - COMPLETE(20, "COMPLETE", "完成"); + public enum STATUS_TYPE { + START(10, "START", "开始状态"), + FINISH(20, "FINISH", "完成状态"), + TERMINATE(30, "TERMINATE", "中断状态"); private int value; private String code; private String description; - AREA_SECTION_TASK_DETAIL_STATUS(int value, String code, String description) { + STATUS_TYPE(int value, String code, String description) { this.value = value; this.code = code; this.description = description; @@ -907,22 +927,18 @@ public class PtlPcnEnumUtil { } } - /** - * 生成任务actor message type - */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum GenTaskMessageType { - GEN_TASK_CMD(10, "GEN_TASK_CMD", "", "生成任务"); + public enum AREA_SECTION_TASK_DETAIL_STATUS { + CREATE(10, "CREATE", "创建"), + COMPLETE(20, "COMPLETE", "完成"); private int value; private String code; - private String callClass; private String description; - GenTaskMessageType(int value, String code, String callClass, String description) { + AREA_SECTION_TASK_DETAIL_STATUS(int value, String code, String description) { this.value = value; this.code = code; - this.callClass = callClass; this.description = description; } @@ -930,10 +946,6 @@ public class PtlPcnEnumUtil { return value; } - public String getCallClass() { - return callClass; - } - public String getCode() { return code; } @@ -941,18 +953,6 @@ public class PtlPcnEnumUtil { public String getDescription() { return description; } - - public static InterfaceSignalMessageType getTypeByValue(String code) { - if (StringUtils.isEmpty(code)) { - return null; - } - for (InterfaceSignalMessageType enums : InterfaceSignalMessageType.values()) { - if (enums.getCode().equals(code)) { - return enums; - } - } - return null; - } } /** From fcb56e09e5757ecc3f92a9bf7ea6bf5ce37b857d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Fri, 6 Mar 2020 17:04:03 +0800 Subject: [PATCH 34/91] =?UTF-8?q?=E3=80=90PTL=5F=E6=8E=A7=E5=88=B6?= =?UTF-8?q?=E5=99=A8=E5=8F=8D=E9=A6=88=E4=BF=A1=E5=8F=B7=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaTask.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaTask.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaTask.java index 64e3c64..cb738fd 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaTask.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaTask.java @@ -31,7 +31,7 @@ public class PtlAreaTask extends BaseBean implements Serializable { @Column(name = "AREA_TASK_NO") @ApiParam("区域任务编号") - private Long areaTaskNo; + private String areaTaskNo; @Column(name = "AREA_NO") @ApiParam("区域代码") From 027470cb071198489235ae2e877e4da1deae50cc Mon Sep 17 00:00:00 2001 From: qianhs Date: Fri, 6 Mar 2020 17:16:06 +0800 Subject: [PATCH 35/91] =?UTF-8?q?1,=E9=87=8D=E8=AF=95=202=EF=BC=8C?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/ptl/model/CommonMsgModel.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/CommonMsgModel.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/CommonMsgModel.java index 34116b7..13576e2 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/CommonMsgModel.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/CommonMsgModel.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.ptl.model; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.ptl.bean.PtlRouteStatus; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -29,6 +30,9 @@ public class CommonMsgModel implements Serializable { @ApiModelProperty("消息类型") private String msgType; + @ApiModelProperty("是否重试") + private Integer isRestart= CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(); + @ApiModelProperty("消息数据") private Map msgData; From 531596d2d439bf6de1c186f2ad54efa71852759e Mon Sep 17 00:00:00 2001 From: joke Date: Fri, 6 Mar 2020 19:43:09 +0800 Subject: [PATCH 36/91] =?UTF-8?q?[mes:=2049=20JIT=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E4=B8=8E=E7=AE=A1=E7=90=86]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 74 +++++++++++++++++- .../i3plus/pojo/mes/bean/MesCustProdLine.java | 8 ++ .../i3plus/pojo/mes/bean/MesProduceGroup.java | 42 ++++++++++ .../i3plus/pojo/mes/bean/MesProduceGroupCfg.java | 40 ++++++++++ .../i3plus/pojo/mes/bean/MesQueueGroupCount.java | 49 ++++++++++++ .../i3plus/pojo/mes/bean/MesQueueGroupRule.java | 49 ++++++++++++ .../i3plus/pojo/mes/bean/MesQueueJitActual.java | 91 ++++++++++++++++++++++ .../pojo/mes/bean/MesQueueJitActualDetail.java | 61 +++++++++++++++ .../i3plus/pojo/mes/bean/MesQueueJitPlan.java | 77 ++++++++++++++++++ .../i3plus/pojo/mes/bean/MesQueueJitPlanBom.java | 53 +++++++++++++ .../pojo/mes/bean/MesQueueJitPlanDetail.java | 49 ++++++++++++ .../repository/MesProduceGroupCfgRepository.java | 14 ++++ .../mes/repository/MesProduceGroupRepository.java | 14 ++++ .../repository/MesQueueGroupCountRepository.java | 14 ++++ .../repository/MesQueueGroupRuleRepository.java | 14 ++++ .../MesQueueJitActualDetailRepository.java | 14 ++++ .../repository/MesQueueJitActualRepository.java | 14 ++++ .../repository/MesQueueJitPlanBomRepository.java | 14 ++++ .../MesQueueJitPlanDetailRepository.java | 14 ++++ .../mes/repository/MesQueueJitPlanRepository.java | 14 ++++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 42 ++++++++++ 21 files changed, 760 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceGroup.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceGroupCfg.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueGroupCount.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueGroupRule.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlan.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanBom.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanDetail.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProduceGroupCfgRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProduceGroupRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueGroupCountRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueGroupRuleRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueJitActualDetailRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueJitActualRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueJitPlanBomRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueJitPlanDetailRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueJitPlanRepository.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 bc83711..850ce6c 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 @@ -1598,7 +1598,8 @@ public class MesEnumUtil { MES_EQU_NOTIFY_OBJECT_CFG(380,"设备通知对象"), MES_PLC(390,"PLC地址清单"), MES_PROCESS(400,"工序信息"), - MES_KPSN_RULE(410,"关键件条码校验规则"); + MES_KPSN_RULE(410,"关键件条码校验规则"), + MES_QUEUE_JIT_ACTUAL(420,"客户JIT生产队列"); private int value; private String description; @@ -4062,4 +4063,75 @@ public class MesEnumUtil { return tmp; } } + + /** + * 客户JIT生产队列状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_QUEUE_JIT_ACTUAL_STATUS { + CREATE(10, "创建"), + LANDED(20, "下达"), + CANCEL(30, "取消"); + + private int value; + private String description; + + MES_QUEUE_JIT_ACTUAL_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; + } + } + + /** + * 客户JIT生产队列特殊标识 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_QUEUE_JIT_ACTUAL_SPECIAL_FLAG { + NORMAL(10, "正常"), + EMPTYING(20, "放空"); + + private int value; + private String description; + + MES_QUEUE_JIT_ACTUAL_SPECIAL_FLAG(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; + } + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustProdLine.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustProdLine.java index c8da995..6224656 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustProdLine.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustProdLine.java @@ -37,4 +37,12 @@ public class MesCustProdLine extends BaseBean implements Serializable { @Column(name = "CUST_PROD_LINE_NAME") @ApiParam("客户产线名称") private String custProdLineName; + + @Column(name = "PG_CODE") + @ApiParam("生产组代码") + private String pgCode; + + @Column(name = "CUST_CODE") + @ApiParam("客户代码") + private String custCode; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceGroup.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceGroup.java new file mode 100644 index 0000000..21fbfe9 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceGroup.java @@ -0,0 +1,42 @@ +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 java.io.Serializable; + +/** + * @Description : + * @Reference : + * @Author : joke + * @CreateDate : 2020-03-06 9:34 上午 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PRODUCE_GROUP") +@Api("MES_生产组") +public class MesProduceGroup extends BaseBean implements Serializable { + + private static final long serialVersionUID = -6926189371427937743L; + + @Column(name = "PG_CODE") + @ApiParam("生产组代码") + private String pgCode; + + @Column(name = "PG_NAME") + @ApiParam("生产组名称") + private String pgName; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceGroupCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceGroupCfg.java new file mode 100644 index 0000000..0648f2c --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceGroupCfg.java @@ -0,0 +1,40 @@ +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 java.io.Serializable; + +/** + * @Description : + * @Reference : + * @Author : joke + * @CreateDate : 2020-03-06 9:22 上午 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PRODUCE_GROUP_CFG") +@Api("MES_生产组配置") +public class MesProduceGroupCfg extends BaseBean implements Serializable { + + private static final long serialVersionUID = 82611799819312505L; + @Column(name = "PG_CODE") + @ApiParam("生产组代码") + private String pgCode; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("生产线") + private String workCenterCode; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueGroupCount.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueGroupCount.java new file mode 100644 index 0000000..1133c1a --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueGroupCount.java @@ -0,0 +1,49 @@ +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 java.io.Serializable; + +/** + * @Description :MES_QUEUE_JIT_ACTUAL_DETAIL + * @Reference : + * @Author : joke + * @CreateDate : 2020-03-06 10:16 上午 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_QUEUE_GROUP_COUNT") +@Api("MES_队列分组计数") +public class MesQueueGroupCount extends BaseBean implements Serializable { + + private static final long serialVersionUID = -7799006330177462162L; + + @Column(name = "QGR_CODE") + @ApiParam("分组规则代码") + private String qgrCode; + + @Column(name = "QUEUE_GROUP_NO") + @ApiParam("分组队列编号") + private String queueGroupNo; + + @Column(name = "QTY") + @ApiParam("分组数量") + private Integer qty; + + @Column(name = "CNT_QTY") + @ApiParam("累计数") + private Integer cntQty; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueGroupRule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueGroupRule.java new file mode 100644 index 0000000..c9e3f4f --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueGroupRule.java @@ -0,0 +1,49 @@ +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 java.io.Serializable; + +/** + * @Description :MES_QUEUE_GROUP_COUNT + * @Reference : + * @Author : joke + * @CreateDate : 2020-03-06 10:16 上午 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_QUEUE_GROUP_RULE") +@Api("MES_队列分组规则") +public class MesQueueGroupRule extends BaseBean implements Serializable { + + private static final long serialVersionUID = -6857842499743356177L; + + @Column(name = "QGR_CODE") + @ApiParam("分组规则代码") + private String qgrCode; + + @Column(name = "CUST_PLANT_CODE") + @ApiParam("客户产线代码") + private String custPlantCode; + + @Column(name = "PRODUCE_CTGY_CODE") + @ApiParam("产品位置代码") + private String produceCtgyCode; + + @Column(name = "QTY") + @ApiParam("分组数量") + private Integer qty; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java new file mode 100644 index 0000000..e3f8e55 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java @@ -0,0 +1,91 @@ +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; +import java.io.Serializable; + +/** + * @Description : + * @Reference : + * @Author : joke + * @CreateDate : 2020-03-06 10:16 上午 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_QUEUE_JIT_ACTUAL") +@Api("MES_客户JIT生产队列") +public class MesQueueJitActual extends BaseBean implements Serializable { + + private static final long serialVersionUID = 655875369308810110L; + + @Column(name = "JIS_ACTUAL_NO") + @ApiParam("队列编号") + private String jisActualNo; + + @Column(name = "PROD_CFG_CODE") + @ApiParam("配置代码") + private String prodCfgCode; + + @Column(name = "VIN_CODE") + @ApiParam("vin") + private String vinCode; + + @Column(name = "CUST_FLAG_NO") + @ApiParam("客户标识号") + private String custFlagNo; + + @Column(name = "SEQ") + @ApiParam("排序号") + private Double seq; + + @Column(name = "STATUS") + @ApiParam("状态") + private Integer status; + + @Column(name = "SPECIAL_FLAG") + @ApiParam("特殊标识") + private Integer specialFlag; + + @Column(name = "CUST_POINT_DATE") + @ApiParam("客户需求时间") + private String custPointDate; + + @Column(name = "CUST_CODE") + @ApiParam("客户代码") + private String custCode; + + @Column(name = "CUST_PLANT_CODE") + @ApiParam("客户产线代码") + private String custPlantCode; + + @Column(name = "MEMO") + @ApiParam("备注") + private String memo; + + @Column(name = "PG_CODE") + @ApiParam("生产组代码") + private String pgCode; + + @Transient + @ApiParam("客户需求开始时间") + private String custPointStartDate; + + @Transient + @ApiParam("客户需求结束时间") + private String custPointEndDate; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java new file mode 100644 index 0000000..77e6c6f --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java @@ -0,0 +1,61 @@ +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 java.io.Serializable; + +/** + * @Description :MES_QUEUE_JIT_ACTUAL + * @Reference : + * @Author : joke + * @CreateDate : 2020-03-06 10:16 上午 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_QUEUE_JIT_ACTUAL_DETAIL") +@Api("MES_客户JIT生产队列明细") +public class MesQueueJitActualDetail extends BaseBean implements Serializable { + + private static final long serialVersionUID = 1442091799346314190L; + + @Column(name = "QGR_CODE") + @ApiParam("分组规则代码") + private String qgrCode; + + @Column(name = "PROD_CFG_CODE") + @ApiParam("配置代码") + private String prodCfgCode; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "PRODUCE_CTGY_CODE") + @ApiParam("产品位置代码") + private String produceCtgyCode; + + @Column(name = "PART_NAME") + @ApiParam("产品名称") + private String partName; + + @Column(name = "QUEUE_GROUP_NO") + @ApiParam("分组队列编号") + private String queueGroupNo; + + @Column(name = "GROUP_NO") + @ApiParam("组内编号") + private Integer groupNo; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlan.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlan.java new file mode 100644 index 0000000..d982dab --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlan.java @@ -0,0 +1,77 @@ +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 java.io.Serializable; + +/** + * @Description : + * @Reference : + * @Author : joke + * @CreateDate : 2020-03-06 9:40 上午 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_QUEUE_JIT_PLAN") +@Api("MES_客户JIT预装队列") +public class MesQueueJitPlan extends BaseBean implements Serializable { + + private static final long serialVersionUID = 6613487463796132500L; + + @Column(name = "JIS_PLAN_NO") + @ApiParam("队列编号") + private String jisPlanNo; + + @Column(name = "PROD_CFG_CODE") + @ApiParam("配置代码") + private String prodCfgCode; + + @Column(name = "VIN_CODE") + @ApiParam("vin") + private String vinCode; + + @Column(name = "CUST_FLAG_NO") + @ApiParam("客户标识号") + private String custFlagNo; + + @Column(name = "VEHICLE_CODE") + @ApiParam("选配码") + private String vehicleCode; + + @Column(name = "SEQ") + @ApiParam("计划排序号") + private String seq; + + @Column(name = "STATUS") + @ApiParam("状态") + private Integer status; + + @Column(name = "PLAN_DATE") + @ApiParam("计划上线时间") + private String planDate; + + @Column(name = "CUST_CODE") + @ApiParam("客户代码") + private String custCode; + + @Column(name = "CUST_PLANT_CODE") + @ApiParam("客户工厂代码") + private String custPlantCode; + + @Column(name = "VERSION") + @ApiParam("版本号") + private String version; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanBom.java new file mode 100644 index 0000000..1d9faad --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanBom.java @@ -0,0 +1,53 @@ +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 java.io.Serializable; + +/** + * @Description : + * @Reference : + * @Author : joke + * @CreateDate : 2020-03-06 10:01 上午 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_QUEUE_JIT_PLAN_BOM") +@Api("MES_客户JIT预装队列BOM") +public class MesQueueJitPlanBom extends BaseBean implements Serializable { + + private static final long serialVersionUID = 2037991315471333415L; + + @Column(name = "JIS_PLAN_NO") + @ApiParam("队列编号") + private String jisPlanNo; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "ITEM_PART_NO") + @ApiParam("原材料物料号") + private String itemPartNo; + + @Column(name = "DOCK_NO") + @ApiParam("道口") + private String dockNo; + + @Column(name = "QTY") + @ApiParam("用量") + private Double qty; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanDetail.java new file mode 100644 index 0000000..7111b75 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanDetail.java @@ -0,0 +1,49 @@ +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 java.io.Serializable; + +/** + * @Description : + * @Reference : + * @Author : joke + * @CreateDate : 2020-03-06 9:58 上午 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_QUEUE_JIT_PLAN_DETAIL") +@Api("MES_客户JIT预装队列明细") +public class MesQueueJitPlanDetail extends BaseBean implements Serializable { + + private static final long serialVersionUID = 1263996676519565026L; + + @Column(name = "JIS_PLAN_NO") + @ApiParam("队列编号") + private String jisPlanNo; + + @Column(name = "PROD_CFG_CODE") + @ApiParam("配置代码") + private String prodCfgCode; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam("产品名称") + private String partName; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProduceGroupCfgRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProduceGroupCfgRepository.java new file mode 100644 index 0000000..9065d3c --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProduceGroupCfgRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesProduceGroupCfg; + +/** + * @Description : + * @Reference : + * @Author : joke + * @CreateDate : 2020-03-06 10:53 上午 + * @Modify: + **/ +public interface MesProduceGroupCfgRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProduceGroupRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProduceGroupRepository.java new file mode 100644 index 0000000..55e5df0 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProduceGroupRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesProduceGroup; + +/** + * @Description : + * @Reference : + * @Author : joke + * @CreateDate : 2020-03-06 10:52 上午 + * @Modify: + **/ +public interface MesProduceGroupRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueGroupCountRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueGroupCountRepository.java new file mode 100644 index 0000000..5b5e0f3 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueGroupCountRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesQueueGroupCount; + +/** + * @Description : + * @Reference : + * @Author : joke + * @CreateDate : 2020-03-06 10:54 上午 + * @Modify: + **/ +public interface MesQueueGroupCountRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueGroupRuleRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueGroupRuleRepository.java new file mode 100644 index 0000000..93a9798 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueGroupRuleRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesQueueGroupRule; + +/** + * @Description : + * @Reference : + * @Author : joke + * @CreateDate : 2020-03-06 10:55 上午 + * @Modify: + **/ +public interface MesQueueGroupRuleRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueJitActualDetailRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueJitActualDetailRepository.java new file mode 100644 index 0000000..2a56b7b --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueJitActualDetailRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesQueueJitActualDetail; + +/** + * @Description : + * @Reference : + * @Author : joke + * @CreateDate : 2020-03-06 10:57 上午 + * @Modify: + **/ +public interface MesQueueJitActualDetailRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueJitActualRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueJitActualRepository.java new file mode 100644 index 0000000..d7d0062 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueJitActualRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesQueueJitActual; + +/** + * @Description : + * @Reference : + * @Author : joke + * @CreateDate : 2020-03-06 10:56 上午 + * @Modify: + **/ +public interface MesQueueJitActualRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueJitPlanBomRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueJitPlanBomRepository.java new file mode 100644 index 0000000..182e8d9 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueJitPlanBomRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesQueueJitPlanBom; + +/** + * @Description : + * @Reference : + * @Author : joke + * @CreateDate : 2020-03-06 10:58 上午 + * @Modify: + **/ +public interface MesQueueJitPlanBomRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueJitPlanDetailRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueJitPlanDetailRepository.java new file mode 100644 index 0000000..f645abc --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueJitPlanDetailRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesQueueJitPlanDetail; + +/** + * @Description : + * @Reference : + * @Author : joke + * @CreateDate : 2020-03-06 10:58 上午 + * @Modify: + **/ +public interface MesQueueJitPlanDetailRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueJitPlanRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueJitPlanRepository.java new file mode 100644 index 0000000..2168ea9 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueJitPlanRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesQueueJitPlan; + +/** + * @Description : + * @Reference : + * @Author : joke + * @CreateDate : 2020-03-06 10:57 上午 + * @Modify: + **/ +public interface MesQueueJitPlanRepository 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 3670819..9e068c0 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 @@ -2164,4 +2164,46 @@ public class MesHqlPack { } return packBean; } + + /** + * 客户JIT生产队列 + * + * @param queueJitActual + * @param organizeCode + * @return + */ + public static DdlPackBean getMesQueueJitActual(MesQueueJitActual queueJitActual, String organizeCode) { + DdlPackBean packBean = getAllBaseData(organizeCode); + if (!StringUtils.isEmpty(queueJitActual.getJisActualNo())) { + DdlPreparedPack.getStringLikerPack(queueJitActual.getJisActualNo(), "jisActualNo", packBean); + } + if (!StringUtils.isEmpty(queueJitActual.getCustPlantCode())) { + DdlPreparedPack.getStringLikerPack(queueJitActual.getCustPlantCode(), "custPlantCode", packBean); + } + if (!StringUtils.isEmpty(queueJitActual.getCustFlagNo())) { + DdlPreparedPack.getStringLikerPack(queueJitActual.getCustFlagNo(), "custFlagNo", packBean); + } + if (!StringUtils.isEmpty(queueJitActual.getVinCode())) { + DdlPreparedPack.getStringLikerPack(queueJitActual.getVinCode(), "vinCode", packBean); + } + if (!StringUtils.isEmpty(queueJitActual.getProdCfgCode())) { + DdlPreparedPack.getStringLikerPack(queueJitActual.getProdCfgCode(), "prodCfgCode", packBean); + } + if (queueJitActual.getStatus() != null) { + DdlPreparedPack.getNumEqualPack(queueJitActual.getStatus(), "status", packBean); + } + if (!StringUtil.isEmpty(queueJitActual.getCreateDateTimeStart()) || !StringUtil.isEmpty(queueJitActual.getCreateDateTimeEnd())) { + DdlPreparedPack.timeBuilder( + queueJitActual.getCreateDateTimeStart(), + queueJitActual.getCreateDateTimeEnd(), + "createDatetime", packBean, true); + } + if (!StringUtil.isEmpty(queueJitActual.getCustPointStartDate()) || !StringUtil.isEmpty(queueJitActual.getCustPointEndDate())) { + DdlPreparedPack.timeBuilder( + queueJitActual.getCustPointStartDate(), + queueJitActual.getCustPointEndDate(), + "createDatetime", packBean, true); + } + return packBean; + } } From 7beaa515c8b612a96cbf2c0c4ddfd574f8a1eb9c Mon Sep 17 00:00:00 2001 From: luweihao Date: Mon, 9 Mar 2020 10:53:45 +0800 Subject: [PATCH 37/91] =?UTF-8?q?task=20`1428`=20=20=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/bean/MesPart.java | 4 +++ .../i3plus/pojo/mes/bean/MesPartProduceType.java | 38 ++++++++++++++++++++++ .../i3plus/pojo/mes/bean/MesProdRouteCfg.java | 4 +++ .../i3plus/pojo/mes/bean/MesQueueOrderDetail.java | 4 +++ .../repository/MesPartProduceTypeRepository.java | 16 +++++++++ 5 files changed, 66 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartProduceType.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartProduceTypeRepository.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java index b326a99..011f6f5 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java @@ -88,6 +88,10 @@ public class MesPart extends BaseBean implements Serializable { @ApiParam("产品编码匹配类型") private Integer productMatchType; + @Column(name = "产品生产类型") + @ApiParam("产品类型名称") + private String pptCode; + @Transient @ApiParam("产品类型名称") private String produceCategoryName; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartProduceType.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartProduceType.java new file mode 100644 index 0000000..e680c19 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartProduceType.java @@ -0,0 +1,38 @@ +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 java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/3/5 11:54 + * @desc + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PART_PRODUCE_TYPE") +@Api("产品生产类型") +public class MesPartProduceType extends BaseBean implements Serializable { + private static final long serialVersionUID = 9191695513960958568L; + + @Column(name = "PPT_CODE") + @ApiParam("产品生产类型") + private String pptCode; + + @Column(name = "PPT_NAME") + @ApiParam("产品生产类型名称") + private String pptName; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteCfg.java index 0285bb7..5fb24e8 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteCfg.java @@ -45,4 +45,8 @@ public class MesProdRouteCfg extends BaseBean implements Serializable { @Column(name = "ROUTE_TYPE") @ApiParam("流程类型 10-扫描类型 20-监控类型") private Integer routeType; + + @Column(name = "PPT_CODE") + @ApiParam("产品生产类型") + private String pptCode; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java index cb39dc8..040bac7 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java @@ -72,6 +72,10 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable { @ApiParam("产品类型名称") private String produceCategoryNameRdd; + @Column(name = "产品生产类型") + @ApiParam("产品类型名称") + private String pptCode; + @Transient @ApiParam("队列序号") private Double queueSeq; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartProduceTypeRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartProduceTypeRepository.java new file mode 100644 index 0000000..0dcd234 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartProduceTypeRepository.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.MesPartProduceType; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesPartProduceTypeRepository extends BaseRepository { +} From b10ddbc9584f12a761172e87b590275078c4bbbc Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 9 Mar 2020 16:01:26 +0800 Subject: [PATCH 38/91] ptl enum --- .../i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java | 50 ++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java index bcf68f3..7d3d688 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java @@ -1747,4 +1747,54 @@ public class PtlPcnEnumUtil { return valueOf(val); } } + + /** + * redis过期时间 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum EXPIRE_TIME { + + NEVER(-1, "不过期"), + ONE_HOUR(3600, "一小时"), + FIVE_MINS(300, "5分钟"), + HALF_HOUR(1800, "半小时"), + ONE_QUARTER(900, "一刻钟"), + ONE_MIN(60, "一分钟"); + + private int value; + private String description; + + EXPIRE_TIME(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 String valueOfDescription2(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description.equals("已审批") ? "审批" : values()[i].description; + } + } + return tmp; + } + } } From 380fded580ee8cc8ce471227ec6827d25168d639 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Mon, 9 Mar 2020 18:21:02 +0800 Subject: [PATCH 39/91] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=B8=85=E7=90=86=E5=AE=9E=E4=BD=93=E5=92=8C=E6=AD=BB=E4=BF=A1?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/ptl/bean/PtlPcnClear.java | 58 ++++++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnClear.java diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnClear.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnClear.java new file mode 100644 index 0000000..f218fc3 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnClear.java @@ -0,0 +1,58 @@ +package cn.estsh.i3plus.pojo.ptl.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 java.io.Serializable; +import java.util.Date; + +/** + * @author adair.song + * @date 2020/03/09 17:41 + * @desc + */ + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "PTL_PCN_CLEAR") +@EqualsAndHashCode(callSuper = true) +@Api("PTL_PCN数据清理") +public class PtlPcnClear extends BaseBean implements Serializable { + private static final long serialVersionUID = -1596443273899197995L; + + @Column(name = "PCN_CODE") + @ApiParam("PCN代码") + private String pcnCode; + + @Column(name = "OBJECT_CODE") + @ApiParam("对象代码") + private String objectCode; + + @Column(name = "OBJECT_NAME") + @ApiParam("对象名称") + private String objectName; + + @Column(name = "EXTRACT_CONDITION") + @ApiParam("获取数据条件") + private String extractCondition; + + @Column(name = "ACTION_FREQUENCY") + @ApiParam("执行频率") + private Integer actionFrequency; + + @Column(name = "LAST_SYNC_TIME") + @ApiParam("上一执行时间") + private Date lastSyncTime; + +} From 50d3de9b772040e905b3e1a6b6aeea89c585cc8e Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Mon, 9 Mar 2020 18:46:54 +0800 Subject: [PATCH 40/91] =?UTF-8?q?7600=20=E4=BA=8C=E7=BB=B4=E7=A0=81?= =?UTF-8?q?=E9=9B=B6=E4=BB=B6=E6=A0=87=E7=AD=BE=E6=89=93=E5=8D=B0=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E4=BF=AE=E6=94=B9=E3=80=82=207565=20=E6=94=B6?= =?UTF-8?q?=E8=B4=A7=E5=88=86=E7=BB=84=E5=8A=9F=E8=83=BD=E8=A6=81=E6=B1=82?= =?UTF-8?q?=E3=80=82=207633=20=E6=9D=A1=E7=A0=81=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E4=B8=AD=EF=BC=8C=E7=82=B9=E5=87=BB=E5=AF=BC=E5=87=BA=EF=BC=8C?= =?UTF-8?q?=E6=97=A5=E7=94=9F=E4=BA=A7=E8=AE=A1=E5=88=92=E4=BA=A7=E7=94=9F?= =?UTF-8?q?=E7=9A=84=E6=9D=A1=E7=A0=81=E6=97=A0=E6=B3=95=E8=A2=AB=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=EF=BC=8C=E7=95=8C=E9=9D=A2=E4=B8=8A=E7=9A=84=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E5=BA=94=E8=AF=A5=E6=98=AF=E6=9F=A5=E5=88=B0=E4=BB=80?= =?UTF-8?q?=E4=B9=88=E5=B0=B1=E5=AF=BC=E5=87=BA=E4=BB=80=E4=B9=88=EF=BC=8C?= =?UTF-8?q?=E4=B8=8D=E9=9C=80=E8=A6=81=E5=86=8D=E5=8A=A0=E5=85=B6=E4=BB=96?= =?UTF-8?q?=E9=A2=9D=E5=A4=96=E7=9A=84=E6=9D=A1=E4=BB=B6=207628=20?= =?UTF-8?q?=E5=BA=93=E5=AD=98=E8=B0=83=E6=95=B4=E7=9B=98=E7=82=B9=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E6=89=AB=E6=8F=8F=E5=BA=93=E4=BD=8D=E5=90=8E=E7=9A=84?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E5=A2=9E=E5=8A=A0=E4=B8=80=E4=B8=AA=E5=BA=93?= =?UTF-8?q?=E4=BD=8D=207640=20=E8=A7=A3=E5=86=BB=E6=89=AB=E6=8F=8F?= =?UTF-8?q?=E6=9D=A1=E7=A0=81=E5=90=8E=E7=9A=84=E6=8F=90=E7=A4=BA=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E6=98=BE=E7=A4=BA=E6=9D=A1=E7=A0=81=EF=BC=8C=E5=86=BB?= =?UTF-8?q?=E7=BB=93=E6=98=AF=E6=9C=89=E7=9A=84=E3=80=82=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E7=BB=9F=E4=B8=80=E9=83=BD=E6=98=BE=E7=A4=BA=207536=20?= =?UTF-8?q?=E6=B2=A1=E5=BA=93=E5=AD=98=E6=97=B6=E9=A2=86=E6=96=99=E4=B8=8E?= =?UTF-8?q?=E5=8F=91=E8=BF=90=E7=9A=84=E6=8F=90=E7=A4=BA=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E4=B8=8B=E5=88=97=207659=20=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E7=9B=98=E7=82=B9=E5=8D=95=E5=86=BB=E7=BB=93=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=E6=97=B6=E6=9D=A1=E7=A0=81is=5Fvaild=3D2=207617=20=E5=87=BA?= =?UTF-8?q?=E5=BA=93=E5=8D=95=E6=98=8E=E7=BB=86=E4=B8=AD=E7=9A=84=E6=89=93?= =?UTF-8?q?=E5=8D=B0=E5=AE=A2=E6=88=B7=E6=A0=87=E7=AD=BE=E6=8C=89=E9=92=AE?= =?UTF-8?q?=EF=BC=8C=E9=9C=80=E8=A6=81=E6=A3=80=E6=B5=8B=E5=8D=95=E6=8D=AE?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E6=9C=89=E6=B2=A1=E6=9C=89=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=EF=BC=8C=E7=8A=B6=E6=80=81=E4=B8=BA=E5=88=9B=E5=BB=BA=E7=9A=84?= =?UTF-8?q?=E6=89=8D=E5=8F=AF=E4=BB=A5=E6=89=93=E5=8D=B0=EF=BC=8C=E5=B9=B6?= =?UTF-8?q?=E4=B8=94=E5=8F=AA=E8=83=BD=E6=89=93=E5=8D=B0=E4=B8=80=E6=AC=A1?= =?UTF-8?q?=E3=80=82=207652=20=E5=9C=A8=E6=9D=A1=E7=A0=81=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E6=8A=A5=E8=A1=A8=E4=B8=AD=E5=A2=9E=E5=8A=A0=E7=BB=84?= =?UTF-8?q?=E5=8F=B7=E5=AD=97=E6=AE=B5=E6=98=BE=E7=A4=BA=EF=BC=8C=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=A1=86=E4=B9=9F=E9=9C=80=E8=A6=81=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=207454=20=E9=9C=80=E8=A6=81=E4=B8=80=E4=B8=AA=E9=85=8D?= =?UTF-8?q?=E6=96=99=E6=92=A4=E9=94=80=EF=BC=88=E9=92=88=E5=AF=B9=E5=8D=95?= =?UTF-8?q?=E4=B8=AA=E6=9D=A1=E7=A0=81=EF=BC=8C=E8=80=8C=E4=B8=8D=E6=98=AF?= =?UTF-8?q?=E5=8D=95=E6=8D=AE=EF=BC=89=E7=9A=84=E5=8A=9F=E8=83=BD=EF=BC=8C?= =?UTF-8?q?=E5=B7=B2=E7=BB=8F=E9=85=8D=E6=96=99=E7=9A=84=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=E9=9C=80=E8=A6=81=E8=A2=AB=E6=92=A4=E5=9B=9E=E5=88=B0=E4=BB=93?= =?UTF-8?q?=E5=BA=93=E4=B8=AD=EF=BC=8C=E9=9C=80=E8=A6=81=E8=80=83=E8=99=91?= =?UTF-8?q?=E5=90=84=E7=A7=8D=E5=BA=93=E5=AD=98=E7=A7=BB=E5=8A=A8=E5=8D=95?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E3=80=82=207631=20=E5=9C=A8=E7=9B=98?= =?UTF-8?q?=E7=82=B9=E6=98=8E=E7=BB=86=E4=B8=AD=E7=9A=84=E7=9B=98=E7=82=B9?= =?UTF-8?q?=E8=8C=83=E5=9B=B4=E7=95=8C=E9=9D=A2=E5=A2=9E=E5=8A=A0=E4=B8=80?= =?UTF-8?q?=E4=B8=AA=E5=AD=97=E6=AE=B5=EF=BC=8C=E6=8A=8A=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93=E4=B8=AD=E7=9A=84src=5Forder=5Fno=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E5=87=BA=E6=9D=A5=EF=BC=8C=E5=AD=97=E6=AE=B5=E5=8F=96=E5=90=8D?= =?UTF-8?q?=E4=B8=BA=E5=8E=9F=E5=A7=8B=E5=8D=95=E5=8F=B7=207526=20?= =?UTF-8?q?=E5=8F=91=E8=BF=90=E5=8D=95=E6=8E=A5=E6=94=B6=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E5=9C=A8=E4=B8=BB=E8=A1=A8=E4=B8=AD=E5=A2=9E=E5=8A=A0=E4=B8=80?= =?UTF-8?q?=E4=B8=AA=E5=AD=97=E6=AE=B5=EF=BC=8C=E5=9C=A8=E8=AE=B2=E5=8D=95?= =?UTF-8?q?=E6=8D=AE=E4=BF=A1=E6=81=AF=E5=86=99=E5=85=A5=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93=E6=97=B6=EF=BC=8C=E5=A6=82=E6=9E=9C=E8=AF=A5=E5=8D=95?= =?UTF-8?q?=E6=8D=AE=E6=9D=A1=E7=A0=81=E4=B8=AD=E5=8F=AA=E5=AD=98=E5=9C=A8?= =?UTF-8?q?=E4=B8=80=E6=AD=A5=E6=B3=95=E7=9A=84=E9=9B=B6=E4=BB=B6=E5=8F=B7?= =?UTF-8?q?=EF=BC=8C=E5=88=99=E8=AF=A5=E5=AD=97=E6=AE=B5=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E5=9C=A8=E5=89=8D=E5=8F=B0=E6=98=BE=E7=A4=BA=E4=B8=BA=E4=B8=80?= =?UTF-8?q?=E6=AD=A5=E6=B3=95=EF=BC=8C=E5=A6=82=E6=9E=9C=E5=AD=98=E5=9C=A8?= =?UTF-8?q?=E4=B8=A4=E6=AD=A5=E6=B3=95=E7=9A=84=E9=9B=B6=E4=BB=B6=E5=8F=B7?= =?UTF-8?q?=EF=BC=8C=E5=88=99=E6=98=BE=E7=A4=BA=E4=B8=BA=E4=B8=A4=E6=AD=A5?= =?UTF-8?q?=E6=B3=95=E3=80=82=207617=20=E5=87=BA=E5=BA=93=E5=8D=95?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E4=B8=AD=E7=9A=84=E6=89=93=E5=8D=B0=E5=AE=A2?= =?UTF-8?q?=E6=88=B7=E6=A0=87=E7=AD=BE=E6=8C=89=E9=92=AE=EF=BC=8C=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E6=A3=80=E6=B5=8B=E5=8D=95=E6=8D=AE=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E6=9C=89=E6=B2=A1=E6=9C=89=E6=8F=90=E4=BA=A4=EF=BC=8C=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E4=B8=BA=E5=88=9B=E5=BB=BA=E7=9A=84=E6=89=8D=E5=8F=AF?= =?UTF-8?q?=E4=BB=A5=E6=89=93=E5=8D=B0=EF=BC=8C=E5=B9=B6=E4=B8=94=E5=8F=AA?= =?UTF-8?q?=E8=83=BD=E6=89=93=E5=8D=B0=E4=B8=80=E6=AC=A1=E3=80=82?= 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 ++- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 1 + 2 files changed, 3 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 e7b8cd0..57cadad 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 @@ -3857,7 +3857,8 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum PRINT_TYPE { - SN(10, "SN"); + SN(10, "SN"), + PACKAGE_NO(20, "PACKAGE_NO"); private int value; private String description; 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 6e717a9..aec24ee 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 @@ -1301,6 +1301,7 @@ public class WmsHqlPack { DdlPreparedPack.getStringRightLikerPack(wmsStockSn.getCustSn(), "custSn", result); DdlPreparedPack.getStringEqualPack(wmsStockSn.getDateCode(), "dateCode", result); DdlPreparedPack.getStringEqualPack(wmsStockSn.getLotNo(), "lotNo", result); + DdlPreparedPack.getStringEqualPack(wmsStockSn.getPackageNo(), "packageNo", result); DdlPreparedPack.timeBuilder(wmsStockSn.getQualityDateTimeStart()+","+ wmsStockSn.getQualityDateTimeEnd(), "qualityDate", result, false,false); if (wmsStockSn.getIsValid() != null) { From 00252caa0c609b3855ddc6d128bb2fd7d403b2ea Mon Sep 17 00:00:00 2001 From: luweihao Date: Mon, 9 Mar 2020 19:19:24 +0800 Subject: [PATCH 41/91] =?UTF-8?q?=E7=A7=BB=E5=8A=A8mespcn=E5=85=AC?= =?UTF-8?q?=E7=94=A8model?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/model/ActorMessageModel.java | 37 ++++++++++++++++++++++ .../i3plus/pojo/mes/model}/StationRequestBean.java | 2 +- .../cn/estsh/i3plus/pojo/mes/model}/StepModel.java | 2 +- 3 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ActorMessageModel.java rename modules/{i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes => i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model}/StationRequestBean.java (98%) rename modules/{i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes => i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model}/StepModel.java (98%) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ActorMessageModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ActorMessageModel.java new file mode 100644 index 0000000..822087a --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ActorMessageModel.java @@ -0,0 +1,37 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import lombok.Data; + +import java.util.List; +import java.util.Map; + +/** + * @author Wynne.Lu + * @date 2020/3/9 15:35 + * @desc + */ +@Data +public class ActorMessageModel { + + private String msgType; + + private String clientInfo; + + private String workCellCode; + + private String workCenterCode; + + private String organizeCode; + + private String routeCode; + + private String serialNumber; + + private String productSn; + + private T dataObj; + + private List dataList; + + private Map dataMap; +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StationRequestBean.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java similarity index 98% rename from modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StationRequestBean.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java index 46134cc..d4961d3 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StationRequestBean.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.model.mes; +package cn.estsh.i3plus.pojo.mes.model; import io.swagger.annotations.ApiParam; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StepModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepModel.java similarity index 98% rename from modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StepModel.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepModel.java index 6b7eedd..7636eae 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StepModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepModel.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.model.mes; +package cn.estsh.i3plus.pojo.mes.model; import io.swagger.annotations.ApiParam; import lombok.Data; From c9f6f336af818031c2967a524392f51d16a24324 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Tue, 10 Mar 2020 10:30:32 +0800 Subject: [PATCH 42/91] =?UTF-8?q?=E5=8A=A8=E6=80=81=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=EF=BC=9A=E8=A7=A3=E5=86=B3=E4=BA=86BUG#7658,7660,7661,7663,766?= =?UTF-8?q?4=203D=E4=BB=93=E5=BA=93=EF=BC=9A=E8=81=94=E8=B0=83=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/model/wms/WmsTdChangeModel.java | 25 +++++++++++++++++++ .../estsh/i3plus/pojo/wms/bean/WmsFurniture.java | 29 ++++++++++++++++++++++ .../cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java | 16 +++++++++++- .../cn/estsh/i3plus/pojo/wms/bean/WmsZones.java | 4 +++ .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 2 +- 5 files changed, 74 insertions(+), 2 deletions(-) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTdChangeModel.java diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTdChangeModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTdChangeModel.java new file mode 100644 index 0000000..a6f69a8 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTdChangeModel.java @@ -0,0 +1,25 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import cn.estsh.i3plus.pojo.wms.bean.WmsFurniture; +import cn.estsh.i3plus.pojo.wms.bean.WmsLocate; +import cn.estsh.i3plus.pojo.wms.bean.WmsZones; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description 更改三维坐标MoDel + * @Reference + * @Author dragon + * @CreateDate 2020/3/6 17:57 + * @Modify + */ +@Data +public class WmsTdChangeModel implements Serializable { + private static final long serialVersionUID = -2682858106052506217L; + + private List wmsZonesList; + private List wmsFurnitureList; + private List wmsLocateList; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFurniture.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFurniture.java index a6f6904..8dd97f8 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFurniture.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFurniture.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description 家具实体 @@ -49,7 +50,35 @@ public class WmsFurniture extends BaseBean { @ApiParam(value = "是否储物") private Integer isSaveGoods; + @Column(name = "POSITION") + @ApiParam(value = "三维位置") + private String position; + + @Transient + @ApiParam(value = "层") + private Integer storey; + + @Transient + @ApiParam(value = "列") + private Integer fntCol; + + public int getIsSaveGoodsVal() { return this.isSaveGoods == null ? 0 : this.isSaveGoods; } + + public WmsFurniture() { + } + + public WmsFurniture(String whNo, String zoneNo, String typeCode, String furnitureNo, + Integer isSaveGoods, String position, Integer storey, Integer fntCol) { + this.whNo = whNo; + this.zoneNo = zoneNo; + this.typeCode = typeCode; + this.furnitureNo = furnitureNo; + this.isSaveGoods = isSaveGoods; + this.position = position; + this.storey = storey; + this.fntCol = fntCol; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java index 41092ce..ea6891b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java @@ -47,7 +47,7 @@ public class WmsLocate extends BaseBean { */ @Column(name = "LOCATE_TYPE") @ApiParam(value = "库位类型") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, entityName = "LOCATE_TYPE") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "LOCATE_TYPE") private Integer locateType; @Column(name = "WH_NO") @@ -147,6 +147,10 @@ public class WmsLocate extends BaseBean { @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) private String lastCsTime; + @Column(name = "POSITION") + @ApiParam(value = "三维位置") + private String position; + // 导入用 @ApiParam(value = "工厂") @Transient @@ -254,5 +258,15 @@ public class WmsLocate extends BaseBean { return this.frequency == null ? 0 : this.frequency.intValue(); } + public Integer getXVal() { + return this.x == null ? 0 : this.x.intValue(); + } + public Integer getYVal() { + return this.y == null ? 0 : this.y.intValue(); + } + public Integer getZVal() { + return this.z == null ? 0 : this.z.intValue(); + } + } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java index 4c9e00d..c00ff31 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java @@ -113,6 +113,10 @@ public class WmsZones extends BaseBean { @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) private Double zoneWidth; + @Column(name = "POSITION") + @ApiParam(value = "三维位置") + private String position; + @Transient @ApiParam(value = "子存储区列表") private List childList; 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 6e717a9..9808095 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 @@ -541,7 +541,7 @@ public class WmsHqlPack { DdlPreparedPack.getNumEqualPack(wmsLocate.getLocateType(), "locateType", result); DdlPreparedPack.getStringEqualPack(wmsLocate.getWhNo(), "whNo", result); if (wmsLocate.getZoneNo() != null) { - DdlPreparedPack.getInPack(StringUtils.join(new ArrayList(Arrays.asList(wmsLocate.getZoneNo().split(","))), ","), "", result); + DdlPreparedPack.getInPack(StringUtils.join(new ArrayList(Arrays.asList(wmsLocate.getZoneNo().split(","))), ","), "zoneNo", result); } if (wmsLocate.getLocateNoArr() != null) { DdlPreparedPack.getInPack(StringUtils.join(wmsLocate.getLocateNoArr()), "", result); From ccf2817788468ba2a0d4083d406c418dd3ddd9f2 Mon Sep 17 00:00:00 2001 From: joke lin Date: Tue, 10 Mar 2020 19:54:52 +0800 Subject: [PATCH 43/91] =?UTF-8?q?[=E8=AE=A1=E5=88=92=E7=AE=A1=E7=90=86]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 117 +++++++++++++++++++-- .../i3plus/pojo/mes/bean/MesQueueGroupCount.java | 2 +- .../cn/estsh/i3plus/pojo/mes/bean/MesQueueJis.java | 8 ++ .../i3plus/pojo/mes/bean/MesQueueJisDetail.java | 8 ++ .../i3plus/pojo/mes/bean/MesQueueJitActual.java | 12 +++ .../pojo/mes/bean/MesQueueJitActualDetail.java | 6 +- .../estsh/i3plus/pojo/mes/bean/MesQueueOrder.java | 20 ++++ .../i3plus/pojo/mes/bean/MesQueueOrderDetail.java | 12 ++- 8 files changed, 173 insertions(+), 12 deletions(-) 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 850ce6c..9683119 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 @@ -17,7 +17,8 @@ public class MesEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MES_ACTION_MODULE { - WORK_ORDER_LANDED(10, "生产工单下达"); + WORK_ORDER_LANDED(10, "生产工单下达"), + QUEUE_JIT_ACTUAL_LANDED(20, "客户JIT生产工单下达"); private int value; private String description; @@ -2915,7 +2916,8 @@ public class MesEnumUtil { STANDARD_ORDER(10, "标准工单"), BTS_ORDER(20, "BTS工单"), ATTEMPT_ORDER(30, "试制工单"), - BH_ORDER(40, "B&H工单"); + BH_ORDER(40, "B&H工单"), + JIT_ORDER(50, "JIT工单"); private int value; private String description; @@ -4068,7 +4070,7 @@ public class MesEnumUtil { * 客户JIT生产队列状态 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum MES_QUEUE_JIT_ACTUAL_STATUS { + public enum QUEUE_JIT_ACTUAL_STATUS { CREATE(10, "创建"), LANDED(20, "下达"), CANCEL(30, "取消"); @@ -4076,7 +4078,7 @@ public class MesEnumUtil { private int value; private String description; - MES_QUEUE_JIT_ACTUAL_STATUS(int value, String description) { + QUEUE_JIT_ACTUAL_STATUS(int value, String description) { this.value = value; this.description = description; } @@ -4104,14 +4106,117 @@ public class MesEnumUtil { * 客户JIT生产队列特殊标识 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum MES_QUEUE_JIT_ACTUAL_SPECIAL_FLAG { + public enum QUEUE_JIT_ACTUAL_SPECIAL_FLAG { NORMAL(10, "正常"), EMPTYING(20, "放空"); private int value; private String description; - MES_QUEUE_JIT_ACTUAL_SPECIAL_FLAG(int value, String description) { + QUEUE_JIT_ACTUAL_SPECIAL_FLAG(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; + } + } + + /** + * JIS发运队列状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum QUEUE_JIS_STATUS { + CREATE(10, "创建"); + + private int value; + private String description; + + QUEUE_JIS_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; + } + } + + /** + * 生产队列 队列类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum QUEUE_ORDER_QUEUE_TYPE { + PRODUCT_QUEUE(10, "生产队列"), + PRELOAD_QUEUE(20, "预装队列"); + + private int value; + private String description; + + QUEUE_ORDER_QUEUE_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; + } + } + + /** + * JIS发运队列明细 状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum QUEUE_JIS_DETAIL_STATUS { + CREATE(10, "创建"); + + private int value; + private String description; + + QUEUE_JIS_DETAIL_STATUS(int value, String description) { this.value = value; this.description = description; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueGroupCount.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueGroupCount.java index 1133c1a..a459fb4 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueGroupCount.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueGroupCount.java @@ -14,7 +14,7 @@ import javax.persistence.Table; import java.io.Serializable; /** - * @Description :MES_QUEUE_JIT_ACTUAL_DETAIL + * @Description : * @Reference : * @Author : joke * @CreateDate : 2020-03-06 10:16 上午 diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJis.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJis.java index 249fd29..4a6ca87 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJis.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJis.java @@ -64,6 +64,14 @@ public class MesQueueJis extends BaseBean implements Serializable { @ApiParam("工作单元代码") private String workCellCode; + @Column(name = "CUST_CODE") + @ApiParam("客户代码") + private String custCode; + + @Column(name = "CUST_PLANT_CODE") + @ApiParam("客户产线代码") + private String custPlantCode; + @Transient @ApiParam("颜色") private String color; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJisDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJisDetail.java index 5ac2924..8c8e9bf 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJisDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJisDetail.java @@ -59,4 +59,12 @@ public class MesQueueJisDetail extends BaseBean implements Serializable { @ApiParam("产品条码") private String serialNumber; + @Column(name = "QUEUE_GROUP_NO") + @ApiParam("分组队列编号") + private String queueGroupNo; + + @Column(name = "GROUP_NO") + @ApiParam("组内编号") + private Integer groupNo; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java index e3f8e55..0f191b6 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java @@ -88,4 +88,16 @@ public class MesQueueJitActual extends BaseBean implements Serializable { @ApiParam("客户需求结束时间") private String custPointEndDate; + @Transient + @ApiParam("产品配置名称") + private String prodCfgName; + + @Transient + @ApiParam("状态名称") + private String statusName; + + @Transient + @ApiParam("特殊标识名称") + private String specialFlagName; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java index 77e6c6f..832419c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java @@ -31,9 +31,9 @@ public class MesQueueJitActualDetail extends BaseBean implements Serializable { private static final long serialVersionUID = 1442091799346314190L; - @Column(name = "QGR_CODE") - @ApiParam("分组规则代码") - private String qgrCode; + @Column(name = "JIS_ACTUAL_NO") + @ApiParam("队列编号") + private String jisActualNo; @Column(name = "PROD_CFG_CODE") @ApiParam("配置代码") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java index 159aa03..fa0c07b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java @@ -72,6 +72,26 @@ public class MesQueueOrder extends BaseBean implements Serializable { @ApiParam("区域代码") private String areaCode; + @Column(name = "IS_LOCK") + @ApiParam("锁定标识") + private Integer isLock; + + @Column(name = "CUST_CODE") + @ApiParam("客户代码") + private String custCode; + + @Column(name = "WORK_TYPE") + @ApiParam("区域代码") + private String workType; + + @Column(name = "QUEUE_TYPE") + @ApiParam("队列类型") + private Integer queueType; + + @Column(name = "PG_CODE") + @ApiParam("生产组代码") + private String pgCode; + @Transient @ApiParam("起始车号") private String custFlagNoStart; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java index 040bac7..c7554a2 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java @@ -72,10 +72,18 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable { @ApiParam("产品类型名称") private String produceCategoryNameRdd; - @Column(name = "产品生产类型") - @ApiParam("产品类型名称") + @Column(name = "PPT_CODE") + @ApiParam("产品生产类型") private String pptCode; + @Column(name = "QUEUE_GROUP_NO") + @ApiParam("分组队列编号") + private String queueGroupNo; + + @Column(name = "GROUP_NO") + @ApiParam("组内编号") + private Integer groupNo; + @Transient @ApiParam("队列序号") private Double queueSeq; From 5cc5844e45179c2af7328b496bf537ebcbf6e577 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Wed, 11 Mar 2020 09:18:36 +0800 Subject: [PATCH 44/91] =?UTF-8?q?=E3=80=90=E5=BA=93=E5=AD=98=E6=9D=A1?= =?UTF-8?q?=E7=A0=81=E5=AE=9E=E4=BD=93-=E6=B7=BB=E5=8A=A0=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=20=E5=8C=85=E8=A3=85=E9=9B=B6=E4=BB=B6=E5=8F=B7?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java index f72a66b..292a424 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java @@ -215,6 +215,10 @@ public class WmsStockSn extends BaseBean { @Transient public String labelNo; + @Column(name = "PACKAGE_PART_NO") + @ApiParam(value = "包装零件号") + private String packagePartNo; + @Transient @ApiParam(value = "工厂名称") public String organizeName; From eefb4721170af31037b6de193a590043d2479a56 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Wed, 11 Mar 2020 10:41:34 +0800 Subject: [PATCH 45/91] =?UTF-8?q?=E3=80=907650=20=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E6=A0=87=E7=AD=BE=E6=89=AB=E6=8F=8F=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java index 81cd4b4..d05658c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java @@ -126,4 +126,15 @@ public class WmsDocMovementSn extends BaseBean { @Transient @ApiParam("父层级packcode对应的可回用零件号") private String parentReturnPart; + + @Transient + @ApiParam("剩余箱数量") + private Long countBox; + + public WmsDocMovementSn(){} + + public WmsDocMovementSn(Long countBox,String partNo) { + this.countBox = countBox; + this.partNo = partNo; + } } From 7aecf9dcc0eb3249d91ff699ae2e53eccae3ea84 Mon Sep 17 00:00:00 2001 From: zcg Date: Wed, 11 Mar 2020 10:58:21 +0800 Subject: [PATCH 46/91] =?UTF-8?q?=E3=80=90task=201436=20=E5=B7=A5=E6=AD=A5?= =?UTF-8?q?-=E5=85=B3=E9=94=AE=E4=BB=B6=E7=BB=91=E5=AE=9A=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C=E5=B9=B6=E8=BD=AC=E8=BF=87=E7=A8=8B=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 71 ---------------------- .../pojo/mes/pcn/bean/MesProdScatterCfgBom.java | 55 +++++++++++++++++ .../repository/MesProdScatterCfgBomRepository.java | 16 +++++ .../i3plus/pojo/mes/bean/MesProdScatterCfgBom.java | 55 +++++++++++++++++ .../repository/MesProdScatterCfgBomRepository.java | 15 +++++ 5 files changed, 141 insertions(+), 71 deletions(-) create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdScatterCfgBom.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdScatterCfgBomRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdScatterCfgBom.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProdScatterCfgBomRepository.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 850ce6c..6882f7c 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 @@ -4063,75 +4063,4 @@ public class MesEnumUtil { return tmp; } } - - /** - * 客户JIT生产队列状态 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum MES_QUEUE_JIT_ACTUAL_STATUS { - CREATE(10, "创建"), - LANDED(20, "下达"), - CANCEL(30, "取消"); - - private int value; - private String description; - - MES_QUEUE_JIT_ACTUAL_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; - } - } - - /** - * 客户JIT生产队列特殊标识 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum MES_QUEUE_JIT_ACTUAL_SPECIAL_FLAG { - NORMAL(10, "正常"), - EMPTYING(20, "放空"); - - private int value; - private String description; - - MES_QUEUE_JIT_ACTUAL_SPECIAL_FLAG(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; - } - } } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdScatterCfgBom.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdScatterCfgBom.java new file mode 100644 index 0000000..180b0df --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdScatterCfgBom.java @@ -0,0 +1,55 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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 java.io.Serializable; +import java.math.BigDecimal; + +/** + * @Description :散件产品配置明细 + * @Reference : + * @Author : zcg + * @Date : 2020/3/9 0009 - 17:52 + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PROD_SCATTER_CFG_BOM") +@Api("散件产品配置明细") +public class MesProdScatterCfgBom extends BaseBean implements Serializable { + + @Column(name = "SP_CFG_CODE") + @ApiParam("散件配置编码") + private String spCfgCode; + + @Column(name = "PRODUCE_CTGY_CODE") + @ApiParam("产品位置代码") + private String produceCtgyCode; + + @Column(name = "PART_NO") + @ApiParam("散件产品代码") + private String partNo; + + @Column(name = "ITEM_PART_NO") + @ApiParam("原材料物料号") + private String itemPartNo; + + @Column(name = "QTY") + @ApiParam("用量") + private BigDecimal qty; + + @Column(name = "IS_KEY_PART") + @ApiParam("是否关键件") + private Integer isKeyPart ; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdScatterCfgBomRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdScatterCfgBomRepository.java new file mode 100644 index 0000000..6827df9 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdScatterCfgBomRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProdScatterCfgBom; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : zcg + * @Date : 2020/3/9 0009 - 18:03 + */ +@Repository +public interface MesProdScatterCfgBomRepository extends BaseRepository { + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdScatterCfgBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdScatterCfgBom.java new file mode 100644 index 0000000..73fae24 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdScatterCfgBom.java @@ -0,0 +1,55 @@ +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 java.io.Serializable; +import java.math.BigDecimal; + +/** + * @Description : + * @Reference : + * @Author : zcg + * @Date : 2020/3/9 0009 - 17:58 + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PROD_SCATTER_CFG_BOM") +@Api("散件产品配置明细") +public class MesProdScatterCfgBom extends BaseBean implements Serializable { + + @Column(name = "SP_CFG_CODE") + @ApiParam("散件配置编码") + private String spCfgCode; + + @Column(name = "PRODUCE_CTGY_CODE") + @ApiParam("产品位置代码") + private String produceCtgyCode; + + @Column(name = "PART_NO") + @ApiParam("散件产品代码") + private String partNo; + + @Column(name = "ITEM_PART_NO") + @ApiParam("原材料物料号") + private String itemPartNo; + + @Column(name = "QTY") + @ApiParam("用量") + private BigDecimal qty; + + @Column(name = "IS_KEY_PART") + @ApiParam("是否关键件") + private Integer isKeyPart ; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProdScatterCfgBomRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProdScatterCfgBomRepository.java new file mode 100644 index 0000000..d21d930 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProdScatterCfgBomRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesProdScatterCfgBom; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : zcg + * @Date : 2020/3/9 0009 - 18:56 + */ +@Repository +public interface MesProdScatterCfgBomRepository extends BaseRepository { +} From 5e7898524782eae4b85e3fb48969889ca31df3ee Mon Sep 17 00:00:00 2001 From: zcg Date: Wed, 11 Mar 2020 11:16:44 +0800 Subject: [PATCH 47/91] =?UTF-8?q?=E3=80=90task=201436=20=20=E5=B7=A5?= =?UTF-8?q?=E6=AD=A5-=E5=85=B3=E9=94=AE=E4=BB=B6=E7=BB=91=E5=AE=9A?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E5=B9=B6=E8=BD=AC=E8=BF=87=E7=A8=8B=E6=9D=A1?= =?UTF-8?q?=E7=A0=81=20=E3=80=91=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 105 +++++++++++++++++++++ 1 file changed, 105 insertions(+) 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 6882f7c..0fb1f78 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 @@ -4063,4 +4063,109 @@ public class MesEnumUtil { return tmp; } } + + /** + * 客户JIT生产队列状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_QUEUE_JIT_ACTUAL_STATUS { + CREATE(10, "创建"), + LANDED(20, "下达"), + CANCEL(30, "取消"); + + private int value; + private String description; + + MES_QUEUE_JIT_ACTUAL_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; + } + } + + /** + * 客户JIT生产队列特殊标识 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_QUEUE_JIT_ACTUAL_SPECIAL_FLAG { + NORMAL(10, "正常"), + EMPTYING(20, "放空"); + private int value; + private String description; + + MES_QUEUE_JIT_ACTUAL_SPECIAL_FLAG(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; + } + } + /** + * 关键件条码校验工步对应的物料分类的值 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PART_TYPE_THREE { + + MM(10, "MM"), + MS(20, "MS"); + + private int value; + private String description; + + PART_TYPE_THREE(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; + } + } } From 0968cdc49e5289438d19f192abfd56bd4eb7741f Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Wed, 11 Mar 2020 11:35:36 +0800 Subject: [PATCH 48/91] =?UTF-8?q?=E3=80=907601=20=E5=8F=91=E8=BF=90?= =?UTF-8?q?=E5=8D=95=E6=98=8E=E7=BB=86=E7=94=9F=E6=88=90=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=E5=90=8E=EF=BC=8C=E7=94=B1=E4=BA=8E=E7=94=9F=E6=88=90=E7=9A=84?= =?UTF-8?q?=E5=AE=A2=E6=88=B7=E6=9D=A1=E7=A0=81=E4=B8=8D=E5=AD=98=E5=9C=A8?= =?UTF-8?q?=E4=BA=8E=E6=9D=A1=E7=A0=81=E8=A1=A8=E4=B8=AD=E3=80=82=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E6=9C=89=E4=B8=80=E4=B8=AA=E7=95=8C=E9=9D=A2=E5=8F=AF?= =?UTF-8?q?=E4=BB=A5=E6=9F=A5=E5=88=B0=E8=BF=99=E4=BA=9B=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=EF=BC=8C=E5=B9=B6=E4=B8=94=E6=89=93=E5=8D=B0=E5=87=BA=E6=9D=A5?= =?UTF-8?q?=EF=BC=8C=E7=9B=AE=E5=89=8D=E7=9A=84=E8=AF=9D=E5=A6=82=E6=9E=9C?= =?UTF-8?q?=E7=94=9F=E6=88=90=E9=82=A3=E6=AC=A1=E7=9A=84=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E4=BA=86=EF=BC=8C=E9=82=A3=E5=B0=B1=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E5=86=8D=E6=AC=A1=E6=89=93=E5=8D=B0=E6=94=B9=E6=9D=A1?= =?UTF-8?q?=E7=A0=81=E3=80=82=E3=80=91BUG#7601=20=E3=80=907567=20=E6=9D=A1?= =?UTF-8?q?=E7=A0=81=E7=8A=B6=E6=80=81=E6=8A=A5=E8=A1=A8=E5=B8=8C=E6=9C=9B?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=80=E4=B8=AAASN=E7=BB=84=E5=8F=B7?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=8C=89=E9=92=AE=EF=BC=8C=E4=B8=8D=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E5=A2=9E=E5=8A=A0=E6=98=BE=E7=A4=BA=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=EF=BC=8C=E5=8F=AA=E6=98=AF=E5=B8=8C=E6=9C=9B=E5=8F=AF=E4=BB=A5?= =?UTF-8?q?=E6=8C=89=E7=85=A7ASN=E7=BB=84=E5=8F=B7=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=9D=A1=E7=A0=81=E3=80=91bug#7567=20=E3=80=907520=20=E7=9B=98?= =?UTF-8?q?=E7=82=B9=E5=8D=95=E4=B8=BB=E7=95=8C=E9=9D=A2=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=BA=93=E5=8C=BA=E4=B8=8E=E9=9B=B6=E4=BB=B6=E5=8F=B7=EF=BC=8C?= =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E4=BB=8E=E7=9B=98=E7=82=B9=E8=8C=83=E5=9B=B4?= =?UTF-8?q?=E9=87=8C=E5=8F=96=EF=BC=8C=E5=A6=82=E6=9E=9C=E6=9C=89=E5=A4=9A?= =?UTF-8?q?=E4=B8=AA=E5=BA=93=E5=8C=BA=E6=88=96=E8=80=85=E5=A4=9A=E4=B8=AA?= =?UTF-8?q?=E9=9B=B6=E4=BB=B6=E5=8F=B7=EF=BC=8C=E5=88=99=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E4=B8=BA=E7=A9=BA=E5=B0=B1=E8=A1=8C,=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=A1=86=E5=A2=9E=E5=8A=A0=E9=9B=B6=E4=BB=B6=E5=8F=B7=E4=B8=8E?= =?UTF-8?q?=E5=BA=93=E5=8C=BA=E5=AD=97=E6=AE=B5=E6=9F=A5=E8=AF=A2=E3=80=91?= =?UTF-8?q?bug#7520?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java | 8 ++++++++ .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java | 5 +++++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 4 ++++ 3 files changed, 17 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java index fe8ebc7..6d70ddc 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java @@ -92,10 +92,18 @@ public class WmsCSOrderMaster extends BaseBean { public String[] wmsCSParts; @Transient + @ApiParam(value = "盘点物料清单") + public String wmsCSPartsStr; + + @Transient @ApiParam(value = "盘点存储区清单") public String[] wmsCSZones; @Transient + @ApiParam(value = "盘点存储区清单") + public String wmsCSZonesStr; + + @Transient @ApiParam(value = "盘点库位清单") public String[] wmsCSLocates; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java index 81cd4b4..f5631cd 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java @@ -126,4 +126,9 @@ public class WmsDocMovementSn extends BaseBean { @Transient @ApiParam("父层级packcode对应的可回用零件号") private String parentReturnPart; + + + @Transient + @ApiParam("打印模板") + private String templateNo; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java index f72a66b..eae8683 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java @@ -306,6 +306,10 @@ public class WmsStockSn extends BaseBean { @ApiParam(value = "预计完成时间") private String planCompleteTime; + @Transient + @ApiParam(value = "集装箱号") + private String containerNo; + public WmsStockSn() { } From 4d701aa9c4bec8647ae1281cbd2ddab8955ed5c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Wed, 11 Mar 2020 11:51:19 +0800 Subject: [PATCH 49/91] =?UTF-8?q?=E6=B7=BB=E5=8A=A0ptl=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java | 2 +- .../estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java | 2 +- .../estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java | 4 ++++ .../i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java | 12 ++++++++++++ .../main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlBom.java | 8 ++++---- .../java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnClear.java | 2 +- .../pojo/ptl/repository/PtlPcnClearRepository.java | 16 ++++++++++++++++ 7 files changed, 39 insertions(+), 7 deletions(-) create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlPcnClearRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java index cd9a311..8956db4 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java @@ -476,7 +476,7 @@ public class PtlEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum SYNC_PATTERN { - UPDATE(1, "修改"), + UPDATE(1, "新增或修改"), INSERT(2, "新增"); private int value; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java index 7d3d688..e452e94 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java @@ -1360,7 +1360,7 @@ public class PtlPcnEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum SYNC_PATTERN { - UPDATE(1, "修改"), + UPDATE(1, "新增或修改"), INSERT(2, "新增"); private int value; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java index 620fa7d..649fe2d 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java @@ -6,6 +6,7 @@ import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.repository.NoRepositoryBean; import java.io.Serializable; +import java.util.Date; import java.util.List; import java.util.Map; @@ -378,4 +379,7 @@ public interface BaseRepository extends JpaReposito double findMinByProperty(String sumPropertyName,String groupByName,String propertyName, Object value); double findMinByProperties(String sumPropertyName,String groupByName,String[] paramName,Object[] paramValue); + + List findByHqlWhereByClear(DdlPackBean packBean, String dateTime); + } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java index 103be31..b766f3f 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java @@ -1548,4 +1548,16 @@ public class BaseRepositoryImpl extends SimpleJpaRep } return num; } + + @Override + public List findByHqlWhereByClear(DdlPackBean packBean, String dateTime) { + StringBuffer queryString = new StringBuffer(); + queryString.append("from " + persistentClass.getSimpleName() + " as model where 1=1 and model.createDatetime <= " + dateTime + " "); + + if (packBean != null) { + queryString.append(packBean.getWhereAppend()); + } + + return entityManager.createQuery(queryString.toString()).getResultList(); + } } diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlBom.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlBom.java index 6aec23d..55a0d3e 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlBom.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlBom.java @@ -82,11 +82,11 @@ public class PtlBom extends BaseBean implements Serializable { @Column(name = "EFF_START_TIME") @ApiParam("有效起始日期") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME) - private Date effStartTime; + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + private String effStartTime; @Column(name = "EFF_END_TIME") @ApiParam("有效截止日期") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME) - private Date effEndTime; + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + private String effEndTime; } diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnClear.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnClear.java index f218fc3..360d748 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnClear.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnClear.java @@ -53,6 +53,6 @@ public class PtlPcnClear extends BaseBean implements Serializable { @Column(name = "LAST_SYNC_TIME") @ApiParam("上一执行时间") - private Date lastSyncTime; + private String lastSyncTime; } diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlPcnClearRepository.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlPcnClearRepository.java new file mode 100644 index 0000000..c39a211 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlPcnClearRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.ptl.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.ptl.bean.PtlPcnClear; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: adair.song + * @CreateDate:2019-04-24-17:13 + * @Modify: + **/ +@Repository +public interface PtlPcnClearRepository extends BaseRepository { +} From 2c0ef55e85e32afe6f2705e2853fc0b2d5420cd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Wed, 11 Mar 2020 15:00:49 +0800 Subject: [PATCH 50/91] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2BUG#7674,#7676+=20=E6=B5=81=E7=A8=8B=E5=AF=BC?= =?UTF-8?q?=E5=85=A5BUG#7682?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WareHouse.java | 51 +++++++++++++--------- .../estsh/i3plus/pojo/wms/bean/WmsFurniture.java | 10 ++--- .../i3plus/pojo/wms/bean/WmsFurnitureType.java | 38 +++++++++++----- .../cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java | 30 ++++++------- .../cn/estsh/i3plus/pojo/wms/bean/WmsZones.java | 16 +++---- 5 files changed, 85 insertions(+), 60 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WareHouse.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WareHouse.java index e3ddc5b..30d7725 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WareHouse.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WareHouse.java @@ -28,52 +28,63 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="WMS_WAREHOUSE") +@Table(name = "WMS_WAREHOUSE") @Api("工厂仓库信息") public class WareHouse extends BaseBean { private static final long serialVersionUID = 7914396535326597148L; - @Column(name="CODE") + @Column(name = "CODE") @ApiParam("仓库代码") @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) public String code; - @Column(name="NAME") + @Column(name = "NAME") @ApiParam("仓库名称") @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) public String name; - @Column(name="ADDRESS") + @Column(name = "ADDRESS") @ApiParam("仓库地址") @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) public String address; - @Column(name = "WH_LENGTH", columnDefinition = "decimal(18,8)") - @ApiParam(value = "长") + @Column(name = "WH_LENGTH") + @ApiParam(value = "长(单位：全局设置参数中的基本单元)") @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) - private Double whLength; + private Integer whLength; - @Column(name = "WH_WIDTH", columnDefinition = "decimal(18,8)") - @ApiParam(value = "宽") + @Column(name = "WH_WIDTH") + @ApiParam(value = "宽(单位：全局设置参数中的基本单元)") @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) - private Double whWidth; + private Integer whWidth; - @Column(name = "WH_HEIGHT", columnDefinition = "decimal(18,8)") - @ApiParam(value = "高") + @Column(name = "WH_HEIGHT") + @ApiParam(value = "高(单位：全局设置参数中的基本单元)") @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) - private Double whHeight; + private Integer whHeight; + + @Column(name = "BASE_UNIT", columnDefinition = "decimal(18,8)") + @ApiParam(value = "基本单元（米）") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + private Double baseUnit; @Transient - @ApiParam(value ="存储区列表") + @ApiParam(value = "存储区列表") private List zoneList; - public double getWhLengthVal() { - return this.whLength == null ? 0 : this.whLength.doubleValue(); + public Integer getWhLengthVal() { + return this.whLength == null ? 0 : this.whLength.intValue(); + } + + public Integer getWhWidthVal() { + return this.whWidth == null ? 0 : this.whWidth.intValue(); } - public double getWhWidthVal() { - return this.whWidth == null ? 0 : this.whWidth.doubleValue(); + + public Integer getWhHeightVal() { + return this.whHeight == null ? 0 : this.whHeight.intValue(); } - public double getWhHeightVal() { - return this.whHeight == null ? 0 : this.whHeight.doubleValue(); + + public Double getBaseUnitVal() { + return this.baseUnit == null ? 0 : this.baseUnit.doubleValue(); } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFurniture.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFurniture.java index 8dd97f8..929b274 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFurniture.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFurniture.java @@ -62,11 +62,6 @@ public class WmsFurniture extends BaseBean { @ApiParam(value = "列") private Integer fntCol; - - public int getIsSaveGoodsVal() { - return this.isSaveGoods == null ? 0 : this.isSaveGoods; - } - public WmsFurniture() { } @@ -81,4 +76,9 @@ public class WmsFurniture extends BaseBean { this.storey = storey; this.fntCol = fntCol; } + + public Integer getIsSaveGoodsVal() { + return this.isSaveGoods == null ? 0 : this.isSaveGoods; + } + } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFurnitureType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFurnitureType.java index 2ee5b0f..d9dd033 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFurnitureType.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFurnitureType.java @@ -37,17 +37,17 @@ public class WmsFurnitureType extends BaseBean { @ApiParam(value = "类型名称") private String typeName; - @Column(name = "FNT_LENGTH", columnDefinition = "decimal(18,8)") + @Column(name = "FNT_LENGTH") @ApiParam(value = "长") - private Double fntLength; + private Integer fntLength; - @Column(name = "FNT_WIDTH", columnDefinition = "decimal(18,8)") + @Column(name = "FNT_WIDTH") @ApiParam(value = "宽") - private Double fntWidth; + private Integer fntWidth; - @Column(name = "FNT_HEIGHT", columnDefinition = "decimal(18,8)") + @Column(name = "FNT_HEIGHT") @ApiParam(value = "高") - private Double fntHeight; + private Integer fntHeight; @Column(name = "STOREY") @ApiParam(value = "层") @@ -61,14 +61,28 @@ public class WmsFurnitureType extends BaseBean { @ApiParam(value = "是否储物") private Integer isSaveGoods; - public Double getFntLengthVal() { - return this.fntLength == null ? 0 : this.fntLength.doubleValue(); + public Integer getStoreyVal() { + return this.storey == null ? 0 : this.storey.intValue(); } - public Double getFntWidthVal() { - return this.fntWidth == null ? 0 : this.fntWidth.doubleValue(); + + public Integer getFntColVal() { + return this.fntCol == null ? 0 : this.fntCol.intValue(); + } + + public Integer getFntLengthVal() { + return this.fntLength == null ? 0 : this.fntLength.intValue(); + } + + public Integer getFntWidthVal() { + return this.fntWidth == null ? 0 : this.fntWidth.intValue(); + } + + public Integer getFntHeightVal() { + return this.fntHeight == null ? 0 : this.fntHeight.intValue(); } - public Double getFntHeightVal() { - return this.fntHeight == null ? 0 : this.fntHeight.doubleValue(); + + public Integer getIsSaveGoodsVal() { + return this.isSaveGoods == null ? 0 : this.isSaveGoods.intValue(); } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java index ea6891b..a5b6221 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java @@ -82,20 +82,20 @@ public class WmsLocate extends BaseBean { @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Integer z; - @Column(name = "LC_LENGTH", columnDefinition = "decimal(18,8)") + @Column(name = "LC_LENGTH") @ApiParam(value = "长") @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) - private Double lcLength; + private Integer lcLength; - @Column(name = "LC_WIDTH", columnDefinition = "decimal(18,8)") + @Column(name = "LC_WIDTH") @ApiParam(value = "宽") @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) - private Double lcWidth; + private Integer lcWidth; - @Column(name = "LC_HEIGHT", columnDefinition = "decimal(18,8)") + @Column(name = "LC_HEIGHT") @ApiParam(value = "高") @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) - private Double lcHeight; + private Integer lcHeight; @Column(name = "SEQ") @ApiParam(value = "序号", example = "-1") @@ -244,18 +244,18 @@ public class WmsLocate extends BaseBean { return this.locateType== null ? 0 : this.locateType.intValue(); } - public Double getLcLengthVal() { - return this.lcLength == null ? 0 : this.lcLength.doubleValue(); + public Integer getFrequencyVal() { + return this.frequency == null ? 0 : this.frequency.intValue(); } - public Double getLcWidthVal() { - return this.lcWidth == null ? 0 : this.lcWidth.doubleValue(); + + public Integer getLcLengthVal() { + return this.lcLength == null ? 0 : this.lcLength.intValue(); } - public Double getLcHeightVal() { - return this.lcHeight == null ? 0 : this.lcHeight.doubleValue(); + public Integer getLcWidthVal() { + return this.lcWidth == null ? 0 : this.lcWidth.intValue(); } - - public Integer getFrequencyVal() { - return this.frequency == null ? 0 : this.frequency.intValue(); + public Integer getLcHeightVal() { + return this.lcHeight == null ? 0 : this.lcHeight.intValue(); } public Integer getXVal() { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java index c00ff31..e11133a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java @@ -103,15 +103,15 @@ public class WmsZones extends BaseBean { @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, entityName = "TRUE_OR_FALSE") private Integer checkFifo; - @Column(name = "ZONE_LENGTH", columnDefinition = "decimal(18,8)") + @Column(name = "ZONE_LENGTH") @ApiParam(value = "长") @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) - private Double zoneLength; + private Integer zoneLength; - @Column(name = "ZONE_WIDTH", columnDefinition = "decimal(18,8)") + @Column(name = "ZONE_WIDTH") @ApiParam(value = "宽") @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) - private Double zoneWidth; + private Integer zoneWidth; @Column(name = "POSITION") @ApiParam(value = "三维位置") @@ -133,10 +133,10 @@ public class WmsZones extends BaseBean { public WmsZones() { } - public double getZoneLengthVal() { - return this.zoneLength == null ? 0 : this.zoneLength.doubleValue(); + public Integer getZoneLengthVal() { + return this.zoneLength == null ? 0 : this.zoneLength.intValue(); } - public double getZoneWidthVal() { - return this.zoneWidth == null ? 0 : this.zoneWidth.doubleValue(); + public Integer getZoneWidthVal() { + return this.zoneWidth == null ? 0 : this.zoneWidth.intValue(); } } From ac4a8b0ab4a2601e5f82903e40b4f57ee2b2740b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Wed, 11 Mar 2020 15:07:09 +0800 Subject: [PATCH 51/91] =?UTF-8?q?=E4=BF=AE=E6=94=B9ptl=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=B8=85=E9=99=A4=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java index b766f3f..8746630 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java @@ -1551,13 +1551,20 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public List findByHqlWhereByClear(DdlPackBean packBean, String dateTime) { + LOGGER.info("ptl_pcn数据清除查询"); StringBuffer queryString = new StringBuffer(); - queryString.append("from " + persistentClass.getSimpleName() + " as model where 1=1 and model.createDatetime <= " + dateTime + " "); + queryString.append("select model from " + persistentClass.getSimpleName() + + " as model where 1=1 and model.createDatetime <= " + "'" + dateTime + "'" + " "); if (packBean != null) { queryString.append(packBean.getWhereAppend()); } - return entityManager.createQuery(queryString.toString()).getResultList(); + Query query = entityManager.createQuery(queryString.toString()); + for (String key : packBean.getHqlPreparedMap().keySet()) { + query.setParameter("m_" + key,packBean.getHqlPreparedMap().get(key)); + } + + return query.getResultList(); } } From 102af98a75a7aafd4c196da55ca3f3b320cb0e7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Wed, 11 Mar 2020 15:53:39 +0800 Subject: [PATCH 52/91] =?UTF-8?q?=E3=80=90PTL=5F=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E4=B8=BB=E4=BB=BB=E5=8A=A1=E7=BC=96=E5=8F=B7=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E5=92=8C=E7=BB=84=E5=86=85=E7=BC=96=E5=8F=B7=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java | 10 ++++------ .../cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java | 4 ++++ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java index c7554a2..1b817ca 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java @@ -72,19 +72,17 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable { @ApiParam("产品类型名称") private String produceCategoryNameRdd; - @Column(name = "PPT_CODE") - @ApiParam("产品生产类型") +@Column(name = "产品生产类型") + @ApiParam("产品类型名称") private String pptCode; - @Column(name = "QUEUE_GROUP_NO") + @Column(name = "QUEUE_GROUP_NO") @ApiParam("分组队列编号") private String queueGroupNo; @Column(name = "GROUP_NO") @ApiParam("组内编号") - private Integer groupNo; - - @Transient + private Integer groupNo; @Transient @ApiParam("队列序号") private Double queueSeq; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java index d4961d3..357f9e8 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.mes.model; +import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -79,6 +80,9 @@ public class StationRequestBean implements Serializable { @ApiParam("工步列表") private List stepList; + @ApiParam("生产主队列编号") + private String orderNo; + @Override public String toString() { return "StationRequestBean{" + From cb09776bdbf40e72736430ff6dae1ccb56830095 Mon Sep 17 00:00:00 2001 From: joke lin Date: Wed, 11 Mar 2020 18:13:16 +0800 Subject: [PATCH 53/91] =?UTF-8?q?[=E4=BB=BB=E5=8A=A1=EF=BC=9A1435=20?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E7=AE=A1=E7=90=86]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 10 +++-- .../i3plus/pojo/mes/bean/MesProdScatterDetail.java | 48 ++++++++++++++++++++++ .../i3plus/pojo/mes/model/MesButtonFlagModel.java | 3 ++ .../repository/MesProdScatterDetailRepository.java | 13 ++++++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 25 ++++++++--- 5 files changed, 90 insertions(+), 9 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdScatterDetail.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProdScatterDetailRepository.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 9683119..5bf74c2 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 @@ -2917,7 +2917,8 @@ public class MesEnumUtil { BTS_ORDER(20, "BTS工单"), ATTEMPT_ORDER(30, "试制工单"), BH_ORDER(40, "B&H工单"), - JIT_ORDER(50, "JIT工单"); + JIT_ORDER(50, "JIT工单"), + STOCK_ORDER(60, "库存工单"); private int value; private String description; @@ -4142,7 +4143,9 @@ public class MesEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum QUEUE_JIS_STATUS { - CREATE(10, "创建"); + CREATE(10, "创建"), + LANDED(20, "下达"), + SHIPMENT(30, "已发运"); private int value; private String description; @@ -4211,7 +4214,8 @@ public class MesEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum QUEUE_JIS_DETAIL_STATUS { - CREATE(10, "创建"); + CREATE(10, "创建"), + SHIPMENT(20, "已发运"); private int value; private String description; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdScatterDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdScatterDetail.java new file mode 100644 index 0000000..097c8d3 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdScatterDetail.java @@ -0,0 +1,48 @@ +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 java.io.Serializable; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/3/11 8:59 上午 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PROD_SCATTER_DETAIL") +@Api("MES_散件产品配置关系") +public class MesProdScatterDetail extends BaseBean implements Serializable { + + private static final long serialVersionUID = -3602480079910597288L; + + @Column(name = "SP_CFG_CODE") + @ApiParam("散件配置编码") + private String spCfgCode; + + @Column(name = "PRODUCE_CTGY_CODE") + @ApiParam("产品位置代码") + private String produceCtgyCode; + + @Column(name = "PART_NO") + @ApiParam("散件产品代码") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam("散件产品名称") + private String partName; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesButtonFlagModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesButtonFlagModel.java index d3ab791..3cd4e8b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesButtonFlagModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesButtonFlagModel.java @@ -26,6 +26,9 @@ public class MesButtonFlagModel implements Serializable { @ApiParam("按配置修改按钮") private boolean updateButtonConfig; + @ApiParam("按散件修改按钮") + private boolean updateButtonScatter; + @ApiParam("下达按钮") private boolean transmitButton; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProdScatterDetailRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProdScatterDetailRepository.java new file mode 100644 index 0000000..254cfb8 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProdScatterDetailRepository.java @@ -0,0 +1,13 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesProdScatterDetail; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/3/11 9:16 上午 + * @Modify: + */ +public interface MesProdScatterDetailRepository 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 9e068c0..914920f 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 @@ -226,15 +226,28 @@ public class MesHqlPack { DdlPreparedPack.getNumEqualPack(mesQueueOrder.getIsValid(), "isValid", packBean); } + if (!StringUtils.isEmpty(mesQueueOrder.getWorkType())) { + DdlPreparedPack.getStringBiggerPack(mesQueueOrder.getWorkType(), "workType", packBean); + } + if (!StringUtils.isEmpty(mesQueueOrder.getCustProdLineCode())) { + DdlPreparedPack.getStringBiggerPack(mesQueueOrder.getCustProdLineCode(), "custProdLineCode", packBean); + } + if (!StringUtils.isEmpty(mesQueueOrder.getPgCode())) { + DdlPreparedPack.getStringBiggerPack(mesQueueOrder.getPgCode(), "pgCode", packBean); + } + if (mesQueueOrder.getQueueType() != null) { + DdlPreparedPack.getStringBiggerPack(mesQueueOrder.getQueueType(), "queueType", packBean); + } + // 只查询创建状态的队列 DdlPreparedPack.getNumEqualPack(MesEnumUtil.QUEUE_ORDER_STATUS.NORMAL.getValue(), "status", packBean); - // 时间段查询 - DdlPreparedPack.timeBuilder( - mesQueueOrder.getCreateDateTimeStart(), - mesQueueOrder.getCreateDateTimeEnd(), - "createDatetime", packBean, true); - + if (!StringUtil.isEmpty(mesQueueOrder.getCreateDateTimeStart()) || !StringUtil.isEmpty(mesQueueOrder.getCreateDateTimeEnd())) { + DdlPreparedPack.timeBuilder( + mesQueueOrder.getCreateDateTimeStart(), + mesQueueOrder.getCreateDateTimeEnd(), + "createDatetime", packBean, true); + } // DdlPreparedPack.getOrderDefault(mesQueueOrder); return packBean; } From a5101960227f43bdfedd06c3236927836521ac95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Wed, 11 Mar 2020 18:49:33 +0800 Subject: [PATCH 54/91] =?UTF-8?q?=E8=BD=AF=E5=88=A0=E5=90=88=E5=90=8C?= =?UTF-8?q?=E7=A6=81=E7=94=A8=E5=90=AF=E7=94=A8=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/form/bean/BfDataObjectProperty.java | 8 ++++++++ .../java/cn/estsh/i3plus/pojo/form/bean/BfElement.java | 17 ++++++++++++++++- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObjectProperty.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObjectProperty.java index 8e246ce..54b9201 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObjectProperty.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObjectProperty.java @@ -112,6 +112,14 @@ public class BfDataObjectProperty extends BaseBean { } @Transient + @ApiParam(value ="是否为数据有效字段") + private transient Integer isValidProperty; + + @Transient + @ApiParam(value ="是否为弱删除字段") + private transient Integer isDeleteWeaklyProperty; + + @Transient @ApiParam(value ="元素值") private transient Object propertyFormValue; diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java index 43874a3..ee72ad6 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java @@ -1,6 +1,5 @@ package cn.estsh.i3plus.pojo.form.bean; -import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; @@ -79,6 +78,22 @@ public class BfElement extends BaseBean { @ApiParam(value = "是否删除") private Integer isObjectDel; + @Column(name = "IS_OBJECT_DEL_WEAK") + @ApiParam(value = "是否弱删除") + private Integer isObjectDelWeak; + + @Column(name = "ELEMENT_DEL_WEAK_ATTR_ID") + @ApiParam(value = "元素弱删除属性id") + private Long elementDelWeakAttrId; + + @Column(name = "IS_OBJECT_VALID") + @ApiParam(value = "是否有效") + private Integer isObjectValid; + + @Column(name = "ELEMENT_VALID_ATTR_ID") + @ApiParam(value = "元素有效属性id") + private Long elementValidAttrId; + @Column(name = "IS_OBJECT_EXPORT") @ApiParam(value = "是否导出") private Integer isObjectExport; From cd19bfb429401680477e9cc4c5a452978a69edb9 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Wed, 11 Mar 2020 19:24:40 +0800 Subject: [PATCH 55/91] ptlpcn --- .../i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java | 36 +++++++++++----------- .../estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java | 1 + 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java index e452e94..6c75133 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java @@ -351,12 +351,12 @@ public class PtlPcnEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum TAG_LIGHT_COLOR_CMD { - TAG_LIGHT_COLOR_RED("00", 0, "红"), - TAG_LIGHT_COLOR_GREEN("01", 1, "绿"), - TAG_LIGHT_COLOR_ORANGE("02", 2, "橙"), - TAG_LIGHT_COLOR_BLUE("03", 3, "蓝"), - TAG_LIGHT_COLOR_PINK_RED("04", 4, "粉红"), - TAG_LIGHT_COLOR_BLUE_GREEN("05", 5, "蓝绿"); + TAG_LIGHT_COLOR_RED("00", 1, "红"), + TAG_LIGHT_COLOR_GREEN("01", 2, "绿"), + TAG_LIGHT_COLOR_ORANGE("02", 3, "橙"), + TAG_LIGHT_COLOR_BLUE("03", 4, "蓝"), + TAG_LIGHT_COLOR_PINK_RED("04", 5, "粉红"), + TAG_LIGHT_COLOR_BLUE_GREEN("05", 6, "蓝绿"); private String code; private Integer value; @@ -441,18 +441,18 @@ public class PtlPcnEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum FINISH_TAG_LIGHT_MUSIC_CMD { - FINISH_TAG_LIGHT_MUSIC_00H("00", 0, "Jingle bells"), - FINISH_TAG_LIGHT_MUSIC_01H("01", 1, "Carmen"), - FINISH_TAG_LIGHT_MUSIC_02H("02", 2, "Happy Chinese new year"), - FINISH_TAG_LIGHT_MUSIC_03H("03", 3, "Edelweiss"), - FINISH_TAG_LIGHT_MUSIC_04H("04", 4, "Going home"), - FINISH_TAG_LIGHT_MUSIC_05H("05", 5, "PAPALA"), - FINISH_TAG_LIGHT_MUSIC_06H("06", 6, "Classical"), - FINISH_TAG_LIGHT_MUSIC_07H("07", 7, "Listen to the rhythm of the falling rain"), - FINISH_TAG_LIGHT_MUSIC_08H("08", 8, "Rock and roll"), - FINISH_TAG_LIGHT_MUSIC_09H("09", 9, "Happy birthday"), - FINISH_TAG_LIGHT_MUSIC_0AH("0A", 10, "Do Re Me"), - FINISH_TAG_LIGHT_MUSIC_0BH("0B", 11, "Strauss"); + FINISH_TAG_LIGHT_MUSIC_00H("00", 1, "Jingle bells"), + FINISH_TAG_LIGHT_MUSIC_01H("01", 2, "Carmen"), + FINISH_TAG_LIGHT_MUSIC_02H("02", 3, "Happy Chinese new year"), + FINISH_TAG_LIGHT_MUSIC_03H("03", 4, "Edelweiss"), + FINISH_TAG_LIGHT_MUSIC_04H("04", 5, "Going home"), + FINISH_TAG_LIGHT_MUSIC_05H("05", 6, "PAPALA"), + FINISH_TAG_LIGHT_MUSIC_06H("06", 7, "Classical"), + FINISH_TAG_LIGHT_MUSIC_07H("07", 8, "Listen to the rhythm of the falling rain"), + FINISH_TAG_LIGHT_MUSIC_08H("08", 9, "Rock and roll"), + FINISH_TAG_LIGHT_MUSIC_09H("09", 10, "Happy birthday"), + FINISH_TAG_LIGHT_MUSIC_0AH("0A", 11, "Do Re Me"), + FINISH_TAG_LIGHT_MUSIC_0BH("0B", 12, "Strauss"); private String code; private Integer value; diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java index 39fec2c..bbb4564 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java @@ -235,6 +235,7 @@ public class PtlHqlPack { DdlPreparedPack.timeBuilder(ptlAreaTask.getCreateDateTimeStart(), ptlAreaTask.getCreateDateTimeEnd() , "createDatetime", result, true); } + DdlPreparedPack.getStringEqualPack(ptlAreaTask.getAreaNo(), "areaNo", result); DdlPreparedPack.getNumEqualPack(ptlAreaTask.getStatus(), "status", result); DdlPreparedPack.getStringEqualPack(ptlAreaTask.getTaskType(), "taskType", result); DdlPreparedPack.getStringEqualPack(ptlAreaTask.getOrganizeCode(), "organizeCode", result); From 068a0956dbeee70c93d9f346d1da694460ed62ec Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Wed, 11 Mar 2020 19:38:06 +0800 Subject: [PATCH 56/91] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-aps/pom.xml | 2 +- modules/i3plus-pojo-base/pom.xml | 2 +- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mes-pcn/pom.xml | 2 +- modules/i3plus-pojo-mes/pom.xml | 2 +- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-ptl/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 2 +- modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- pom.xml | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index f8fa98e..ebd53c3 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index 1414885..4fa7c5a 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index d790ef1..e97c0bb 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index c6141da..90e744d 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index 23e5bee..0ba3645 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index c1e2cb9..6706323 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 856da5f..ffcac19 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index 09f2c4a..e388a1d 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index 82fdbe8..62ebe64 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index b7b2dfc..39d9423 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index ec9e100..e310bfd 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index 0db7b7d..92de049 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index bd09726..e36fcf7 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index 4c96781..81fb02b 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 2c24e41..1f622d9 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 18c811c..bc41914 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index 1171f4e..93f9732 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index bca9cbb..2ffb2ae 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform From 5ebb5cbf20da4f734680f9c070078ae16b23925b Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Wed, 11 Mar 2020 20:11:05 +0800 Subject: [PATCH 57/91] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=20TSET-pom.xm?= =?UTF-8?q?l=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-aps/pom.xml | 2 +- modules/i3plus-pojo-base/pom.xml | 2 +- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mes-pcn/pom.xml | 2 +- modules/i3plus-pojo-mes/pom.xml | 2 +- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-ptl/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 2 +- modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- pom.xml | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index ebd53c3..f8fa98e 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index 4fa7c5a..1414885 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index e97c0bb..d790ef1 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index 90e744d..c6141da 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index 0ba3645..23e5bee 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 6706323..c1e2cb9 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index ffcac19..856da5f 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index e388a1d..09f2c4a 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index 62ebe64..82fdbe8 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index 39d9423..b7b2dfc 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index e310bfd..ec9e100 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index 92de049..0db7b7d 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index e36fcf7..bd09726 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index 81fb02b..4c96781 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 1f622d9..2c24e41 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index bc41914..18c811c 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index 93f9732..1171f4e 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index 2ffb2ae..bca9cbb 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform From 1d90195de668b0d253a7546cd53f432663579a30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Thu, 12 Mar 2020 09:50:34 +0800 Subject: [PATCH 58/91] =?UTF-8?q?3D=E4=BB=93=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 21 +++++++++++++++++++++ .../i3plus/pojo/model/wms/WmsSearchGroupModel.java | 3 +++ .../i3plus/pojo/model/wms/WmsTdChangeModel.java | 1 + 3 files changed, 25 insertions(+) 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 57cadad..9a6da09 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 @@ -3155,10 +3155,21 @@ public class WmsEnumUtil { } 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);} + } @@ -4955,10 +4966,20 @@ public class WmsEnumUtil { } 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);} } /** diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchGroupModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchGroupModel.java index b4d1527..5d35929 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchGroupModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchGroupModel.java @@ -30,4 +30,7 @@ public class WmsSearchGroupModel { @ApiParam(value = "有效性") public Integer isValid; + + @ApiParam(value = "工厂代码") + public String organizeCode; } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTdChangeModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTdChangeModel.java index a6f69a8..4033d02 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTdChangeModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTdChangeModel.java @@ -22,4 +22,5 @@ public class WmsTdChangeModel implements Serializable { private List wmsZonesList; private List wmsFurnitureList; private List wmsLocateList; + private String organizeCode; } From d34f3b8215a096c025e9100da9044a4ab05c0fb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Thu, 12 Mar 2020 14:59:43 +0800 Subject: [PATCH 59/91] =?UTF-8?q?2020-03-12/14:59=20--=20=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=B8=85=E9=99=A4=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=87=BA=E5=BC=82=E5=B8=B8=E6=97=B6=EF=BC=8C=E5=B0=86=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=E4=BF=A1=E6=81=AF=E5=AD=98=E8=BF=9B=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93syncErrLog=E8=A1=A8=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java index 8746630..d9c5e6f 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java @@ -1551,10 +1551,10 @@ public class BaseRepositoryImpl extends SimpleJpaRep @Override public List findByHqlWhereByClear(DdlPackBean packBean, String dateTime) { - LOGGER.info("ptl_pcn数据清除查询"); + LOGGER.info("PTL-PCN数据清除查询"); StringBuffer queryString = new StringBuffer(); queryString.append("select model from " + persistentClass.getSimpleName() - + " as model where 1=1 and model.createDatetime <= " + "'" + dateTime + "'" + " "); + + " as model where 1=1 and model.modifyDatetime < " + "'" + dateTime + "'" + " "); if (packBean != null) { queryString.append(packBean.getWhereAppend()); From fd79008df65ccc7d718aab91e165ed703f1aa3bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Thu, 12 Mar 2020 16:36:40 +0800 Subject: [PATCH 60/91] =?UTF-8?q?ptl=E5=90=8C=E6=AD=A5=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E8=A1=A8=E6=B7=BB=E5=8A=A0=E6=98=AF=E5=90=A6=E5=8C=BA=E5=88=86?= =?UTF-8?q?=E5=B7=A5=E5=8E=82=E5=AD=97=E6=AE=B5isIgnoreOrg?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/ptl/bean/PtlPcnSyncCfg.java | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnSyncCfg.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnSyncCfg.java index 6fd597a..060404d 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnSyncCfg.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnSyncCfg.java @@ -77,6 +77,26 @@ public class PtlPcnSyncCfg extends BaseBean implements Serializable { @ApiParam(value = "从数据库抽取的条件限制") private String extractCondition; + @Column(name = "IS_IGNORE_ORG") + @ApiParam(value = "同步的时候是否区分工厂") + private Integer isIgnoreOrg = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(); + + @Transient + @ApiParam("同步方式") + private String syncPatternName; + + @Transient + @ApiParam("同步类型名称") + private String syncTypeName; + + @Transient + @ApiParam(value = "同步的时候是否区分工厂") + private String isIgnoreOrgName; + + public int getIsIgnoreOrgVal() { + return this.isIgnoreOrg == null ? 0 : this.isIgnoreOrg; + } + public int getSyncFrequencyVal() { return this.syncFrequency == null ? 0 : this.syncFrequency; } From 8ace0c363d430002c153ba6e21dcdb8ca673ebdc Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 12 Mar 2020 17:08:33 +0800 Subject: [PATCH 61/91] ptl enum --- .../i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java | 125 ++------------------- .../estsh/i3plus/pojo/ptl/model/LightOnModel.java | 3 + 2 files changed, 12 insertions(+), 116 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java index 6c75133..3dfb805 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java @@ -927,6 +927,9 @@ public class PtlPcnEnumUtil { } } + /** + * PTL_区段亮灯任务明细状态 + */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum AREA_SECTION_TASK_DETAIL_STATUS { CREATE(10, "CREATE", "创建"), @@ -956,67 +959,11 @@ public class PtlPcnEnumUtil { } /** - * PTL_区段亮灯任务明细状态 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum TASK_DETAIL_STATUS { - CREATE(10, "CREATE", "新建"), - RECEIPT_FINISH(20, "RECEIPT_FINISH", "已完成"); - - private int value; - private String code; - private String description; - - TASK_DETAIL_STATUS(int value, String code, String description) { - this.value = value; - this.code = code; - this.description = description; - } - - public int getValue() { - return value; - } - - public String getCode() { - return code; - } - - 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); - } - } - - /** - * PTL_区段、区域亮灯任务状态 + * PTL_区段亮灯任务状态 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum AREA_SECTION_TASK_STATUS { CREATE(10, "CREATE", "新建"), - RECEIPT(20, "RECEIPT", "执行中"), RECEIPT_FINISH(30, "RECEIPT_FINISH", "已完成"); private int value; @@ -1525,64 +1472,10 @@ public class PtlPcnEnumUtil { return valueOf(val); } } - /** - * 区域任务状态(ASN,PO,MOVE,QC) - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum MASTER_ORDER_STATUS { - CREATE(10, "CREATE", "创建"), - RECEIPT(20, "IN_PROGRESS", "处理中"), - RECEIPT_FINISH(30, "COMPLETED", "已完成"), - CANCELLED(40, "CANCELLED", "已取消"); - private int value; - private String code; - private String description; - MASTER_ORDER_STATUS(int value, String code, String description) { - this.value = value; - this.code = code; - this.description = description; - } - - public int getValue() { - return value; - } - - public String getCode() { - return code; - } - - 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); - } - } /** - * 区域任务类型(ASN,PO,MOVE,QC) + * 区段任务类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum AREA_SECTION_TASK_TYPE { @@ -1636,14 +1529,14 @@ public class PtlPcnEnumUtil { return valueOf(val); } } + /** - * 区域任务状态(ASN,PO,MOVE,QC) + * 区域任务状态 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum AREA_TASK_STATUS { CREATE(10, "CREATE", "创建"), - RECEIPT(20, "IN_PROGRESS", "处理中"), - RECEIPT_FINISH(30, "COMPLETED", "已完成"); + RECEIPT_FINISH(30, "COMPLETED", "完成"); private int value; private String code; @@ -1693,7 +1586,7 @@ public class PtlPcnEnumUtil { } /** - * 区域任务类型(ASN,PO,MOVE,QC) + * 区域任务类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum AREA_TASK_TYPE { diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/LightOnModel.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/LightOnModel.java index 7dd41d4..32bbe43 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/LightOnModel.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/LightOnModel.java @@ -44,4 +44,7 @@ public class LightOnModel implements Serializable { @ApiParam("是否熄灯") private Integer lightFlag; + @ApiParam("状态") + private Integer status; + } From 80ca438ce392b4eb473a499959737c1260553640 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 12 Mar 2020 17:23:36 +0800 Subject: [PATCH 62/91] =?UTF-8?q?test=E5=90=88=E5=B9=B6=E5=88=B0dev?= =?UTF-8?q?=E8=A7=A3=E5=86=B3pom=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-aps/pom.xml | 2 +- modules/i3plus-pojo-base/pom.xml | 2 +- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mes-pcn/pom.xml | 2 +- modules/i3plus-pojo-mes/pom.xml | 2 +- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-ptl/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 2 +- modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- pom.xml | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index f8fa98e..ebd53c3 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index 1414885..4fa7c5a 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index d790ef1..e97c0bb 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index c6141da..90e744d 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index 23e5bee..0ba3645 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index c1e2cb9..6706323 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 856da5f..ffcac19 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index 09f2c4a..e388a1d 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index 82fdbe8..62ebe64 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index b7b2dfc..39d9423 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index ec9e100..e310bfd 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index 0db7b7d..92de049 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index bd09726..e36fcf7 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index 4c96781..81fb02b 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 2c24e41..1f622d9 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 18c811c..bc41914 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index 1171f4e..93f9732 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index bca9cbb..2ffb2ae 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform From 4823660070ad3aa2a15a65d4b50e1d0f730a6a23 Mon Sep 17 00:00:00 2001 From: joke lin Date: Thu, 12 Mar 2020 18:03:10 +0800 Subject: [PATCH 63/91] =?UTF-8?q?[=E4=BB=BB=E5=8A=A1=EF=BC=9A1435=20?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E7=AE=A1=E7=90=86]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 36 ++++++++++++++++++++++ .../i3plus/pojo/mes/bean/MesQueueJitActual.java | 5 +++ .../estsh/i3plus/pojo/mes/bean/MesQueueOrder.java | 14 ++++++++- .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 26 +++++++++++++--- 4 files changed, 76 insertions(+), 5 deletions(-) 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 5bf74c2..61fd480 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 @@ -4243,4 +4243,40 @@ public class MesEnumUtil { return tmp; } } + + /** + * mes生产队列是否锁定 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum QUEUE_ORDER_IS_LOCK { + + TRUE(1, "是"), + FALSE(2, "否"); + + private int value; + private String description; + + QUEUE_ORDER_IS_LOCK(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; + } + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java index 0f191b6..c839b14 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.mes.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.mes.model.MesButtonFlagModel; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -100,4 +101,8 @@ public class MesQueueJitActual extends BaseBean implements Serializable { @ApiParam("特殊标识名称") private String specialFlagName; + @Transient + @ApiParam(value = "下达按钮编号") + public String buttonCode; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java index fa0c07b..3e4272d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java @@ -81,7 +81,7 @@ public class MesQueueOrder extends BaseBean implements Serializable { private String custCode; @Column(name = "WORK_TYPE") - @ApiParam("区域代码") + @ApiParam("工单类型") private String workType; @Column(name = "QUEUE_TYPE") @@ -100,6 +100,18 @@ public class MesQueueOrder extends BaseBean implements Serializable { @ApiParam("截至车号") private String custFlagNoEnd; + @Transient + @ApiParam("工单类型名称") + private String workTypeName; + + @Transient + @ApiParam("锁定标识名称") + private String isLockName; + + @Transient + @ApiParam("队列类型名称") + private String queueTypeName; + public int getStatusVal() { return this.status == null ? 0 : this.status; } 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 914920f..15b53e4 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 @@ -227,16 +227,16 @@ public class MesHqlPack { } if (!StringUtils.isEmpty(mesQueueOrder.getWorkType())) { - DdlPreparedPack.getStringBiggerPack(mesQueueOrder.getWorkType(), "workType", packBean); + DdlPreparedPack.getStringEqualPack(mesQueueOrder.getWorkType(), "workType", packBean); } if (!StringUtils.isEmpty(mesQueueOrder.getCustProdLineCode())) { - DdlPreparedPack.getStringBiggerPack(mesQueueOrder.getCustProdLineCode(), "custProdLineCode", packBean); + DdlPreparedPack.getStringLikePack(mesQueueOrder.getCustProdLineCode(), "custProdLineCode", packBean); } if (!StringUtils.isEmpty(mesQueueOrder.getPgCode())) { - DdlPreparedPack.getStringBiggerPack(mesQueueOrder.getPgCode(), "pgCode", packBean); + DdlPreparedPack.getStringLikePack(mesQueueOrder.getPgCode(), "pgCode", packBean); } if (mesQueueOrder.getQueueType() != null) { - DdlPreparedPack.getStringBiggerPack(mesQueueOrder.getQueueType(), "queueType", packBean); + DdlPreparedPack.getNumEqualPack(mesQueueOrder.getQueueType(), "queueType", packBean); } // 只查询创建状态的队列 @@ -2219,4 +2219,22 @@ public class MesHqlPack { } return packBean; } + + /** + * 生产组 + * + * @param produceGroup + * @param organizeCode + * @return + */ + public static DdlPackBean getMesProduceGroup(MesProduceGroup produceGroup, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(produceGroup, organizeCode); + if (!StringUtils.isEmpty(produceGroup.getPgCode())) { + DdlPreparedPack.getStringLikerPack(produceGroup.getPgCode(), "pgCode", packBean); + } + if (!StringUtils.isEmpty(produceGroup.getPgName())) { + DdlPreparedPack.getStringLikerPack(produceGroup.getPgName(), "pgName", packBean); + } + return packBean; + } } From 4c0b2a19612ce3bd747b13808173ff65dbce8a8a Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Thu, 12 Mar 2020 18:31:55 +0800 Subject: [PATCH 64/91] =?UTF-8?q?=E3=80=90=207603=20=E5=8D=95=E4=B8=AA?= =?UTF-8?q?=E9=9B=B6=E4=BB=B6=E6=A0=87=E7=AD=BE=E6=89=93=E5=8D=B0=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E4=BF=AE=E6=94=B9=E3=80=82=20=E3=80=91bug7603?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 8 ++++++++ 2 files changed, 12 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index 9c02389..33453b8 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java @@ -160,6 +160,10 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam("客户订单号") public String custOrderNo; + @Column(name = "ASSIGN_DATE_CODE") + @ApiParam(value = "指定生产日期") + private String assignDateCode; + @Transient @ApiParam("实际批次") private String actualLot; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java index 5891908..f9e000a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java @@ -399,4 +399,12 @@ public class WmsStockSn extends BaseBean { this.modifyDatetime = modifyDatetime; this.modifyUser = modifyUser; } + + public WmsStockSn (String partNo, String packageNo,String locateNo, String createDatetime, String modifyDatetime) { + this.partNo = partNo; + this.packageNo =packageNo; + this.locateNo = locateNo; + this.createDatetime=createDatetime; + this.modifyDatetime = modifyDatetime; + } } From 2625c2cb0f001cb2de62095467dc395b292b06d5 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Thu, 12 Mar 2020 20:24:11 +0800 Subject: [PATCH 65/91] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=20TSET-pom.xm?= =?UTF-8?q?l=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-aps/pom.xml | 2 +- modules/i3plus-pojo-base/pom.xml | 2 +- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mes-pcn/pom.xml | 2 +- modules/i3plus-pojo-mes/pom.xml | 2 +- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-ptl/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 2 +- modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- pom.xml | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index ebd53c3..f8fa98e 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index 4fa7c5a..1414885 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index e97c0bb..d790ef1 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index 90e744d..c6141da 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index 0ba3645..23e5bee 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 6706323..c1e2cb9 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index ffcac19..856da5f 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index e388a1d..09f2c4a 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index 62ebe64..82fdbe8 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index 39d9423..b7b2dfc 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index e310bfd..ec9e100 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index 92de049..0db7b7d 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index e36fcf7..bd09726 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index 81fb02b..4c96781 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 1f622d9..2c24e41 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index bc41914..18c811c 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index 93f9732..1171f4e 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index 2ffb2ae..bca9cbb 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform From c0ce05e07c8a2ea313b4154746f1b72067d0651c Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Thu, 12 Mar 2020 22:16:36 +0800 Subject: [PATCH 66/91] =?UTF-8?q?=E3=80=907648=20=E5=9C=A8=E5=8F=91?= =?UTF-8?q?=E8=BF=90=E7=95=8C=E9=9D=A2=E5=A2=9E=E5=8A=A0=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E6=89=93=E5=BC=80=E5=8D=95=E6=8D=AE=E6=8C=89=E9=92=AE=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 63 ++++++++++++++++++++++ .../estsh/i3plus/pojo/wms/bean/WmsTransType.java | 8 ++- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 1 + 3 files changed, 71 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 9a6da09..44f3039 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 @@ -5087,4 +5087,67 @@ public class WmsEnumUtil { return tmp; } } + + /** + * 交易类型-单据回退类型 + * 默认为 10 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ORDER_BACK_TYPE { + REC_QTY(10, "REC_QTY", "已收货数量"), + PICK_QTY(20, "PICK_QTY", "已拣货数量"), + MOVE_QTY(30, "MOVE_QTY", "已移库数量"), + OUT_QTY(40, "OUT_QTY", "已出库数量"); + + private int value; + private String code; + private String description; + + ORDER_BACK_TYPE(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } + + public static ORDER_BACK_TYPE codeOf(int value) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + return values()[i]; + } + } + return null; + } + + 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; + } + } } \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java index 107503e..a20ea25 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; @@ -70,6 +72,11 @@ public class WmsTransType extends BaseBean { @ApiParam(value = "是否发送异常邮件") private Integer isSendErrorEmail; + @Column(name = "ORDER_BACK_TYPE") + @ApiParam(value = "单据回退类型") + @AnnoOutputColumn(refClass = WmsEnumUtil.ORDER_BACK_TYPE.class, refForeignKey = "value", value = "description") + private Integer orderBackType; + @Transient @ApiParam("菜单URL") private String menuUrl; @@ -78,7 +85,6 @@ public class WmsTransType extends BaseBean { @ApiParam("交易处理组件调用类") private String callClass; - public String getMenuUrl() { return "/handle?transTypeCode=" + this.transTypeCode; } 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 a56cbf7..abff614 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 @@ -418,6 +418,7 @@ public class WmsHqlPack { //查询参数封装 DdlPreparedPack.getStringRightLikerPack(wmsTransType.getTransTypeCode(), "transTypeCode", result); DdlPreparedPack.getStringLikerPack(wmsTransType.getTransTypeName(), "transTypeName", result); + DdlPreparedPack.getNumEqualPack(wmsTransType.getOrderBackType(),"orderBackType",result); DdlPreparedPack.getNumEqualPack(wmsTransType.getAgId(), "agId", result); getStringBuilderPack(wmsTransType, result); From eaed7962abbc47cbc8296348bfc52153e01bbf54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Fri, 13 Mar 2020 11:22:20 +0800 Subject: [PATCH 67/91] =?UTF-8?q?=E5=8A=A8=E6=80=81=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=EF=BC=9A=E5=B7=A5=E5=8E=82=E4=BB=A3=E7=A0=81=E5=8F=AF=E4=BB=A5?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E5=9C=A8=E8=A1=A8=E6=A0=BC=E4=B8=AD=E4=BD=86?= =?UTF-8?q?=E6=98=AF=E4=B8=8D=E8=83=BD=E4=BD=9C=E4=B8=BA=E5=8F=AF=E9=80=89?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=EF=BC=88BUG#7675=EF=BC=89+?= =?UTF-8?q?=203D=E4=BB=93=E5=BA=93=EF=BC=9A=E5=BA=93=E4=BD=8D=E5=92=8C?= =?UTF-8?q?=E5=AD=98=E5=82=A8=E5=8C=BA=E6=96=B0=E5=A2=9E=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E7=9A=84=E9=95=BF=E5=AE=BD=E9=AB=98=E6=A0=A1=E9=AA=8C=E9=83=BD?= =?UTF-8?q?=E5=8E=BB=E6=8E=89=EF=BC=88BUG#7723=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/annotation/DynamicField.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java | 9 ++++----- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/DynamicField.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/DynamicField.java index 4445d2f..954b670 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/DynamicField.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/DynamicField.java @@ -25,7 +25,7 @@ public @interface DynamicField { int sort() default 0; // 是否标题字段加粗 是否加粗:默认1-加粗，2-非加粗 int isWider() default 2; - // 是否勾选:默认1-勾选，2-非勾选 + // 是否可选作查询条件:默认1-可选，2-不可选 int isSelect() default 1; // 是否必选:默认1-必选，2-非必选 int isRequire() default 1; 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 9e8bd67..3e7e597 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 @@ -65,6 +65,7 @@ public abstract class BaseBean implements Serializable { @Column(name="ORGANIZE_CODE", nullable = false) @ApiParam(value ="组织代码") // @AnnoOutputColumn(hidden = true) + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT,isSelect = 2, isRequire = 2) public String organizeCode; @Column(name="IS_VALID", columnDefinition = "int default 1", nullable = false) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java index 9362c05..378144b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java @@ -12,10 +12,7 @@ import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; +import javax.persistence.*; /** * @Description :物料实体 @@ -29,7 +26,9 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "WMS_PART") +@Table(name = "WMS_PART", indexes = { + @Index(columnList = "ORGANIZE_CODE") +}) @Api("物料表") public class WmsPart extends BaseBean { private static final long serialVersionUID = 4849044986767609346L; From 46273325d31a2219225bac5201db21b142ada1fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Fri, 13 Mar 2020 11:38:24 +0800 Subject: [PATCH 68/91] =?UTF-8?q?=E5=8A=A8=E6=80=81=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=EF=BC=9A=E6=96=B0=E5=A2=9EisQuery=E5=AD=97=E6=AE=B5=E7=94=A8?= =?UTF-8?q?=E4=BA=8E=E6=8E=A7=E5=88=B6=E6=98=AF=E5=90=A6=E5=8F=AF=E4=BD=9C?= =?UTF-8?q?=E4=B8=BA=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=EF=BC=88BUG#7675?= =?UTF-8?q?=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/annotation/DynamicField.java | 2 ++ .../src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/DynamicField.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/DynamicField.java index 954b670..cd04561 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/DynamicField.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/DynamicField.java @@ -26,6 +26,8 @@ public @interface DynamicField { // 是否标题字段加粗 是否加粗:默认1-加粗，2-非加粗 int isWider() default 2; // 是否可选作查询条件:默认1-可选，2-不可选 + int isQuery() default 1; + // 是否勾选:默认1-勾选，2-非勾选 int isSelect() default 1; // 是否必选:默认1-必选，2-非必选 int isRequire() default 1; 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 3e7e597..249411a 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 @@ -65,7 +65,7 @@ public abstract class BaseBean implements Serializable { @Column(name="ORGANIZE_CODE", nullable = false) @ApiParam(value ="组织代码") // @AnnoOutputColumn(hidden = true) - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT,isSelect = 2, isRequire = 2) + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT,isQuery = 2, isRequire = 2) public String organizeCode; @Column(name="IS_VALID", columnDefinition = "int default 1", nullable = false) From 8f584f250b091509eda5d5f255cad763e0dd69fc Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Fri, 13 Mar 2020 15:29:08 +0800 Subject: [PATCH 69/91] =?UTF-8?q?=E3=80=907633=20=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E4=B8=AD=EF=BC=8C=E7=82=B9=E5=87=BB=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=EF=BC=8C=E6=97=A5=E7=94=9F=E4=BA=A7=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E4=BA=A7=E7=94=9F=E7=9A=84=E6=9D=A1=E7=A0=81=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E8=A2=AB=E5=AF=BC=E5=87=BA=EF=BC=8C=E7=95=8C=E9=9D=A2=E4=B8=8A?= =?UTF-8?q?=E7=9A=84=E5=AF=BC=E5=87=BA=E5=BA=94=E8=AF=A5=E6=98=AF=E6=9F=A5?= =?UTF-8?q?=E5=88=B0=E4=BB=80=E4=B9=88=E5=B0=B1=E5=AF=BC=E5=87=BA=E4=BB=80?= =?UTF-8?q?=E4=B9=88=EF=BC=8C=E4=B8=8D=E9=9C=80=E8=A6=81=E5=86=8D=E5=8A=A0?= =?UTF-8?q?=E5=85=B6=E4=BB=96=E9=A2=9D=E5=A4=96=E7=9A=84=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=20=E3=80=91bug7633?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 7 +++++++ 1 file changed, 7 insertions(+) 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 abff614..d03d299 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 @@ -6,6 +6,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.base.tool.HqlPack; +import cn.estsh.i3plus.pojo.base.util.StringUtil; import cn.estsh.i3plus.pojo.wms.bean.*; import cn.estsh.i3plus.pojo.wms.bean.dynamictable.WmsFieldInfo; import cn.estsh.i3plus.pojo.wms.bean.dynamictable.WmsSearchElementFunction; @@ -1303,6 +1304,12 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsStockSn.getDateCode(), "dateCode", result); DdlPreparedPack.getStringEqualPack(wmsStockSn.getLotNo(), "lotNo", result); DdlPreparedPack.getStringEqualPack(wmsStockSn.getPackageNo(), "packageNo", result); + if (StringUtil.isEmpty(wmsStockSn.getQualityDateTimeStart())) { + wmsStockSn.setQualityDateTimeStart(""); + } + if (StringUtil.isEmpty(wmsStockSn.getQualityDateTimeEnd())) { + wmsStockSn.setQualityDateTimeEnd(""); + } DdlPreparedPack.timeBuilder(wmsStockSn.getQualityDateTimeStart()+","+ wmsStockSn.getQualityDateTimeEnd(), "qualityDate", result, false,false); if (wmsStockSn.getIsValid() != null) { From 4b8cd0da38bee4b65f3463fb6ad62cc574d972b6 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Fri, 13 Mar 2020 17:51:40 +0800 Subject: [PATCH 70/91] ptlpcn enum --- .../java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java | 3 +-- .../main/java/cn/estsh/i3plus/pojo/ptl/model/WsResultBean.java | 8 ++++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java index 3dfb805..1205a9c 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java @@ -746,8 +746,7 @@ public class PtlPcnEnumUtil { DISCONNECT_CONTROL_CMD(20, "DISCONNECT_CONTROL_CMD", "disconnectControlService", "断开控制器"), REFRESH_CONTROL_CMD(30, "REFRESH_CONTROL_CMD", "refreshControlService", "刷新"), SCAN_CONTROL_CMD(40, "SCAN_CONTROL_CMD", "scanControlService", "扫描"), - INIT_MODULE_CONTROL_CMD(50, "INIT_MODULE_CONTROL_CMD", "initModuleControlService", "初始化页面"), - GET_CONTROL_DATA_CONTROL_CMD(60, "GET_CONTROL_DATA_CONTROL_CMD", "getControlDataControlService", "获取控制器数据"); + INIT_MODULE_CONTROL_CMD(50, "INIT_MODULE_CONTROL_CMD", "initModuleControlService", "初始化页面"); // UNLOCK_CONTROL_CMD(50, "UNLOCK_CONTROL_CMD", "unlockControlService", "解锁"), // LABEL_SELF_CHECK_CONTROL_CMD(60, "labelSelfCheck", "labelSelfCheckControlService", "标签自检"), // LIGHT_DETAIL_CONTROL_CMD(70, "LABEL_SELF_CHECK_CONTROL_CMD", "lightDetailControlService", "亮灯明细"); diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/WsResultBean.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/WsResultBean.java index 1dff444..030a1d9 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/WsResultBean.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/WsResultBean.java @@ -1,5 +1,7 @@ package cn.estsh.i3plus.pojo.ptl.model; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -32,6 +34,12 @@ public class WsResultBean implements Serializable { @ApiParam("数据类型") private String dataType; + @ApiParam("是否需要获取数据,默认展示") + private Integer isInitData = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(); + + @ApiParam("执行结果信息是否需要展示,默认展示") + private Integer isShow = CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(); + @ApiParam("执行结果信息") private String message; From 999aae6fc016be1b305d2b4884035ce014736e7f Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Fri, 13 Mar 2020 18:01:06 +0800 Subject: [PATCH 71/91] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-aps/pom.xml | 2 +- modules/i3plus-pojo-base/pom.xml | 2 +- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mes-pcn/pom.xml | 2 +- modules/i3plus-pojo-mes/pom.xml | 2 +- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-ptl/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 2 +- modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- pom.xml | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index f8fa98e..ebd53c3 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index 1414885..4fa7c5a 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index d790ef1..e97c0bb 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index c6141da..90e744d 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index 23e5bee..0ba3645 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index c1e2cb9..6706323 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 856da5f..ffcac19 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index 09f2c4a..e388a1d 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index 82fdbe8..62ebe64 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index b7b2dfc..39d9423 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index ec9e100..e310bfd 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index 0db7b7d..92de049 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index bd09726..e36fcf7 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index 4c96781..81fb02b 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 2c24e41..1f622d9 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 18c811c..bc41914 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index 1171f4e..93f9732 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index bca9cbb..2ffb2ae 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform From 65572b34a0bc34ac9e78645893b66b4e8586c559 Mon Sep 17 00:00:00 2001 From: qianhs Date: Fri, 13 Mar 2020 18:02:47 +0800 Subject: [PATCH 72/91] =?UTF-8?q?=E3=80=901432=20=E5=B7=A5=E4=BD=8D?= =?UTF-8?q?=E6=89=AB=E6=8F=8F-ESOP=E5=B1=95=E7=A4=BA=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E5=BC=80=E5=8F=91=EF=BC=8C=E9=98=9F=E5=88=97=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E3=80=91=E3=80=90=E5=B7=A5=E4=BD=8D=E6=89=AB?= =?UTF-8?q?=E6=8F=8F-ESOP=E5=B1=95=E7=A4=BA=E7=BB=84=E4=BB=B6=E5=BC=80?= =?UTF-8?q?=E5=8F=91=EF=BC=8C=E9=98=9F=E5=88=97=E7=BB=84=E4=BB=B6=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 66 ++++++++++++++++++++++ .../pojo/mes/bean/MesWorkCellModuleParam.java | 58 +++++++++++++++++++ .../MesWorkCellModuleParamRepository.java | 16 ++++++ 3 files changed, 140 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellModuleParam.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellModuleParamRepository.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 5bf74c2..d42cf87 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 @@ -83,6 +83,72 @@ public class MesEnumUtil { } /** + * 排序校验模式 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum CHECK_PROD_SEQ_FLAG { + PRODUCTION_MATERIAS(10, "NO_SORT_CHECK", "无排序校验"), + CUSTOMER_SHPING(20, "QUEUE_BAR_CODE", "按产品队列条码校验排序"), + OUTWARD_SHIPMENT(30, "PRODUCT_MATERIAL_NUMBER", "按产品物料号校验排序"), + ALLOCATION(40, "SAME_MATERIAL_RACK", "按队列同料架单产品校验排序"); + + private int value; + private String code; + private String description; + + CHECK_PROD_SEQ_FLAG(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } + + 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 String codeOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].code; + } + } + 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); + } + } + /** * JIS发运是否按主队列顺序扫描 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellModuleParam.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellModuleParam.java new file mode 100644 index 0000000..c2d9e17 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellModuleParam.java @@ -0,0 +1,58 @@ +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.Index; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description : + * @Reference : + * @Author :QianHuaSheng + * @CreateDate : 2020-03-12 7:45 下午 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_WORK_CELL_MODULE_PARAM", indexes = { + @Index(columnList = "CREATE_DATE_TIME") +}) +@Api("工作单元组件参数配置") +public class MesWorkCellModuleParam extends BaseBean implements Serializable { + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name = "MODULE_CODE") + @ApiParam("组件代码") + private String moduleCode; + + @Column(name = "CALL_CLASS") + @ApiParam("调用类") + private String callClass; + + @Column(name = "PARAM_CODE") + @ApiParam("参数代码") + private String paramCode; + + @Column(name = "PARAM_VALUE") + @ApiParam("参数值") + private String paramValue; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellModuleParamRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellModuleParamRepository.java new file mode 100644 index 0000000..77ab036 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellModuleParamRepository.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.MesWorkCellModuleParam; +import org.springframework.stereotype.Repository; + +/** + * @Description: 工作单元组件参数配置 + * @Reference: + * @Author: qianhuasheng + * @CreateDate:2019-04-17-17:11 + * @Modify: + **/ +@Repository +public interface MesWorkCellModuleParamRepository extends BaseRepository { +} From d4e1e854c5734da1590f4cece7f3af84eca7558b Mon Sep 17 00:00:00 2001 From: joke lin Date: Fri, 13 Mar 2020 18:24:03 +0800 Subject: [PATCH 73/91] =?UTF-8?q?[=E4=BB=BB=E5=8A=A1=EF=BC=9A1441=20plc?= =?UTF-8?q?=E6=8E=A8=E9=80=81=E6=95=B0=E6=8D=AE]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java index 357f9e8..f947335 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java @@ -7,6 +7,7 @@ import lombok.Data; import java.io.Serializable; import java.util.List; +import java.util.Map; /** * @Description : 工位请求bean @@ -83,6 +84,9 @@ public class StationRequestBean implements Serializable { @ApiParam("生产主队列编号") private String orderNo; + @ApiParam("数据map") + private Map dataMap; + @Override public String toString() { return "StationRequestBean{" + From 4fec84f8103545f6873e335af7b60cc4a2c9caa1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Fri, 13 Mar 2020 19:15:11 +0800 Subject: [PATCH 74/91] =?UTF-8?q?=E3=80=90PTL=5FPLC=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E8=A1=A8=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java index 942809f..fa2a81b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java @@ -104,7 +104,19 @@ public class MesPlc extends BaseBean implements Serializable { @ApiParam("对象代码") private String objectCode; + @Column(name = "OPC_URL") + @ApiParam("OPCUA路径") + private String opcUrl; + + @Column(name = "NAME_SPACE_INDEX") + @ApiParam("空间索引") + private Integer nameSpaceIndex = 2; + @Transient @ApiParam("设备名称") private String equipmentName; + + @Transient + @ApiParam("OPC值") + private String opcValue; } From 679319635afd5cdf32ea464babcfb02b5eef83d7 Mon Sep 17 00:00:00 2001 From: luweihao Date: Fri, 13 Mar 2020 20:54:43 +0800 Subject: [PATCH 75/91] =?UTF-8?q?task=20`1430`=20=E5=B7=A5=E4=BD=8D?= =?UTF-8?q?=E6=89=AB=E6=8F=8F=EF=BC=8C=E4=BA=A7=E5=93=81=E4=BF=A1=E5=8F=B7?= =?UTF-8?q?=E7=9B=91=E5=90=AC=EF=BC=8C=E9=98=9F=E5=88=97=E7=9B=91=E5=90=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 72 ++++++++++++++++++++ .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 76 +++++++++++++++++++++- .../java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java | 12 ++++ .../i3plus/pojo/mes/bean/MesQueueOrderDetail.java | 2 +- .../i3plus/pojo/mes/bean/MesWorkCellModule.java | 46 +++++++++++++ .../pojo/mes/bean/MesWorkCellModuleParam.java | 58 +++++++++++++++++ .../estsh/i3plus/pojo/mes/bean/MesWorkModule.java | 55 ++++++++++++++++ .../i3plus/pojo/mes/bean/MesWorkModuleParam.java | 51 +++++++++++++++ .../i3plus/pojo/mes/model/ActorMessageModel.java | 45 +++++++++---- .../i3plus/pojo/mes/model/MonitoringModel.java | 28 ++++++++ .../i3plus/pojo/mes/model/StationRequestBean.java | 31 +++------ .../i3plus/pojo/mes/model/StepDispatchModel.java | 29 +++++++++ .../MesWorkCellModuleParamRepository.java | 15 +++++ .../repository/MesWorkCellModuleRepository.java | 14 ++++ .../repository/MesWorkModuleParamRepository.java | 14 ++++ .../mes/repository/MesWorkModuleRepository.java | 14 ++++ 16 files changed, 524 insertions(+), 38 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellModule.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellModuleParam.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkModule.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkModuleParam.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MonitoringModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepDispatchModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellModuleParamRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellModuleRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkModuleParamRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkModuleRepository.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 bc83711..4a13e89 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 @@ -4062,4 +4062,76 @@ public class MesEnumUtil { return tmp; } } + + /** + * 工位监听组件类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum WORK_CELL_MONITOR_TYPE { + MONITOR(10, "监听组件"), + SHOW(20, "展示组件"); + + private int value; + private String description; + + WORK_CELL_MONITOR_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + } + + /** + * 工位监听组件触发类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum WORK_MODULE_TRIGGER_TYPE { + BY_SN(10, "根据条码加载工步"), + BY_PART(20, "根据零件号加载工步"); + + private int value; + private String description; + + WORK_MODULE_TRIGGER_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + } + + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum WORK_MODULE_PARAM_TYPE { + NUMBER(10, "数值"), + STRING(20, "字符串"); + + private int value; + private String description; + + WORK_MODULE_PARAM_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return 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 6bd6523..acd5453 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 @@ -204,8 +204,8 @@ public class MesPcnEnumUtil { PCN_LOGOUT(190, "PCN_LOGOUT", ""), UPDATE_LOCALE_RES(200, "LOCALE_RES_URL", "LOCALE_RES_URL"), PCN_SYS_LOCALE_LANGUAGE(210, "PCN_SYS_LOCALE_LANGUAGE", ""), - PCN_SYS_ALL_LANGUAGE(220,"PCN_SYS_ALL_LANGUAGE","PCN_SYS_ALL_LANGUAGE"), - PCN_SYS_RESOURCE_KEY_LANGUAGE(230,"PCN_SYS_RESOURCE_KEY_LANGUAGE","PCN_SYS_RESOURCE_KEY_LANGUAGE"); + PCN_SYS_ALL_LANGUAGE(220, "PCN_SYS_ALL_LANGUAGE", "PCN_SYS_ALL_LANGUAGE"), + PCN_SYS_RESOURCE_KEY_LANGUAGE(230, "PCN_SYS_RESOURCE_KEY_LANGUAGE", "PCN_SYS_RESOURCE_KEY_LANGUAGE"); private int value; private String code; @@ -2806,4 +2806,76 @@ public class MesPcnEnumUtil { return tmp; } } + + /** + * 工位监听组件类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum WORK_CELL_MONITOR_TYPE { + MONITOR(10, "监听组件"), + SHOW(20, "展示组件"); + + private int value; + private String description; + + WORK_CELL_MONITOR_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + } + + /** + * 工位监听组件触发类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum WORK_MODULE_TRIGGER_TYPE { + BY_SN(10, "根据条码加载工步"), + BY_PART(20, "根据零件号加载工步"); + + private int value; + private String description; + + WORK_MODULE_TRIGGER_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + } + + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum WORK_MODULE_PARAM_TYPE { + NUMBER(10, "数值"), + STRING(20, "字符串"); + + private int value; + private String description; + + WORK_MODULE_PARAM_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java index 942809f..ded67e0 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java @@ -48,6 +48,10 @@ public class MesPlc extends BaseBean implements Serializable { @ApiParam("PLC IP") private String plcIp; + @Column(name = "OPC_URL") + @ApiParam("OPC URL") + private String opcUrl; + @Column(name = "CHANNEL") @ApiParam("通道") private String channel; @@ -104,6 +108,14 @@ public class MesPlc extends BaseBean implements Serializable { @ApiParam("对象代码") private String objectCode; + @Column(name = "USER_NAME") + @ApiParam("用户名") + private String userName; + + @Column(name = "PASSWORD") + @ApiParam("密码") + private String password; + @Transient @ApiParam("设备名称") private String equipmentName; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java index 040bac7..eebe17b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java @@ -72,7 +72,7 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable { @ApiParam("产品类型名称") private String produceCategoryNameRdd; - @Column(name = "产品生产类型") + @Column(name = "PPT_CODE") @ApiParam("产品类型名称") private String pptCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellModule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellModule.java new file mode 100644 index 0000000..aede8be --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellModule.java @@ -0,0 +1,46 @@ +package cn.estsh.i3plus.pojo.mes.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description :工位投料信息 + * @Reference : + * @Author : Wynne.Lu + * @CreateDate : 2019-09-17 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_WORK_CELL_MODULE") +@Api("作业程序组件参数") +public class MesWorkCellModule extends BaseBean implements Serializable { + private static final long serialVersionUID = -3537487776977917751L; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("产线") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工位") + private String workCellCode; + + @Column(name = "MODULE_CODE") + @ApiParam("组件代码") + private String moduleCode; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellModuleParam.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellModuleParam.java new file mode 100644 index 0000000..ae3f6e8 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellModuleParam.java @@ -0,0 +1,58 @@ +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 java.io.Serializable; + +/** + * @Description :工位投料信息 + * @Reference : + * @Author : Wynne.Lu + * @CreateDate : 2019-09-17 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_WORK_CELL_MODULE_PARAM") +@Api("作业程序组件参数") +public class MesWorkCellModuleParam extends BaseBean implements Serializable { + private static final long serialVersionUID = 4836155960343256982L; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("产线") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工位") + private String workCellCode; + + @Column(name = "MODULE_CODE") + @ApiParam("组件代码") + private String moduleCode; + + @Column(name = "PARAM_CODE") + @ApiParam("参数代码") + private String paramCode; + + @Column(name = "PARAM_VALUE") + @ApiParam("参数值") + private String paramValue; + + @Column(name = "CALL_CLASS") + @ApiParam("调用类") + private String callClass; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkModule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkModule.java new file mode 100644 index 0000000..3f7e4cc --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkModule.java @@ -0,0 +1,55 @@ +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 java.io.Serializable; + +/** + * @Description :工位投料信息 + * @Reference : + * @Author : Wynne.Lu + * @CreateDate : 2019-09-17 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_WORK_MODULE") +@Api("作业程序组件") +public class MesWorkModule extends BaseBean implements Serializable { + private static final long serialVersionUID = -4121840589026322086L; + + @Column(name = "MODULE_CODE") + @ApiParam("组件代码") + private String moduleCode; + + @Column(name = "MODULE_NAME") + @ApiParam("组件名称") + private String moduleName; + + @Column(name = "MODULE_TYPE") + @ApiParam("组件类型") + private Integer moduleType; + + @Column(name = "CALL_CLASS") + @ApiParam("调用类") + private String callClass; + + @Column(name = "TRIGGER_TYPE") + @ApiParam("触发类型") + private Integer triggerType; + + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkModuleParam.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkModuleParam.java new file mode 100644 index 0000000..08699c4 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkModuleParam.java @@ -0,0 +1,51 @@ +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 java.io.Serializable; + +/** + * @Description :工位投料信息 + * @Reference : + * @Author : Wynne.Lu + * @CreateDate : 2019-09-17 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_WORK_MODULE_PARAM") +@Api("作业程序组件参数") +public class MesWorkModuleParam extends BaseBean implements Serializable { + private static final long serialVersionUID = -3965186392895014717L; + + @Column(name = "MODULE_CODE") + @ApiParam("组件代码") + private String moduleCode; + + @Column(name = "PARAM_CODE") + @ApiParam("参数代码") + private String paramCode; + + @Column(name = "PARAM_NAME") + @ApiParam("参数名称") + private String paramName; + + @Column(name = "PARAM_TYPE") + @ApiParam("参数类型") + private Integer paramType; + + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ActorMessageModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ActorMessageModel.java index 822087a..b0b6205 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ActorMessageModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ActorMessageModel.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.mes.model; +import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NoArgsConstructor; import java.util.List; import java.util.Map; @@ -10,28 +12,45 @@ import java.util.Map; * @date 2020/3/9 15:35 * @desc */ -@Data -public class ActorMessageModel { +@NoArgsConstructor +@AllArgsConstructor +public class ActorMessageModel { - private String msgType; + private boolean success; - private String clientInfo; + private Object dataObj; - private String workCellCode; + public boolean isSuccess() { + return success; + } - private String workCenterCode; + public void setSuccess(boolean success) { + this.success = success; + } - private String organizeCode; + public Object getDataObj() { + return dataObj; + } - private String routeCode; + public void setDataObj(Object dataObj) { + this.dataObj = dataObj; + } - private String serialNumber; + public static ActorMessageModel getSuccess() { + return new ActorMessageModel(true, null); + } - private String productSn; + public static ActorMessageModel getFailure() { + return new ActorMessageModel(true, null); + } - private T dataObj; + public static ActorMessageModel getSuccess(Object data) { + return new ActorMessageModel(true, data); + } + + public static ActorMessageModel getFailure(Object data) { + return new ActorMessageModel(false, data); + } - private List dataList; - private Map dataMap; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MonitoringModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MonitoringModel.java new file mode 100644 index 0000000..8c63ee0 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MonitoringModel.java @@ -0,0 +1,28 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.mes.bean.MesWorkCellModuleParam; +import cn.estsh.i3plus.pojo.mes.bean.MesWorkModule; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +/** + * @author Wynne.Lu + * @date 2020/3/10 15:24 + * @desc + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +public class MonitoringModel { + + private String monitorType; + + private Boolean isStop; + + private MesWorkModule workModule; + + private List cellModuleParams; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java index d4961d3..6ef2a18 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java @@ -67,6 +67,15 @@ public class StationRequestBean implements Serializable { @ApiParam("业务类型") private String busiType; + @ApiParam("工位监听类型") + private String monitorType; + + @ApiParam("工位监听组件") + private String monitorModule; + + @ApiParam("工位监听消息") + private String monitorMsg; + @ApiParam("工单号") private String workOrderNo; @@ -79,26 +88,4 @@ public class StationRequestBean implements Serializable { @ApiParam("工步列表") private List stepList; - @Override - public String toString() { - return "StationRequestBean{" + - "scanInfo='" + scanInfo + '\'' + - ", serialNumber='" + serialNumber + '\'' + - ", partNo='" + partNo + '\'' + - ", organizeCode='" + organizeCode + '\'' + - ", organizeName='" + organizeName + '\'' + - ", workCenterCode='" + workCenterCode + '\'' + - ", workCellCode='" + workCellCode + '\'' + - ", routeCode='" + routeCode + '\'' + - ", processCode='" + processCode + '\'' + - ", clientInfo='" + clientInfo + '\'' + - ", userInfo='" + userInfo + '\'' + - ", buttonCode='" + buttonCode + '\'' + - ", stepCode='" + stepCode + '\'' + - ", busiType='" + busiType + '\'' + - ", workOrderNo='" + workOrderNo + '\'' + - ", tray='" + tray + '\'' + - ", finishCount=" + finishCount + - '}'; - } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepDispatchModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepDispatchModel.java new file mode 100644 index 0000000..bf9d485 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepDispatchModel.java @@ -0,0 +1,29 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @author Wynne.Lu + * @date 2020/3/13 17:55 + * @desc + */ +@Data +@NoArgsConstructor +public class StepDispatchModel { + + private String stepListKey; + + private String firstScanKey; + + private String cellParamKey; + + private String scanInfo; + + public StepDispatchModel(String stepListKey, String firstScanKey, String cellParamKey, String scanInfo) { + this.stepListKey = stepListKey; + this.firstScanKey = firstScanKey; + this.cellParamKey = cellParamKey; + this.scanInfo = scanInfo; + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellModuleParamRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellModuleParamRepository.java new file mode 100644 index 0000000..74c3137 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellModuleParamRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesWorkCellModule; +import cn.estsh.i3plus.pojo.mes.bean.MesWorkCellModuleParam; +import org.springframework.stereotype.Repository; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/9/18 10:05 AM + * @Description: + **/ +@Repository +public interface MesWorkCellModuleParamRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellModuleRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellModuleRepository.java new file mode 100644 index 0000000..2dc0346 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellModuleRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesWorkCellModule; +import org.springframework.stereotype.Repository; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/9/18 10:05 AM + * @Description: + **/ +@Repository +public interface MesWorkCellModuleRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkModuleParamRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkModuleParamRepository.java new file mode 100644 index 0000000..98dc59c --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkModuleParamRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesWorkModuleParam; +import org.springframework.stereotype.Repository; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/9/18 10:05 AM + * @Description: + **/ +@Repository +public interface MesWorkModuleParamRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkModuleRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkModuleRepository.java new file mode 100644 index 0000000..5362d5a --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkModuleRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesWorkModule; +import org.springframework.stereotype.Repository; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/9/18 10:05 AM + * @Description: + **/ +@Repository +public interface MesWorkModuleRepository extends BaseRepository { +} From 416c2ceffcb8ecf57bb58a1a3b6b72f1f02c9b76 Mon Sep 17 00:00:00 2001 From: zcg Date: Fri, 13 Mar 2020 21:50:40 +0800 Subject: [PATCH 76/91] =?UTF-8?q?=E3=80=90=E4=BB=BB=E5=8A=A1=201443=20exce?= =?UTF-8?q?l=E6=A8=A1=E6=9D=BF=E5=AF=BC=E5=85=A5=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java index 33cb908..6cfbd40 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java @@ -58,6 +58,10 @@ public class MesWorkCenter extends BaseBean implements Serializable { @ApiParam("运行状态") private String runningStatus; + @Column(name = "PRODUCTION_CAPACITY") + @ApiParam("产能") + private Integer productionCapacity; + @Transient @ApiParam(value = "子集列表") private List childTreeList; From 12579c7a14dcf1738e5307352f9cdab8f6fb813e Mon Sep 17 00:00:00 2001 From: luweihao Date: Sat, 14 Mar 2020 01:01:03 +0800 Subject: [PATCH 77/91] =?UTF-8?q?=E8=BF=98=E5=8E=9Fpom?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-aps/pom.xml | 2 +- modules/i3plus-pojo-base/pom.xml | 2 +- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mes-pcn/pom.xml | 2 +- modules/i3plus-pojo-mes/pom.xml | 2 +- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-ptl/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 2 +- modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- pom.xml | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index ebd53c3..f8fa98e 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index 4fa7c5a..1414885 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index e97c0bb..d790ef1 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index 90e744d..c6141da 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index 0ba3645..23e5bee 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 6706323..c1e2cb9 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index ffcac19..856da5f 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index e388a1d..09f2c4a 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index 62ebe64..82fdbe8 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index 39d9423..b7b2dfc 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index e310bfd..ec9e100 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index 92de049..0db7b7d 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index e36fcf7..bd09726 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index 81fb02b..4c96781 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 1f622d9..2c24e41 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index bc41914..18c811c 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index 93f9732..1171f4e 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index 2ffb2ae..bca9cbb 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform From 8148b1654fe8fb25dd3ec94309ada7c49d19e3d8 Mon Sep 17 00:00:00 2001 From: luweihao Date: Sat, 14 Mar 2020 01:30:18 +0800 Subject: [PATCH 78/91] =?UTF-8?q?=E8=A1=A5=E4=B8=8Ames=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 79 ++++++++++++++++++++-- 1 file changed, 73 insertions(+), 6 deletions(-) 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 1e56902..2861293 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 @@ -1596,11 +1596,11 @@ public class MesEnumUtil { MES_ROUTE_PROCESS_WORK_CELL(350, "工序工作单元"), MES_DATASOURCE(360, "DB地址清单"), MES_EQU_TASK_NOTIFY_CFG(370, "设备通知配置"), - MES_EQU_NOTIFY_OBJECT_CFG(380,"设备通知对象"), - MES_PLC(390,"PLC地址清单"), - MES_PROCESS(400,"工序信息"), - MES_KPSN_RULE(410,"关键件条码校验规则"), - MES_QUEUE_JIT_ACTUAL(420,"客户JIT生产队列"); + MES_EQU_NOTIFY_OBJECT_CFG(380, "设备通知对象"), + MES_PLC(390, "PLC地址清单"), + MES_PROCESS(400, "工序信息"), + MES_KPSN_RULE(410, "关键件条码校验规则"), + MES_QUEUE_JIT_ACTUAL(420, "客户JIT生产队列"); private int value; private String description; @@ -4242,6 +4242,7 @@ public class MesEnumUtil { return tmp; } } + /** * 关键件条码校验工步对应的物料分类的值 */ @@ -4279,7 +4280,6 @@ public class MesEnumUtil { } - /** * 工位监听组件类型 */ @@ -4351,4 +4351,71 @@ public class MesEnumUtil { return description; } } + + /** + * 排序校验模式 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum CHECK_PROD_SEQ_FLAG { + PRODUCTION_MATERIAS(10, "NO_SORT_CHECK", "无排序校验"), + CUSTOMER_SHPING(20, "QUEUE_BAR_CODE", "按产品队列条码校验排序"), + OUTWARD_SHIPMENT(30, "PRODUCT_MATERIAL_NUMBER", "按产品物料号校验排序"), + ALLOCATION(40, "SAME_MATERIAL_RACK", "按队列同料架单产品校验排序"); + + private int value; + private String code; + private String description; + + CHECK_PROD_SEQ_FLAG(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } + + 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 String codeOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].code; + } + } + 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); + } + } } From 9edfe18aec489e88f65541ddf2a801be69dccbd8 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Sat, 14 Mar 2020 19:24:19 +0800 Subject: [PATCH 79/91] =?UTF-8?q?=E3=80=907565=20=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=E5=88=86=E7=BB=84=E5=8A=9F=E8=83=BD=E8=A6=81=E6=B1=82=E3=80=82?= =?UTF-8?q?=E3=80=91bug7565?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java index 8827222..8688652 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java @@ -33,6 +33,7 @@ public class WmsSnOperateRecord extends BaseBean { @Column(name = "SN") @ApiParam(value = "条码") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String sn; @Column(name = "LINE_CODE") From 5b92cae5d1b65ff5b6fbaf0c3974b8b6b057e0c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Sun, 15 Mar 2020 17:58:21 +0800 Subject: [PATCH 80/91] =?UTF-8?q?3D=E4=BB=93=E5=BA=93=EF=BC=9A=E8=81=94?= =?UTF-8?q?=E8=B0=83=E4=BC=98=E5=8C=96+=E6=94=B6=E8=B4=A7=E7=9C=8B?= =?UTF-8?q?=E6=9D=BFBUG#7308?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFurniture.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java | 10 ++++++---- .../main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFurniture.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFurniture.java index 929b274..f64bf33 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFurniture.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFurniture.java @@ -65,8 +65,10 @@ public class WmsFurniture extends BaseBean { public WmsFurniture() { } - public WmsFurniture(String whNo, String zoneNo, String typeCode, String furnitureNo, + public WmsFurniture(Long id,String organizeCode, String whNo, String zoneNo, String typeCode, String furnitureNo, Integer isSaveGoods, String position, Integer storey, Integer fntCol) { + this.id = id; + this.organizeCode = organizeCode; this.whNo = whNo; this.zoneNo = zoneNo; this.typeCode = typeCode; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java index a5b6221..ee6babb 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java @@ -178,7 +178,7 @@ public class WmsLocate extends BaseBean { @Transient @ApiParam(value = "移动频次") - private Integer frequency; + private Long frequency; @Transient @ApiParam(value = "库龄") @@ -197,7 +197,8 @@ public class WmsLocate extends BaseBean { this.partQty=partQty; this.locateNo=locateNo; } - public WmsLocate(String locateNo,Integer frequency,String organizeCode, + //3D仓库-库位移动频率热力图 + public WmsLocate(String locateNo,Long frequency,String organizeCode, String whNo,String zoneNo,String furnitureNo, Integer x,Integer y,Integer z){ this.locateNo=locateNo; @@ -210,6 +211,7 @@ public class WmsLocate extends BaseBean { this.y=y; this.z=z; } + //3D仓库-库龄热力图 public WmsLocate(String locateNo,String age,String organizeCode, String whNo,String zoneNo,String furnitureNo, Integer x,Integer y,Integer z){ @@ -244,8 +246,8 @@ public class WmsLocate extends BaseBean { return this.locateType== null ? 0 : this.locateType.intValue(); } - public Integer getFrequencyVal() { - return this.frequency == null ? 0 : this.frequency.intValue(); + public Long getFrequencyVal() { + return this.frequency == null ? 0 : this.frequency.longValue(); } public Integer getLcLengthVal() { 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 abff614..551d6d6 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 @@ -545,7 +545,7 @@ public class WmsHqlPack { DdlPreparedPack.getInPack(StringUtils.join(new ArrayList(Arrays.asList(wmsLocate.getZoneNo().split(","))), ","), "zoneNo", result); } if (wmsLocate.getLocateNoArr() != null) { - DdlPreparedPack.getInPack(StringUtils.join(wmsLocate.getLocateNoArr()), "", result); + DdlPreparedPack.getInPack(StringUtils.join(wmsLocate.getLocateNoArr()), "locateNo", result); } // DdlPreparedPack.getStringEqualPack(wmsLocate.getZoneNo(), "zoneNo", result); From 8b9d8fd16d801898ada9246e0484e26cfd561c89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Mon, 16 Mar 2020 11:49:31 +0800 Subject: [PATCH 81/91] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E3=80=81=E7=95=8C=E9=9D=A2=E5=85=83=E7=B4=A0=E3=80=81=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=E5=85=83=E7=B4=A0=E5=B1=9E=E6=80=A7=E3=80=81RFID?= =?UTF-8?q?=E3=80=81=E6=8E=A5=E5=8F=A3=E6=B8=85=E5=8D=95=E3=80=81=E5=8C=BA?= =?UTF-8?q?=E5=9F=9F=E8=A7=82=E5=AF=9F=E8=80=85=E4=BA=8B=E4=BB=B6=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E3=80=81=E5=8C=BA=E5=9F=9F=E6=B5=81=E7=A8=8B=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E8=B0=83=E7=94=A8=E5=8F=82=E6=95=B0=E5=AE=9E=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/ptl/bean/PtlAreaActorAction.java | 59 ++++++++++++++++++++ .../pojo/ptl/bean/PtlAreaRouteModuleParam.java | 64 ++++++++++++++++++++++ .../java/cn/estsh/i3plus/pojo/ptl/bean/PtlIf.java | 59 ++++++++++++++++++++ .../cn/estsh/i3plus/pojo/ptl/bean/PtlRfid.java | 59 ++++++++++++++++++++ .../cn/estsh/i3plus/pojo/ptl/bean/PtlWindow.java | 47 ++++++++++++++++ .../i3plus/pojo/ptl/bean/PtlWindowElement.java | 44 +++++++++++++++ .../pojo/ptl/bean/PtlWindowElementAttribute.java | 55 +++++++++++++++++++ 7 files changed, 387 insertions(+) create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaActorAction.java create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaRouteModuleParam.java create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlIf.java create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRfid.java create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlWindow.java create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlWindowElement.java create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlWindowElementAttribute.java diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaActorAction.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaActorAction.java new file mode 100644 index 0000000..f6dc79a --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaActorAction.java @@ -0,0 +1,59 @@ +package cn.estsh.i3plus.pojo.ptl.bean; + + +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +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.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/2/12 17:41 + * @desc + */ + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "PTL_AREA_ACTOR_ACTION") +@EqualsAndHashCode(callSuper = true) +@Api("PTL_区域观察者事件配置") +public class PtlAreaActorAction extends BaseBean implements Serializable { + private static final long serialVersionUID = -1596837642283797995L; + + @Column(name = "AREA_NO") + @ApiParam("区域代码") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + private String areaNo; + + @Column(name = "ACTOR_CODE") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @ApiParam("观察者编码") + private String actorCode; + + @Column(name = "MT_CODE") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @ApiParam("消息类型代码") + private String mtCode; + + @Column(name = "OTHER_WHERE") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @ApiParam("特定条件") + private String otherWhere; + + @Column(name = "AMG_ID") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @ApiParam("组件集编号") + private Long amgId; +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaRouteModuleParam.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaRouteModuleParam.java new file mode 100644 index 0000000..e879275 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaRouteModuleParam.java @@ -0,0 +1,64 @@ +package cn.estsh.i3plus.pojo.ptl.bean; + + +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +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.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/2/12 17:41 + * @desc + */ + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "PTL_AREA_ROUTE_MODULE_PARAM") +@EqualsAndHashCode(callSuper = true) +@Api("PTL_区域流程组件调用参数") +public class PtlAreaRouteModuleParam extends BaseBean implements Serializable { + private static final long serialVersionUID = -1596829442283797995L; + + @Column(name = "AREA_NO") + @ApiParam("区域代码") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + private String areaNo; + + @Column(name = "ROUTE_CODE") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @ApiParam("流程代码") + private String routeCode; + + @Column(name = "AMG_ID") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @ApiParam("组件集编号") + private Long amgId; + + @Column(name = "AM_CODE") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @ApiParam("组件代码") + private String amCode; + + @Column(name = "PARAM_CODE") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @ApiParam("参数代码") + private String paramCode; + + @Column(name = "PARAM_VALUE") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @ApiParam("参数值") + private String paramValue; +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlIf.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlIf.java new file mode 100644 index 0000000..3471aee --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlIf.java @@ -0,0 +1,59 @@ +package cn.estsh.i3plus.pojo.ptl.bean; + + +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +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.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/2/12 17:41 + * @desc + */ + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "PTL_IF") +@EqualsAndHashCode(callSuper = true) +@Api("PTL_接口清单") +public class PtlIf extends BaseBean implements Serializable { + private static final long serialVersionUID = -1596882732758197995L; + + @Column(name = "IF_CODE") + @ApiParam("接口代码") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + private String ifCode; + + @Column(name = "IF_NAME") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @ApiParam("接口名称") + private String ifName; + + @Column(name = "IF_CONNECT_TYPE") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT) + @ApiParam("交互方式") + private String ifConnectType; + + @Column(name = "IF_CLASS") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT) + @ApiParam("接口实现类") + private String ifClass; + + @Column(name = "IF_CALL_TYPE") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT) + @ApiParam("接口调用方向") + private String ifCallType; +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRfid.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRfid.java new file mode 100644 index 0000000..9bf3380 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRfid.java @@ -0,0 +1,59 @@ +package cn.estsh.i3plus.pojo.ptl.bean; + + +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +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.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/2/12 17:41 + * @desc + */ + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "PTL_RFID") +@EqualsAndHashCode(callSuper = true) +@Api("PTL_RFID") +public class PtlRfid extends BaseBean implements Serializable { + private static final long serialVersionUID = -1596837642758197995L; + + @Column(name = "RFID_CONTROL_NO") + @ApiParam("RFID读写器代码") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + private String rfidControlNo; + + @Column(name = "IP") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @ApiParam("IP") + private String ip; + + @Column(name = "PORT") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @ApiParam("端口号") + private String port; + + @Column(name = "AREA_NO") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT) + @ApiParam("区域代码") + private String areaNo; + + @Column(name = "RFID_VALUE") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @ApiParam("rfid内容") + private String rfidValue; +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlWindow.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlWindow.java new file mode 100644 index 0000000..3961a36 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlWindow.java @@ -0,0 +1,47 @@ +package cn.estsh.i3plus.pojo.ptl.bean; + + +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; + +/** + * @author Wynne.Lu + * @date 2020/2/12 17:41 + * @desc + */ + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "PTL_WINDOW") +@EqualsAndHashCode(callSuper = true) +@Api("PTL_界面") +public class PtlWindow extends BaseBean implements Serializable { + private static final long serialVersionUID = -1596443842758197995L; + + @Column(name = "WINDOW_NO") + @ApiParam("界面代码") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + private String windowNo; + + @Column(name = "WINDOW_NAME") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @ApiParam("界面名称") + private String windowName; +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlWindowElement.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlWindowElement.java new file mode 100644 index 0000000..818bc4b --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlWindowElement.java @@ -0,0 +1,44 @@ +package cn.estsh.i3plus.pojo.ptl.bean; + + +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +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.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/2/12 17:41 + * @desc + */ + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "PTL_WINDOW_ELEMENT") +@EqualsAndHashCode(callSuper = true) +@Api("PTL_界面元素") +public class PtlWindowElement extends BaseBean implements Serializable { + private static final long serialVersionUID = -1596427582758197995L; + + @Column(name = "WINDOW_NO") + @ApiParam("界面代码") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + private String windowNo; + + @Column(name = "ELEMENT_NO") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @ApiParam("元素代码") + private String elementNo; +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlWindowElementAttribute.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlWindowElementAttribute.java new file mode 100644 index 0000000..f5f98d4 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlWindowElementAttribute.java @@ -0,0 +1,55 @@ +package cn.estsh.i3plus.pojo.ptl.bean; + + +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +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.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/2/12 17:41 + * @desc + */ + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "PTL_WINDOW_ELEMENT_ATTRIBUTE") +@EqualsAndHashCode(callSuper = true) +@Api("PTL_界面元素属性") +public class PtlWindowElementAttribute extends BaseBean implements Serializable { + private static final long serialVersionUID = -1596427582758285995L; + + @Column(name = "WINDOW_NO") + @ApiParam("界面代码") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + private String windowNo; + + @Column(name = "ELEMENT_NO") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @ApiParam("元素代码") + private String elementNo; + + @Column(name = "ATTRIBUTE_NO") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @ApiParam("属性代码") + private String attributeNo; + + @Column(name = "ATTRIBUTE_VALUE") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @ApiParam("属性值") + private String attributeValue; + +} From b28c092ade6b08887e9e9ff786a6fe5ed753d228 Mon Sep 17 00:00:00 2001 From: zcg Date: Mon, 16 Mar 2020 14:38:06 +0800 Subject: [PATCH 82/91] =?UTF-8?q?=E3=80=90=E6=96=B0=E5=A2=9E=E6=9E=9A?= =?UTF-8?q?=E4=B8=BE=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 180 ++++++++++++++------- 1 file changed, 126 insertions(+), 54 deletions(-) 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 2861293..80c65f6 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 @@ -83,6 +83,72 @@ public class MesEnumUtil { } /** + * 排序校验模式 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum CHECK_PROD_SEQ_FLAG { + PRODUCTION_MATERIAS(10, "NO_SORT_CHECK", "无排序校验"), + CUSTOMER_SHPING(20, "QUEUE_BAR_CODE", "按产品队列条码校验排序"), + OUTWARD_SHIPMENT(30, "PRODUCT_MATERIAL_NUMBER", "按产品物料号校验排序"), + ALLOCATION(40, "SAME_MATERIAL_RACK", "按队列同料架单产品校验排序"); + + private int value; + private String code; + private String description; + + CHECK_PROD_SEQ_FLAG(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } + + 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 String codeOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].code; + } + } + 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); + } + } + /** * JIS发运是否按主队列顺序扫描 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) @@ -4110,6 +4176,7 @@ public class MesEnumUtil { public enum QUEUE_JIT_ACTUAL_SPECIAL_FLAG { NORMAL(10, "正常"), EMPTYING(20, "放空"); + private int value; private String description; @@ -4251,7 +4318,6 @@ public class MesEnumUtil { MM(10, "MM"), MS(20, "MS"); - private int value; private String description; @@ -4281,17 +4347,18 @@ public class MesEnumUtil { /** - * 工位监听组件类型 + * mes生产队列是否锁定 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum WORK_CELL_MONITOR_TYPE { - MONITOR(10, "监听组件"), - SHOW(20, "展示组件"); + public enum QUEUE_ORDER_IS_LOCK { + + TRUE(1, "是"), + FALSE(2, "否"); private int value; private String description; - WORK_CELL_MONITOR_TYPE(int value, String description) { + QUEUE_ORDER_IS_LOCK(int value, String description) { this.value = value; this.description = description; } @@ -4303,20 +4370,31 @@ public class MesEnumUtil { 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; + } } /** - * 工位监听组件触发类型 + * 查询散件BOM关键物料号工步对应的物料分类的值 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum WORK_MODULE_TRIGGER_TYPE { - BY_SN(10, "根据条码加载工步"), - BY_PART(20, "根据零件号加载工步"); + public enum PART_TYPE_THREE_STATION_BOM { + + MM(10, "MM"), + NLX(20, "NLX"); private int value; private String description; - WORK_MODULE_TRIGGER_TYPE(int value, String description) { + PART_TYPE_THREE_STATION_BOM(int value, String description) { this.value = value; this.description = description; } @@ -4328,17 +4406,31 @@ public class MesEnumUtil { 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; + } } + + /** + * 工位监听组件类型 + */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum WORK_MODULE_PARAM_TYPE { - NUMBER(10, "数值"), - STRING(20, "字符串"); + public enum WORK_CELL_MONITOR_TYPE { + MONITOR(10, "监听组件"), + SHOW(20, "展示组件"); private int value; private String description; - WORK_MODULE_PARAM_TYPE(int value, String description) { + WORK_CELL_MONITOR_TYPE(int value, String description) { this.value = value; this.description = description; } @@ -4353,22 +4445,18 @@ public class MesEnumUtil { } /** - * 排序校验模式 + * 工位监听组件触发类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum CHECK_PROD_SEQ_FLAG { - PRODUCTION_MATERIAS(10, "NO_SORT_CHECK", "无排序校验"), - CUSTOMER_SHPING(20, "QUEUE_BAR_CODE", "按产品队列条码校验排序"), - OUTWARD_SHIPMENT(30, "PRODUCT_MATERIAL_NUMBER", "按产品物料号校验排序"), - ALLOCATION(40, "SAME_MATERIAL_RACK", "按队列同料架单产品校验排序"); + public enum WORK_MODULE_TRIGGER_TYPE { + BY_SN(10, "根据条码加载工步"), + BY_PART(20, "根据零件号加载工步"); private int value; - private String code; private String description; - CHECK_PROD_SEQ_FLAG(int value, String code, String description) { + WORK_MODULE_TRIGGER_TYPE(int value, String description) { this.value = value; - this.code = code; this.description = description; } @@ -4379,43 +4467,27 @@ public class MesEnumUtil { public String getDescription() { return description; } + } - public String getCode() { - return code; - } + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum WORK_MODULE_PARAM_TYPE { + NUMBER(10, "数值"), + STRING(20, "字符串"); - 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; - } + private int value; + private String description; - public static String codeOf(int val) { - String tmp = null; - for (int i = 0; i < values().length; i++) { - if (values()[i].value == val) { - tmp = values()[i].code; - } - } - return tmp; + WORK_MODULE_PARAM_TYPE(int value, String description) { + this.value = value; + this.description = description; } - 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 int getValue() { + return value; } - public static String valueOfDescription(int val) { - return valueOf(val); + public String getDescription() { + return description; } } } From 3d28840bae726bb7ad374473655013772b89cf7e Mon Sep 17 00:00:00 2001 From: zcg Date: Mon, 16 Mar 2020 17:02:06 +0800 Subject: [PATCH 83/91] =?UTF-8?q?=E3=80=90=E6=96=B0=E5=A2=9E=E6=9E=9A?= =?UTF-8?q?=E4=B8=BE=EF=BC=8Cpojo=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 73 ++++++++++++++++++++++ .../i3plus/pojo/mes/pcn/bean/MesCachaQueue.java | 45 +++++++++++++ .../i3plus/pojo/mes/pcn/bean/MesPartFormula.java | 45 +++++++++++++ .../estsh/i3plus/pojo/mes/bean/MesCachaQueue.java | 45 +++++++++++++ .../estsh/i3plus/pojo/mes/bean/MesPartFormula.java | 45 +++++++++++++ .../mes/repository/MesCachaQueueRepository.java | 15 +++++ .../mes/repository/MesPartFormulaRepository.java | 15 +++++ 7 files changed, 283 insertions(+) create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCachaQueue.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPartFormula.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCachaQueue.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartFormula.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesCachaQueueRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartFormulaRepository.java 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 acd5453..037f318 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 @@ -2878,4 +2878,77 @@ public class MesPcnEnumUtil { return description; } } + + /** + * 缓存类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum CACHA_TYPE { + DATA_REVIEW(10, "数据复核"); + + private int value; + private String description; + + CACHA_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + } + + /** + * 缓存队列状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum CACHA_QUEUE_STATUS { + CREATE(10, "创建"); + + private int value; + private String description; + + CACHA_QUEUE_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + } + + + /** + * 配方类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PART_FORMULA_TYPE { + DEVICE_SEMAPHORE(10, "设备信号"); + + private int value; + private String description; + + PART_FORMULA_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + } } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCachaQueue.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCachaQueue.java new file mode 100644 index 0000000..fd9c366 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCachaQueue.java @@ -0,0 +1,45 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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 java.io.Serializable; + +/** + * @Description : + * @Reference : + * @Author : zcg + * @Date : 2020/3/16 0016 - 15:09 + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_CACHA_QUEUE") +@Api("MES缓存队列") +public class MesCachaQueue extends BaseBean implements Serializable { + + private static final long serialVersionUID = 8272649623030195332L; + + @Column(name = "SERIAL_NUMBER") + @ApiParam("过程条码") + private String serialNumber; + + @Column(name = "STATUS") + @ApiParam("状态") + private Integer status; + + @Column(name = "CACHA_TYPE") + @ApiParam("缓存类型") + private String cachaType; + +} \ No newline at end of file diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPartFormula.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPartFormula.java new file mode 100644 index 0000000..94f495f --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPartFormula.java @@ -0,0 +1,45 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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 java.io.Serializable; + +/** + * @Description : + * @Reference : + * @Author : zcg + * @Date : 2020/3/16 0016 - 15:50 + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PART_FORMULA") +@Api("MES_物料配方") +public class MesPartFormula extends BaseBean implements Serializable { + + private static final long serialVersionUID = 3120650997069271308L; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "FORMULA_CONTENT") + @ApiParam("配方内容") + private String formulaContent; + + @Column(name = "FORMULA_TYPE") + @ApiParam("配方类型") + private Integer formulaType; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCachaQueue.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCachaQueue.java new file mode 100644 index 0000000..34e21f9 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCachaQueue.java @@ -0,0 +1,45 @@ +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 java.io.Serializable; + +/** + * @Description :MES_缓存队列 + * @Reference : + * @Author : zcg + * @Date : 2020/3/16 0016 - 14:52 + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_CACHA_QUEUE") +@Api("MES缓存队列") +public class MesCachaQueue extends BaseBean implements Serializable { + + private static final long serialVersionUID = 6875307024103023380L; + + @Column(name = "SERIAL_NUMBER") + @ApiParam("过程条码") + private String serialNumber; + + @Column(name = "STATUS") + @ApiParam("状态") + private Integer status; + + @Column(name = "CACHA_TYPE") + @ApiParam("缓存类型") + private String cachaType; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartFormula.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartFormula.java new file mode 100644 index 0000000..63b5871 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartFormula.java @@ -0,0 +1,45 @@ +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 java.io.Serializable; + +/** + * @Description : + * @Reference : + * @Author : zcg + * @Date : 2020/3/16 0016 - 15:45 + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PART_FORMULA") +@Api("MES_物料配方") +public class MesPartFormula extends BaseBean implements Serializable { + + private static final long serialVersionUID = 4905294092563287950L; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "FORMULA_CONTENT") + @ApiParam("配方内容") + private String formulaContent; + + @Column(name = "FORMULA_TYPE") + @ApiParam("配方类型") + private Integer formulaType; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesCachaQueueRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesCachaQueueRepository.java new file mode 100644 index 0000000..24f6cd2 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesCachaQueueRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesCachaQueue; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : zcg + * @Date : 2020/3/16 0016 - 15:05 + */ +@Repository +public interface MesCachaQueueRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartFormulaRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartFormulaRepository.java new file mode 100644 index 0000000..9a0d707 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartFormulaRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesPartFormula; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : zcg + * @Date : 2020/3/16 0016 - 15:59 + */ +@Repository +public interface MesPartFormulaRepository extends BaseRepository { +} From 0b8c3317b8bb9f8c5fce1236598634a329b81106 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Tue, 17 Mar 2020 10:02:23 +0800 Subject: [PATCH 84/91] ptlpcn enum --- .../i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java | 84 +++++++++++----------- 1 file changed, 40 insertions(+), 44 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java index 1205a9c..614df60 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java @@ -1457,16 +1457,6 @@ public class PtlPcnEnumUtil { 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); } @@ -1514,16 +1504,6 @@ public class PtlPcnEnumUtil { 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); } @@ -1569,16 +1549,6 @@ public class PtlPcnEnumUtil { 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); } @@ -1625,11 +1595,47 @@ public class PtlPcnEnumUtil { return tmp; } - public static int descOf(String desc) { - int tmp = 1; + public static String valueOfDescription(int val) { + return valueOf(val); + } + } + + /** + * 主任务类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MAIN_TASK_TYPE { + CREATE(10, "JIT_TASK", "JIT任务"), + RECEIPT(20, "DOCUMENT_TASK", "单据任务"), + RECEIPT_FINISH(30, "SINGLE_POINT_TASK", "单点任务"); + + private int value; + private String code; + private String description; + + MAIN_TASK_TYPE(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + 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].description.equals(desc)) { - tmp = values()[i].value; + if (values()[i].value == val) { + tmp = values()[i].description; } } return tmp; @@ -1678,15 +1684,5 @@ public class PtlPcnEnumUtil { } return tmp; } - - public static String valueOfDescription2(int val) { - String tmp = null; - for (int i = 0; i < values().length; i++) { - if (values()[i].value == val) { - tmp = values()[i].description.equals("已审批") ? "审批" : values()[i].description; - } - } - return tmp; - } } } From e8f48bcb04a806024df574431f08cc11547e2ece Mon Sep 17 00:00:00 2001 From: joke lin Date: Tue, 17 Mar 2020 13:38:30 +0800 Subject: [PATCH 85/91] =?UTF-8?q?[bug:=207637=20=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9F=A5=E8=AF=A2]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java index cd951ae..122b4a5 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java @@ -13,6 +13,8 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; import java.io.Serializable; +import java.util.List; +import java.util.Map; /** * @Description :生产数据 @@ -112,7 +114,7 @@ public class MesProductData extends BaseBean implements Serializable { @Lob @Column(name = "LINE_DATA") @ApiParam("生产数据") - private String lineData; + private List lineData; @Lob @Transient From 3b928c6ddc44fa9680887811b01da4e984a0c51f Mon Sep 17 00:00:00 2001 From: joke lin Date: Tue, 17 Mar 2020 16:08:28 +0800 Subject: [PATCH 86/91] =?UTF-8?q?[bug:=207637=20=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E6=95=B0=E6=8D=AE]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java index d78860d..6c6aeec 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java @@ -14,6 +14,7 @@ import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; import java.io.Serializable; +import java.util.List; /** * @Description: @@ -126,5 +127,5 @@ public class MesPlc extends BaseBean implements Serializable { @Transient @ApiParam("OPC值") - private String opcValue; + private List opcValue; } From 8881bafecf91331a6e97d19ff0dcfcf74bc12aca Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Tue, 17 Mar 2020 17:05:51 +0800 Subject: [PATCH 87/91] ptl pcn --- .../cn/estsh/i3plus/pojo/ptl/model/LightOnModel.java | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/LightOnModel.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/LightOnModel.java index 32bbe43..f423f60 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/LightOnModel.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/LightOnModel.java @@ -47,4 +47,22 @@ public class LightOnModel implements Serializable { @ApiParam("状态") private Integer status; + @ApiParam("控制器ip") + private String ip; + + @ApiParam("端口") + private String port; + + @ApiParam("控制器编号") + private String controlNo; + + public LightOnModel() { + } + + public LightOnModel(Integer tagNo, String ip, String port, String controlNo) { + this.tagNo = tagNo; + this.ip = ip; + this.port = port; + this.controlNo = controlNo; + } } From 03f1c4fddfabf05cce531c50b5e0d122f51f51e3 Mon Sep 17 00:00:00 2001 From: luweihao Date: Tue, 17 Mar 2020 18:02:24 +0800 Subject: [PATCH 88/91] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java index cd951ae..5db7e04 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java @@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; import java.io.Serializable; +import java.util.List; /** * @Description :生产数据 From 6cfc2c550147e00b404a8aad72405b54e9a758b6 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Tue, 17 Mar 2020 18:45:49 +0800 Subject: [PATCH 89/91] ptl --- .../estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java | 26 +++++++++++----------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java index bbb4564..9a1598e 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java @@ -4,7 +4,6 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.PtlPcnEnumUtil; -import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.ptl.bean.*; import org.springframework.util.StringUtils; @@ -228,10 +227,10 @@ public class PtlHqlPack { public static DdlPackBean packPtlAreaTask(PtlAreaTask ptlAreaTask) { DdlPackBean result = new DdlPackBean(); //查询参数封装 - DdlPreparedPack.getStringEqualPack(ptlAreaTask.getTaskNo(), "taskNo", result); - DdlPreparedPack.getStringEqualPack(ptlAreaTask.getPartNo(), "partNo", result); - if (org.apache.commons.lang3.StringUtils.isNotBlank(ptlAreaTask.getCreateDateTimeStart()) - && org.apache.commons.lang3.StringUtils.isNotBlank(ptlAreaTask.getCreateDateTimeEnd())) { + DdlPreparedPack.getStringLikerPack(ptlAreaTask.getTaskNo(), "taskNo", result); + DdlPreparedPack.getStringLikerPack(ptlAreaTask.getPartNo(), "partNo", result); + if (!StringUtils.isEmpty(ptlAreaTask.getCreateDateTimeStart()) + || !StringUtils.isEmpty(ptlAreaTask.getCreateDateTimeEnd())) { DdlPreparedPack.timeBuilder(ptlAreaTask.getCreateDateTimeStart(), ptlAreaTask.getCreateDateTimeEnd() , "createDatetime", result, true); } @@ -253,10 +252,10 @@ public class PtlHqlPack { public static DdlPackBean packPtlMainTask(PtlMainTask ptlMainTask) { DdlPackBean result = new DdlPackBean(); //查询参数封装 - DdlPreparedPack.getStringEqualPack(ptlMainTask.getTaskNo(), "taskNo", result); - DdlPreparedPack.getStringEqualPack(ptlMainTask.getPartNo(), "partNo", result); - if (org.apache.commons.lang3.StringUtils.isNotBlank(ptlMainTask.getCreateDateTimeStart()) - && org.apache.commons.lang3.StringUtils.isNotBlank(ptlMainTask.getCreateDateTimeEnd())) { + DdlPreparedPack.getStringLikerPack(ptlMainTask.getTaskNo(), "taskNo", result); + DdlPreparedPack.getStringLikerPack(ptlMainTask.getPartNo(), "partNo", result); + if (!StringUtils.isEmpty(ptlMainTask.getCreateDateTimeStart()) + || !StringUtils.isEmpty(ptlMainTask.getCreateDateTimeEnd())) { DdlPreparedPack.timeBuilder(ptlMainTask.getCreateDateTimeStart(), ptlMainTask.getCreateDateTimeEnd() , "createDatetime", result, true); } @@ -276,15 +275,16 @@ public class PtlHqlPack { public static DdlPackBean packPtlAreaSectionTask(PtlAreaSectionTask ptlAreaSectionTask) { DdlPackBean result = new DdlPackBean(); //查询参数封装 - DdlPreparedPack.getStringEqualPack(ptlAreaSectionTask.getAreaTaskNo(), "areaTaskNo", result); - DdlPreparedPack.getStringEqualPack(ptlAreaSectionTask.getPartNo(), "partNo", result); - if (org.apache.commons.lang3.StringUtils.isNotBlank(ptlAreaSectionTask.getCreateDateTimeStart()) - && org.apache.commons.lang3.StringUtils.isNotBlank(ptlAreaSectionTask.getCreateDateTimeEnd())) { + DdlPreparedPack.getStringLikerPack(ptlAreaSectionTask.getAreaTaskNo(), "areaTaskNo", result); + DdlPreparedPack.getStringLikerPack(ptlAreaSectionTask.getPartNo(), "partNo", result); + if (!StringUtils.isEmpty(ptlAreaSectionTask.getCreateDateTimeStart()) + || !StringUtils.isEmpty(ptlAreaSectionTask.getCreateDateTimeEnd())) { DdlPreparedPack.timeBuilder(ptlAreaSectionTask.getCreateDateTimeStart(), ptlAreaSectionTask.getCreateDateTimeEnd() , "createDatetime", result, true); } DdlPreparedPack.getStringEqualPack(ptlAreaSectionTask.getAreaNo(), "areaNo", result); DdlPreparedPack.getStringEqualPack(ptlAreaSectionTask.getSectionNo(), "sectionNo", result); + DdlPreparedPack.getNumEqualPack(ptlAreaSectionTask.getStatus(), "status", result); DdlPreparedPack.getStringEqualPack(ptlAreaSectionTask.getOrganizeCode(), "organizeCode", result); DdlPreparedPack.getNumEqualPack(ptlAreaSectionTask.getIsValid(), "isValid", result); DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", result); From 2da53135a8a2c6e08c921f1e6d20021b3b53a9e2 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Wed, 18 Mar 2020 10:04:03 +0800 Subject: [PATCH 90/91] =?UTF-8?q?bug7761=E3=80=907761=20=E5=8F=91=E8=BF=90?= =?UTF-8?q?=E9=85=8D=E6=96=99=E7=95=8C=E9=9D=A2=EF=BC=8C=E6=89=A7=E8=A1=8C?= =?UTF-8?q?=E6=88=90=E5=8A=9F=E4=B8=8E=E6=97=A0=E5=BA=93=E5=AD=98=E6=9C=AA?= =?UTF-8?q?=E5=81=9A=E5=9B=BD=E9=99=85=E5=8C=96=EF=BC=8C=E7=BF=BB=E8=AF=91?= =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=B7=B2=E9=85=8D=E7=BD=AE=E5=A5=BD=E3=80=91?= =?UTF-8?q?=20bug=E3=80=907766=20=E6=8B=86=E5=88=86=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E6=93=8D=E4=BD=9C=E5=AE=8C=E6=88=90=E5=90=8E?= =?UTF-8?q?=E4=B8=8B=E6=96=B9=E9=9C=80=E8=A6=81=E5=9B=9E=E6=98=BE=EF=BC=8C?= =?UTF-8?q?=E6=8B=86=E5=88=86=E5=87=BA=E7=9A=84=E6=9D=A1=E7=A0=81=E7=9A=84?= =?UTF-8?q?=E9=9B=B6=E4=BB=B6=E5=8F=B7=EF=BC=8C=E6=9D=A1=E7=A0=81=EF=BC=8C?= =?UTF-8?q?=E6=95=B0=E9=87=8F=EF=BC=8C=E5=BA=93=E4=BD=8D=E3=80=82=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 d707fe8..2e3cffa 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 @@ -54,7 +54,7 @@ public class WmsInterfaceDataMapper extends BaseBean { /** * 来源表的查询条件 */ - @Column(name = "SRC_WHERE", length = 255) + @Column(name = "SRC_WHERE", length = 500) public String srcWhere; /** From e3b6f03dd8656dfd545dab2a431dfb8a0bbc1a72 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Wed, 18 Mar 2020 10:17:59 +0800 Subject: [PATCH 91/91] =?UTF-8?q?=E5=8C=97=E4=BA=AC=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3WMS#511=E3=80=90511=20=E5=8C=97=E4=BA=AC=E9=BA=A6?= =?UTF-8?q?=E6=A0=BC=E7=BA=B3-NC=E6=8A=A5=E5=BA=9FNC=E5=86=BB=E7=BB=93-?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E4=B8=8D=E8=89=AF=E5=93=81=E6=A0=87=E7=AD=BE?= =?UTF-8?q?=E6=89=93=E5=8D=B0=E3=80=91=20=E5=8C=97=E4=BA=AC=E9=BA=A6?= =?UTF-8?q?=E6=A0=BC=E7=BA=B3WMS#510=E3=80=90510=20=E5=8C=97=E4=BA=AC?= =?UTF-8?q?=E9=BA=A6=E6=A0=BC=E7=BA=B3-=E6=8B=A3=E8=B4=A7-=E9=A2=86?= =?UTF-8?q?=E6=96=99=E4=BB=BB=E5=8A=A1=E7=9B=91=E6=8E=A7=E7=9C=8B=E6=9D=BF?= =?UTF-8?q?=E3=80=91=20=E5=8C=97=E4=BA=AC=E9=BA=A6=E6=A0=BC=E7=BA=B3WMS#50?= =?UTF-8?q?8=E3=80=90508=20=E5=8C=97=E4=BA=AC=E9=BA=A6=E6=A0=BC=E7=BA=B3-?= =?UTF-8?q?=E6=8B=A3=E8=B4=A7-=E6=A0=B9=E6=8D=AE=E6=9C=80=E7=9F=AD?= =?UTF-8?q?=E8=B7=AF=E5=BE=84=E6=8E=A8=E8=8D=90=E6=9D=A1=E7=A0=81=E3=80=91?= =?UTF-8?q?=20=E5=8C=97=E4=BA=AC=E9=BA=A6=E6=A0=BC=E7=BA=B3WMS#507?= =?UTF-8?q?=E3=80=90507=20=E5=8C=97=E4=BA=AC=E9=BA=A6=E6=A0=BC=E7=BA=B3-?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=A4=96=E5=85=A5=E5=BA=93=EF=BC=88=E9=9B=B6?= =?UTF-8?q?=E6=98=9F=E5=85=A5=E5=BA=93=EF=BC=89=E6=96=B0=E5=A2=9E=EF=BC=8C?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E6=89=B9=E6=AC=A1=E4=B8=BA=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E6=97=A5=E6=9C=9F=E3=80=91=20=E5=8C=97=E4=BA=AC=E9=BA=A6?= =?UTF-8?q?=E6=A0=BC=E7=BA=B3WMS#505=E3=80=90505=20=E5=8C=97=E4=BA=AC?= =?UTF-8?q?=E9=BA=A6=E6=A0=BC=E7=BA=B3-=E9=87=87=E8=B4=AD=E6=94=B6?= =?UTF-8?q?=E8=B4=A7-=E6=8E=A8=E9=80=81=E6=94=B6=E8=B4=A7=E5=B7=AE?= =?UTF-8?q?=E5=BC=82=E9=82=AE=E4=BB=B6=E3=80=91=20=E5=8C=97=E4=BA=AC?= =?UTF-8?q?=E9=BA=A6=E6=A0=BC=E7=BA=B3WMS#509=E3=80=90509=20=E5=8C=97?= =?UTF-8?q?=E4=BA=AC=E9=BA=A6=E6=A0=BC=E7=BA=B3-=E8=BF=87=E6=9C=9F?= =?UTF-8?q?=E5=93=81=E8=87=AA=E5=8A=A8=E6=8A=A5=E8=AD=A6=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index 33453b8..8b79c72 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java @@ -311,4 +311,14 @@ public class WmsDocMovementDetails extends BaseBean { this.orderNo = orderNo; } + public WmsDocMovementDetails (String orderNo,String partNo,Double qty, Double pickQty, int itemStatus, String createDatetime, String modifyDatetime) { + this.orderNo = orderNo; + this.partNo = partNo; + this.qty = qty; + this.pickQty = pickQty; + this.itemStatus = itemStatus; + this.createDatetime = createDatetime; + this.modifyDatetime = modifyDatetime; + } + }