From a38be26538227fe0be9d9a5835627a57d318390a Mon Sep 17 00:00:00 2001 From: "duan.yang" <994300880@qq.com> Date: Thu, 26 Nov 2020 19:38:44 +0800 Subject: [PATCH 01/33] =?UTF-8?q?=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E8=A1=A8-=E4=B8=BB=E8=A1=A8=E6=B7=BB=E5=8A=A0=E5=90=8C?= =?UTF-8?q?=E6=AD=A5=E6=A0=87=E8=AF=86=E3=80=81=E6=8E=A5=E5=8F=A3=E6=98=A0?= =?UTF-8?q?=E5=B0=84=E6=96=B9=E5=90=91=E7=B1=BB=E5=9E=8B=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: duan.yang <994300880@qq.com> --- .../main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrder.java | 5 +++++ .../cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java | 1 + 2 files changed, 6 insertions(+) diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrder.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrder.java index 73c18c8..329db54 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrder.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrder.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.sweb.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -122,4 +123,8 @@ public class SwebPurchaseOrder extends BaseBean { @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiParam(value = "预计到货时间 结束时间") private String expectedTimeEnd; + + @Column(name = "IS_SYNC", nullable = false) + @ApiParam("是否同步") + public Integer isSync = CommonEnumUtil.FALSE; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java index 6e210ce..2e0383f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java @@ -11,6 +11,7 @@ public class WmsInterfaceEnumUtil { MES2WMS(30, "MES2WMS", "MES --> WMS"), WMS2MES(40, "WMS2MES", "WMS --> MES"), SWEB2WMS(50, "SWEB2WMS", "SWEB --> WMS"), + SWEB2SAP(50, "SWEB2SAP", "SWEB --> SAP"), WMS2SWEB(50, "WMS2SWEB", "WMS --> SWEB"), SAP2SWEB(50, "SAP2SWEB", "SAP --> SWEB"); From af732b7a4fc9c72ef3a6bbec5d023e186eac3f36 Mon Sep 17 00:00:00 2001 From: Jason Date: Thu, 26 Nov 2020 20:07:35 +0800 Subject: [PATCH 02/33] =?UTF-8?q?=E5=90=88=E5=B9=B6test=E4=BB=A3=E7=A0=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-mongo/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-ics/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mdm/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 +- sonar-project.properties | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index bc7071b..004fb69 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 f902a7c..650ee5b 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-mongo/pom.xml b/modules/i3plus-pojo-base-mongo/pom.xml index 5868e20..15ad445 100644 --- a/modules/i3plus-pojo-base-mongo/pom.xml +++ b/modules/i3plus-pojo-base-mongo/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 d2521de..1e17935 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 b599490..37b8a51 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 9f5788e..dc13374 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-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index ae38208..6df1cc2 100644 --- a/modules/i3plus-pojo-ics/pom.xml +++ b/modules/i3plus-pojo-ics/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 1674a47..123fdc9 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 04b40d4..fdcf6e3 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-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml index 6854e65..d266163 100644 --- a/modules/i3plus-pojo-mdm/pom.xml +++ b/modules/i3plus-pojo-mdm/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 ac387fd..60d9861 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 bbe0ff9..54c8306 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 be533a6..190efa7 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 14e8567..5896851 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 102ab0e..aa3dd42 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 864c56a..80498fc 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 e755225..076f15a 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 194f0cb..1351ed3 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 60543fe..67b0bff 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 bdc4cab..15d36cd 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 cc6131f..f06d17f 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 diff --git a/sonar-project.properties b/sonar-project.properties index 0786d8d..268eaf2 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -6,7 +6,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo # defaults to project key sonar.projectName=i3plus-pojo # defaults to 'not provided' -sonar.projectVersion=1.0-TEST-SNAPSHOT +sonar.projectVersion=1.0-DEV-SNAPSHOT # Path is relative to the sonar-project.properties file. Defaults to . #sonar.sources=./ From e0ee86ab738224d89729635be72d85da6a37dd32 Mon Sep 17 00:00:00 2001 From: simon Date: Thu, 26 Nov 2020 23:51:27 +0800 Subject: [PATCH 03/33] =?UTF-8?q?=E5=88=A0=E9=99=A4mes-pcn=E5=8C=85?= =?UTF-8?q?=EF=BC=8C=E5=90=8E=E7=BB=AD=E5=BC=95=E5=85=A5=E7=B1=BB=E4=BB=A5?= =?UTF-8?q?mes=E5=8C=85=E4=B8=BA=E5=87=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-mes-pcn/pom.xml | 55 --- .../pojo/mes/pcn/bean/IfDismantleRecord.java | 105 ------ .../i3plus/pojo/mes/pcn/bean/IfPackageDetail.java | 100 ----- .../i3plus/pojo/mes/pcn/bean/IfProductOffLine.java | 88 ----- .../estsh/i3plus/pojo/mes/pcn/bean/MesAction.java | 48 --- .../i3plus/pojo/mes/pcn/bean/MesActionIf.java | 40 -- .../i3plus/pojo/mes/pcn/bean/MesActionMethod.java | 49 --- .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesArea.java | 59 --- .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesBom.java | 90 ----- .../i3plus/pojo/mes/pcn/bean/MesCachaQueue.java | 45 --- .../i3plus/pojo/mes/pcn/bean/MesCellFeed.java | 79 ---- .../pojo/mes/pcn/bean/MesCellFeedRecord.java | 74 ---- .../estsh/i3plus/pojo/mes/pcn/bean/MesConfig.java | 56 --- .../i3plus/pojo/mes/pcn/bean/MesCustProdLine.java | 40 -- .../i3plus/pojo/mes/pcn/bean/MesCustomer.java | 56 --- .../i3plus/pojo/mes/pcn/bean/MesCustomerPart.java | 49 --- .../i3plus/pojo/mes/pcn/bean/MesDataObject.java | 71 ---- .../i3plus/pojo/mes/pcn/bean/MesDatasource.java | 82 ---- .../estsh/i3plus/pojo/mes/pcn/bean/MesDefect.java | 80 ---- .../i3plus/pojo/mes/pcn/bean/MesDefectCause.java | 44 --- .../i3plus/pojo/mes/pcn/bean/MesDefectRecord.java | 80 ---- .../pojo/mes/pcn/bean/MesDismantleRecord.java | 97 ----- .../pojo/mes/pcn/bean/MesEquAlarmRecord.java | 53 --- .../i3plus/pojo/mes/pcn/bean/MesEquipment.java | 97 ----- .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesEsop.java | 93 ----- .../estsh/i3plus/pojo/mes/pcn/bean/MesEvent.java | 52 --- .../i3plus/pojo/mes/pcn/bean/MesEventAction.java | 54 --- .../estsh/i3plus/pojo/mes/pcn/bean/MesFiCfg.java | 47 --- .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesFile.java | 59 --- .../estsh/i3plus/pojo/mes/pcn/bean/MesKpData.java | 65 ---- .../i3plus/pojo/mes/pcn/bean/MesKpsnRule.java | 95 ----- .../i3plus/pojo/mes/pcn/bean/MesLabelTemplate.java | 54 --- .../pojo/mes/pcn/bean/MesLabelTemplateParam.java | 55 --- .../estsh/i3plus/pojo/mes/pcn/bean/MesMethod.java | 55 --- .../i3plus/pojo/mes/pcn/bean/MesMonitorTask.java | 52 --- .../pojo/mes/pcn/bean/MesMonitorTaskDetail.java | 48 --- .../i3plus/pojo/mes/pcn/bean/MesNumberRule.java | 60 --- .../pojo/mes/pcn/bean/MesNumberSerialno.java | 49 --- .../i3plus/pojo/mes/pcn/bean/MesObjectCfg.java | 60 --- .../i3plus/pojo/mes/pcn/bean/MesPLCConfigure.java | 62 ---- .../i3plus/pojo/mes/pcn/bean/MesPackSpec.java | 99 ----- .../estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java | 119 ------ .../i3plus/pojo/mes/pcn/bean/MesPackageDetail.java | 63 ---- .../i3plus/pojo/mes/pcn/bean/MesPackageTravel.java | 58 --- .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesPart.java | 93 ----- .../i3plus/pojo/mes/pcn/bean/MesPartCategory.java | 44 --- .../i3plus/pojo/mes/pcn/bean/MesPartFormula.java | 45 --- .../i3plus/pojo/mes/pcn/bean/MesPatternJis.java | 68 ---- .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcn.java | 87 ----- .../i3plus/pojo/mes/pcn/bean/MesPcnConnectLog.java | 55 --- .../i3plus/pojo/mes/pcn/bean/MesPcnSyncCfg.java | 92 ----- .../pojo/mes/pcn/bean/MesPcnSyncErrorLog.java | 54 --- .../pojo/mes/pcn/bean/MesPcnSysUserOffline.java | 70 ---- .../estsh/i3plus/pojo/mes/pcn/bean/MesPcnTask.java | 90 ----- .../i3plus/pojo/mes/pcn/bean/MesPcnTaskLog.java | 53 --- .../i3plus/pojo/mes/pcn/bean/MesPlanOrder.java | 144 -------- .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java | 112 ------ .../estsh/i3plus/pojo/mes/pcn/bean/MesProcess.java | 39 -- .../pojo/mes/pcn/bean/MesProdBindRecord.java | 106 ------ .../estsh/i3plus/pojo/mes/pcn/bean/MesProdCfg.java | 44 --- .../i3plus/pojo/mes/pcn/bean/MesProdCfgDetail.java | 53 --- .../i3plus/pojo/mes/pcn/bean/MesProdPack.java | 69 ---- .../i3plus/pojo/mes/pcn/bean/MesProdRouteCfg.java | 45 --- .../pojo/mes/pcn/bean/MesProdRouteOptParam.java | 71 ---- .../pojo/mes/pcn/bean/MesProdScatterCfgBom.java | 55 --- .../pojo/mes/pcn/bean/MesProduceCategory.java | 40 -- .../pojo/mes/pcn/bean/MesProduceCtgyPicture.java | 56 --- .../i3plus/pojo/mes/pcn/bean/MesProduceSn.java | 205 ---------- .../pojo/mes/pcn/bean/MesProduceSnTravel.java | 154 -------- .../i3plus/pojo/mes/pcn/bean/MesProductData.java | 109 ------ .../pojo/mes/pcn/bean/MesProductEncodeCfg.java | 50 --- .../i3plus/pojo/mes/pcn/bean/MesQcCheckData.java | 107 ------ .../pojo/mes/pcn/bean/MesQcCheckStandard.java | 108 ------ .../i3plus/pojo/mes/pcn/bean/MesQueueJis.java | 71 ---- .../pojo/mes/pcn/bean/MesQueueJisDetail.java | 62 ---- .../i3plus/pojo/mes/pcn/bean/MesQueueOrder.java | 90 ----- .../pojo/mes/pcn/bean/MesQueueOrderDetail.java | 103 ------ .../i3plus/pojo/mes/pcn/bean/MesRawPartSn.java | 78 ---- .../estsh/i3plus/pojo/mes/pcn/bean/MesRepair.java | 44 --- .../i3plus/pojo/mes/pcn/bean/MesRepairRecord.java | 102 ----- .../estsh/i3plus/pojo/mes/pcn/bean/MesRoute.java | 51 --- .../i3plus/pojo/mes/pcn/bean/MesRouteProcess.java | 64 ---- .../pojo/mes/pcn/bean/MesRouteProcessCell.java | 44 --- .../estsh/i3plus/pojo/mes/pcn/bean/MesScrap.java | 45 --- .../i3plus/pojo/mes/pcn/bean/MesScrapRecord.java | 71 ---- .../estsh/i3plus/pojo/mes/pcn/bean/MesShift.java | 68 ---- .../i3plus/pojo/mes/pcn/bean/MesShiftGroup.java | 47 --- .../i3plus/pojo/mes/pcn/bean/MesShiftRest.java | 49 --- .../pojo/mes/pcn/bean/MesSnPhotoRelation.java | 45 --- .../i3plus/pojo/mes/pcn/bean/MesStationBom.java | 151 -------- .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesStep.java | 102 ----- .../i3plus/pojo/mes/pcn/bean/MesStepParam.java | 47 --- .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesTime.java | 40 -- .../i3plus/pojo/mes/pcn/bean/MesTorqueDetail.java | 97 ----- .../estsh/i3plus/pojo/mes/pcn/bean/MesTypeCfg.java | 48 --- .../estsh/i3plus/pojo/mes/pcn/bean/MesWcCheck.java | 56 --- .../i3plus/pojo/mes/pcn/bean/MesWcCheckRecord.java | 83 ----- .../i3plus/pojo/mes/pcn/bean/MesWcEquipment.java | 43 --- .../i3plus/pojo/mes/pcn/bean/MesWorkCell.java | 64 ---- .../pojo/mes/pcn/bean/MesWorkCellMonitorLog.java | 64 ---- .../i3plus/pojo/mes/pcn/bean/MesWorkCellParam.java | 48 --- .../pojo/mes/pcn/bean/MesWorkCellParamCfg.java | 56 --- .../i3plus/pojo/mes/pcn/bean/MesWorkCellPoint.java | 56 --- .../pojo/mes/pcn/bean/MesWorkCellStatus.java | 47 --- .../i3plus/pojo/mes/pcn/bean/MesWorkCenter.java | 57 --- .../i3plus/pojo/mes/pcn/bean/MesWorkOrder.java | 249 ------------- .../i3plus/pojo/mes/pcn/bean/MesWorkOrderLog.java | 231 ------------ .../pojo/mes/pcn/model/ActionRequestBean.java | 38 -- .../estsh/i3plus/pojo/mes/pcn/model/AttrBean.java | 17 - .../i3plus/pojo/mes/pcn/model/ButtonBean.java | 22 -- .../pojo/mes/pcn/model/DataAcquisitionModel.java | 35 -- .../i3plus/pojo/mes/pcn/model/DefectModel.java | 49 --- .../i3plus/pojo/mes/pcn/model/EsopFileModel.java | 26 -- .../pojo/mes/pcn/model/FastDfsDownloadModel.java | 31 -- .../pojo/mes/pcn/model/GenSerialNoModel.java | 72 ---- .../pojo/mes/pcn/model/MesButtonFlagModel.java | 57 --- .../i3plus/pojo/mes/pcn/model/MesDefectModel.java | 35 -- .../pojo/mes/pcn/model/MesProdBindRecordModel.java | 125 ------- .../pojo/mes/pcn/model/MesStationBomModel.java | 75 ---- .../pojo/mes/pcn/model/PLCInteracticeModel.java | 50 --- .../pojo/mes/pcn/model/PcsObserverStatusModel.java | 25 -- .../pojo/mes/pcn/model/ProdPackageModel.java | 78 ---- .../pojo/mes/pcn/model/ProductDataModel.java | 24 -- .../pojo/mes/pcn/model/QcCheckStandardModel.java | 25 -- .../i3plus/pojo/mes/pcn/model/QueueJisModel.java | 90 ----- .../i3plus/pojo/mes/pcn/model/QueueOrderModel.java | 82 ---- .../i3plus/pojo/mes/pcn/model/RequestModel.java | 151 -------- .../pojo/mes/pcn/model/SnPrintDataModel.java | 27 -- .../i3plus/pojo/mes/pcn/model/SnPrintModel.java | 27 -- .../i3plus/pojo/mes/pcn/model/StationBomModel.java | 29 -- .../pojo/mes/pcn/model/StationResultBean.java | 55 --- .../i3plus/pojo/mes/pcn/model/StepParamsModel.java | 29 -- .../pojo/mes/pcn/model/StepPrintSnModel.java | 79 ---- .../i3plus/pojo/mes/pcn/model/StepResult.java | 69 ---- .../i3plus/pojo/mes/pcn/model/TorqueModel.java | 71 ---- .../i3plus/pojo/mes/pcn/model/WcCheckModel.java | 63 ---- .../repository/IfDismantleRecordRepository.java | 14 - .../pcn/repository/IfPackageDetailRepository.java | 14 - .../pcn/repository/IfProductOffLineRepository.java | 14 - .../mes/pcn/repository/MesActionIfRepository.java | 14 - .../pcn/repository/MesActionMethodRepository.java | 16 - .../mes/pcn/repository/MesActionRepository.java | 17 - .../pojo/mes/pcn/repository/MesAreaRepository.java | 16 - .../pojo/mes/pcn/repository/MesBomRepository.java | 16 - .../repository/MesCellFeedRecordRepository.java | 14 - .../mes/pcn/repository/MesCellFeedRepository.java | 14 - .../mes/pcn/repository/MesConfigRepository.java | 17 - .../pcn/repository/MesCustProdLineRepository.java | 16 - .../pcn/repository/MesCustomerPartRepository.java | 17 - .../mes/pcn/repository/MesCustomerRepository.java | 17 - .../pcn/repository/MesDataObjectRepository.java | 13 - .../pcn/repository/MesDatasourceRepository.java | 13 - .../pcn/repository/MesDefectCauseRepository.java | 14 - .../pcn/repository/MesDefectRecordRepository.java | 14 - .../mes/pcn/repository/MesDefectRepository.java | 14 - .../repository/MesDismantleRecordRepository.java | 14 - .../mes/pcn/repository/MesEquipmentRepository.java | 16 - .../pojo/mes/pcn/repository/MesEsopRepository.java | 17 - .../pcn/repository/MesEventActionRepository.java | 17 - .../mes/pcn/repository/MesEventRepository.java | 17 - .../mes/pcn/repository/MesFiCfgRepository.java | 17 - .../pojo/mes/pcn/repository/MesFileRepository.java | 16 - .../mes/pcn/repository/MesKpDataRepository.java | 17 - .../mes/pcn/repository/MesKpsnRuleRepository.java | 16 - .../MesLabelTemplateParamRepository.java | 14 - .../pcn/repository/MesLabelTemplateRepository.java | 14 - .../mes/pcn/repository/MesMethodRepository.java | 17 - .../repository/MesMonitorTaskDetailRepository.java | 15 - .../pcn/repository/MesMonitorTaskRepository.java | 15 - .../pcn/repository/MesNumberRuleRepository.java | 15 - .../repository/MesNumberSerialnoRepository.java | 16 - .../mes/pcn/repository/MesObjectCfgRepository.java | 13 - .../pcn/repository/MesPLCConfigureRepository.java | 16 - .../mes/pcn/repository/MesPackSpecRepository.java | 16 - .../pcn/repository/MesPackageDetailRepository.java | 13 - .../mes/pcn/repository/MesPackageRepository.java | 13 - .../pcn/repository/MesPackageTravelRepository.java | 13 - .../pcn/repository/MesPartCategoryRepository.java | 16 - .../pojo/mes/pcn/repository/MesPartRepository.java | 16 - .../pcn/repository/MesPatternJisRepository.java | 16 - .../pcn/repository/MesPcnConnectLogRepository.java | 16 - .../pojo/mes/pcn/repository/MesPcnRepository.java | 16 - .../pcn/repository/MesPcnSyncCfgRepository.java | 16 - .../repository/MesPcnSyncErrorLogRepository.java | 16 - .../repository/MesPcnSysUserOfflineRepository.java | 16 - .../pcn/repository/MesPcnTaskLogRepository.java | 16 - .../mes/pcn/repository/MesPcnTaskRepository.java | 16 - .../mes/pcn/repository/MesPlanOrderRepository.java | 16 - .../pojo/mes/pcn/repository/MesPlcRepository.java | 15 - .../mes/pcn/repository/MesProcessRepository.java | 16 - .../repository/MesProdBindRecordRepository.java | 16 - .../pcn/repository/MesProdCfgDetailRepository.java | 16 - .../mes/pcn/repository/MesProdCfgRepository.java | 16 - .../mes/pcn/repository/MesProdPackRepository.java | 16 - .../pcn/repository/MesProdRouteCfgRepository.java | 16 - .../repository/MesProdRouteOptParamRepository.java | 16 - .../repository/MesProdScatterCfgBomRepository.java | 16 - .../repository/MesProduceCategoryRepository.java | 16 - .../MesProduceCtgyPictureRepository.java | 14 - .../mes/pcn/repository/MesProduceSnRepository.java | 16 - .../repository/MesProduceSnTravelRepository.java | 17 - .../pcn/repository/MesProductDataRepository.java | 16 - .../repository/MesProductEncodeCfgRepository.java | 16 - .../pcn/repository/MesQcCheckDataRepository.java | 14 - .../repository/MesQcCheckStandardRepository.java | 14 - .../repository/MesQueueJisDetailRepository.java | 16 - .../mes/pcn/repository/MesQueueJisRepository.java | 16 - .../repository/MesQueueOrderDetailRepository.java | 16 - .../pcn/repository/MesQueueOrderRepository.java | 16 - .../mes/pcn/repository/MesRawPartSnRepository.java | 15 - .../pcn/repository/MesRepairRecordRepository.java | 14 - .../mes/pcn/repository/MesRepairRepository.java | 16 - .../repository/MesRouteProcessCellRepository.java | 16 - .../pcn/repository/MesRouteProcessRepository.java | 16 - .../mes/pcn/repository/MesRouteRepository.java | 16 - .../pcn/repository/MesScrapRecordRepository.java | 14 - .../mes/pcn/repository/MesScrapRepository.java | 16 - .../pcn/repository/MesShiftGroupRepository.java | 16 - .../mes/pcn/repository/MesShiftRepository.java | 17 - .../mes/pcn/repository/MesShiftRestRepository.java | 16 - .../pcn/repository/MesStationBomRepository.java | 16 - .../mes/pcn/repository/MesStepParamRepository.java | 16 - .../pojo/mes/pcn/repository/MesStepRepository.java | 16 - .../pojo/mes/pcn/repository/MesTimeRepository.java | 10 - .../pcn/repository/MesTorqueDetailRepository.java | 17 - .../mes/pcn/repository/MesTypeCfgRepository.java | 14 - .../pcn/repository/MesWcCheckRecordRepository.java | 13 - .../mes/pcn/repository/MesWcCheckRepository.java | 13 - .../pcn/repository/MesWcEquipmentRepository.java | 13 - .../MesWorkCellMonitorLogRepository.java | 13 - .../repository/MesWorkCellParamCfgRepository.java | 16 - .../pcn/repository/MesWorkCellParamRepository.java | 16 - .../pcn/repository/MesWorkCellPointRepository.java | 17 - .../mes/pcn/repository/MesWorkCellRepository.java | 16 - .../repository/MesWorkCellStatusRepository.java | 16 - .../pcn/repository/MesWorkCenterRepository.java | 16 - .../pcn/repository/MesWorkOrderLogRepository.java | 16 - .../mes/pcn/repository/MesWorkOrderRepository.java | 16 - .../i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java | 411 --------------------- 239 files changed, 11363 deletions(-) delete mode 100644 modules/i3plus-pojo-mes-pcn/pom.xml delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfDismantleRecord.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfPackageDetail.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfProductOffLine.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesAction.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesActionIf.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesActionMethod.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesArea.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesBom.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCachaQueue.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCellFeed.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCellFeedRecord.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesConfig.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustProdLine.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustomer.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustomerPart.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDataObject.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDatasource.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefect.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefectCause.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefectRecord.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDismantleRecord.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEquAlarmRecord.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEquipment.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEsop.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEvent.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEventAction.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesFiCfg.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesFile.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesKpData.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesKpsnRule.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesLabelTemplate.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesLabelTemplateParam.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMethod.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMonitorTask.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMonitorTaskDetail.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesNumberRule.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesNumberSerialno.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesObjectCfg.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPLCConfigure.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackSpec.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageTravel.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPart.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPartCategory.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPartFormula.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPatternJis.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcn.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnConnectLog.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncCfg.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncErrorLog.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSysUserOffline.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTask.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTaskLog.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlanOrder.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProcess.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdBindRecord.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdCfg.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdCfgDetail.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdPack.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdRouteCfg.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdRouteOptParam.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdScatterCfgBom.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCategory.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCtgyPicture.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSnTravel.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProductData.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProductEncodeCfg.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckData.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckStandard.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJis.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJisDetail.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrder.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRawPartSn.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRepair.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRepairRecord.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRoute.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRouteProcess.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRouteProcessCell.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesScrap.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesScrapRecord.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShift.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShiftGroup.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShiftRest.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesSnPhotoRelation.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStationBom.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStep.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStepParam.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTime.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTorqueDetail.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTypeCfg.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcCheck.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcCheckRecord.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcEquipment.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCell.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellMonitorLog.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellParam.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellParamCfg.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellPoint.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellStatus.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCenter.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrderLog.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ActionRequestBean.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/AttrBean.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ButtonBean.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/DataAcquisitionModel.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/DefectModel.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/EsopFileModel.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/FastDfsDownloadModel.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/GenSerialNoModel.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesButtonFlagModel.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesDefectModel.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProdBindRecordModel.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesStationBomModel.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/PLCInteracticeModel.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/PcsObserverStatusModel.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProdPackageModel.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProductDataModel.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QcCheckStandardModel.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueJisModel.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueOrderModel.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/RequestModel.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/SnPrintDataModel.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/SnPrintModel.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationBomModel.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationResultBean.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepParamsModel.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepPrintSnModel.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepResult.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/TorqueModel.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/WcCheckModel.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/IfDismantleRecordRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/IfPackageDetailRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/IfProductOffLineRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesActionIfRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesActionMethodRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesActionRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesAreaRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesBomRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCellFeedRecordRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCellFeedRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesConfigRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCustProdLineRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCustomerPartRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCustomerRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDataObjectRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDatasourceRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDefectCauseRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDefectRecordRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDefectRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDismantleRecordRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEquipmentRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEsopRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEventActionRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEventRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesFiCfgRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesFileRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesKpDataRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesKpsnRuleRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesLabelTemplateParamRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesLabelTemplateRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesMethodRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesMonitorTaskDetailRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesMonitorTaskRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesNumberRuleRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesNumberSerialnoRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesObjectCfgRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPLCConfigureRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackSpecRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackageDetailRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackageRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackageTravelRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPartCategoryRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPartRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPatternJisRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnConnectLogRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnSyncCfgRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnSyncErrorLogRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnSysUserOfflineRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnTaskLogRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnTaskRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPlanOrderRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPlcRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProcessRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdBindRecordRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdCfgDetailRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdCfgRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdPackRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdRouteCfgRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdRouteOptParamRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdScatterCfgBomRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceCategoryRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceCtgyPictureRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceSnRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceSnTravelRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProductDataRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProductEncodeCfgRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQcCheckDataRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQcCheckStandardRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueJisDetailRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueJisRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueOrderDetailRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueOrderRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRawPartSnRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRepairRecordRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRepairRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRouteProcessCellRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRouteProcessRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRouteRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesScrapRecordRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesScrapRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesShiftGroupRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesShiftRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesShiftRestRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesStationBomRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesStepParamRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesStepRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesTimeRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesTorqueDetailRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesTypeCfgRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWcCheckRecordRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWcCheckRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWcEquipmentRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellMonitorLogRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellParamCfgRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellParamRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellPointRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellStatusRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCenterRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkOrderLogRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkOrderRepository.java delete mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml deleted file mode 100644 index 60d9861..0000000 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ /dev/null @@ -1,55 +0,0 @@ - - - - i3plus-pojo - i3plus.pojo - 1.0-DEV-SNAPSHOT - ../../pom.xml - - 4.0.0 - - i3plus-pojo-mes-pcn - jar - - - - i3plus.pojo - i3plus-pojo-base - - - - - dev - - DEV - - - true - - - - test - - TEST - - - - docker - - DOCKER - - - - prod - - PROD - - - - - ${project.artifactId}-${project.version} - - - \ No newline at end of file diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfDismantleRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfDismantleRecord.java deleted file mode 100644 index eb147e3..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfDismantleRecord.java +++ /dev/null @@ -1,105 +0,0 @@ -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: joke.wang - * @CreateDate: 2019\11\14 19:36 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "IF_DISMENTLE_RECORD") -@Api("物料拆解表") -public class IfDismantleRecord extends BaseBean implements Serializable { - - private static final long serialVersionUID = -6010207359066736962L; - @Column(name = "DISMANTLE_ID") - @ApiParam("拆解编号") - private String dismantleId; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("产线") - private String workCenterCode; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工位") - private String workCellCode; - - @Column(name = "PARENT_PART_NO") - @ApiParam("产品物料编码") - private String parentPartNo; - - @Column(name = "PARENT_PART_NAME") - @ApiParam("产品物料名称") - private String parentPartName; - - @Column(name = "SN") - @ApiParam("产品条码") - private String sn; - - @Column(name = "QTY") - @ApiParam("产品数量") - private Double qty; - - @Column(name = "DISMANTLE_QTY") - @ApiParam("拆解数") - private BigDecimal dismantleQty; - - @Column(name = "ITEM_PART_NO") - @ApiParam("子物料编码") - private String itemPartNo; - - @Column(name = "ITEM_PART_NAME") - @ApiParam("子物料名称") - private String itemPartName; - - @Column(name = "OK_QTY") - @ApiParam("合格数") - private BigDecimal okQty; - - @Column(name = "MISS_QTY") - @ApiParam("缺失数") - private BigDecimal missQty; - - @Column(name = "SCRAP_QTY") - @ApiParam("报废数") - private BigDecimal scrapQty; - - @Column(name = "LOT_NO") - @ApiParam("批次") - private String lotNo; - - @Column(name = "SYNC_STATUS") - @ApiParam("同步状态") - private Integer syncStatus; - - @Column(name = "ERROR_MESSAGE") - @ApiParam("异常消息") - private String errorMessage; - - @Column(name = "ACTION_CODE") - @ApiParam("动作代码") - private String actionCode; - - @Column(name = "IF_CODE") - @ApiParam("接口代码") - private String ifCode; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfPackageDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfPackageDetail.java deleted file mode 100644 index 651f8dc..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfPackageDetail.java +++ /dev/null @@ -1,100 +0,0 @@ -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: joke.wang - * @CreateDate: 2019\11\15 10:01 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "IF_PACKAGE_DETAIL") -@Api("包装明细表") -public class IfPackageDetail extends BaseBean implements Serializable { - - private static final long serialVersionUID = -1873101288426218272L; - @Column(name = "PART_NO") - @ApiParam("物料号") - private String partNo; - - @Column(name = "PART_NAME") - @ApiParam("物料名称") - private String partName; - - @Column(name = "SERIAL_NUMBER") - @ApiParam("产品条码") - private String serialNumber; - - @Column(name = "PACKAGE_NO") - @ApiParam("包装条码") - private String packageNo; - - @Column(name = "LOT_NO") - @ApiParam("包装批次") - private String lotNo; - - @Column(name = "QTY") - @ApiParam("数量") - private Double qty; - - @Column(name = "PACKAGE_NO2") - @ApiParam("包装编号2") - private String packageNo2; - - @Column(name = "PACKAGE_NO3") - @ApiParam("包装编号3") - private String packageNo3; - - @Column(name = "PACKAGE_NO4") - @ApiParam("包装编号4") - private String packageNo4; - - @Column(name = "ACTION_USER") - @ApiParam("操作人") - private String actionUser; - - @Column(name = "ACTION_DATE_TIME") - @ApiParam("操作时间") - private String actionDateTime; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("产线") - private String workCenterCode; - - @Column(name = "SYNC_STATUS") - @ApiParam("同步状态") - private Integer syncStatus; - - @Column(name = "ERROR_MESSAGE") - @ApiParam("异常消息") - private String errorMessage; - - @Column(name = "ACTION_CODE") - @ApiParam("动作代码") - private String actionCode; - - @Column(name = "IF_CODE") - @ApiParam("接口代码") - private String ifCode; - - @Column(name = "CT_NO") - @ApiParam("容器编号") - private String ctNo; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfProductOffLine.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfProductOffLine.java deleted file mode 100644 index 367bb1c..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfProductOffLine.java +++ /dev/null @@ -1,88 +0,0 @@ -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: joke.wang - * @CreateDate: 2019\11\15 10:12 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "IF_PRODUCT_OFF_LINE") -@Api("生产报工表") -public class IfProductOffLine extends BaseBean implements Serializable { - - private static final long serialVersionUID = 200629529131241418L; - @Column(name = "PART_NO") - @ApiParam("物料号") - private String partNo; - - @Column(name = "PART_NAME") - @ApiParam("物料名称") - private String partName; - - @Column(name = "PACKAGE_NO") - @ApiParam("包装条码") - private String packageNo; - - @Column(name = "QTY") - @ApiParam("数量") - private Double qty; - - @Column(name = "UNIT") - @ApiParam("单位") - private String unit; - - @Column(name = "LOT_NO") - @ApiParam("生产批次") - private String lotNo; - - @Column(name = "FIX_LOT_NO") - @ApiParam("特殊批次") - private String fixLotNo; - - @Column(name = "ACTION_USER") - @ApiParam("操作人") - private String actionUser; - - @Column(name = "ACTION_DATE_TIME") - @ApiParam("操作时间") - private String actionDateTime; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("产线") - private String workCenterCode; - - @Column(name = "SYNC_STATUS") - @ApiParam("同步状态") - private Integer syncStatus; - - @Column(name = "ERROR_MESSAGE") - @ApiParam("异常消息") - private String errorMessage; - - @Column(name = "ACTION_CODE") - @ApiParam("动作代码") - private String actionCode; - - @Column(name = "IF_CODE") - @ApiParam("接口代码") - private String ifCode; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesAction.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesAction.java deleted file mode 100644 index ac19407..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesAction.java +++ /dev/null @@ -1,48 +0,0 @@ -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 :mes系统业务动作 - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-12 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_ACTION") -@Api("mes系统业务动作") -public class MesAction extends BaseBean implements Serializable { - private static final long serialVersionUID = -6451213228967727835L; - @Column(name = "ACTION_CODE") - @ApiParam("动作代码") - private String actionCode; - - @Column(name = "ACTION_NAME") - @ApiParam("动作名称") - private String actionName; - - @Column(name = "ACTION_TYPE") - @ApiParam("动作类型") - private Integer actionType; - - public int getActionTypeVal() { - return this.actionType == null ? 0 : this.actionType; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesActionIf.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesActionIf.java deleted file mode 100644 index eafb489..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesActionIf.java +++ /dev/null @@ -1,40 +0,0 @@ -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: joke.wang - * @CreateDate: 2019\11\13 11:47 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_ACTION_IF") -@Api("动作接口配置") -public class MesActionIf extends BaseBean implements Serializable { - - private static final long serialVersionUID = -5058215339453766620L; - @Column(name = "ACTION_CODE") - @ApiParam("动作代码") - private String actionCode; - - @Column(name = "IF_CODE") - @ApiParam("接口代码") - private String ifCode; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesActionMethod.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesActionMethod.java deleted file mode 100644 index b38452f..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesActionMethod.java +++ /dev/null @@ -1,49 +0,0 @@ -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 :mes系统业务动作方法 - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-12 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_ACTION_METHOD") -@Api("系统业务动作方法") -public class MesActionMethod extends BaseBean implements Serializable { - private static final long serialVersionUID = 6249418690993577108L; - @Column(name = "ACTION_CODE") - @ApiParam("动作代码") - private String actionCode; - - @Column(name = "METHOD_CODE") - @ApiParam("方法代码") - private String methodCode; - - @Column(name = "SEQ") - @ApiParam("序号") - private Integer seq; - - public int getSeqVal() { - return this.seq == null ? 0 : this.seq; - } - -} 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 deleted file mode 100644 index d1910a3..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesArea.java +++ /dev/null @@ -1,59 +0,0 @@ -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; -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.List; - -/** - * @Description :生产区域 - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_AREA") -@Api("生产区域") -public class MesArea extends BaseBean implements Serializable { - private static final long serialVersionUID = 1047604067591557689L; - @Column(name = "AREA_CODE") - @ApiParam("区域代码") - private String areaCode; - - @Column(name = "AREA_NAME") - @ApiParam("区域名称") - private String areaName; - - @Transient - @ApiParam(value = "子集列表") - private List childTreeList; - - @Transient - @ApiParam(value = "名称") - private String name; - - // 默认值 -1 - @Transient - @ApiParam(value = "父节点", access = "父节点", example = "-1") - @JsonSerialize(using = ToStringSerializer.class) - private Long parentId; - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesBom.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesBom.java deleted file mode 100644 index 7471095..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesBom.java +++ /dev/null @@ -1,90 +0,0 @@ -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.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; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description :BOM清单 - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_BOM") -@Api("BOM清单") -public class MesBom extends BaseBean implements Serializable { - private static final long serialVersionUID = -1772273641263268564L; - @Column(name = "PART_NO") - @ApiParam("父零件号") - private String partNo; - - @Column(name = "PART_NAME") - @ApiParam("父零件名称") - private String partName; - - @Column(name = "UNIT") - @ApiParam(value = "单位") - private String unit; - - @Column(name = "QTY") - @ColumnDefault("0") - @ApiParam(value = "数量", example = "0") - private Double qty; - - @Column(name = "ITEM_PART_NO") - @ApiParam("子零件") - private String itemPartNo; - - @Column(name = "ITEM_PART_NAME") - @ApiParam("子零件名称") - private String itemPartName; - - @Column(name = "ITEM_UNIT") - @ApiParam(value = "子零件单位") - private String itemUnit; - - @Column(name = "ITEM_QTY") - @ColumnDefault("0") - @ApiParam(value = "子零件数量", example = "0") - private Double itemQty; - - @Column(name = "BOM_VERSION") - @ApiParam(value = "BOM版本") - private String bomVersion; - - @Column(name = "EFF_START_TIME") - @ApiParam(value = "生效时间") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private String effStartTime; - - @Column(name = "EFF_END_TIME") - @ApiParam(value = "失效时间") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private String effEndTime; - - public double getQtyVal() { - return this.qty == null ? 0.0d : this.qty; - } - - public double getitemQtyVal() { - return this.itemQty == null ? 0.0d : this.itemQty; - } -} 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 deleted file mode 100644 index fd9c366..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCachaQueue.java +++ /dev/null @@ -1,45 +0,0 @@ -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/MesCellFeed.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCellFeed.java deleted file mode 100644 index 60e2d1d..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCellFeed.java +++ /dev/null @@ -1,79 +0,0 @@ -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 javax.persistence.Version; -import java.io.Serializable; - -/** - * @Description :工位投料信息 - * @Reference : - * @Author : Wynne.Lu - * @CreateDate : 2019-09-17 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_CELL_FEED") -@Api("工位投料信息") -public class MesCellFeed extends BaseBean implements Serializable { - private static final long serialVersionUID = 2412657464618960515L; - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心") - private String workCenterCode; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工作单元") - private String workCellCode; - - @Column(name = "PART_NO") - @ApiParam("物料号") - private String partNo; - - @Column(name = "PART_NAME") - @ApiParam("物料名称") - private String partName; - - @Column(name = "RAW_TYPE") - @ApiParam("原料类型") - private String rawType; - - @Column(name = "RAW_SN") - @ApiParam("原材料条码") - private String rawSn; - - @Column(name = "RAW_QTY") - @ApiParam("特殊批次") - private Double rawQty; - - @Column(name = "LOT_NO") - @ApiParam("关联批次") - private String lotNo; - - @Column(name = "SUPPLIER_CODE") - @ApiParam("供应商代码") - private String supplierCode; - -// @Version -// @Column(name = "LOCK_VERSION") -// @ApiParam(value = "乐观锁", example = "1") -// public Integer lockVersion; - - public double getRawQtyVal() { - return this.rawQty == null ? 0l : this.rawQty; - } - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCellFeedRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCellFeedRecord.java deleted file mode 100644 index 6464445..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCellFeedRecord.java +++ /dev/null @@ -1,74 +0,0 @@ -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 : siliter.yuan - * @CreateDate : 2020-06-17 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_CELL_FEED_RECORD") -@Api("工位投料履历信息") -public class MesCellFeedRecord extends BaseBean implements Serializable { - private static final long serialVersionUID = 1947971379489107783L; - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心") - private String workCenterCode; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工作单元") - private String workCellCode; - - @Column(name = "PART_NO") - @ApiParam("物料号") - private String partNo; - - @Column(name = "PART_NAME") - @ApiParam("物料名称") - private String partName; - - @Column(name = "RAW_TYPE") - @ApiParam("原料类型") - private String rawType; - - @Column(name = "RAW_SN") - @ApiParam("原材料条码") - private String rawSn; - - @Column(name = "RAW_QTY") - @ApiParam("原材料数量") - private Double rawQty; - - @Column(name = "LOT_NO") - @ApiParam("关联批次") - private String lotNo; - - @Column(name = "SUPPLIER_CODE") - @ApiParam("供应商代码") - private String supplierCode; - - - public double getRawQtyVal() { - return this.rawQty == null ? 0l : this.rawQty; - } - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesConfig.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesConfig.java deleted file mode 100644 index f8b9558..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesConfig.java +++ /dev/null @@ -1,56 +0,0 @@ -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 : crish - * @CreateDate : 2019-06-04 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_CONFIG") -@Api("mes配置表") -public class MesConfig extends BaseBean implements Serializable { - private static final long serialVersionUID = -5759669472714287000L; - @Column(name = "CFG_CODE") - @ApiParam("配置代码") - private String cfgCode; - - @Column(name = "CFG_NAME") - @ApiParam("配置名称") - private String cfgName; - - @Column(name = "CFG_TYPE") - @ApiParam("配置类型") - private String cfgType; - - @Column(name = "CFG_KEY") - @ApiParam("配置key") - private String cfgKey; - - @Column(name = "CFG_VALUE") - @ApiParam("配置value") - private String cfgValue; - - @Column(name = "CFG_VAULE_DESC") - @ApiParam("配置value描述") - private String cfgValueDesc; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustProdLine.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustProdLine.java deleted file mode 100644 index 8e9a363..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustProdLine.java +++ /dev/null @@ -1,40 +0,0 @@ -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 :mes系统业务动作 - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-12 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_CUST_PROD_LINE") -@Api("客户产线代码") -public class MesCustProdLine extends BaseBean implements Serializable { - private static final long serialVersionUID = 3049432665592161513L; - @Column(name = "CUST_PROD_LINE_CODE") - @ApiParam("客户产线代码") - private String custProdLineCode; - - @Column(name = "CUST_PROD_LINE_NAME") - @ApiParam("客户产线名称") - private String custProdLineName; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustomer.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustomer.java deleted file mode 100644 index 21f2ad1..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustomer.java +++ /dev/null @@ -1,56 +0,0 @@ -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 :mes客户表 - * @Reference : - * @Author : crish - * @CreateDate : 2019-04-22 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_CUSTOMER") -@Api("客户信息") -public class MesCustomer extends BaseBean implements Serializable { - private static final long serialVersionUID = 167635887082538926L; - @Column(name = "CUSTOMER_CODE") - @ApiParam("客户代码") - private String customerCode; - - @Column(name = "CUSTOMER_NAME") - @ApiParam("客户名称") - private String customerName; - - @Column(name = "BRIEF_TEXT") - @ApiParam("客户简称") - private String briefText; - - @Column(name = "ADDRESS") - @ApiParam("客户地址") - private String address; - - @Column(name = "CONTACT") - @ApiParam("客户联系人") - private String contact; - - @Column(name = "TELEPHONE") - @ApiParam("客户电话") - private String telephone; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustomerPart.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustomerPart.java deleted file mode 100644 index 0c5f49c..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustomerPart.java +++ /dev/null @@ -1,49 +0,0 @@ -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 :mes客户表 - * @Reference : - * @Author : yiming.gu - * @CreateDate : 2019-05-20 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_CUSTOMER_PART") -@Api("客户零件关系") -public class MesCustomerPart extends BaseBean implements Serializable { - private static final long serialVersionUID = -4731252848471949263L; - @Column(name = "CUSTOMER_CODE") - @ApiParam("客户代码") - private String customerCode; - - @Column(name = "PART_NO") - @ApiParam("物料号") - private String partNo; - - @Column(name = "CUSTOMER_PART_NO") - @ApiParam("客户零件号") - private String customerPartNo; - - @Column(name = "CUSTOMER_PART_NAME") - @ApiParam("客户零件描述") - private String customerPartName; - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDataObject.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDataObject.java deleted file mode 100644 index 8bded7d..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDataObject.java +++ /dev/null @@ -1,71 +0,0 @@ -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; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/9/24 7:12 PM - * @Description: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_DATA_OBJECT") -@Api("数据对象") -public class MesDataObject extends BaseBean implements Serializable { - - private static final long serialVersionUID = -1419262751765770535L; - @Column(name = "OBJECT_CODE") - @ApiParam("对象代码") - private String objectCode; - - @Column(name = "OBJECT_NAME") - @ApiParam("对象名称") - private String objectName; - - @Column(name = "DS_CODE") - @ApiParam("数据源代码") - private String dsCode; - - @Column(name = "OPERATE_TYPE") - @ApiParam("操作类型") - private Integer operateType; - - @Column(name = "FIELD_PK") - @ApiParam("主键") - private String fieldPk; - - @Column(name = "READ_FLAG_VALUE") - @ApiParam("读取标志值") - private String readFlagValue; - - @Column(name = "FEED_FIELD") - @ApiParam("反馈字段") - private String feedField; - - @Column(name = "FEED_VALUE") - @ApiParam("反馈值") - private String feedValue; - - @Column(name = "SELF_ADDITION") - @ApiParam("自增列") - private String selfAddition; - - @Column(name = "SELF_ADDITION_VALUE") - @ApiParam("自增列值") - private Long selfAdditionValue; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDatasource.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDatasource.java deleted file mode 100644 index 93ea185..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDatasource.java +++ /dev/null @@ -1,82 +0,0 @@ -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; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/9/24 7:17 PM - * @Description: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_DATASOURCE") -@Api("地址清单") -public class MesDatasource extends BaseBean implements Serializable { - - private static final long serialVersionUID = -7387559860198655900L; - @Column(name = "DS_CODE") - @ApiParam("数据源代码") - private String dsCode; - - @Column(name = "DS_NAME") - @ApiParam("数据源名称") - private String dsName; - - @Column(name = "DS_TYPE") - @ApiParam("数据源类型") - private String dsType; - - @Column(name = "DS_HOST") - @ApiParam("主机") - private String dsHost; - - @Column(name = "DS_PORT") - @ApiParam("端口") - private Integer dsPort; - - @Column(name = "DS_USER") - @ApiParam("用户名") - private String dsUser; - - @Column(name = "DS_PASSWORD") - @ApiParam("密码") - private String dsPassword; - - @Column(name = "DS_DB_NAME") - @ApiParam("数据库名称") - private String dsDbName; - - @Column(name = "EQUIPMENT_CODE") - @ApiParam("设备代码") - private String equipmentCode; - - @Override - public String toString() { - return "MesDatasource{" + - "dsCode='" + dsCode + '\'' + - ", dsName='" + dsName + '\'' + - ", dsType='" + dsType + '\'' + - ", dsHost='" + dsHost + '\'' + - ", dsPort=" + dsPort + - ", dsUser='" + dsUser + '\'' + - ", dsPassword='" + dsPassword + '\'' + - ", dsDbName='" + dsDbName + '\'' + - ", equipmentCode='" + equipmentCode + '\'' + - '}'; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefect.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefect.java deleted file mode 100644 index bed31e1..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefect.java +++ /dev/null @@ -1,80 +0,0 @@ -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 javax.persistence.Transient; -import java.io.Serializable; -import java.util.List; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\10\16 14:25 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_DEFECT") -@Api("缺陷表") -public class MesDefect extends BaseBean implements Serializable { - - private static final long serialVersionUID = -6771813937279359333L; - @Column(name = "DEFECT_CODE") - @ApiParam("缺陷代码") - private String defectCode; - - @Column(name = "DEFECT_NAME") - @ApiParam("缺陷名称") - private String defectName; - - @Column(name = "DEFECT_TYPE") - @ApiParam("缺陷类型") - private String defectType; - - @Column(name = "PROD_CFG_TYPE_CODE") - @ApiParam("项目代码") - private String prodCfgTypeCode; - - @Column(name = "DEFECT_FLAG_VALUE") - @ApiParam("缺陷标识值") - private String defectFlagValue; - - @Column(name = "DEFECT_ACTION_TYPE") - @ApiParam("不良处理类型") - private String defectActionType; - - @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-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefectCause.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefectCause.java deleted file mode 100644 index d4f287f..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefectCause.java +++ /dev/null @@ -1,44 +0,0 @@ -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: joke.wang - * @CreateDate: 2019\10\16 14:28 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_DEFECT_CAUSE") -@Api("缺陷原因表") -public class MesDefectCause extends BaseBean implements Serializable { - - private static final long serialVersionUID = -3867250593038812861L; - @Column(name = "DC_CODE") - @ApiParam("缺陷原因代码") - private String dcCode; - - @Column(name = "DC_NAME") - @ApiParam("缺陷原因名称") - private String dcName; - - @Column(name = "DC_TYPE") - @ApiParam("缺陷原因类型") - private String dcType; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefectRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefectRecord.java deleted file mode 100644 index a97ccef..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefectRecord.java +++ /dev/null @@ -1,80 +0,0 @@ -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.*; -import java.io.Serializable; -import java.util.List; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\10\16 19:53 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_DEFECT_RECORD", indexes = { - @Index(columnList = "SERIAL_NUMBER"), - @Index(columnList = "CREATE_DATE_TIME") -}) -@Api("不良信息记录表") -public class MesDefectRecord extends BaseBean implements Serializable { - private static final long serialVersionUID = -2828208776424343584L; - @Column(name = "SERIAL_NUMBER") - @ApiParam("产品条码") - private String serialNumber; - - @Column(name = "PART_NO") - @ApiParam("物料号") - private String partNo; - - @Column(name = "PART_NAME") - @ApiParam("物料名称") - private String partName; - - @Column(name = "DEFECT_CODE") - @ApiParam("缺陷代码") - private String defectCode; - - @Column(name = "DEFECT_NAME") - @ApiParam("缺陷名称") - private String defectName; - - @Column(name = "DEFECT_LOCATION") - @ApiParam("缺陷位置") - private String defectLocation; - - @Column(name = "SIDE_LOCATION") - @ApiParam("面位") - private String sideLocation; - - @Column(name = "REPAIR_STATUS") - @ApiParam("维修状态") - private Integer repairStatus; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心代码") - private String workCenterCode; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工作单元代码") - private String workCellCode; - - @Column(name = "MEMO") - @ApiParam("备注") - private String memo; - - @Transient - private List mesDefectList; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDismantleRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDismantleRecord.java deleted file mode 100644 index 14151ff..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDismantleRecord.java +++ /dev/null @@ -1,97 +0,0 @@ -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.*; -import java.io.Serializable; -import java.math.BigDecimal; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\10\16 15:03 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_DISMANTLE_RECORD", indexes = { - @Index(columnList = "SN"), - @Index(columnList = "CREATE_DATE_TIME") -}) -@Api("物料拆解记录表") -public class MesDismantleRecord extends BaseBean implements Serializable { - - private static final long serialVersionUID = -7924346039878218038L; - @Column(name = "DISMANTLE_ID") - @ApiParam("拆解编号") - private String dismantleId; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心代码") - private String workCenterCode; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工作单元代码") - private String workCellCode; - - @Column(name = "PARENT_PART_NO") - @ApiParam("产品物料编码") - private String parentPartNo; - - @Column(name = "PARENT_PART_NAME") - @ApiParam("产品物料名称") - private String parentPartName; - - @Column(name = "SN") - @ApiParam("产品条码") - private String sn; - - @Column(name = "QTY") - @ApiParam("产品数量") - private Double qty; - - @Column(name = "DISMANTLE_QTY") - @ApiParam("拆解数") - private BigDecimal dismantleQty; - - @Column(name = "ITEM_PART_NO") - @ApiParam("子物料编码") - private String itemPartNo; - - @Column(name = "ITEM_PART_NAME") - @ApiParam("子物料名称") - private String itemPartName; - - @Column(name = "OK_QTY") - @ApiParam("合格数") - private BigDecimal okQty; - - @Column(name = "MISS_QTY") - @ApiParam("缺失数") - private BigDecimal missQty; - - @Column(name = "SCRAP_QTY") - @ApiParam("报废数") - private BigDecimal scrapQty; - - @Column(name = "MEMO") - @ApiParam("备注") - private String memo; - - @Column(name = "LOT_NO") - @ApiParam("关联批次") - private String lotNo; - - @Transient - private String serialNumber; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEquAlarmRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEquAlarmRecord.java deleted file mode 100644 index 25fe6ee..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEquAlarmRecord.java +++ /dev/null @@ -1,53 +0,0 @@ -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.Index; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @author Wynne.Lu - * @date 2020/9/23 18:47 - * @desc - */ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_EQU_ALARM_RECORD", indexes = { - @Index(columnList = "WORK_CENTER_CODE") -}) -@Api("设备自动报警记录表") -public class MesEquAlarmRecord extends BaseBean implements Serializable { - private static final long serialVersionUID = 1675134362612851879L; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("产线") - private String workCenterCode; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工位") - private String workCellCode; - - @Column(name = "ALARM_LEVEL") - @ApiParam("报警等级") - private Integer alarmLevel; - - @Column(name = "ALARM_START_TIME") - @ApiParam("报警开始时间") - private String alarmStartTime; - - @Column(name = "ALARM_STOP_TIME") - @ApiParam("报警开始时间") - private String alarmStopTime; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEquipment.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEquipment.java deleted file mode 100644 index df432f3..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEquipment.java +++ /dev/null @@ -1,97 +0,0 @@ -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; -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 : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_EQUIPMENT") -@Api("生产设备") -public class MesEquipment extends BaseBean implements Serializable { - private static final long serialVersionUID = 7269069290035250108L; - @Column(name = "EQUIPMENT_CODE") - @ApiParam("设备代码") - private String equipmentCode; - - @Column(name = "EQUIPMENT_NAME") - @ApiParam("设备名称") - private String equipmentName; - - @Column(name = "STATUS") - @ApiParam("设备状态") - private Integer status; - - @Column(name = "EQUIPMENT_TYPE") - @ApiParam("设备类型") - private Integer equipmentType; - - @Column(name = "EQUIPMENT_CATEGORY") - @ApiParam("设备类别") - private String equipmentCategory; - - @Column(name = "EQUIPMENT_MODEL") - @ApiParam("型号") - private String equipmentModel; - - @Column(name = "EQUIPMENT_SPEC") - @ApiParam("规格") - private String equipmentSpec; - - @Column(name = "EQUIPMENT_MAKER") - @ApiParam("制造商") - private String equipmentMaker; - - @Column(name = "RELEASE_DATE") - @ApiParam("出厂日期") - private String releaseDate; - - @Column(name = "RECEIVE_DATE") - @ApiParam("接收日期") - private String receiveDate; - - @Column(name = "ENABLE_DATE") - @ApiParam("启用日期") - private String enableDate; - - @Column(name = "CONNECT_TYPE") - @ApiParam("连接类型") - private Integer connectType; - - @Column(name = "MEMO") - @ApiParam("备注") - private String memo; - - @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/MesEsop.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEsop.java deleted file mode 100644 index 655c2f4..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEsop.java +++ /dev/null @@ -1,93 +0,0 @@ -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 javax.persistence.Transient; -import java.io.Serializable; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/7/30 9:30 AM - * @Description: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_ESOP") -@Api("作业指导书信息表(ODS)") -public class MesEsop extends BaseBean implements Serializable { - - private static final long serialVersionUID = -4869646502033099294L; - @Column(name = "PART_NO") - @ApiParam("零件号") - private String partNo; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心代码") - private String workCenterCode; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工作单元代码") - private String workCellCode; - - @Column(name = "ROUTE_CODE") - @ApiParam("流程代码") - private String routeCode; - - @Column(name = "PROCESS_CODE") - @ApiParam("工序代码") - private String processCode; - - @Column(name = "STEP_CODE") - @ApiParam("工步代码") - private String stepCode; - - @Column(name = "STEP_SEQ") - @ApiParam("工步序号") - private Integer stepSeq; - - @Column(name = "FILE_ID") - @ApiParam("文件id") - private Long fileId; - - @Transient - @ApiParam("文件名称") - private String fileName; - - @Transient - @ApiParam("文件URL") - private String fileUrl; - - @Transient - @ApiParam("组名") - private String groupName; - - @Transient - @ApiParam("文件原名") - private String fileOriginName; - - @Transient - @ApiParam("文件大小") - private String fileSize; - - @Transient - @ApiParam("文件类型名称") - private String fileType; - - @Transient - @ApiParam("同步标记") - private Integer syncTag = 0; - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEvent.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEvent.java deleted file mode 100644 index cc17b50..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEvent.java +++ /dev/null @@ -1,52 +0,0 @@ -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 :mes系统业务事件 - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-12 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_EVENT") -@Api("系统业务事件") -public class MesEvent extends BaseBean implements Serializable { - private static final long serialVersionUID = -5604724665202938464L; - @Column(name = "EVENT_CODE") - @ApiParam("事件代码") - private String eventCode; - - @Column(name = "EVENT_NAME") - @ApiParam("事件名称") - private String eventName; - - @Column(name = "EVENT_TYPE") - @ApiParam("事件类型") - private Integer eventType; - - @Column(name = "BUTTON_CODE") - @ApiParam("按钮代码") - private String buttonCode; - - public int getEventTypeVal() { - return this.eventType == null ? 0 : this.eventType; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEventAction.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEventAction.java deleted file mode 100644 index 2a16eb0..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEventAction.java +++ /dev/null @@ -1,54 +0,0 @@ -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.AllArgsConstructor; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; -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 : jack.jia - * @CreateDate : 2019-04-12 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@AllArgsConstructor -@NoArgsConstructor -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_EVENT_ACTION") -@Api("系统业务事件动作") -public class MesEventAction extends BaseBean implements Serializable { - private static final long serialVersionUID = 3964084375279916831L; - @Column(name = "EVENT_CODE") - @ApiParam("事件代码") - private String eventCode; - - @Column(name = "ACTION_CODE") - @ApiParam("动作代码") - private String actionCode; - - @Column(name = "SEQ") - @ApiParam("序号") - private Integer seq; - - public int getSeqVal() { - return this.seq == null ? 0 : this.seq; - } - - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesFiCfg.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesFiCfg.java deleted file mode 100644 index f128453..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesFiCfg.java +++ /dev/null @@ -1,47 +0,0 @@ -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; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/10/10 8:37 PM - * @Description: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_FI_CFG") -@Api("首检件配置") -public class MesFiCfg extends BaseBean implements Serializable { - - private static final long serialVersionUID = 1791614973371037158L; - @Column(name = "WORK_CENTER_CODE") - @ApiParam("产线") - private String workCenterCode; - - @Column(name = "PART_NO") - @ApiParam("物料号") - private String partNo; - - @Column(name = "CUST_CODE") - @ApiParam("客户代码") - private String custCode; - - @Column(name = "FI_QTY") - @ApiParam("首检数量") - private Double fiQty; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesFile.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesFile.java deleted file mode 100644 index a90ed92..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesFile.java +++ /dev/null @@ -1,59 +0,0 @@ -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; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/12/4 1:28 下午 - * @Description: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_FILE") -@Api("文件表") -public class MesFile extends BaseBean implements Serializable { - - private static final long serialVersionUID = 7017379708394714424L; - @Column(name = "FILE_NAME") - @ApiParam("文件名称") - private String fileName; - - @Column(name = "FILE_URL") - @ApiParam("文件URL") - private String fileUrl; - - @Column(name = "GROUP_NAME") - @ApiParam("组名") - private String groupName; - - @Column(name = "FILE_ORIGIN_NAME") - @ApiParam("文件原名") - private String fileOriginName; - - @Column(name = "FILE_SIZE") - @ApiParam("文件大小") - private String fileSize; - - @Column(name = "FILE_TYPE") - @ApiParam("文件类型名称") - private String fileType; - - @Column(name = "SYNC_TAG") - @ApiParam("同步标记") - private Integer syncTag = 0; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesKpData.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesKpData.java deleted file mode 100644 index 243e6a9..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesKpData.java +++ /dev/null @@ -1,65 +0,0 @@ -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 javax.persistence.Transient; -import java.io.Serializable; - -/** - * @Description :物料关键数据 - * @Reference : - * @Author : crish - * @CreateDate : 2019-05-15 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_KP_DATA") -@Api("生产区域") -public class MesKpData extends BaseBean implements Serializable { - private static final long serialVersionUID = -3332582267186642790L; - @Column(name = "PART_NO") - @ApiParam("物料号") - private String partNo; - - @Column(name = "KEY_DATA_CODE") - @ApiParam("关键数据代码") - private String keyDataCode; - - @Column(name = "KEY_DATA_NAME") - @ApiParam("关键数据名称") - private String keyDataName; - - @Column(name = "KEY_DATA_COUNT") - @ApiParam("关键数据数量") - private Integer keyDataCount; - - @Column(name = "UPPER_LIMIT") - @ApiParam("数据上限") - private Double upperLimit; - - @Column(name = "LOWER_LIMIT") - @ApiParam("数据下限") - private Double lowerLimit; - - @Transient - @ApiParam("扭矩值") - private Double torqueValue; - - @Transient - @ApiParam("是否在范围之内") - private Boolean ok; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesKpsnRule.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesKpsnRule.java deleted file mode 100644 index 9ca9ac7..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesKpsnRule.java +++ /dev/null @@ -1,95 +0,0 @@ -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: Crish - * @CreateDate:2019-04-16-17:36 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_KPSN_RULE") -@Api("关键件条码校验规则") -public class MesKpsnRule extends BaseBean implements Serializable { - private static final long serialVersionUID = 8238308232531730720L; - @Column(name = "PART_NO") - @ApiParam("物料号") - private String partNo; - - @Column(name = "LENGTH") - @ApiParam("长度") - private Integer length; - - @Column(name = "FROM1") - @ApiParam("起始1") - private Integer from1; - - @Column(name = "TO1") - @ApiParam("至1") - private Integer to1; - - @Column(name = "FIX1") - @ApiParam("内容1") - private String fix1; - - @Column(name = "FROM2") - @ApiParam("起始2") - private Integer from2; - - @Column(name = "TO2") - @ApiParam("至2") - private Integer to2; - - @Column(name = "FIX2") - @ApiParam("内容2") - private String fix2; - - @Column(name = "TYPE") - @ApiParam("类型") - private String type; - - @Column(name = "BIND_RULE") - @ApiParam("绑定规则") - private Integer bandRule; - - @Column(name = "SUPPLIER_CODE") - @ApiParam("供应商代码") - private String supplierCode; - - public int getLengthVal() { - return this.length == null ? 0 : this.length; - } - - public int getFrom1Val() { - return this.from1 == null ? 0 : this.from1; - } - - public int getTo1Val() { - return this.to1 == null ? 0 : this.to1; - } - - public int getFrom2Val() { - return this.from2 == null ? 0 : this.from2; - } - - public int getTo2Val() { - return this.to2 == null ? 0 : this.to2; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesLabelTemplate.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesLabelTemplate.java deleted file mode 100644 index 589c237..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesLabelTemplate.java +++ /dev/null @@ -1,54 +0,0 @@ -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.*; -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 = "MES_LABEL_TEMPLATE") -@Api(value = "打印模板", description = "打印模板") -public class MesLabelTemplate extends BaseBean implements Serializable { - - - private static final long serialVersionUID = 3797103812377146878L; - @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-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesLabelTemplateParam.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesLabelTemplateParam.java deleted file mode 100644 index 253f29a..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesLabelTemplateParam.java +++ /dev/null @@ -1,55 +0,0 @@ -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; -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 = "MES_LABEL_TEMPLATE_PARAM") -@Api(value = "打印模板参数", description = "打印模板参数") -public class MesLabelTemplateParam extends BaseBean implements Serializable { - - private static final long serialVersionUID = -3595706874099358555L; - @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-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMethod.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMethod.java deleted file mode 100644 index e8daace..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMethod.java +++ /dev/null @@ -1,55 +0,0 @@ -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 :mes系统业务方法 - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-12 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_METHOD") -@Api("系统业务方法") -public class MesMethod extends BaseBean implements Serializable { - private static final long serialVersionUID = -3629909409034083767L; - @Column(name = "METHOD_CODE") - @ApiParam("方法代码") - private String methodCode; - - @Column(name = "METHOD_NAME") - @ApiParam("方法名称") - private String methodName; - - @Column(name = "CALL_CLASS") - @ApiParam("具体实现类") - private String callClass; - - /** - * 10-执行方法（不需要返回值），20-完成方法（返回ResultBean） - */ - @Column(name = "METHOD_TYPE") - @ApiParam("方法类型") - private Integer methodType; - - public int getMethodTypeVal() { - return this.methodType == null ? 0 : this.methodType; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMonitorTask.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMonitorTask.java deleted file mode 100644 index 3e81c47..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMonitorTask.java +++ /dev/null @@ -1,52 +0,0 @@ -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/1/8 0008 - 17:11 - */ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_MONITOR_TASK") -@Api("监听任务") -public class MesMonitorTask extends BaseBean implements Serializable { - - private static final long serialVersionUID = -8614480099840448294L; - @Column(name = "TASK_NO") - @ApiParam("任务编号") - private String taskNo; - - @Column(name = "TASK_NAME") - @ApiParam("任务名称") - private String taskName; - - @Column(name = "TASK_OBJECT_TYPE") - @ApiParam("任务对象类型") - private Integer taskObjectType; - - @Column(name = "TASK_STATUS") - @ApiParam("任务状态") - private Integer taskStatus; - - @Column(name = "TASK_EXCEPTION_DESC") - @ApiParam("异常描述") - private String taskExceptionDesc; - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMonitorTaskDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMonitorTaskDetail.java deleted file mode 100644 index 891dc65..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMonitorTaskDetail.java +++ /dev/null @@ -1,48 +0,0 @@ -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/1/8 0008 - 17:19 - */ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_MONITOR_TASK_DETAIL") -@Api("监听任务明细") -public class MesMonitorTaskDetail extends BaseBean implements Serializable { - - private static final long serialVersionUID = -4811270359386960747L; - @Column(name = "TASK_NO") - @ApiParam("任务编号") - private String taskNo; - - @Column(name = "DATA_OBJECT_NO") - @ApiParam("数据对象编号") - private String dataObjectNo; - -// @Column(name = "STORE_OBJECT_CODE") -// @ApiParam("存储对象代码") -// private String storeObjectCode; -// -// @Column(name = "STORE_FIELD_CODE") -// @ApiParam("存储字段代码") -// private String storeFieldCode; - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesNumberRule.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesNumberRule.java deleted file mode 100644 index 9fc51c2..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesNumberRule.java +++ /dev/null @@ -1,60 +0,0 @@ -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; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/8/22 5:59 PM - * @Description: - **/ - -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_NUMBER_RULE") -@Api("条码生成规则") -public class MesNumberRule extends BaseBean implements Serializable { - - private static final long serialVersionUID = -4039194855353751178L; - @Column(name = "RULE_CODE") - @ApiParam("规则代码") - private String ruleCode; - - @Column(name = "RULE_DESC") - @ApiParam("规则描述") - private String ruleDesc; - - @Column(name = "PREFIX") - @ApiParam("前缀") - private String prefix; - - @Column(name = "NUMBER_RULE") - @ApiParam("编码规则") - private String numberRule; - - @Column(name = "SERIALNO_LENGTH") - @ApiParam("序号长度") - private Integer serialnoLength; - - @Column(name = "SERIALNO_INCREMENT") - @ApiParam("增量") - private Integer serialnoIncrement; - - @Column(name = "IS_CYCLE") - @ApiParam("最大值后循环") - private Integer isCycle; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesNumberSerialno.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesNumberSerialno.java deleted file mode 100644 index 16436c6..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesNumberSerialno.java +++ /dev/null @@ -1,49 +0,0 @@ -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 javax.persistence.Version; -import java.io.Serializable; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/8/23 9:14 AM - * @Description: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_NUMBER_SERIALNO") -@Api("编码序号") -public class MesNumberSerialno extends BaseBean implements Serializable { - - private static final long serialVersionUID = -3024166851634742872L; - @Column(name = "CURRENT_NUMBER_PREFIX") - @ApiParam("当前编号前缀") - private String currentNumberPrefix; - - @Column(name = "CURRENT_SERIALNO") - @ApiParam("当前序号") - private Integer currentSerialno; - - @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-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesObjectCfg.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesObjectCfg.java deleted file mode 100644 index 5b7c166..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesObjectCfg.java +++ /dev/null @@ -1,60 +0,0 @@ -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; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/9/24 7:14 PM - * @Description: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_OBJECT_CFG") -@Api("对象结构") -public class MesObjectCfg extends BaseBean implements Serializable { - - private static final long serialVersionUID = -3640782210450491835L; - @Column(name = "OBJECT_CODE") - @ApiParam("对象代码") - private String objectCode; - - @Column(name = "FIELD_CODE") - @ApiParam("字段代码") - private String fieldCode; - - @Column(name = "FIELD_NAME") - @ApiParam("字段名称") - private String fieldName; - - @Column(name = "FIELD_TYPE") - @ApiParam("字段类型") - private String fieldType; - - @Column(name = "FIELD_LENGTH") - @ApiParam("列长度") - private Integer fieldLength; - - @Column(name = "POJO_ATTR") - @ApiParam("对应的pojo属性") - private String pojoAttr; - - @Column(name = "IS_SAVE") - @ApiParam("是否保存 1存 2不存") - private Integer isSave; - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPLCConfigure.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPLCConfigure.java deleted file mode 100644 index 38c0363..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPLCConfigure.java +++ /dev/null @@ -1,62 +0,0 @@ -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 :PLC设备信息配置表 - * @Reference : - * @Author : Crish - * @CreateDate : 2019-05-17 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PLC_CONFIGURE") -@Api("PLC设备信息配置表") -@Deprecated -public class MesPLCConfigure extends BaseBean implements Serializable { - private static final long serialVersionUID = 8274445475806774L; - @Column(name = "IP") - @ApiParam("设备ip") - private String ipAddress; - - @Column(name = "CHANNEL_NAME") - @ApiParam("通道名称") - private String channelName; - - @Column(name = "DEVICE_NAME") - @ApiParam("设备地址") - private String deviceName; - - @Column(name = "TAG_NAME") - @ApiParam("标签地址") - private String tagName; - - @Column(name = "AREA_CODE") - @ApiParam("区域代码") - private String areaCode; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工作单元") - private String workCellCode; - - @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/MesPackSpec.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackSpec.java deleted file mode 100644 index 7ca973d..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackSpec.java +++ /dev/null @@ -1,99 +0,0 @@ -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.ColumnDefault; -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 : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PACK_SPEC") -@Api("包装规格") -public class MesPackSpec extends BaseBean implements Serializable { - private static final long serialVersionUID = -788654193624068327L; - @Column(name = "SPEC_CODE") - @ApiParam("包装规格代码") - private String specCode; - - @Column(name = "SPEC_NAME") - @ApiParam("包装规格名称") - private String specName; - - @Column(name = "QTY") - @ColumnDefault("0") - @ApiParam(value = "包装数量", example = "0") - private Double qty; - - @Column(name = "QTY2") - @ColumnDefault("0") - @ApiParam(value = "包装数量2", example = "0") - private Double qty2; - - @Column(name = "QTY3") - @ColumnDefault("0") - @ApiParam(value = "包装数量3", example = "0") - private Double qty3; - - @Column(name = "QTY4") - @ColumnDefault("0") - @ApiParam(value = "包装数量4", example = "0") - private Double qty4; - - @Column(name = "IS_MIXED") - @ApiParam("是否混包") - private Integer isMixed; - - @Column(name = "IS_MIXED2") - @ApiParam("是否混包2") - private Integer isMixed2; - - @Column(name = "IS_MIXED3") - @ApiParam("是否混包3") - private Integer isMixed3; - - @Column(name = "IS_MIXED4") - @ApiParam("是否混包4") - private Integer isMixed4; - - - public double getQtyVal() { - return this.qty == null ? 0.0d : this.qty; - } - - public int getIsMixedVal() { - return this.isMixed == null ? 0 : this.isMixed; - } - - public int getIsMixed2Val() { - return this.isMixed2 == null ? 0 : this.isMixed2; - } - - public int getIsMixed3Val() { - return this.isMixed3 == null ? 0 : this.isMixed3; - } - - public int getIsMixed4Val() { - return this.isMixed4 == null ? 0 : this.isMixed4; - } - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java deleted file mode 100644 index 6c1beda..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java +++ /dev/null @@ -1,119 +0,0 @@ -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.*; -import java.io.Serializable; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/10/18 1:26 下午 - * @Description: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PACKAGE", indexes = {@Index(columnList = "PACKAGE_NO") -}, uniqueConstraints = { - @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "PACKAGE_NO"}) - } -) -@Api("包装规格") -public class MesPackage extends BaseBean implements Serializable { - private static final long serialVersionUID = 2292859018089339608L; - @Column(name = "PACKAGE_NO", nullable = false) - @ApiParam("包装编号") - private String packageNo; - - @Column(name = "PART_NO") - @ApiParam("物料号") - private String partNo; - - @Column(name = "PART_NAME_RDD") - @ApiParam("物料名称") - private String partNameRdd; - - @Column(name = "QTY") - @ApiParam("数量") - private Double qty; - - @Column(name = "PACK_SPEC_QTY") - @ApiParam("包装规格数量") - private Double packSpecQty; - - @Column(name = "UNIT") - @ApiParam("单位") - private String unit; - - @Column(name = "LOT_NO") - @ApiParam("批号") - private String lotNo; - - @Column(name = "FIX_LOT_NO") - @ApiParam("特殊批号") - private String fixLotNo; - - @Column(name = "PACK_SPEC") - @ApiParam("包装规格") - private String packSpec; - - @Column(name = "IS_SEALED") - @ApiParam("是否封箱") - private Integer isSealed; - - @Column(name = "PRINT_STATUS") - @ApiParam("打印状态10：未打印 20：已打印") - private Integer printStatus; - - @Column(name = "PACK_LEVEL") - @ApiParam("包装层级 1-第一层，2-第二层，3-第三层，4-第四层") - private Integer packLevel; - - @Column(name = "WORK_ORDER_NO") - @ApiParam("生产工单号") - private String workOrderNo; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心代码") - private String workCenterCode; - - @Column(name = "MEMO") - @ApiParam("备注") - private String memo; - - @Column(name = "CUST_CODE") - @ApiParam("客户代码") - private String custCode; - - @Transient - @ApiParam("封箱状态") - private String sealStatus; - - @Transient - @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-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java deleted file mode 100644 index a987364..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java +++ /dev/null @@ -1,63 +0,0 @@ -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.*; -import java.io.Serializable; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/10/18 2:55 下午 - * @Description: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PACKAGE_DETAIL", indexes = {@Index(columnList = "PACKAGE_NO") -}, uniqueConstraints = { - @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "PACKAGE_NO", "SERIAL_NUMBER"}) -} -) -@Api("包装规格明细") -public class MesPackageDetail extends BaseBean implements Serializable { - - private static final long serialVersionUID = 8162606304720621672L; - @Column(name = "PACKAGE_NO", nullable = false) - @ApiParam("包装编码") - private String packageNo; - - @Column(name = "SERIAL_NUMBER", nullable = false) - @ApiParam("过程条码") - private String serialNumber; - - @Column(name = "PART_NO") - @ApiParam("物料编号") - private String partNo; - - @Column(name = "PART_NAME_RDD") - @ApiParam("物料名称") - private String partNameRdd; - - @Column(name = "PACKAGE_NO2") - @ApiParam("包装编码2") - private String packageNo2; - - @Column(name = "PACKAGE_NO3") - @ApiParam("包装编码3") - private String packageNo3; - - @Column(name = "PACKAGE_NO4") - @ApiParam("包装编码4") - private String packageNo4; - - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageTravel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageTravel.java deleted file mode 100644 index 72084e3..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageTravel.java +++ /dev/null @@ -1,58 +0,0 @@ -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.Index; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/10/18 3:23 下午 - * @Description: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PACKAGE_TRAVEL", indexes = {@Index(columnList = "PACKAGE_NO")}) -@Api("包装履历表") -public class MesPackageTravel extends BaseBean implements Serializable { - - private static final long serialVersionUID = -2808747095415676213L; - @Column(name = "PACKAGE_NO") - @ApiParam("包装编码") - private String packageNo; - - @Column(name = "SERIAL_NUMBER") - @ApiParam("过程条码") - private String serialNumber; - - @Column(name = "OP_TYPE") - @ApiParam("操作类型") - private Integer opType; - - @Column(name = "PACKAGE_NO2") - @ApiParam("包装编码2") - private String packageNo2; - - @Column(name = "PACKAGE_NO3") - @ApiParam("包装编码3") - private String packageNo3; - - @Column(name = "PACKAGE_NO4") - @ApiParam("包装编码4") - private String packageNo4; - - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPart.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPart.java deleted file mode 100644 index 81365ef..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPart.java +++ /dev/null @@ -1,93 +0,0 @@ -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 javax.persistence.Transient; -import java.io.Serializable; - -/** - * @Description :物料信息 - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PART") -@Api("物料信息") -public class MesPart extends BaseBean implements Serializable { - private static final long serialVersionUID = 3936033255397936854L; - @Column(name = "PART_NO") - @ApiParam("零件号") - private String partNo; - - @Column(name = "PART_NAME") - @ApiParam("零件名称") - private String partName; - - @Column(name = "BRIEF_TEXT") - @ApiParam("零件简称") - private String briefText; - - @Column(name = "PART_SPEC") - @ApiParam("零件规格") - private String partSpec; - - @Column(name = "CATEGORY_CODE1") - @ApiParam("分类1") - private String categoryCode1; - - @Column(name = "CATEGORY_CODE2") - @ApiParam("分类2") - private String categoryCode2; - - @Column(name = "CATEGORY_CODE3") - @ApiParam("分类3") - private String categoryCode3; - - @Column(name = "UNIT") - @ApiParam("单位") - private String unit; - - @Column(name = "PACK_SPEC_CODE") - @ApiParam("包装规格代码") - private String packSpecCode; - - @Column(name = "DEFAULT_WORK_CENTER") - @ApiParam("默认工作中心") - private String defaultWorkCenter; - - @Column(name = "PRODUCE_CTGY_CODE") - @ApiParam("产品类型代码") - private String produceCategoryCode; - - @Column(name = "PROCESS_MATCH_TYPE") - @ApiParam("过程编码匹配类型") - private Integer processMatchType; - - @Column(name = "PACKAGE_MATCH_TYPE") - @ApiParam("包装编码匹配类型") - private Integer packageMatchType; - - @Column(name = "PRODUCT_MATCH_TYPE") - @ApiParam("产品编码匹配类型") - private Integer productMatchType; - - @Transient - @ApiParam("分类名称") - private String categoryName; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPartCategory.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPartCategory.java deleted file mode 100644 index 949a02f..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPartCategory.java +++ /dev/null @@ -1,44 +0,0 @@ -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 : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PART_CATEGORY") -@Api("零件种类") -public class MesPartCategory extends BaseBean implements Serializable { - private static final long serialVersionUID = 9076081904146489470L; - @Column(name = "CATEGORY_CODE") - @ApiParam("分类代码") - private String categoryCode; - - @Column(name = "CATEGORY_NAME") - @ApiParam("分类名称") - private String categoryName; - - @Column(name = "CATEGORY_TYPE") - @ApiParam("分类类型") - private String categoryType; -} 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 deleted file mode 100644 index 94f495f..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPartFormula.java +++ /dev/null @@ -1,45 +0,0 @@ -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-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPatternJis.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPatternJis.java deleted file mode 100644 index 9c8adca..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPatternJis.java +++ /dev/null @@ -1,68 +0,0 @@ -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.Lob; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description :JIS发运模式 - * @Reference : - * @Author : wangjie - * @CreateDate : 2019-12-25 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PATTERN_JIS") -@Api("JIS发运模式") -public class MesPatternJis extends BaseBean implements Serializable { - - private static final long serialVersionUID = 1119289554542499312L; - @Column(name = "PATTERN_NO") - @ApiParam("模式编号") - private String patternNo; - - @Column(name = "PATTERN_NAME") - @ApiParam("模式名称") - private String patternName; - - @Column(name = "QUEUE_NO") - @ApiParam("显示主队列数") - private Integer queueNo; - - @Column(name = "HANDLE_NO") - @ApiParam("一次处理套数") - private Integer handleNo; - - @Column(name = "PATTERN_DESC") - @ApiParam("描述") - private String patternDesc; - - @Column(name = "PRODUCE_CTGY_CODE") - @ApiParam("产品类型组") - private String produceCategoryCode; - - @Column(name = "PATTERN_TYPE") - @ApiParam("模式类型") - private Integer patternType; - - @Lob - @Column(name = "RULE") - @ApiParam("规则") - private String rule; - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcn.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcn.java deleted file mode 100644 index c19bfa3..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcn.java +++ /dev/null @@ -1,87 +0,0 @@ -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: yiming.gu - * @CreateDate:2019-04-22-17:20 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PCN") -@Api("PCN节点") -public class MesPcn extends BaseBean implements Serializable { - private static final long serialVersionUID = -7570827672640277097L; - @Column(name = "PCN_CODE") - @ApiParam("PCN代码") - private String pcnCode; - - @Column(name = "PCN_NAME") - @ApiParam("PCN名称") - private String pcnName; - - @Column(name = "AREA_CODE") - @ApiParam("区域") - private String areaCode; - - @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-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnConnectLog.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnConnectLog.java deleted file mode 100644 index faa7f92..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnConnectLog.java +++ /dev/null @@ -1,55 +0,0 @@ -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: yiming.gu - * @CreateDate:2019-04-22-17:20 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PCN_CONNECT_LOG") -@Api("PCN节点连接日志") -public class MesPcnConnectLog extends BaseBean implements Serializable { - private static final long serialVersionUID = -4153357131289178766L; - @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-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncCfg.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncCfg.java deleted file mode 100644 index 4d321f8..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncCfg.java +++ /dev/null @@ -1,92 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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 java.io.Serializable; - -/** - * @Description: - * @Reference: - * @Author: yiming.gu - * @CreateDate:2019-04-22-17:32 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PCN_SYNC_CFG") -@Api("MES_PCN_同步配置") -public class MesPcnSyncCfg extends BaseBean implements Serializable { - private static final long serialVersionUID = -6869288362923390521L; - @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("同步方式 2.新增 1.修改") - private Integer syncPattern; - - @Column(name = "SYNC_TYPE") - @ApiParam("同步类型 1.pcn获取mes数据 2.pcn推送数据至mes") - 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(); - - 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-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncErrorLog.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncErrorLog.java deleted file mode 100644 index 22810be..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncErrorLog.java +++ /dev/null @@ -1,54 +0,0 @@ -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.Lob; -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 = "MES_PCN_SYNC_ERRORLOG") -@Api("MES_PCN同步异常日志") -public class MesPcnSyncErrorLog extends BaseBean implements Serializable { - private static final long serialVersionUID = -2249754641660006488L; - @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-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSysUserOffline.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSysUserOffline.java deleted file mode 100644 index 78d3caa..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSysUserOffline.java +++ /dev/null @@ -1,70 +0,0 @@ -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; -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 : 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-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTask.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTask.java deleted file mode 100644 index 8288401..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTask.java +++ /dev/null @@ -1,90 +0,0 @@ -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 :mes-pcn定时任务工作清单 - * @Reference : - * @Author : wangjie - * @CreateDate : 2019-08-26 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PCN_TASK") -@Api("mes-pcn定时任务工作清单") -public class MesPcnTask extends BaseBean implements Serializable { - - private static final long serialVersionUID = 4777357978430670966L; - @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-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTaskLog.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTaskLog.java deleted file mode 100644 index f0ee69f..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTaskLog.java +++ /dev/null @@ -1,53 +0,0 @@ -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 :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-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlanOrder.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlanOrder.java deleted file mode 100644 index bb60da6..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlanOrder.java +++ /dev/null @@ -1,144 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.bean; - -import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.hibernate.annotations.DynamicInsert; -import org.hibernate.annotations.DynamicUpdate; - -import javax.persistence.*; -import java.io.Serializable; - -/** - * @Description: - * @Reference: - * @Author: Crish - * @CreateDate:2019-04-16-17:36 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PLAN_ORDER", indexes = {@Index(columnList = "ORDER_NO") -}, uniqueConstraints = { - @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO"}) - } -) -@Api("生产主计划") -public class MesPlanOrder extends BaseBean implements Serializable { - private static final long serialVersionUID = 8571104279843276872L; - @Column(name = "ORDER_NO", nullable = false) - @ApiParam("生产计划单号") - private String orderNo; - - @Column(name = "PO_TYPE") - @ApiParam("计划类型") - private Integer planType; - - @Column(name = "PROD_CFG_CODE") - @ApiParam("产品配置代码") - private String prodCfgCode; - - @Column(name = "PART_NO") - @ApiParam("物料号") - private String partNo; - - @Column(name = "PART_NAME_RDD") - @ApiParam("物料名称") - private String partNameRdd; - - @Column(name = "PLAN_QTY") - @ApiParam("计划数量") - private Double planQty; - - @Column(name = "DECOMPOSE_QTY") - @ApiParam("分解数量") - private Double decomposeQty; - - @Column(name = "STATUS") - @ApiParam("状态") - private Integer status; - - @Column(name = "START_TIME") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam("计划开始时间") - private String startTime; - - @Column(name = "END_TIME") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam("计划结束时间") - private String endTime; - - @Column(name = "DELIVERY_DATE") - @ApiParam("交货日期") - private String deliveryDate; - - @Column(name = "CUST_CODE") - @ApiParam("客户代码") - private String custCode; - - @Column(name = "CUST_ORDER_NO") - @ApiParam("客户订单号") - private String custOrderNo; - - @Column(name = "SOURCE") - @ApiParam("计划来源") - private String source; - - @Column(name = "MEMO") - @ApiParam("备注") - private String memo; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心代码") - private String workCenterCode; - - /********************** 冗余字段 *********************************/ - - @Transient - @ApiParam(value = "区域") - public String areaCode; - - @Transient -// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value = "创建日期查询用，查询结束日期", example = "2018-12-31 23:59:59") - public String startTimeStart; - - - @Transient -// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value = "创建日期查询用，查询结束日期", example = "2018-12-31 23:59:59") - public String startTimeEnd; - - - @Transient -// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value = "计划结束日期查询用，查询结束日期", example = "2018-12-31 23:59:59") - public String endTimeStart; - - @Transient -// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value = "计划结束日期查询用，查询结束日期", example = "2018-12-31 23:59:59") - public String endTimeEnd; - - public double getPlanQtyVal() { - return this.planQty == null ? 0.0d : this.planQty; - } - - public double getDecomposeQtyVal() { - return this.decomposeQty == null ? 0.0d : this.decomposeQty; - } - - public int getStatusVal() { - return this.status == null ? 0 : this.status; - } - - public int getPlanTypeVal() { - return this.planType == null ? 0 : this.planType; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java deleted file mode 100644 index 5d5a48c..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java +++ /dev/null @@ -1,112 +0,0 @@ -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 javax.persistence.Transient; -import java.io.Serializable; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/9/25 8:07 PM - * @Description: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PLC") -@Api("PLC配置表") -public class MesPlc extends BaseBean implements Serializable { - - private static final long serialVersionUID = -5346536604317095818L; - @Column(name = "PLC_CODE") - @ApiParam("PLC代码") - private String plcCode; - - @Column(name = "PLC_NAME") - @ApiParam("PLC名称") - private String plcName; - - @Column(name = "PLC_MODEL") - @ApiParam("PLC型号") - private String plcModel; - - @Column(name = "PLC_IP") - @ApiParam("PLC IP") - private String plcIp; - - @Column(name = "CHANNEL") - @ApiParam("通道") - private String channel; - - @Column(name = "TAG_NAME") - @ApiParam("标签名称") - private String tagName; - - @Column(name = "TAG_ADDRESS") - @ApiParam("标签地址") - private String tagAddress; - - @Column(name = "DATA_TYPE") - @ApiParam("标签数据类型") - private String dataType; - - @Column(name = "GROUP_NAME") - @ApiParam("分组名称") - private String groupName; - - @Column(name = "DEVICE") - @ApiParam("驱动") - private String device; - - @Column(name = "EQUIPMENT_CODE") - @ApiParam("设备代码") - private String equipmentCode; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("生产线") - private String workCenterCode; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工位") - private String workCellCode; - - @Column(name = "PLC_CFG") - @ApiParam("PLC的值的设定") - private String plcCfg; - - @Column(name = "ANALYSIS_RULE") - @ApiParam("解析规则") - private String analysisRule; - - @Column(name = "IS_ANALYSIS") - @ApiParam("是否解析") - private String isAnalysis; - - @Column(name = "FEED_VALUE") - @ApiParam("反馈值") - private String feedValue; - - @Column(name = "OBJECT_CODE") - @ApiParam("对象代码") - private String objectCode; - - @Transient - @ApiParam("设备名称") - private String equipmentName; - - @Column(name = "TOOLING_CODE ") - @ApiParam("工装代码") - private String toolingCode; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProcess.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProcess.java deleted file mode 100644 index 752400b..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProcess.java +++ /dev/null @@ -1,39 +0,0 @@ -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 : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PROCESS") -@Api("工序") -public class MesProcess extends BaseBean implements Serializable { - private static final long serialVersionUID = -2619648674238082872L; - @Column(name = "PROCESS_CODE") - @ApiParam("工序代码") - private String processCode; - - @Column(name = "PROCESS_NAME") - @ApiParam("工序名称") - private String processName; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdBindRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdBindRecord.java deleted file mode 100644 index 8114387..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdBindRecord.java +++ /dev/null @@ -1,106 +0,0 @@ -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.ColumnDefault; -import org.hibernate.annotations.DynamicInsert; -import org.hibernate.annotations.DynamicUpdate; - -import javax.persistence.*; -import java.io.Serializable; - -/** - * @Description :产品绑定记录表 - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PROD_BIND_RECORD", indexes = { - @Index(columnList = "SERIAL_NUMBER"), - @Index(columnList = "KP_SN") -}) -@Api("产品绑定记录表") -public class MesProdBindRecord extends BaseBean implements Serializable { - private static final long serialVersionUID = -4319604821328717354L; - @Column(name = "SERIAL_NUMBER") - @ApiParam(value = "产品条码") - private String serialNumber; - - @Column(name = "PART_NO") - @ApiParam("产品条码零件号") - private String partNo; - - @Column(name = "WORK_ORDER_NO") - @ApiParam("工单号") - private String workOrderNo; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam(value = "工作中心") - private String workCenterCode; - - @Column(name = "WORK_CELL_CODE") - @ApiParam(value = "工作单元") - private String workCellCode; - - @Column(name = "STEP_CODE") - @ApiParam(value = "工步代码") - private String stepCode; - - @Column(name = "ITEM_PART_NO") - @ApiParam("原材料零件号") - private String itemPartNo; - - @Column(name = "KP_SN") - @ApiParam("原材料条码") - private String kpSn; - - @Column(name = "KP_QTY") - @ColumnDefault("0") - @ApiParam(value = "原材料数量", example = "0") - private Double kpQty; - - @Column(name = "SUPPLIER_CODE") - @ApiParam("供应商") - private String supplierCode; - - @Column(name = "LOT_NO") - @ApiParam("关联批次") - private String lotNo; - - @Column(name = "IS_FEED") - @ApiParam("是否投料配置") - private Integer isFeed; - - @Column(name = "VERSION") - @ApiParam("版本") - private String version; - - @Column(name = "RESULT") - @ApiParam(value = "结果") - private String result; - - @Column(name = "is_BIND_KEY") - @ApiParam(value = "是否绑定关键件") - private Integer isBindKey; - - @Column(name = "ACTION_TYPE") - @ApiParam(value = "动作类型") - private Integer actionType; - - public int getIsFeedVal() { - return this.isFeed == null ? 0 : this.isFeed; - } - - public double getQtyVal() { - return this.kpQty == null ? 0.0d : this.kpQty; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdCfg.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdCfg.java deleted file mode 100644 index 4ff20da..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdCfg.java +++ /dev/null @@ -1,44 +0,0 @@ -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 : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PROD_CFG") -@Api("产品配置") -public class MesProdCfg extends BaseBean implements Serializable { - private static final long serialVersionUID = 7487874316722319947L; - @Column(name = "PROD_CFG_CODE") - @ApiParam("产品配置代码") - private String prodCfgCode; - - @Column(name = "PROD_CFG_NAME") - @ApiParam("产品配置名称") - private String prodCfgName; - - @Column(name = "PROD_CFG_Type_CODE") - @ApiParam("产品配置类型代码") - private String prodCfgTypeCode; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdCfgDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdCfgDetail.java deleted file mode 100644 index fd4cf72..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdCfgDetail.java +++ /dev/null @@ -1,53 +0,0 @@ -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 javax.persistence.Transient; -import java.io.Serializable; - -/** - * @Description :产品配置明细 - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PROD_CFG_DETAIL") -@Api("产品配置明细") -public class MesProdCfgDetail extends BaseBean implements Serializable { - private static final long serialVersionUID = -8362302529703401583L; - @Column(name = "PROD_CFG_CODE") - @ApiParam("产品配置代码") - private String prodCfgCode; - - @Column(name = "PART_NO") - @ApiParam("零件号") - private String partNo; - - @Column(name = "IS_VIRTUAL") - @ApiParam("是否虚零件") - private Integer isVirtual; - - @Transient - @ApiParam("零件名称") - private String partName; - - public int getIsVirtualVal() { - return this.isVirtual == null ? 0 : this.isVirtual; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdPack.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdPack.java deleted file mode 100644 index a68bcec..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdPack.java +++ /dev/null @@ -1,69 +0,0 @@ -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; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/10/18 3:25 下午 - * @Description: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PROD_PACK") -@Api("产品包装关系") -public class MesProdPack extends BaseBean implements Serializable { - - private static final long serialVersionUID = -2621135811864108025L; - @Column(name = "PART_NO") - @ApiParam("物料号") - private String partNo; - - @Column(name = "CUSTOMER_CODE") - @ApiParam("客户代码") - private String customerCode; - - @Column(name = "PACK_SPEC") - @ApiParam("包装规格") - private String packSpec; - - @Column(name = "PROD_LABEL_TEMPLATE") - @ApiParam("产品标签模板") - private String prodLabelTemplate; - - @Column(name = "PACK_LABEL_TEMPLATE") - @ApiParam("包装标签模板") - private String packLabelTemplate; - - @Column(name = "PACK_LABEL_TEMPLATE2") - @ApiParam("包装标签模板2") - private String packLabelTemplate2; - - @Column(name = "PACK_LABEL_TEMPLATE3") - @ApiParam("包装标签模板3") - private String packLabelTemplate3; - - @Column(name = "PACK_LABEL_TEMPLATE4") - @ApiParam("包装标签模板4") - private String packLabelTemplate4; - - @Column(name = "PROD_CFG_TYPE") - @ApiParam("项目") - private String prodCfgType; - - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdRouteCfg.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdRouteCfg.java deleted file mode 100644 index 4e8c76d..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdRouteCfg.java +++ /dev/null @@ -1,45 +0,0 @@ -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 : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PROD_ROUTE_CFG") -@Api("产品类流程配置表") -public class MesProdRouteCfg extends BaseBean implements Serializable { - private static final long serialVersionUID = -3768632071281056796L; - @Column(name = "PART_NO") - @ApiParam("物料号") - private String partNo; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心代码") - private String workCenterCode; - - @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/MesProdRouteOptParam.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdRouteOptParam.java deleted file mode 100644 index 169af24..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdRouteOptParam.java +++ /dev/null @@ -1,71 +0,0 @@ -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 : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PROD_ROUTE_OPT_PARAM") -@Api("产品流程配置操作参数表") -public class MesProdRouteOptParam extends BaseBean implements Serializable { - private static final long serialVersionUID = -932364659894292000L; - @Column(name = "PROD_ROUTE_CFG_ID") - @ApiParam("产品流程ID") - private Long prodRouteCfgId; - - @Column(name = "ROUTE_CODE") - @ApiParam("流程代码") - private String routeCode; - - @Column(name = "PROCESS_CODE") - @ApiParam("工序代码") - private String processCode; - - @Column(name = "STEP_CODE") - @ApiParam("工步代码") - private String stepCode; - - @Column(name = "STEP_SEQ") - @ApiParam("工步顺序") - private Integer stepSeq; - - @Column(name = "PARAM_CODE") - @ApiParam("工步参数代码") - private String paramCode; - - @Column(name = "PARAM_VALUE") - @ApiParam("工步参数值") - private String paramValue; - - public long getProdRouteCfgIdVal() { - return this.prodRouteCfgId == null ? 0l : this.prodRouteCfgId; - } - - public int getStepSeq() { - return this.stepSeq == null ? 0 : this.stepSeq; - } - - public void setStepSeq(int stepSeq) { - this.stepSeq = stepSeq; - } -} 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 deleted file mode 100644 index 180b0df..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdScatterCfgBom.java +++ /dev/null @@ -1,55 +0,0 @@ -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/bean/MesProduceCategory.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCategory.java deleted file mode 100644 index 5520632..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCategory.java +++ /dev/null @@ -1,40 +0,0 @@ -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: Crish - * @CreateDate:2019-04-26-10:25 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PRODUCE_CATEGORY") -@Api("系统业务动作") -public class MesProduceCategory extends BaseBean implements Serializable { - - private static final long serialVersionUID = 4593983703007675620L; - @Column(name = "PRODUCE_CTGY_CODE") - @ApiParam("产品类型代码") - private String produceCategoryCode; - - @Column(name = "PRODUCE_CTGY_NAME") - @ApiParam("产品类型名称") - private String produceCategoryName; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCtgyPicture.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCtgyPicture.java deleted file mode 100644 index aeda2b0..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCtgyPicture.java +++ /dev/null @@ -1,56 +0,0 @@ -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 javax.persistence.Transient; -import java.io.Serializable; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\10\16 14:17 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PRODUCE_CTGY_PICTURE") -@Api("产品类型图片表") -public class MesProduceCtgyPicture extends BaseBean implements Serializable { - - private static final long serialVersionUID = -7223382567320219332L; - @Column(name = "PRODUCE_CTGY_CODE") - @ApiParam("产品类型代码") - private String produceCtgyCode; - - @Column(name = "SIDE_LOCATION") - @ApiParam("面位") - private String sideLocation; - - @Column(name = "FILE_ID") - @ApiParam("文件id") - private Long fileId; - - @Transient - @ApiParam("文件名称") - private String fileName; - - @Transient - @ApiParam("文件URL") - private String fileUrl; - - @ApiParam("图片URL") - private String pictureUrl; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java deleted file mode 100644 index 5e3440d..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java +++ /dev/null @@ -1,205 +0,0 @@ -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.*; -import java.io.Serializable; - -/** - * @Description: - * @Reference: - * @Author: Crish - * @CreateDate:2019-04-16-17:36 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PRODUCE_SN", indexes = { - @Index(columnList = "PRODUCT_SN"), - @Index(columnList = "CREATE_DATE_TIME") -}, uniqueConstraints = { - @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "SERIAL_NUMBER"}) - } -) -@Api("产品条码表") -public class MesProduceSn extends BaseBean implements Serializable { - - private static final long serialVersionUID = 6641051790330191326L; - - @Column(name = "SERIAL_NUMBER", nullable = false) - @ApiParam("过程条码") - private String serialNumber; - - @Column(name = "PRODUCT_SN") - @ApiParam("产品条码") - private String productSn; - - @Column(name = "PART_NO") - @ApiParam("物料号") - private String partNo; - - @Column(name = "PART_NAME_RDD") - @ApiParam("物料名称") - private String partNameRdd; - - @Column(name = "QTY") - @ApiParam("数量") - private Double qty; - - @Column(name = "QC_STATUS") - @ApiParam("质量状态") - private Integer qcStatus; - - @Column(name = "SN_STATUS") - @ApiParam("条码状态") - private Integer snStatus; - - @Column(name = "PRINT_COUNT") - @ApiParam("打印次数") - private Integer printCount; - - @Column(name = "PRINT_STATUS") - @ApiParam("打印状态") - private Integer printStatus; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("生产线") - private String workCenterCode; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工位") - private String workCellCode; - - @Column(name = "ROUTE_CODE") - @ApiParam("流程代码") - private String routeCode; - - @Column(name = "PROCESS_CODE") - @ApiParam("工序代码") - private String processCode; - - @Column(name = "NEXT_PROCESS_CODE") - @ApiParam("下一工序代码") - private String nextProcessCode; - - @Column(name = "IN_WC_TIME") - @ApiParam("进产线时间") - private String inWorkCenterTime; - - @Column(name = "OUT_WC_TIME") - @ApiParam("出产线时间") - private String outWorkCenterTime; - - @Column(name = "SHIPPING_TIME") - @ApiParam("发运时间") - private String shippingTime; - - @Column(name = "WORK_ORDER_NO") - @ApiParam("生产工单号") - private String workOrderNo; - - @Column(name = "CUST_SN") - @ApiParam("客户条码") - private String custSn; - - @Column(name = "CUST_PART_NO") - @ApiParam("客户零件号") - private String custPartNo; - - @Column(name = "CUST_CODE") - @ApiParam("客户代码") - private String custCode; - - @Column(name = "SN_TYPE") - @ApiParam("条码类型 10=正常 20=首检件") - private Integer snType; - - @Column(name = "TRAY_NO") - @ApiParam("托盘号") - private String trayNo; -// -// @Version -// @Column(name = "LOCK_VERSION") -// @ApiParam(value = "乐观锁", example = "1") -// public transient Integer lockVersion; - - @Transient - @ApiParam("返回信息") - private String resultMsg; - - @Column(name = "OPERATE_TYPE") - @ApiParam("操作类型") - private Integer operateType; - - @Transient - @ApiParam("下线时间开始") - private String outWorkCenterTimeStart; - - @Transient - @ApiParam("下线时间截止") - private String outWorkCenterTimeEnd; - - public double getQtyVal() { - return this.qty == null ? 0.0d : this.qty; - } - - public int getQcStatusVal() { - return this.qcStatus == null ? 0 : this.qcStatus; - } - - public int getSnStatusVal() { - return this.snStatus == null ? 0 : this.snStatus; - } - - public int getPrintCountVal() { - return this.printCount == null ? 0 : this.printCount; - } - - public int getPrintStatusVal() { - return this.printStatus == null ? 0 : this.printStatus; - } - - public int getSnTypeVal() { - return this.snType == null ? 0 : this.snType; - } - - @Override - public String toString() { - return "MesProduceSn{" + - "serialNumber='" + serialNumber + '\'' + - ", partNo='" + partNo + '\'' + - ", partNameRdd='" + partNameRdd + '\'' + - ", qty=" + qty + - ", qcStatus=" + qcStatus + - ", snStatus=" + snStatus + - ", printCount=" + printCount + - ", printStatus=" + printStatus + - ", workCenterCode='" + workCenterCode + '\'' + - ", workCellCode='" + workCellCode + '\'' + - ", routeCode='" + routeCode + '\'' + - ", processCode='" + processCode + '\'' + - ", nextProcessCode='" + nextProcessCode + '\'' + - ", inWorkCenterTime='" + inWorkCenterTime + '\'' + - ", outWorkCenterTime='" + outWorkCenterTime + '\'' + - ", shippingTime='" + shippingTime + '\'' + - ", workOrderNo='" + workOrderNo + '\'' + - ", custSn='" + custSn + '\'' + - ", custPartNo='" + custPartNo + '\'' + - ", snType=" + snType + - ", trayNo='" + trayNo + '\'' + - ", resultMsg='" + resultMsg + '\'' + - ", operateType=" + operateType + - ", outWorkCenterTimeStart='" + outWorkCenterTimeStart + '\'' + - ", outWorkCenterTimeEnd='" + outWorkCenterTimeEnd + '\'' + - '}'; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSnTravel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSnTravel.java deleted file mode 100644 index 5d8ce41..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSnTravel.java +++ /dev/null @@ -1,154 +0,0 @@ -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.*; -import java.io.Serializable; - -/** - * @Description : 产品条码履历实体类 - * @Reference : - * @Author : dragon.xu - * @CreateDate : 2019-05-29 16:22 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PRODUCE_SN_TRAVEL", indexes = { - @Index(columnList = "SERIAL_NUMBER"), - @Index(columnList = "PRODUCT_SN"), - @Index(columnList = "CREATE_DATE_TIME"), - @Index(columnList = "MODIFY_DATE_TIME") -}) -@Api("产品条码履历表") -public class MesProduceSnTravel extends BaseBean implements Serializable { - private static final long serialVersionUID = -1692487592284871549L; - @Column(name = "SERIAL_NUMBER") - @ApiParam("过程条码") - private String serialNumber; - - @Column(name = "PRODUCT_SN") - @ApiParam("产品条码") - private String productSn; - - @Column(name = "PART_NO") - @ApiParam("物料号") - private String partNo; - - @Column(name = "PART_NAME_RDD") - @ApiParam("物料名称") - private String partNameRdd; - - @Column(name = "QTY") - @ApiParam("数量") - private Double qty; - - @Column(name = "QC_STATUS") - @ApiParam("质量状态") - private Integer qcStatus; - - @Column(name = "SN_STATUS") - @ApiParam("条码状态") - private Integer snStatus; - - @Column(name = "PRINT_COUNT") - @ApiParam("打印次数") - private Integer printCount; - - @Column(name = "PRINT_STATUS") - @ApiParam("打印状态") - private Integer printStatus; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心代码") - private String workCenterCode; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工作单元代码") - private String workCellCode; - - @Column(name = "ROUTE_CODE") - @ApiParam("流程代码") - private String routeCode; - - @Column(name = "PROCESS_CODE") - @ApiParam("工序代码") - private String processCode; - - @Column(name = "NEXT_PROCESS_CODE") - @ApiParam("下一工序代码") - private String nextProcessCode; - - @Column(name = "IN_WC_TIME") - @ApiParam("进产线时间") - private String inWorkCenterTime; - - @Column(name = "OUT_WC_TIME") - @ApiParam("出产线时间") - private String outWorkCenterTime; - - @Column(name = "SHIPPING_TIME") - @ApiParam("发运时间") - private String shippingTime; - - @Column(name = "WORK_ORDER_NO") - @ApiParam("生产工单号") - private String workOrderNo; - - @Column(name = "CUST_SN") - @ApiParam("客户条码") - private String custSn; - - @Column(name = "CUST_CODE") - @ApiParam("客户代码") - private String custCode; - - @Column(name = "CUST_PART_NO") - @ApiParam("客户零件号") - private String custPartNo; - - @Column(name = "SN_TYPE") - @ApiParam("条码类型 10=正常（默认），20=首检件") - private Integer snType; - - @Column(name = "TRAY_NO") - @ApiParam("托盘号") - private String trayNo; - - @Column(name = "OPERATE_TYPE") - @ApiParam("操作类型") - private Integer operateType; - - @Transient - @ApiParam("返回信息") - private String resultMsg; - - public double getQtyVal() { - return this.qty == null ? 0.0d : this.qty; - } - - public int getQcStatusVal() { - return this.qcStatus == null ? 0 : this.qcStatus; - } - - public int getSnStatusVal() { - return this.snStatus == null ? 0 : this.snStatus; - } - - public int getPrintCountVal() { - return this.printCount == null ? 0 : this.printCount; - } - - public int getPrintStatusVal() { - return this.printStatus == null ? 0 : this.printStatus; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProductData.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProductData.java deleted file mode 100644 index 600bfc2..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProductData.java +++ /dev/null @@ -1,109 +0,0 @@ -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.*; -import java.io.Serializable; - -/** - * @Description :生产数据 - * @Reference : - * @Author : Wynne.Lu - * @CreateDate : 2019-10-17 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PRODUCT_DATA", indexes = { - @Index(columnList = "SERIAL_NUMBER"), - @Index(columnList = "PRODUCT_SN"), - @Index(columnList = "OBJECT_CODE"), - @Index(columnList = "MODIFY_DATE_TIME") -}) -@Api("生产数据") -public class MesProductData extends BaseBean implements Serializable { - private static final long serialVersionUID = -2365404168777050771L; - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心") - private String workCenterCode; - - @Column(name = "WORK_CENTER_NAME") - @ApiParam("工作中心名称") - private String workCenterName; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工作单元") - private String workCellCode; - - @Column(name = "WORK_CELL_NAME") - @ApiParam("工作单元名称") - private String workCellName; - - @Column(name = "SERIAL_NUMBER") - @ApiParam("产品条码") - private String serialNumber; - - @Column(name = "PRODUCT_SN") - @ApiParam("产品条码") - private String productSn; - - @Column(name = "PART_NO") - @ApiParam("物料号") - private String partNo; - - @Column(name = "PART_DESC") - @ApiParam("物料名称") - private String partDesc; - - @Column(name = "EQU_CODE") - @ApiParam("设备代码") - private String equCode; - - @Column(name = "EQU_NAME") - @ApiParam("设备名称") - private String equName; - - @Column(name = "OBJECT_CODE") - @ApiParam("对象代码") - private String objectCode; - - @Column(name = "OBJECT_NAME") - @ApiParam("对象名称") - private String objectName; - - @Column(name = "FIELD_CODE") - @ApiParam("字段代码") - private String fieldCode; - - @Column(name = "FIELD_NAME") - @ApiParam("字段名称") - private String fieldName; - - @Column(name = "FIELD_VALUE") - @ApiParam("字段值") - private String fieldValue; - - @Column(name = "ROW_NO") - @ApiParam("数据行号") - private String rowNo; - - @Column(name = "GROUP_NO") - @ApiParam("数据组号") - private String groupNo; - - @Lob - @Column(name = "LINE_DATA") - @ApiParam("生产数据") - private String lineData; - -} 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 deleted file mode 100644 index b1b3d8c..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProductEncodeCfg.java +++ /dev/null @@ -1,50 +0,0 @@ -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: wangjie - * @CreateDate:2019-04-16-17:36 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PRODUCT_ENCODE_CFG") -@Api("产品编码配置表") -public class MesProductEncodeCfg extends BaseBean implements Serializable { - - private static final long serialVersionUID = 6641051790330191326L; - - @Column(name = "CODE_TYPE") - @ApiParam("编码类型") - private Integer codeType; - - @Column(name = "MATCH_TYPE") - @ApiParam("匹配类型") - private Integer matchType; - - @Column(name = "MATCH_VALUE") - @ApiParam("匹配值") - private String matchValue; - - @Column(name = "RULE_CODE") - @ApiParam("编码规则代码") - private String ruleCode; - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckData.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckData.java deleted file mode 100644 index b5b9fa2..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckData.java +++ /dev/null @@ -1,107 +0,0 @@ -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.*; -import java.io.Serializable; -import java.util.List; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\10\12 16:33 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_QC_CHECK_DATA", indexes = { - @Index(columnList = "CREATE_DATE_TIME"), - @Index(columnList = "SN") -}) -@Api("质量过程检测数据") -public class MesQcCheckData extends BaseBean implements Serializable { - - private static final long serialVersionUID = 3600528549583720850L; - @Column(name = "CHECK_ID") - @ApiParam("检测id") - private String checkId; - - @Column(name = "PART_NO") - @ApiParam("物料编码") - private String partNo; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心代码") - private String workCenterCode; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工作单元代码") - private String workCellCode; - - @Column(name = "CHECK_TYPE") - @ApiParam("检测类型") - private Integer checkType; - - @Column(name = "CHECK_ITEM") - @ApiParam("检测项") - private String checkItem; - - @Column(name = "CHECK_STANDARD") - @ApiParam("检测标准") - private String checkStandard; - - @Column(name = "CHECK_GUIDE") - @ApiParam("检测指导") - private String checkGuide; - - @Column(name = "CHECK_FREQUENCY") - @ApiParam("频率") - private String checkFrequency; - - @Column(name = "CHECK_VALUE") - @ApiParam("检测值") - private String checkValue; - - @Column(name = "CHECK_RESULT") - @ApiParam("判定结果") - private String checkResult; - - @Column(name = "SN") - @ApiParam("产品条码") - private String sn; - - @Column(name = "QTY") - @ApiParam("产品数量") - private Integer qty; - - @Column(name = "MEMO") - @ApiParam("备注") - private String memo; - - @Column(name = "ORDER_NO") - @ApiParam("工单号") - private String orderNo; - - @Column(name = "CUST_CODE") - @ApiParam("客户代码") - private String custCode; - - @Transient - @ApiParam("产品条码") - private String serialNumber; - - @Transient - @ApiParam("过程质量检测数据") - private List mesQcCheckStandardList; - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckStandard.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckStandard.java deleted file mode 100644 index be9bfe8..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckStandard.java +++ /dev/null @@ -1,108 +0,0 @@ -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 javax.persistence.Transient; -import java.io.Serializable; -import java.util.List; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\10\12 14:46 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_QC_CHECK_STANDARD") -@Api("质量检测标准") -public class MesQcCheckStandard extends BaseBean implements Serializable { - - private static final long serialVersionUID = 1590320231495124712L; - @Column(name = "PART_NO") - @ApiParam("物料编码") - private String partNo; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心代码") - private String workCenterCode; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工作单元代码") - private String workCellCode; - - @Column(name = "CHECK_TYPE") - @ApiParam("检测类型") - private Integer checkType; - - @Column(name = "CHECK_ITEM") - @ApiParam("检测项") - private String checkItem; - - @Column(name = "CHECK_STANDARD") - @ApiParam("检测标准") - private String checkStandard; - - @Column(name = "CHECK_GUIDE") - @ApiParam("检测指导") - private String checkGuide; - - @Column(name = "CHECK_FREQUENCY") - @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; - - @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-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJis.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJis.java deleted file mode 100644 index 7d4bd81..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJis.java +++ /dev/null @@ -1,71 +0,0 @@ -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 javax.persistence.Transient; -import java.io.Serializable; - -/** - * @Description :JIS发运队列 - * @Reference : - * @Author : wangjie - * @CreateDate : 2019-12-24 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_QUEUE_JIS") -@Api("JIS发运队列") -public class MesQueueJis extends BaseBean implements Serializable { - - private static final long serialVersionUID = 8028683333028906395L; - @Column(name = "JIS_NO") - @ApiParam("主队列编号") - private String jisNo; - - @Column(name = "PROD_CFG_CODE") - @ApiParam("产品配置代码") - private String prodCfgCode; - - @Column(name = "VIN_CODE") - @ApiParam("vin") - private String vinCode; - - @Column(name = "CAR_NO") - @ApiParam("车号") - private String carNo; - - @Column(name = "SEQ") - @ApiParam("排序") - private Double seq; - - @Column(name = "STATUS") - @ApiParam("状态") - private Integer status; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心代码") - private String workCenterCode; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工作单元代码") - private String workCellCode; - - @Transient - @ApiParam("颜色") - private String color; - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJisDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJisDetail.java deleted file mode 100644 index ef3b7d1..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJisDetail.java +++ /dev/null @@ -1,62 +0,0 @@ -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 :JIS发运队列明细 - * @Reference : - * @Author : wangjie - * @CreateDate : 2019-12-24 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_QUEUE_JIS_DETAIL") -@Api("JIS发运队列明细") -public class MesQueueJisDetail extends BaseBean implements Serializable { - - private static final long serialVersionUID = 829273008952400763L; - @Column(name = "JIS_NO") - @ApiParam("主队列编号") - private String jisNo; - - @Column(name = "PROD_CFG_CODE") - @ApiParam("产品配置代码") - private String prodCfgCode; - - @Column(name = "PART_NO") - @ApiParam("物料号") - private String partNo; - - @Column(name = "PART_NAME_RDD") - @ApiParam("物料名称") - private String partNameRdd; - - @Column(name = "STATUS") - @ApiParam("状态") - private Integer status; - - @Column(name = "FINAL_STATUS") - @ApiParam("明细整体状态") - private Integer finalStatus; - - @Column(name = "SERIAL_NUMBER") - @ApiParam("产品条码") - private String serialNumber; - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrder.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrder.java deleted file mode 100644 index c8dcab7..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrder.java +++ /dev/null @@ -1,90 +0,0 @@ -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.*; -import java.io.Serializable; - -/** - * @Description: - * @Reference: - * @Author: Crish - * @CreateDate:2019-04-16-17:36 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_QUEUE_ORDER", indexes = { - @Index(columnList = "CUST_FLAG_NO") -}, uniqueConstraints = { - @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO"}) - } -) -@Api("生产队列主表") -public class MesQueueOrder extends BaseBean implements Serializable { - private static final long serialVersionUID = 6538031118299400711L; - @Column(name = "ORDER_NO", nullable = false) - @ApiParam("主队列编号") - private String orderNo; - - @Column(name = "VIN_CODE") - @ApiParam("Vin") - private String vinCode; - - @Column(name = "CUST_FLAG_NO") - @ApiParam("客户标识号") - private String custFlagNo; - - @Column(name = "PROD_CFG_CODE") - @ApiParam("产品配置代码") - private String prodCfgCode; - - @Column(name = "PROD_CFG_NAME_RDD") - @ApiParam("产品配置名称") - private String prodCfgNameRdd; - - @Column(name = "SEQ") - @ApiParam("排序") - private Double seq; - - @Column(name = "WORK_ORDER_NO") - @ApiParam("生产工单号") - private String workOrderNo; - - @Column(name = "STATUS") - @ApiParam("状态") - private Integer status; - - @Column(name = "CUST_PROD_LINE_CODE") - @ApiParam("客户产线代码") - private String custProdLineCode; - - @Column(name = "AREA_CODE") - @ApiParam("区域代码") - private String areaCode; - - @Transient - @ApiParam("起始车号") - private String custFlagNoStart; - - @Transient - @ApiParam("截至车号") - private String custFlagNoEnd; - - public int getStatusVal() { - return this.status == null ? 0 : this.status; - } - - public double getSeqVal() { - return this.seq == null ? 0.0d : this.seq; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.java deleted file mode 100644 index a266608..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.java +++ /dev/null @@ -1,103 +0,0 @@ -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.*; -import java.io.Serializable; - -/** - * @Description: - * @Reference: - * @Author: Crish - * @CreateDate:2019-04-16-17:36 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_QUEUE_ORDER_DETAIL", indexes = { - @Index(columnList = "ORDER_NO") -}, uniqueConstraints = { - @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO", "PART_NO"}) - } -) -@Api("生产队列明细") -public class MesQueueOrderDetail extends BaseBean implements Serializable { - private static final long serialVersionUID = 1548933241804083457L; - @Column(name = "ORDER_NO", nullable = false) - @ApiParam("主队列编号") - private String orderNo; - - @Column(name = "PART_NO", nullable = false) - @ApiParam("物料号") - private String partNo; - - @Column(name = "PART_NAME_RDD") - @ApiParam("物料名称") - private String partNameRdd; - - @Column(name = "SERIAL_NUMBER") - @ApiParam("产品条码") - private String serialNumber; - - @Column(name = "SEQ") - @ApiParam("队列明细序号") - private Double seq; - - @Column(name = "QTY") - @ApiParam("数量") - private Double qty; - - @Column(name = "STATUS") - @ApiParam("状态") - private Integer status; - - @Column(name = "WORK_TYPE") - @ApiParam("生产类型") - private String workType; - - @Column(name = "PRODUCE_CATEGORY_CODE") - @ApiParam("产品类型代码") - private String produceCategoryCode; - - @Column(name = "PRODUCE_CATEGORY_NAME_RDD") - @ApiParam("产品类型名称") - private String produceCategoryNameRdd; - - @Transient - @ApiParam("队列序号") - private Double queueSeq; - - public double getQueueSeqVal() { - return this.queueSeq == null ? 0.0d : this.queueSeq; - } - - public double getSeqVal() { - return this.seq == null ? 0.0d : this.seq; - } - - public double getQtyVal() { - return this.qty == null ? 0.0d : this.qty; - } - - 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-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRawPartSn.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRawPartSn.java deleted file mode 100644 index 3f3458c..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRawPartSn.java +++ /dev/null @@ -1,78 +0,0 @@ -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.Index; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description :mes系统业务动作 - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-12 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_RAW_PART_SN", indexes = {@Index(columnList = "RAW_SN")}) -@Api("原材料信息") -public class MesRawPartSn extends BaseBean implements Serializable { - private static final long serialVersionUID = 5504323561257182116L; - @Column(name = "PART_NO") - @ApiParam("物料号") - private String partNo; - - @Column(name = "PART_NAME") - @ApiParam("物料名称") - private String partName; - - @Column(name = "RAW_TYPE") - @ApiParam("原料类型") - private String rawType; - - @Column(name = "RAW_SN") - @ApiParam("原材料条码") - private String rawSn; - - @Column(name = "RAW_QTY") - @ApiParam("数量") - private Double rawQty; - - @Column(name = "LOT_NO") - @ApiParam("生产批次") - private String lotNo; - - @Column(name = "FIX_LOT_NO") - @ApiParam("特殊批次") - private String fixLotNo; - - @Column(name = "STATUS") - @ApiParam("原料状态") - private Integer status; - - @Column(name = "SUPPLIER_CODE") - @ApiParam("供应商代码") - private String supplierCode; - - public double getRawQtyVal() { - return this.rawQty == null ? 0l : this.rawQty; - } - - public int getStatusVal() { - return this.status == null ? 0 : this.status; - } - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRepair.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRepair.java deleted file mode 100644 index 785f350..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRepair.java +++ /dev/null @@ -1,44 +0,0 @@ -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 : crish - * @CreateDate : 2019-08-08 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_REPAIR") -@Api("维修") -public class MesRepair extends BaseBean implements Serializable { - private static final long serialVersionUID = -7520365696308295804L; - @Column(name = "REPAIR_CODE") - @ApiParam("维修代码") - private String repairCode; - - @Column(name = "REPAIR_NAME") - @ApiParam("维修名称") - private String repairName; - - @Column(name = "REPAIR_TYPE") - @ApiParam("维修类型") - private Integer repairType; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRepairRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRepairRecord.java deleted file mode 100644 index e6da731..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRepairRecord.java +++ /dev/null @@ -1,102 +0,0 @@ -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.*; -import java.io.Serializable; -import java.util.List; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\10\16 14:33 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_REPAIR_RECORD", indexes = { - @Index(columnList = "SERIAL_NUMBER"), - @Index(columnList = "CREATE_DATE_TIME") -}) -@Api("维修信息记录表") -public class MesRepairRecord extends BaseBean implements Serializable { - - private static final long serialVersionUID = -2453726410779076150L; - @Column(name = "SERIAL_NUMBER") - @ApiParam("产品条码") - private String serialNumber; - - @Column(name = "PART_NO") - @ApiParam("产品物料号") - private String partNo; - - @Column(name = "PART_NAME") - @ApiParam("物料名称") - private String partName; - - @Column(name = "DEFECT_CODE") - @ApiParam("缺陷代码") - private String defectCode; - - @Column(name = "DEFECT_NAME") - @ApiParam("缺陷名称") - private String defectName; - - @Column(name = "SIDE_LOCATION") - @ApiParam("产品面位") - private String sideLocation; - - @Column(name = "DEFECT_LOCATION") - @ApiParam("缺陷位置") - private String defectLocation; - - @Column(name = "REPAIR_CODE") - @ApiParam("维修代码") - private String repairCode; - - @Column(name = "REPAIR_NAME") - @ApiParam("维修名称") - private String repairName; - - @Column(name = "DC_CODE") - @ApiParam("缺陷原因代码") - private String dcCode; - - @Column(name = "DC_NAME") - @ApiParam("缺陷原因描述") - private String dcName; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("生产线") - private String workCenterCode; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工位") - private String workCellCode; - - @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-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRoute.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRoute.java deleted file mode 100644 index f8b2802..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRoute.java +++ /dev/null @@ -1,51 +0,0 @@ -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.Lob; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description :流程表 - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_ROUTE") -@Api("流程表") -public class MesRoute extends BaseBean implements Serializable { - private static final long serialVersionUID = -7622507229961050740L; - @Column(name = "ROUTE_CODE") - @ApiParam("流程代码") - private String routeCode; - - @Column(name = "ROUTE_NAME") - @ApiParam("流程名称") - private String routeName; - - @Column(name = "ROUTE_TYPE") - @ApiParam("流程类型 10-扫描类型 20-监控类型") - private Integer routeType; - - @Lob - @Column(name = "POSITION") - @ApiParam("GOJS位置") - private String position; - - -} 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 deleted file mode 100644 index 556d26f..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRouteProcess.java +++ /dev/null @@ -1,64 +0,0 @@ -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 : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_ROUTE_PROCESS") -@Api("流程工序关系") -public class MesRouteProcess extends BaseBean implements Serializable { - private static final long serialVersionUID = 3477334942090180010L; - - @Column(name = "ROUTE_CODE") - @ApiParam("流程代码") - private String routeCode; - - @Column(name = "PROCESS_CODE") - @ApiParam("工序代码") - private String processCode; - - @Column(name = "NEXT_PROCESS") - @ApiParam("下一工序") - private String nextProcess; - - @Column(name = "REPAIR_PROCESS") - @ApiParam("维修工序") - private String repairProcess; - - @Column(name = "SEQ") - @ApiParam("顺序") - private Integer seq; - - @Column(name = "IS_NECESSARY") - @ApiParam("是否必须") - private Integer isNecessary; - - public int getSeqVal() { - return this.seq == null ? 0 : this.seq; - } - - public int getIsNecessaryVal() { - return this.isNecessary == null ? 0 : this.isNecessary; - } -} 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 deleted file mode 100644 index 5907cec..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRouteProcessCell.java +++ /dev/null @@ -1,44 +0,0 @@ -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 : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_ROUTE_PROCESS_CELL") -@Api("工序工作单元对照") -public class MesRouteProcessCell extends BaseBean implements Serializable { - private static final long serialVersionUID = -703779336699805482L; - - @Column(name = "ROUTE_CODE") - @ApiParam("流程代码") - private String routeCode; - - @Column(name = "PROCESS_CODE") - @ApiParam("工序代码") - private String processCode; - - @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/MesScrap.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesScrap.java deleted file mode 100644 index a77b075..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesScrap.java +++ /dev/null @@ -1,45 +0,0 @@ -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 : crish - * @CreateDate : 2019-08-08 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_SCRAP") -@Api("报废原因") -public class MesScrap extends BaseBean implements Serializable { - private static final long serialVersionUID = -6202113707752178624L; - @Column(name = "SCRAP_CODE") - @ApiParam("报废代码") - private String scrapCode; - - @Column(name = "SCRAP_NAME") - @ApiParam("报废名称") - private String scrapName; - - @Column(name = "SCRAP_TYPE") - @ApiParam("报废类型") - private String scrapType; - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesScrapRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesScrapRecord.java deleted file mode 100644 index 97ac5d3..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesScrapRecord.java +++ /dev/null @@ -1,71 +0,0 @@ -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.Index; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\10\16 14:42 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_SCRAP_RECORD", indexes = { - @Index(columnList = "CREATE_DATE_TIME") -}) -@Api("报废信息记录表") -public class MesScrapRecord extends BaseBean implements Serializable { - - private static final long serialVersionUID = -8519832449647086195L; - @Column(name = "SERIAL_NUMBER") - @ApiParam("产品条码") - private String serialNumber; - - @Column(name = "PART_NO") - @ApiParam("产品物料号") - private String partNo; - - @Column(name = "PART_NAME") - @ApiParam("物料名称") - private String partName; - - @Column(name = "DEFECT_CODE") - @ApiParam("缺陷代码") - private String defectCode; - - @Column(name = "SCRAP_CODE") - @ApiParam("报废代码") - private String scrapCode; - - @Column(name = "SCRAP_NAME") - @ApiParam("报废名称") - private String scrapName; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("生产线") - private String workCenterCode; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工位") - private String workCellCode; - - @Column(name = "MEMO") - @ApiParam("备注") - private String memo; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShift.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShift.java deleted file mode 100644 index 13874ae..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShift.java +++ /dev/null @@ -1,68 +0,0 @@ -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 :mes系统业务动作 - * @Reference : - * @Author : crish - * @CreateDate : 2019-04-19 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_SHIFT") -@Api("班次信息") -public class MesShift extends BaseBean implements Serializable { - private static final long serialVersionUID = -1174268061355263705L; - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心代码") - private String workCenterCode; - - @Column(name = "SHIFT_CODE") - @ApiParam("班次代码") - private String shiftCode; - - @Column(name = "SHIFT_NAME") - @ApiParam("班次名称") - private String shiftName; - - @Column(name = "START_TIME") - @ApiParam("开班时间") - private String startTime; - - @Column(name = "END_TIME") - @ApiParam("下班时间") - private String endTime; - - @Column(name = "WORK_TIMES") - @ApiParam("作业时长") - private Double workTimes; - - @Column(name="SHIFT_SEQ") - @ApiParam("班次顺序") - private Integer shiftSeq; - - public int getShiftSeqVal() { - return this.shiftSeq == null ? 0 : this.shiftSeq; - } - - public double getWorkTimesVal() { - return this.workTimes == null ? 0.0d : this.workTimes; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShiftGroup.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShiftGroup.java deleted file mode 100644 index 7aac2d7..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShiftGroup.java +++ /dev/null @@ -1,47 +0,0 @@ -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: wangjie - * @CreateDate:2019-09-18-17:36 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_SHIFT_GROUP") -@Api("班组") -public class MesShiftGroup extends BaseBean implements Serializable { - private static final long serialVersionUID = 8962836866086379111L; - @Column(name = "GROUP_CODE") - @ApiParam("班组代码") - private String groupCode; - - @Column(name = "GROUP_NAME") - @ApiParam("班组名称") - private String groupName; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("产线") - private String workCenterCode; - - @Column(name = "SQUAD_LEADER") - @ApiParam("班长") - private String squadLeader; -} 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 deleted file mode 100644 index a7c1232..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShiftRest.java +++ /dev/null @@ -1,49 +0,0 @@ -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 :mes系统业务动作 - * @Reference : - * @Author : yiming.gu - * @CreateDate : 2019-05-20 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_SHIFT_REST") -@Api("班次休息信息") -public class MesShiftRest extends BaseBean implements Serializable { - private static final long serialVersionUID = -8712815093203320523L; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心代码") - private String workCenterCode; - - @Column(name = "SHIFT_CODE") - @ApiParam("班次代码") - private String shiftCode; - - @Column(name = "START_TIME") - @ApiParam("开始时间") - private String startTime; - - @Column(name = "REST_TIMES") - @ApiParam("休息时长") - private Double restTimes; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesSnPhotoRelation.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesSnPhotoRelation.java deleted file mode 100644 index b29fae0..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesSnPhotoRelation.java +++ /dev/null @@ -1,45 +0,0 @@ -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/18 0018 - 9:07 - */ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_SN_PHOTO_RELATION") -@Api("条码照片关系") -public class MesSnPhotoRelation extends BaseBean implements Serializable { - - private static final long serialVersionUID = -7732648131003455681L; - - @Column(name = "SERIAL_NUMBER") - @ApiParam("条码") - private String serialNumber; - - @Column(name = "PHOTO_PATH") - @ApiParam("照片路径") - private String photoPath; - - @Column(name = "PHOTO_NAME") - @ApiParam("照片名称") - private String photoName; - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStationBom.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStationBom.java deleted file mode 100644 index b376b32..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStationBom.java +++ /dev/null @@ -1,151 +0,0 @@ -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.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 java.io.Serializable; - -/** - * @Description :工序物料清单 - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_STATION_BOM") -@Api("工序物料清单") -public class MesStationBom extends BaseBean implements Serializable { - private static final long serialVersionUID = -4693067673094931011L; - @Column(name = "PART_NO") - @ApiParam("零件号") - private String partNo; - - @Column(name = "PART_NAME") - @ApiParam("产品物料名称") - private String partName; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心") - private String workCenterCode; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工作单元") - private String workCellCode; - - @Column(name = "ITEM_PART_NO") - @ApiParam("子零件") - private String itemPartNo; - - @Column(name = "ITEM_PART_NAME") - @ApiParam("原材料物料名称") - private String itemPartName; - - @Column(name = "QTY") - @ColumnDefault("0") - @ApiParam(value = "子零件数量", example = "0") - private Double qty; - - @Column(name = "IS_REPEAT") - @ApiParam(value = "是否可重复") - private Integer isRepeat; - - @Column(name = "IS_CHECK") - @ApiParam(value = "是否检查") - private Integer isCheck; - - @Column(name = "IS_FEED") - @ApiParam(value = "是否投料配置") - private Integer isFeed; - - @Column(name = "IS_BIND_KEY") - @ApiParam(value = "是否绑定关键件") - private Integer isBindKey; - - @Transient - @ApiParam(value = "绑定数量") - private Double boundQty; - - @Transient - @ApiParam("是否已绑定") - private Boolean isBind; - - @Transient - @ApiParam("显示颜色") - private String color; - - @Transient - @ApiParam("关键件代码") - private String keyBarCode; - - @Transient - @ApiParam("产品条码") - private String serialNumber; - - public double getBoundQtyVal() { - return this.boundQty == null ? 0.0d : this.boundQty; - } - - public double getQtyVal() { - return this.qty == null ? 0.0d : this.qty; - } - - public int getIsRepeatVal() { - return this.isRepeat == null ? 0 : this.isRepeat; - } - - public int getIsCheckVal() { - return this.isCheck == null ? 0 : this.isCheck; - } - - public boolean getIsBindVal() { - return this.isBind == null ? false : this.isBind; - } - - public int getIsFeedVal() { - return this.isFeed == null ? 0 : this.isFeed; - } - - @Override - public String toString() { - return "MesStationBom{" + - "partNo='" + partNo + '\'' + - ", itemPartNo='" + itemPartNo + '\'' + - ", qty=" + qty + - ", isRepeat=" + isRepeat + - ", isCheck=" + isCheck + - ", isFeed=" + isFeed + - ", isBind=" + isBind + - ", color='" + color + '\'' + - ", id=" + id + - ", organizeCode='" + organizeCode + '\'' + - ", isValid=" + isValid + - ", isDeleted=" + isDeleted + - ", createUser='" + createUser + '\'' + - ", createDatetime='" + createDatetime + '\'' + - ", modifyUser='" + modifyUser + '\'' + - ", modifyDatetime='" + modifyDatetime + '\'' + - ", createDateTimeStart='" + createDateTimeStart + '\'' + - ", createDateTimeEnd='" + createDateTimeEnd + '\'' + - ", modifyDateTimeStart='" + modifyDateTimeStart + '\'' + - ", modifyDateTimeEnd='" + modifyDateTimeEnd + '\'' + - ", orderByParam='" + orderByParam + '\'' + - ", ascOrDesc=" + ascOrDesc + - '}'; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStep.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStep.java deleted file mode 100644 index 0998015..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStep.java +++ /dev/null @@ -1,102 +0,0 @@ -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 javax.persistence.Transient; -import java.io.Serializable; - -/** - * @Description :工步 - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_STEP") -@Api("工步") -public class MesStep extends BaseBean implements Serializable { - private static final long serialVersionUID = -2157306767211269786L; - @Column(name = "STEP_CODE") - @ApiParam("工步代码") - private String stepCode; - - @Column(name = "STEP_NAME") - @ApiParam("工步名称") - private String stepName; - - @Column(name = "STEP_TEXT") - @ApiParam("工步描述") - private String stepText; - - @Column(name = "STEP_TYPE") - @ApiParam("工步类型") - private String stepType; - - @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-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStepParam.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStepParam.java deleted file mode 100644 index dd5a834..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStepParam.java +++ /dev/null @@ -1,47 +0,0 @@ -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 : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_STEP_PARAM") -@Api("工步参数") -public class MesStepParam extends BaseBean implements Serializable { - private static final long serialVersionUID = -147541368320233093L; - @Column(name = "STEP_CODE") - @ApiParam("工步代码") - private String stepCode; - - @Column(name = "PARAM_CODE") - @ApiParam("参数代码") - private String paramCode; - - @Column(name = "PARAM_NAME") - @ApiParam("参数名称") - private String paramName; - - @Column(name = "PARAM_ATTRIBUTE") - @ApiParam("参数属性") - private String paramAttribute; -} 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 deleted file mode 100644 index 0d30d54..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTime.java +++ /dev/null @@ -1,40 +0,0 @@ -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; - -@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-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 deleted file mode 100644 index b6071b9..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTorqueDetail.java +++ /dev/null @@ -1,97 +0,0 @@ -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 : 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-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 deleted file mode 100644 index 506ed2a..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTypeCfg.java +++ /dev/null @@ -1,48 +0,0 @@ -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: joke.wang - * @CreateDate: 2019\11\22 16:56 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@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; - - @Column(name = "TYPE_NAME") - @ApiParam("类型名称") - private String typeName; - - @Column(name = "BUSINESS_TYPE_CODE") - @ApiParam("业务类型代码") - private String businessTypeCode; - - @Column(name = "BUSINESS_TYPE_NAME") - @ApiParam("业务类型名称") - private String businessTypeName; -} 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 deleted file mode 100644 index a089f0a..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcCheck.java +++ /dev/null @@ -1,56 +0,0 @@ -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; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/9/21 1:45 PM - * @Description: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@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; - - @Column(name = "PART_NO") - @ApiParam("产品物料号") - private String partNo; - - @Column(name = "CHECK_TYPE") - @ApiParam("检查类型") - private String checkType; - - @Column(name = "CHECK_OBJ") - @ApiParam("检查对象") - private String checkObj; - - @Column(name = "CHECK_ITEM") - @ApiParam("检查项") - private String checkItem; - - @Column(name = "STANDARD") - @ApiParam("检查标准") - private String standard; - -} 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 deleted file mode 100644 index fbf5699..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcCheckRecord.java +++ /dev/null @@ -1,83 +0,0 @@ -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.Index; -import javax.persistence.Table; -import java.io.Serializable; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/9/21 1:57 PM - * @Description: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_WC_CHECK_RECORD", indexes = { - @Index(columnList = "CREATE_DATE_TIME") -}) -@Api("开线检查记录") -public class MesWcCheckRecord extends BaseBean implements Serializable { - private static final long serialVersionUID = -2173902677953303765L; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心") - private String workCenterCode; - - @Column(name = "WORK_ORDER") - @ApiParam("工单号") - private String workOrder; - - @Column(name = "PART_NO") - @ApiParam("产品物料号") - private String partNo; - - @Column(name = "CHECK_TYPE") - @ApiParam("检查类型") - private String checkType; - - @Column(name = "CHECK_OBJ") - @ApiParam("检查对象") - private String checkObj; - - @Column(name = "CHECK_ITEM") - @ApiParam("检查项") - private String checkItem; - - @Column(name = "STANDARD") - @ApiParam("检查标准") - private String standard; - - @Column(name = "CHECK_RESULT") - @ApiParam("检查结果") - private String checkResult; - - @Column(name = "CHECK_VALUE") - @ApiParam("检查值") - private String checkValue; - - @Column(name = "REASON") - @ApiParam("原因") - private String reason; - - @Column(name = "GROUP_CODE") - @ApiParam("组名") - private String groupCode; - - @Column(name = "OVERALL_RESULT") - @ApiParam("总体结果") - private Integer overAllResult; - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcEquipment.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcEquipment.java deleted file mode 100644 index feeef17..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcEquipment.java +++ /dev/null @@ -1,43 +0,0 @@ -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; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/9/24 2:31 PM - * @Description: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_WC_EQUIPMENT") -@Api("工作单元设备关系表") -public class MesWcEquipment extends BaseBean implements Serializable { - private static final long serialVersionUID = 2088600237918553286L; - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心代码") - private String workCenterCode; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工作单元代码") - private String workCellCode; - - @Column(name = "EQUIPMENT_CODE") - @ApiParam("设备代码") - private String equipmentCode; - -} 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 deleted file mode 100644 index e9bd56b..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCell.java +++ /dev/null @@ -1,64 +0,0 @@ -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 : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_WORK_CELL") -@Api("工作单元") -public class MesWorkCell extends BaseBean implements Serializable { - private static final long serialVersionUID = -493313481197504121L; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工作单元代码") - private String workCellCode; - - @Column(name = "WORK_CELL_NAME") - @ApiParam("工作单元名称") - private String workCellName; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心") - private String workCenterCode; - - @Column(name = "AREA_CODE") - @ApiParam("生产区域代码") - private String areaCode; - - @Column(name = "WORK_CELL_TYPE") - @ApiParam("工位类型") - private Integer workCellType; - - @Column(name = "SEQ") - @ApiParam("序号") - private Integer seq; - - @Column(name = "WORK_CELL_IP") - @ApiParam("工作单元IP") - private String workCellIp; - - @Column(name = "WORK_CELL_PORT") - @ApiParam("工作单元端口") - private String workCellPort; -} 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 deleted file mode 100644 index 2200ceb..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellMonitorLog.java +++ /dev/null @@ -1,64 +0,0 @@ -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.*; -import java.io.Serializable; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/10/16 2:42 PM - * @Description: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_WORK_CELL_MONITOR_LOG", indexes = { - @Index(columnList = "CREATE_DATE_TIME") -}) -@Api("工位监控异常信息") -public class MesWorkCellMonitorLog extends BaseBean implements Serializable { - private static final long serialVersionUID = -5634446206963213556L; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心") - private String workCenterCode; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工作单元") - private String workCellCode; - - @Column(name = "PART_NO") - @ApiParam("物料号") - private String partNo; - - @Column(name = "WORK_ORDER_NO") - @ApiParam("工单") - private String workOrderNo; - - @Column(name = "STEP_CODE") - @ApiParam("工步") - private String stepCode; - - @Column(name = "PROCESS_CODE") - @ApiParam("工序") - private String processCode; - - @Column(name = "ROUTE_CODE") - @ApiParam("流程") - private String routeCOde; - - @Lob - @Column(name = "MESSAGE") - @ApiParam("异常信息") - private String message; -} 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 deleted file mode 100644 index 2249726..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellParam.java +++ /dev/null @@ -1,48 +0,0 @@ -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 : wangjie - * @CreateDate : 2019-08-30 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@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; - - @Column(name = "PARAM_NAME") - @ApiParam("参数名称") - private String paramName; - - @Column(name = "PARAM_TYPE") - @ApiParam("参数类型") - private Integer paramType; - - @Column(name = "PARAM_MODEL") - @ApiParam("参数模式") - private Integer paramModel; -} 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 deleted file mode 100644 index a434107..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellParamCfg.java +++ /dev/null @@ -1,56 +0,0 @@ -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 : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_WORK_CELL_PARAM_CFG") -@Api("工作单元参数配置") -public class MesWorkCellParamCfg extends BaseBean implements Serializable { - private static final long serialVersionUID = 1739991089354361293L; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工作单元代码") - private String workCellCode; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心代码") - private String workCenterCode; - - @Column(name = "PARAM_CODE") - @ApiParam("参数代码") - private String paramCode; - - @Column(name = "PARAM_NAME") - @ApiParam("参数名称") - private String paramName; - - @Column(name = "PARAM_VALUE") - @ApiParam("参数值") - private String paramValue; - - @Column(name = "IS_CHECK") - @ApiParam("是否必须校验") - private Integer isCheck; -} 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 deleted file mode 100644 index 0329add..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellPoint.java +++ /dev/null @@ -1,56 +0,0 @@ -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 : dragon.xu - * @CreateDate : 2019-05-22 17:58 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@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; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工作单元代码") - private String workCellCode; - - @Column(name = "QUEUE_SEQ") - @ApiParam("队列主表序号") - private Double queueSeq; - - @Column(name = "QUEUE_DETAIL_SEQ") - @ApiParam("队列明细表序号") - private Double queueDetailSeq; - - public double getQueueSeqVal() { - return this.queueSeq == null ? 0 : this.queueSeq; - } - - public double getQueueDetailSeqVal() { - return this.queueDetailSeq == null ? 0 : this.queueDetailSeq; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellStatus.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellStatus.java deleted file mode 100644 index 5932327..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellStatus.java +++ /dev/null @@ -1,47 +0,0 @@ -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 : crish - * @CreateDate : 2019-06-04 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_WORK_CELL_STATUS") -@Api("工位运行状态") -public class MesWorkCellStatus extends BaseBean implements Serializable { - private static final long serialVersionUID = 102975351699481524L; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("产线") - private String workCenterCode; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工位") - private String workCellCode; - - @Column(name = "TIME_OUT_STATUS") - @ApiParam("超时状态") - private Integer timeOutStatus; - - -} 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 deleted file mode 100644 index 3d35275..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCenter.java +++ /dev/null @@ -1,57 +0,0 @@ -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 : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_WORK_CENTER") -@Api("工作中心") -public class MesWorkCenter extends BaseBean implements Serializable { - private static final long serialVersionUID = -1119897685621371682L; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心代码") - private String workCenterCode; - - @Column(name = "WORK_CENTER_NAME") - @ApiParam("工作中心名称") - private String workCenterName; - - @Column(name = "ERP_WORK_CENTER") - @ApiParam("ERP工作中心") - private String erpWorkCenter; - - @Column(name = "WORK_VER") - @ApiParam("工作版本") - private String workVer; - - @Column(name = "AREA_CODE") - @ApiParam("生产区域代码") - private String areaCode; - - @Column(name = "RUNNING_STATUS") - @ApiParam("运行状态") - private String runningStatus; - -} 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 deleted file mode 100644 index c4443eb..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java +++ /dev/null @@ -1,249 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.bean; - -import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.mes.pcn.model.MesButtonFlagModel; -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-04-16-17:36 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@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; - - @Column(name = "PART_NO", nullable = false) - @ApiParam("物料号") - private String partNo; - - @Column(name = "PART_NAME_RDD") - @ApiParam("物料名称") - private String partNameRdd; - - @Column(name = "PROD_CFG_CODE") - @ApiParam("产品配置代码") - private String prodCfgCode; - - @Column(name = "QTY") - @ApiParam("数量") - private Double qty; - - @Column(name = "COMPLETE_QTY") - @ApiParam("完成数量") - private Double completeQty; - - @Column(name = "REPAIR_QTY") - @ApiParam("返修数量") - private Double repairQty; - - @Column(name = "SCRAP_QTY") - @ApiParam("报废数量") - private Double scrapQty; - - @Column(name = "SEQ") - @ApiParam("工单序号") - private Double seq; - - @Column(name = "WO_STATUS") - @ApiParam("工单状态") - private Integer workOrderStatus; - - @Column(name = "WO_TYPE") - @ApiParam("工单类型") - private Integer workOrderType; - - @Column(name = "NEXT_ORDER") - @ApiParam("下一工单") - private String nextOrder; - - @Column(name = "PLAN_ORDER_NO") - @ApiParam("生产计划单号") - private String planOrderNo; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心代码") - private String workCenterCode; - - @Column(name = "AREA_CODE") - @ApiParam("区域代码") - private String areaCode; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工作单元代码") - private String workCellCode; - - @Column(name = "SCHEDULE_DATE") - @ApiParam("排产日期") - private String scheduleDate; - - @Column(name = "CUST_PROD_LINE_CODE") - @ApiParam("客户产线代码") - private String custProdLineCode; - - @Column(name = "SHIFT_CODE") - @ApiParam("班次") - private String shiftCode; - - @Column(name = "START_TIME") - @ApiParam("开始时间") - private String startTime; - - @Column(name = "END_TIME") - @ApiParam("结束时间") - private String endTime; - - @Column(name = "WO_SOURCE") - @ApiParam("工单来源") - private String workOrderSource; - - @Column(name = "MEMO") - @ApiParam("备注") - private String memo; - - @Column(name = "SHIFT_GROUP") - @ApiParam("班组") - private String shiftGroup; - - @Column(name = "APPROVAL_STATUS") - @ApiParam("审批状态") - private Integer approvalStatus; - - @Column(name = "CUST_CODE") - @ApiParam("客户代码") - private String custCode; - - @Column(name = "CUST_ORDER_NO") - @ApiParam("客户订单号") - private String custOrderNo; - - @Column(name = "FI_QTY") - @ApiParam("首检数量") - private Double fiQty; - - @Column(name = "FI_COMPLETE_QTY") - @ApiParam("首检完成数量") - private Double fiCompleteQty; - - @Column(name = "FI_GENERATE_QTY") - @ApiParam("首检生成数量") - private Double fiGenerateQty; - - @Version - @Column(name = "LOCK_VERSION") - @ApiParam(value = "乐观锁", example = "1") - public Integer lockVersion; - - /********************** 冗余字段 *********************************/ - @Transient - @ApiParam(value = "工作中心名称") - public String workCenterName; - - @Transient - @ApiParam(value = "工作单元名称") - public String workCellName; - - @Transient - @ApiParam(value = "客户产线名称") - public String custProdLineName; - - @Transient - @ApiParam(value = "班次名称") - public String shiftName; - - @Transient - @ApiParam(value = "班组名称") - public String shiftGroupName; - - @Transient - @ApiParam(value = "产品配置名称") - public String prodCfgName; - - @Transient - @ApiParam("区域代码名称") - private String areaCodeName; - - @Transient -// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value = "计划开始日期查询用，查询开始日期", example = "2018-12-31 23:59:59") - public String startTimeStart; - - - @Transient -// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value = "计划开始日期查询用，查询截至日期", example = "2018-12-31 23:59:59") - public String startTimeEnd; - - @Transient -// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value = "计划结束日期查询用，查询结束日期起始", example = "2018-12-31 23:59:59") - public String endTimeStart; - - @Transient -// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value = "计划结束日期查询用，查询结束日期截至", example = "2018-12-31 23:59:59") - public String endTimeEnd; - - @Transient - @ApiParam("mes生产工单页面按钮控制") - private MesButtonFlagModel mesButtonFlagModel; - - @Transient - @ApiParam("批量打包开窗页面查询工单=1") - private String pageType; - - public double getQtyVal() { - return this.qty == null ? 0.0d : this.qty; - } - - public double getCompleteQtyVal() { - return this.completeQty == null ? 0.0d : this.completeQty; - } - - public double getRepairQtyVal() { - return this.repairQty == null ? 0.0d : this.repairQty; - } - - public double getScrapQtyVal() { - return this.scrapQty == null ? 0.0d : this.scrapQty; - } - - public double getSeqVal() { - return this.seq == null ? 0.0d : this.seq; - } - - public int getWorkOrderStatusVal() { - return this.workOrderStatus == null ? 0 : this.workOrderStatus; - } - - public int getWorkOrderTypeVal() { - return this.workOrderType == null ? 0 : this.workOrderType; - } - - public int getApprovalStatusVal() { - return this.approvalStatus == null ? 0 : this.approvalStatus; - } -} 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 deleted file mode 100644 index caba23a..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrderLog.java +++ /dev/null @@ -1,231 +0,0 @@ -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.*; -import java.io.Serializable; - -/** - * @Description: - * @Reference: - * @Author: wangjie - * @CreateDate:2019-09-19-17:36 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "MES_WORK_ORDER_LOG", indexes = { - @Index(columnList = "ORDER_NO"), - @Index(columnList = "CREATE_DATE_TIME") -}) -@Api("生产工单日志") -public class MesWorkOrderLog extends BaseBean implements Serializable { - private static final long serialVersionUID = -7018645997937147427L; - - @Column(name = "ORDER_NO") - @ApiParam("工单号") - private String orderNo; - - @Column(name = "PART_NO") - @ApiParam("物料号") - private String partNo; - - @Column(name = "PART_NAME_RDD") - @ApiParam("物料名称") - private String partNameRdd; - - @Column(name = "PROD_CFG_CODE") - @ApiParam("产品配置代码") - private String prodCfgCode; - - @Column(name = "QTY") - @ApiParam("数量") - private Double qty; - - @Column(name = "COMPLETE_QTY") - @ApiParam("完成数量") - private Double completeQty; - - @Column(name = "REPAIR_QTY") - @ApiParam("返修数量") - private Double repairQty; - - @Column(name = "SCRAP_QTY") - @ApiParam("报废数量") - private Double scrapQty; - - @Column(name = "SEQ") - @ApiParam("工单序号") - private Double seq; - - @Column(name = "WO_STATUS") - @ApiParam("工单状态") - private Integer workOrderStatus; - - @Column(name = "WO_TYPE") - @ApiParam("工单类型") - private Integer workOrderType; - - @Column(name = "NEXT_ORDER") - @ApiParam("下一工单") - private String nextOrder; - - @Column(name = "PLAN_ORDER_NO") - @ApiParam("生产计划单号") - private String planOrderNo; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心代码") - private String workCenterCode; - - @Column(name = "AREA_CODE") - @ApiParam("区域代码") - private String areaCode; - - @Column(name = "WORK_CELL_CODE") - @ApiParam("工作单元代码") - private String workCellCode; - - @Column(name = "SCHEDULE_DATE") - @ApiParam("排产日期") - private String scheduleDate; - - @Column(name = "CUST_PROD_LINE_CODE") - @ApiParam("客户产线代码") - private String custProdLineCode; - - @Column(name = "SHIFT_CODE") - @ApiParam("班次") - private String shiftCode; - - @Column(name = "START_TIME") - @ApiParam("开始时间") - private String startTime; - - @Column(name = "END_TIME") - @ApiParam("结束时间") - private String endTime; - - @Column(name = "WO_SOURCE") - @ApiParam("工单来源") - private String workOrderSource; - - @Column(name = "MEMO") - @ApiParam("备注") - private String memo; - - @Column(name = "SHIFT_GROUP") - @ApiParam("班组") - private String shiftGroup; - - @Column(name = "APPROVAL_STATUS") - @ApiParam("审批状态") - private Integer approvalStatus; - - @Column(name = "CUST_CODE") - @ApiParam("客户代码") - private String custCode; - - @Column(name = "CUST_ORDER_NO") - @ApiParam("客户订单号") - private String custOrderNo; - - @Column(name = "FI_QTY") - @ApiParam("首检数量") - private Double fiQty; - - @Column(name = "FI_COMPLETE_QTY") - @ApiParam("首检完成数量") - private Double fiCompleteQty; - - @Column(name = "FI_GENERATE_QTY") - @ApiParam("首检生成数量") - private Double fiGenerateQty; - - /********************** 冗余字段 *********************************/ - @Transient - @ApiParam(value = "工作中心名称") - public String workCenterName; - - @Transient - @ApiParam(value = "工作单元名称") - public String workCellName; - - @Transient - @ApiParam(value = "客户产线名称") - public String custProdLineName; - - @Transient - @ApiParam(value = "班次名称") - public String shiftName; - - @Transient - @ApiParam(value = "班组名称") - public String shiftGroupName; - - @Transient - @ApiParam(value = "产品配置名称") - public String prodCfgName; - - @Transient -// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value = "计划开始日期查询用，查询开始日期", example = "2018-12-31 23:59:59") - public String startTimeStart; - - - @Transient -// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value = "计划开始日期查询用，查询截至日期", example = "2018-12-31 23:59:59") - public String startTimeEnd; - - @Transient -// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value = "计划结束日期查询用，查询结束日期起始", example = "2018-12-31 23:59:59") - public String endTimeStart; - - @Transient -// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value = "计划结束日期查询用，查询结束日期截至", example = "2018-12-31 23:59:59") - public String endTimeEnd; - - public double getQtyVal() { - return this.qty == null ? 0.0d : this.qty; - } - - public double getCompleteQtyVal() { - return this.completeQty == null ? 0.0d : this.completeQty; - } - - public double getRepairQtyVal() { - return this.repairQty == null ? 0.0d : this.repairQty; - } - - public double getScrapQtyVal() { - return this.scrapQty == null ? 0.0d : this.scrapQty; - } - - public double getSeqVal() { - return this.seq == null ? 0.0d : this.seq; - } - - public int getWorkOrderStatusVal() { - return this.workOrderStatus == null ? 0 : this.workOrderStatus; - } - - public int getWorkOrderTypeVal() { - return this.workOrderType == null ? 0 : this.workOrderType; - } - - public int getApprovalStatusVal() { - return this.approvalStatus == null ? 0 : this.approvalStatus; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ActionRequestBean.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ActionRequestBean.java deleted file mode 100644 index 3306bbf..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ActionRequestBean.java +++ /dev/null @@ -1,38 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - -import io.swagger.annotations.ApiParam; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; -import java.util.Map; - -/** - * @Description : 动作请求参数 - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-12 - * @Modify: - **/ -@Data -public class ActionRequestBean implements Serializable { - - @ApiParam("事件代码") - @Deprecated - public String eventCode; - - @ApiParam("按钮代码") - public String buttonCode; - - @ApiParam("单个结果") - public Obj resultObject; - - @ApiParam("List请求集") - public List resultList; - - @ApiParam("Map请求集") - public Map resultMap; - - @ApiParam("目的状态") - private Integer destStatus; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/AttrBean.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/AttrBean.java deleted file mode 100644 index bfdcf1f..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/AttrBean.java +++ /dev/null @@ -1,17 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ButtonBean.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ButtonBean.java deleted file mode 100644 index 5919ee5..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ButtonBean.java +++ /dev/null @@ -1,22 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/DataAcquisitionModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/DataAcquisitionModel.java deleted file mode 100644 index f70aaaa..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/DataAcquisitionModel.java +++ /dev/null @@ -1,35 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.Data; - -/** - * @Description : - * @Reference : - * @Author : 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-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/DefectModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/DefectModel.java deleted file mode 100644 index 83a9451..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/DefectModel.java +++ /dev/null @@ -1,49 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesDefect; -import io.swagger.annotations.ApiParam; -import lombok.Data; - -import 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-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/EsopFileModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/EsopFileModel.java deleted file mode 100644 index ac086ba..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/EsopFileModel.java +++ /dev/null @@ -1,26 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - - -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesEsop; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesFile; -import io.swagger.annotations.Api; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/12/4 3:09 下午 - * @Description: - **/ -@Data -@NoArgsConstructor -@AllArgsConstructor -@Api("FastDfs文件model") -public class EsopFileModel { - - private MesEsop esop; - - private MesFile file; - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/FastDfsDownloadModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/FastDfsDownloadModel.java deleted file mode 100644 index 418ab92..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/FastDfsDownloadModel.java +++ /dev/null @@ -1,31 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/8/19 7:00 PM - * @Description: - **/ - -@Data -@NoArgsConstructor -@AllArgsConstructor -@Api("FastDfs文件model") -public class FastDfsDownloadModel { - - @ApiParam("部分相对路径") - private String dirPath; - - @ApiParam("文件名称") - private String fileName; - - @ApiParam("文件字节") - private byte[] fileByte; - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/GenSerialNoModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/GenSerialNoModel.java deleted file mode 100644 index fd91386..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/GenSerialNoModel.java +++ /dev/null @@ -1,72 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/8/23 11:42 AM - * @Description: - **/ - -@Data -@NoArgsConstructor -@AllArgsConstructor -@Api("生成条码模型") -public class GenSerialNoModel { - - @ApiParam("规则代码") - private String ruleCode; - - @ApiParam("规则描述") - private String ruleDesc; - - @ApiParam("物料号") - private String partNo; - - @ApiParam("客户物料号") - private String custPartNo; - - @ApiParam("客户代码") - private String custCode; - - @ApiParam("过程条码") - private String serialNumber; - - @ApiParam("产地") - private String prodLocation; - - @ApiParam("前缀") - private String prefix; - - @ApiParam("编码规则") - private String numberRule; - - @ApiParam("序号长度") - private Integer serialnoLength; - - @ApiParam("增量") - private Integer serialnoIncrement; - - @ApiParam("最大值后循环") - private Integer isCycle; - - @ApiParam("当前编号前缀") - private String currentNumberPrefix; - - @ApiParam("当前序号") - private Integer currentSerialno; - - @ApiParam("当前编号") - private String currentNumber; - - - public GenSerialNoModel(String ruleCode) { - this.ruleCode = ruleCode; - } - -} 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 deleted file mode 100644 index 7883204..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesButtonFlagModel.java +++ /dev/null @@ -1,57 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serializable; - -/** - * @Author: wangjie - * @CreateDate: 2019/8/21 9:19 AM - * @Description: - **/ -@Data -@NoArgsConstructor -@AllArgsConstructor -@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; - - @ApiParam("暂停按钮") - private boolean suspendButton; - - @ApiParam("取消按钮") - private boolean revokeButton; - - @ApiParam("关闭按钮") - private boolean closeButton; - - @ApiParam("完成按钮") - private boolean completeButton; - - @ApiParam("关闭按钮-提醒") - private boolean closeButtonNoticeFlag; - - @ApiParam("维修任务按钮") - private boolean repairButton; - - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesDefectModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesDefectModel.java deleted file mode 100644 index 57ba538..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesDefectModel.java +++ /dev/null @@ -1,35 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesDefect; -import io.swagger.annotations.ApiParam; -import lombok.Data; - -import javax.persistence.Transient; -import java.util.List; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\10\24 22:04 - * @Modify: - **/ -@Data -public class MesDefectModel { - - private String defectCode; - - @ApiParam("缺陷名称") - private String defectName; - - @ApiParam("缺陷类型") - private String defectType; - - @Transient - @ApiParam("缺陷类型名称") - private String defectTypeName; - - @Transient - @ApiParam("缺陷分类子集") - private List mesDefectList; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProdBindRecordModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProdBindRecordModel.java deleted file mode 100644 index 1487bb8..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProdBindRecordModel.java +++ /dev/null @@ -1,125 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - -import io.swagger.annotations.ApiParam; -import lombok.Data; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\10\24 22:05 - * @Modify: - **/ -@Data -public class MesProdBindRecordModel { - private Long id; - private String itemPartNo; - private String itemPartName; - private Double qty; - private Integer isValid; - private Integer isDeleted; - private String organizeCode; - private Integer isFeed; - private String workCenterCode; - private String workCellCode; - private String kpSn; - @ApiParam("拆解数") - private Double dismantleQty; - - @ApiParam("产品物料编码") - private String parentPartNo; - @ApiParam("产品物料名称") - private String parentPartName; - @ApiParam("合格数") - private Integer okQty; - @ApiParam("缺失数") - private Integer missQty; - @ApiParam("报废数") - private Integer scrapQty; - @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-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesStationBomModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesStationBomModel.java deleted file mode 100644 index e6504ec..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesStationBomModel.java +++ /dev/null @@ -1,75 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - -import io.swagger.annotations.ApiParam; -import lombok.Data; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\10\24 22:04 - * @Modify: - **/ -@Data -public class 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-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/PLCInteracticeModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/PLCInteracticeModel.java deleted file mode 100644 index f3b4227..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/PLCInteracticeModel.java +++ /dev/null @@ -1,50 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - - -import io.swagger.annotations.Api; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.util.Map; - -/** - * @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/PcsObserverStatusModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/PcsObserverStatusModel.java deleted file mode 100644 index ed2bc6c..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/PcsObserverStatusModel.java +++ /dev/null @@ -1,25 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * @author Wynne.Lu - * @date 2020/2/21 17:20 - * @desc - */ -@Data -@NoArgsConstructor -@AllArgsConstructor -@Api("工位监控观察者对象") -public class PcsObserverStatusModel { - - @ApiParam("产线") - private String workCenterCode; - - @ApiParam("运行状况") - private Boolean runningStatus; -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProdPackageModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProdPackageModel.java deleted file mode 100644 index ba753cc..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProdPackageModel.java +++ /dev/null @@ -1,78 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - - -import cn.estsh.i3plus.pojo.mes.pcn.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-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProductDataModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProductDataModel.java deleted file mode 100644 index 727e482..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProductDataModel.java +++ /dev/null @@ -1,24 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QcCheckStandardModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QcCheckStandardModel.java deleted file mode 100644 index f2ec4a3..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QcCheckStandardModel.java +++ /dev/null @@ -1,25 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - -import cn.estsh.i3plus.pojo.mes.pcn.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-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueJisModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueJisModel.java deleted file mode 100644 index bdb5567..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueJisModel.java +++ /dev/null @@ -1,90 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueOrderModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueOrderModel.java deleted file mode 100644 index e641bcf..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueOrderModel.java +++ /dev/null @@ -1,82 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.Data; - -import javax.persistence.Transient; -import java.io.Serializable; - -/** - * @Description : JIT队列列表Model - * @Reference : - * @Author : dragon.xu - * @CreateDate : 2019-05-22 16:34 - * @Modify: - **/ -@Data -@Api("JIT队列列表Model") -public class QueueOrderModel implements Serializable { - private Long id; - @ApiParam("队列序号") - public Double queueSeq; - @ApiParam("队列明细序号") - public Double queDetailSeq; - @ApiParam("客户标识号") - public String custFlagNo; - @ApiParam("产品配置名称") - public String prodCfgNameRdd; - @ApiParam("产品类型名称") - public String categoryNameRdd; - @ApiParam("产品条码") - public String serialNumber; - @ApiParam("物料号") - public String partNo; - @ApiParam("物料名称") - public String partNameRdd; - @ApiParam("条码状态") - public Integer snStatus; - @ApiParam("生产类型") - public String workType; - @Transient - @ApiParam("显示颜色") - private String color; - @ApiParam("工厂代码") - private String organizeCode; - @ApiParam("展示行数") - private Integer prodNum; - @ApiParam("产线") - private String workCenterCode; - @ApiParam("工位") - private String workCellCode; - - public QueueOrderModel() { - } - - 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; - } - public QueueOrderModel(Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, - String partNo, String partNameRdd, String workType) { - this.id = id; - this.queueSeq = queueSeq; - this.queDetailSeq = queDetailSeq; - this.custFlagNo = custFlagNo; - this.prodCfgNameRdd = prodCfgNameRdd; - this.categoryNameRdd = categoryNameRdd; - this.partNo = partNo; - this.partNameRdd = partNameRdd; - this.workType = workType; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/RequestModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/RequestModel.java deleted file mode 100644 index 231b12c..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/RequestModel.java +++ /dev/null @@ -1,151 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - -import cn.estsh.i3plus.pojo.mes.pcn.bean.*; - -import java.util.List; - -/** - * @Description: 生产计划，生产队列，生产工单的复杂请求数据结构的统一请求模型 - * @Reference: - * @Author: Crish - * @CreateDate:2019-04-29-11:58 - * @Modify: - **/ -public class RequestModel { - - private List mesDefectRecordList; // 不良/缺陷记录数据集 - - private List mesRepairRecordList; // 维修记录数据集 - - private List dismantleRecordList; // 拆解记录数据集 - - private List workOrderList; // 工单数据集 - - private List partList; // 物料数据集 - - private List queueOrderList; // 生产队列数据集 - - private Double currentSeq; // 生产队列中的当前序列号 - - private Double nextSeq; // 生产队列中的下一个序列号 - - private Integer srcStatus; // 源状态 - - private Integer destStatus; // 目的状态 - - private List orderNoList;//工单编号 - - private ActionRequestBean actionRequestBean;//工单状态 - - public RequestModel(List queueOrderList, Double currentSeq, Double nextSeq) { - this.queueOrderList = queueOrderList; - this.currentSeq = currentSeq; - this.nextSeq = nextSeq; - } - - public RequestModel(List queueOrderList, Integer srcStatus, Integer destStatus) { - this.queueOrderList = queueOrderList; - this.srcStatus = srcStatus; - this.destStatus = destStatus; - } - - public RequestModel(List workOrderList, List partList) { - this.workOrderList = workOrderList; - 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; - } - - public RequestModel() { - } - - public void setWorkOrderList(List workOrderList) { - this.workOrderList = workOrderList; - } - - public List getPartList() { - return partList; - } - - public void setPartList(List partList) { - this.partList = partList; - } - - public List getQueueOrderList() { - return queueOrderList; - } - - public void setQueueOrderList(List queueOrderList) { - this.queueOrderList = queueOrderList; - } - - public void setOrderNoList(List orderNoList) { - this.orderNoList = orderNoList; - } - - public List getOrderNoList() { - return orderNoList; - } - - public void setActionRequestBean(ActionRequestBean actionRequestBean) { this.actionRequestBean = actionRequestBean; } - - public ActionRequestBean getActionRequestBean() { return actionRequestBean; } - - public Double getCurrentSeq() { - return currentSeq == null ? 0.0d : currentSeq; - } - - public void setCurrentSeq(Double currentSeq) { - this.currentSeq = currentSeq; - } - - public Double getNextSeq() { - return nextSeq == null ? 0.0d : nextSeq; - } - - public void setNextSeq(Double nextSeq) { - this.nextSeq = nextSeq; - } - - public Integer getSrcStatus() { - return srcStatus == null ? 0 : srcStatus; - } - - public void setSrcStatus(Integer srcStatus) { - this.srcStatus = srcStatus; - } - - public Integer getDestStatus() { - return destStatus == null ? 0 : destStatus; - } - - public void setDestStatus(Integer destStatus) { - this.destStatus = destStatus; - } -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/SnPrintDataModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/SnPrintDataModel.java deleted file mode 100644 index 831a997..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/SnPrintDataModel.java +++ /dev/null @@ -1,27 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - -import cn.estsh.i3plus.pojo.mes.pcn.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-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/SnPrintModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/SnPrintModel.java deleted file mode 100644 index 0f1d4a6..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/SnPrintModel.java +++ /dev/null @@ -1,27 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.Data; - -/** - * @Description: 打印信息汇总 - * @Reference: - * @Author: 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-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationBomModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationBomModel.java deleted file mode 100644 index e894595..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationBomModel.java +++ /dev/null @@ -1,29 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - - -import cn.estsh.i3plus.pojo.mes.pcn.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-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationResultBean.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationResultBean.java deleted file mode 100644 index 978fd4b..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationResultBean.java +++ /dev/null @@ -1,55 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepParamsModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepParamsModel.java deleted file mode 100644 index 7b2296f..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepParamsModel.java +++ /dev/null @@ -1,29 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; -import java.util.Map; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/11/12 3:50 下午 - * @Description: 下拉工步参数对象 - **/ -@Data -@Api("下拉工步参数对象") -public class StepParamsModel implements Serializable { - private static final long serialVersionUID = -6361645141217616499L; - - @ApiParam("参数代码") - private String paramCode; - - @ApiParam("参数代码") - private Map paramValues; - - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepPrintSnModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepPrintSnModel.java deleted file mode 100644 index c7f4937..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepPrintSnModel.java +++ /dev/null @@ -1,79 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProduceSn; -import com.fasterxml.jackson.annotation.JsonInclude; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.Data; - -import java.beans.Transient; -import java.util.List; - -/** - * @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-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepResult.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepResult.java deleted file mode 100644 index ab30bd7..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepResult.java +++ /dev/null @@ -1,69 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/TorqueModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/TorqueModel.java deleted file mode 100644 index ad0541e..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/TorqueModel.java +++ /dev/null @@ -1,71 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/WcCheckModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/WcCheckModel.java deleted file mode 100644 index e1e1c93..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/WcCheckModel.java +++ /dev/null @@ -1,63 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; - - -import cn.estsh.i3plus.pojo.base.enumutil.MesPcnEnumUtil; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWcCheckRecord; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.util.*; - -/** - * @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-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/IfDismantleRecordRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/IfDismantleRecordRepository.java deleted file mode 100644 index 02bca6e..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/IfDismantleRecordRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -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.IfDismantleRecord; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\11\15 14:14 - * @Modify: - **/ -public interface IfDismantleRecordRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/IfPackageDetailRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/IfPackageDetailRepository.java deleted file mode 100644 index 9a4d6be..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/IfPackageDetailRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -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.IfPackageDetail; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\11\15 17:47 - * @Modify: - **/ -public interface IfPackageDetailRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/IfProductOffLineRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/IfProductOffLineRepository.java deleted file mode 100644 index 9d362f1..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/IfProductOffLineRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -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.IfProductOffLine; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\11\15 17:48 - * @Modify: - **/ -public interface IfProductOffLineRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesActionIfRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesActionIfRepository.java deleted file mode 100644 index 5f1dbef..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesActionIfRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -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.MesActionIf; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\11\15 11:21 - * @Modify: - **/ -public interface MesActionIfRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesActionMethodRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesActionMethodRepository.java deleted file mode 100644 index d5e2954..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesActionMethodRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -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.MesActionMethod; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesActionMethodRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesActionRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesActionRepository.java deleted file mode 100644 index 80cb307..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesActionRepository.java +++ /dev/null @@ -1,17 +0,0 @@ -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.MesAction; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesActionRepository extends BaseRepository { - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesAreaRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesAreaRepository.java deleted file mode 100644 index c91b713..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesAreaRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -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.MesArea; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesAreaRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesBomRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesBomRepository.java deleted file mode 100644 index 42b5b30..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesBomRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -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.MesBom; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesBomRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCellFeedRecordRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCellFeedRecordRepository.java deleted file mode 100644 index 6153d23..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCellFeedRecordRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -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.MesCellFeedRecord; - -/** - * @Description : 工位投料履历持久化类 - * @Reference : - * @Author : siliter.yuan - * @CreateDate : 2020-06-17 09:53 - * @Modify: - **/ -public interface MesCellFeedRecordRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCellFeedRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCellFeedRepository.java deleted file mode 100644 index 462dff4..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCellFeedRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -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.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-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesConfigRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesConfigRepository.java deleted file mode 100644 index 6b43fa6..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesConfigRepository.java +++ /dev/null @@ -1,17 +0,0 @@ -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.MesArea; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesConfig; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : crish - * @CreateDate : 2019-06-04 - * @Modify: - **/ -@Repository -public interface MesConfigRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCustProdLineRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCustProdLineRepository.java deleted file mode 100644 index cbca918..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCustProdLineRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -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.MesCustProdLine; -import org.springframework.stereotype.Repository; - -/** - * @Description: - * @Reference: - * @Author: Crish - * @CreateDate:2019-04-19-11:15 - * @Modify: - **/ -@Repository -public interface MesCustProdLineRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCustomerPartRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCustomerPartRepository.java deleted file mode 100644 index 72e72bc..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCustomerPartRepository.java +++ /dev/null @@ -1,17 +0,0 @@ -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.MesCustomerPart; -import org.springframework.stereotype.Repository; - -/** - * @Description: - * @Reference: - * @Author: yiming.gu - * @CreateDate:2019-05-20 - * @Modify: - **/ -@Repository -public interface MesCustomerPartRepository extends BaseRepository { - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCustomerRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCustomerRepository.java deleted file mode 100644 index c006be6..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCustomerRepository.java +++ /dev/null @@ -1,17 +0,0 @@ -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.MesCustomer; -import org.springframework.stereotype.Repository; - -/** - * @Description: - * @Reference: - * @Author: Crish - * @CreateDate:2019-04-22-16:12 - * @Modify: - **/ -@Repository -public interface MesCustomerRepository extends BaseRepository { - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDataObjectRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDataObjectRepository.java deleted file mode 100644 index d285a59..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDataObjectRepository.java +++ /dev/null @@ -1,13 +0,0 @@ -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.MesDataObject; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/9/27 1:59 PM - * @Description: - **/ -public interface MesDataObjectRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDatasourceRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDatasourceRepository.java deleted file mode 100644 index 36faed5..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDatasourceRepository.java +++ /dev/null @@ -1,13 +0,0 @@ -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.MesDatasource; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/9/27 1:58 PM - * @Description: - **/ -public interface MesDatasourceRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDefectCauseRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDefectCauseRepository.java deleted file mode 100644 index c0ecd89..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDefectCauseRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -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.MesDefectCause; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\10\16 20:04 - * @Modify: - **/ -public interface MesDefectCauseRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDefectRecordRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDefectRecordRepository.java deleted file mode 100644 index c8a7a7b..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDefectRecordRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -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.MesDefectRecord; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\10\16 20:05 - * @Modify: - **/ -public interface MesDefectRecordRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDefectRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDefectRepository.java deleted file mode 100644 index 274f334..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDefectRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -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.MesDefect; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\10\16 20:04 - * @Modify: - **/ -public interface MesDefectRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDismantleRecordRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDismantleRecordRepository.java deleted file mode 100644 index e093fe2..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDismantleRecordRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -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.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-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEquipmentRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEquipmentRepository.java deleted file mode 100644 index 9d54073..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEquipmentRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -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.MesEquipment; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesEquipmentRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEsopRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEsopRepository.java deleted file mode 100644 index 103e176..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEsopRepository.java +++ /dev/null @@ -1,17 +0,0 @@ -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.MesEsop; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : wynne.lu - * @CreateDate : 2019-07-30 - * @Modify: - **/ -@Repository -public interface MesEsopRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEventActionRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEventActionRepository.java deleted file mode 100644 index 6b15531..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEventActionRepository.java +++ /dev/null @@ -1,17 +0,0 @@ -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.MesEventAction; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesEventActionRepository extends BaseRepository { - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEventRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEventRepository.java deleted file mode 100644 index cfa330f..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEventRepository.java +++ /dev/null @@ -1,17 +0,0 @@ -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.MesEvent; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesEventRepository extends BaseRepository { - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesFiCfgRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesFiCfgRepository.java deleted file mode 100644 index 0050530..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesFiCfgRepository.java +++ /dev/null @@ -1,17 +0,0 @@ -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.MesFiCfg; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : wangjie - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesFiCfgRepository extends BaseRepository { - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesFileRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesFileRepository.java deleted file mode 100644 index 16383bc..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesFileRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -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.MesFile; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : wynne.lu - * @CreateDate : 2019-07-30 - * @Modify: - **/ -@Repository -public interface MesFileRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesKpDataRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesKpDataRepository.java deleted file mode 100644 index da57b4f..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesKpDataRepository.java +++ /dev/null @@ -1,17 +0,0 @@ -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.MesArea; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesKpData; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : crish - * @CreateDate : 2019-05-15 - * @Modify: - **/ -@Repository -public interface MesKpDataRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesKpsnRuleRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesKpsnRuleRepository.java deleted file mode 100644 index 373ab6d..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesKpsnRuleRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -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.MesKpsnRule; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesKpsnRuleRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesLabelTemplateParamRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesLabelTemplateParamRepository.java deleted file mode 100644 index ce73083..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesLabelTemplateParamRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -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.MesLabelTemplateParam; - -/** - * @Description : 打印模板 - * @Reference : - * @Author : crish - * @Date : 2019-08-18 12:03:01.024 - * @Modify : - **/ -public interface MesLabelTemplateParamRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesLabelTemplateRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesLabelTemplateRepository.java deleted file mode 100644 index 16f04a4..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesLabelTemplateRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -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.MesLabelTemplate; - -/** - * @Description : 打印模板 - * @Reference : - * @Author : crish - * @Date : 2019-08-18 12:03:01.024 - * @Modify : - **/ -public interface MesLabelTemplateRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesMethodRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesMethodRepository.java deleted file mode 100644 index d064c63..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesMethodRepository.java +++ /dev/null @@ -1,17 +0,0 @@ -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.MesMethod; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesMethodRepository extends BaseRepository { - -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesMonitorTaskDetailRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesMonitorTaskDetailRepository.java deleted file mode 100644 index 46e8f5d..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesMonitorTaskDetailRepository.java +++ /dev/null @@ -1,15 +0,0 @@ -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.MesMonitorTaskDetail; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : zcg - * @Date : 2020/1/8 0008 - 18:42 - */ -@Repository -public interface MesMonitorTaskDetailRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesMonitorTaskRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesMonitorTaskRepository.java deleted file mode 100644 index f87ff43..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesMonitorTaskRepository.java +++ /dev/null @@ -1,15 +0,0 @@ -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.MesMonitorTask; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : zcg - * @Date : 2020/1/8 0008 - 18:43 - */ -@Repository -public interface MesMonitorTaskRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesNumberRuleRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesNumberRuleRepository.java deleted file mode 100644 index d3b014d..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesNumberRuleRepository.java +++ /dev/null @@ -1,15 +0,0 @@ -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.MesNumberRule; -import org.springframework.stereotype.Repository; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/8/23 1:22 PM - * @Description: - **/ -@Repository -public interface MesNumberRuleRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesNumberSerialnoRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesNumberSerialnoRepository.java deleted file mode 100644 index 11299b0..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesNumberSerialnoRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -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.MesNumberSerialno; -import org.springframework.stereotype.Repository; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/8/23 1:23 PM - * @Description: - **/ - -@Repository -public interface MesNumberSerialnoRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesObjectCfgRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesObjectCfgRepository.java deleted file mode 100644 index c1a67b2..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesObjectCfgRepository.java +++ /dev/null @@ -1,13 +0,0 @@ -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.MesObjectCfg; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/9/27 1:59 PM - * @Description: - **/ -public interface MesObjectCfgRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPLCConfigureRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPLCConfigureRepository.java deleted file mode 100644 index d10efa8..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPLCConfigureRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -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.MesPLCConfigure; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesPLCConfigureRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackSpecRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackSpecRepository.java deleted file mode 100644 index fc409e1..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackSpecRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -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.MesPackSpec; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesPackSpecRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackageDetailRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackageDetailRepository.java deleted file mode 100644 index 6d2fe27..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackageDetailRepository.java +++ /dev/null @@ -1,13 +0,0 @@ -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.MesPackageDetail; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/10/19 10:33 上午 - * @Description: - **/ -public interface MesPackageDetailRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackageRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackageRepository.java deleted file mode 100644 index eb7c894..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackageRepository.java +++ /dev/null @@ -1,13 +0,0 @@ -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.MesPackage; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/10/19 10:39 上午 - * @Description: - **/ -public interface MesPackageRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackageTravelRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackageTravelRepository.java deleted file mode 100644 index dde5b62..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackageTravelRepository.java +++ /dev/null @@ -1,13 +0,0 @@ -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.MesPackageTravel; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/10/19 2:57 下午 - * @Description: - **/ -public interface MesPackageTravelRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPartCategoryRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPartCategoryRepository.java deleted file mode 100644 index eb12a69..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPartCategoryRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -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.MesPartCategory; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesPartCategoryRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPartRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPartRepository.java deleted file mode 100644 index 0324dd1..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPartRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -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.MesPart; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesPartRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPatternJisRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPatternJisRepository.java deleted file mode 100644 index 87029c6..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPatternJisRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -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.MesPatternJis; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : wangjie - * @CreateDate : 2019-12-25 - * @Modify: - **/ -@Repository -public interface MesPatternJisRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnConnectLogRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnConnectLogRepository.java deleted file mode 100644 index c9e3e97..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnConnectLogRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -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.MesPcnConnectLog; -import org.springframework.stereotype.Repository; - -/** - * @Description: - * @Reference: - * @Author: yiming.gu - * @CreateDate:2019-04-24-17:13 - * @Modify: - **/ -@Repository -public interface MesPcnConnectLogRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnRepository.java deleted file mode 100644 index 1ae09bf..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -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.MesPcn; -import org.springframework.stereotype.Repository; - -/** - * @Description: - * @Reference: - * @Author: yiming.gu - * @CreateDate:2019-04-24-17:13 - * @Modify: - **/ -@Repository -public interface MesPcnRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnSyncCfgRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnSyncCfgRepository.java deleted file mode 100644 index 256e8da..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnSyncCfgRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -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.MesPcnSyncCfg; -import org.springframework.stereotype.Repository; - -/** - * @Description: - * @Reference: - * @Author: yiming.gu - * @CreateDate:2019-04-24-17:13 - * @Modify: - **/ -@Repository -public interface MesPcnSyncCfgRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnSyncErrorLogRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnSyncErrorLogRepository.java deleted file mode 100644 index a217480..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnSyncErrorLogRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -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.MesPcnSyncErrorLog; -import org.springframework.stereotype.Repository; - -/** - * @Description: - * @Reference: - * @Author: yiming.gu - * @CreateDate:2019-04-24-17:13 - * @Modify: - **/ -@Repository -public interface MesPcnSyncErrorLogRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnSysUserOfflineRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnSysUserOfflineRepository.java deleted file mode 100644 index 111a055..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnSysUserOfflineRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -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.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-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnTaskLogRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnTaskLogRepository.java deleted file mode 100644 index 66621f9..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnTaskLogRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -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.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-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnTaskRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnTaskRepository.java deleted file mode 100644 index 68295ee..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnTaskRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -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.MesPcnTask; -import org.springframework.stereotype.Repository; - -/** - * @Description :mes-pcn定时任务清单 - * @Reference : - * @Author : wangjie - * @CreateDate : 2019-08-26 - * @Modify: - **/ -@Repository -public interface MesPcnTaskRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPlanOrderRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPlanOrderRepository.java deleted file mode 100644 index c4ba8c9..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPlanOrderRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -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.MesPlanOrder; -import org.springframework.stereotype.Repository; - -/** - * @Description: - * @Reference: - * @Author: Crish - * @CreateDate:2019-04-17-17:08 - * @Modify: - **/ -@Repository -public interface MesPlanOrderRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPlcRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPlcRepository.java deleted file mode 100644 index add5aac..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPlcRepository.java +++ /dev/null @@ -1,15 +0,0 @@ -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.MesPlc; -import org.springframework.stereotype.Repository; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/9/26 7:47 PM - * @Description: - **/ -@Repository -public interface MesPlcRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProcessRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProcessRepository.java deleted file mode 100644 index d931c12..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProcessRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -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.MesProcess; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesProcessRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdBindRecordRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdBindRecordRepository.java deleted file mode 100644 index 2b9ba19..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdBindRecordRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -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.MesProdBindRecord; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesProdBindRecordRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdCfgDetailRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdCfgDetailRepository.java deleted file mode 100644 index c93700b..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdCfgDetailRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -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.MesProdCfgDetail; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesProdCfgDetailRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdCfgRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdCfgRepository.java deleted file mode 100644 index 1413862..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdCfgRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -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.MesProdCfg; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesProdCfgRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdPackRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdPackRepository.java deleted file mode 100644 index cf70703..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdPackRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -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.MesProdPack; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesProdPackRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdRouteCfgRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdRouteCfgRepository.java deleted file mode 100644 index 7a55397..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdRouteCfgRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -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.MesProdRouteCfg; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesProdRouteCfgRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdRouteOptParamRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdRouteOptParamRepository.java deleted file mode 100644 index 93e532b..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdRouteOptParamRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -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.MesProdRouteOptParam; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesProdRouteOptParamRepository extends BaseRepository { -} 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 deleted file mode 100644 index 6827df9..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdScatterCfgBomRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -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-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceCategoryRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceCategoryRepository.java deleted file mode 100644 index 50602d5..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceCategoryRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -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.MesProduceCategory; -import org.springframework.stereotype.Repository; - -/** - * @Description: - * @Reference: - * @Author: Crish - * @CreateDate:2019-04-26-10:28 - * @Modify: - **/ -@Repository -public interface MesProduceCategoryRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceCtgyPictureRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceCtgyPictureRepository.java deleted file mode 100644 index 2edb306..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceCtgyPictureRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -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.MesProduceCtgyPicture; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\10\16 20:35 - * @Modify: - **/ -public interface MesProduceCtgyPictureRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceSnRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceSnRepository.java deleted file mode 100644 index e049715..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceSnRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -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.MesProduceSn; -import org.springframework.stereotype.Repository; - -/** - * @Description: - * @Reference: - * @Author: Crish - * @CreateDate:2019-04-17-17:10 - * @Modify: - **/ -@Repository -public interface MesProduceSnRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceSnTravelRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceSnTravelRepository.java deleted file mode 100644 index 607e64c..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceSnTravelRepository.java +++ /dev/null @@ -1,17 +0,0 @@ -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.MesProduceSn; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProduceSnTravel; -import org.springframework.stereotype.Repository; - -/** - * @Description : 条码履历Dao层接口 - * @Reference : - * @Author : dragon.xu - * @CreateDate : 2019-05-29 16:36 - * @Modify: - **/ -@Repository -public interface MesProduceSnTravelRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProductDataRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProductDataRepository.java deleted file mode 100644 index eb8debf..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProductDataRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -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.MesProductData; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesProductDataRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProductEncodeCfgRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProductEncodeCfgRepository.java deleted file mode 100644 index de434ac..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProductEncodeCfgRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -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.MesProductEncodeCfg; -import org.springframework.stereotype.Repository; - -/** - * @Description: - * @Reference: - * @Author: wangjie - * @CreateDate:2019-04-17-17:10 - * @Modify: - **/ -@Repository -public interface MesProductEncodeCfgRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQcCheckDataRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQcCheckDataRepository.java deleted file mode 100644 index 8c909e7..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQcCheckDataRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -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.MesQcCheckData; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\10\12 16:43 - * @Modify: - **/ -public interface MesQcCheckDataRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQcCheckStandardRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQcCheckStandardRepository.java deleted file mode 100644 index 1348b9c..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQcCheckStandardRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -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.MesQcCheckStandard; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\10\12 14:58 - * @Modify: - **/ -public interface MesQcCheckStandardRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueJisDetailRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueJisDetailRepository.java deleted file mode 100644 index bd19fef..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueJisDetailRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -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.MesQueueJisDetail; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : wangjie - * @CreateDate : 2019-12-25 - * @Modify: - **/ -@Repository -public interface MesQueueJisDetailRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueJisRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueJisRepository.java deleted file mode 100644 index 8a08948..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueJisRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -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.MesQueueJis; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : wangjie - * @CreateDate : 2019-12-25 - * @Modify: - **/ -@Repository -public interface MesQueueJisRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueOrderDetailRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueOrderDetailRepository.java deleted file mode 100644 index 82bbefb..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueOrderDetailRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -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.MesQueueOrderDetail; -import org.springframework.stereotype.Repository; - -/** - * @Description: - * @Reference: - * @Author: Crish - * @CreateDate:2019-04-17-17:12 - * @Modify: - **/ -@Repository -public interface MesQueueOrderDetailRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueOrderRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueOrderRepository.java deleted file mode 100644 index 989e14f..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueOrderRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -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.MesQueueOrder; -import org.springframework.stereotype.Repository; - -/** - * @Description: - * @Reference: - * @Author: Crish - * @CreateDate:2019-04-17-17:11 - * @Modify: - **/ -@Repository -public interface MesQueueOrderRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRawPartSnRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRawPartSnRepository.java deleted file mode 100644 index 1f048c1..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRawPartSnRepository.java +++ /dev/null @@ -1,15 +0,0 @@ -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.MesCellFeed; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesRawPartSn; -import org.springframework.stereotype.Repository; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/9/18 10:05 AM - * @Description: - **/ -@Repository -public interface MesRawPartSnRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRepairRecordRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRepairRecordRepository.java deleted file mode 100644 index 1325e76..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRepairRecordRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -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.MesRepairRecord; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\10\16 20:06 - * @Modify: - **/ -public interface MesRepairRecordRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRepairRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRepairRepository.java deleted file mode 100644 index 2e22c77..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRepairRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -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.MesRepair; -import org.springframework.stereotype.Repository; - -/** - * @Description: - * @Reference: - * @Author: Crish - * @CreateDate:2019-08-08-17:13 - * @Modify: - **/ -@Repository -public interface MesRepairRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRouteProcessCellRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRouteProcessCellRepository.java deleted file mode 100644 index f217869..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRouteProcessCellRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -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.MesRouteProcessCell; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesRouteProcessCellRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRouteProcessRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRouteProcessRepository.java deleted file mode 100644 index 5749bbd..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRouteProcessRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -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.MesRouteProcess; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesRouteProcessRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRouteRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRouteRepository.java deleted file mode 100644 index 92800fd..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRouteRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -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.MesRoute; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesRouteRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesScrapRecordRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesScrapRecordRepository.java deleted file mode 100644 index 0f3e5eb..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesScrapRecordRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -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.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-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesScrapRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesScrapRepository.java deleted file mode 100644 index 4dbf260..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesScrapRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -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.MesScrap; -import org.springframework.stereotype.Repository; - -/** - * @Description: - * @Reference: - * @Author: Crish - * @CreateDate:2019-08-08-17:13 - * @Modify: - **/ -@Repository -public interface MesScrapRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesShiftGroupRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesShiftGroupRepository.java deleted file mode 100644 index 544c627..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesShiftGroupRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -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.MesShiftGroup; -import org.springframework.stereotype.Repository; - -/** - * @Description: - * @Reference: - * @Author: wangjie - * @CreateDate:2019-09-18-17:13 - * @Modify: - **/ -@Repository -public interface MesShiftGroupRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesShiftRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesShiftRepository.java deleted file mode 100644 index 7f5b1a7..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesShiftRepository.java +++ /dev/null @@ -1,17 +0,0 @@ -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.MesShift; -import org.springframework.stereotype.Repository; - -/** - * @Description: - * @Reference: - * @Author: Crish - * @CreateDate:2019-04-19-13:53 - * @Modify: - **/ -@Repository -public interface MesShiftRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesShiftRestRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesShiftRestRepository.java deleted file mode 100644 index b3cc087..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesShiftRestRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -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.MesShiftRest; -import org.springframework.stereotype.Repository; - -/** - * @Description: - * @Reference: - * @Author: yiming.gu - * @CreateDate:2019-05-20 - * @Modify: - **/ -@Repository -public interface MesShiftRestRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesStationBomRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesStationBomRepository.java deleted file mode 100644 index f5fd71f..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesStationBomRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -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.MesStationBom; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesStationBomRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesStepParamRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesStepParamRepository.java deleted file mode 100644 index f7b386f..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesStepParamRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -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.MesStepParam; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesStepParamRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesStepRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesStepRepository.java deleted file mode 100644 index 5f3f562..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesStepRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -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.MesStep; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesStepRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesTimeRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesTimeRepository.java deleted file mode 100644 index 6489cec..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesTimeRepository.java +++ /dev/null @@ -1,10 +0,0 @@ -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.MesTime; -import org.springframework.stereotype.Repository; - -@Repository -public interface MesTimeRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesTorqueDetailRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesTorqueDetailRepository.java deleted file mode 100644 index d2be5f1..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesTorqueDetailRepository.java +++ /dev/null @@ -1,17 +0,0 @@ -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.MesArea; -import cn.estsh.i3plus.pojo.mes.pcn.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-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesTypeCfgRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesTypeCfgRepository.java deleted file mode 100644 index 02911ac..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesTypeCfgRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -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.MesTypeCfg; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\12\4 10:34 - * @Modify: - **/ -public interface MesTypeCfgRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWcCheckRecordRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWcCheckRecordRepository.java deleted file mode 100644 index 71d7efa..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWcCheckRecordRepository.java +++ /dev/null @@ -1,13 +0,0 @@ -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.MesWcCheckRecord; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/9/23 7:30 PM - * @Description: - **/ -public interface MesWcCheckRecordRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWcCheckRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWcCheckRepository.java deleted file mode 100644 index cbf9cae..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWcCheckRepository.java +++ /dev/null @@ -1,13 +0,0 @@ -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.MesWcCheck; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/9/23 7:30 PM - * @Description: - **/ -public interface MesWcCheckRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWcEquipmentRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWcEquipmentRepository.java deleted file mode 100644 index 0e70427..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWcEquipmentRepository.java +++ /dev/null @@ -1,13 +0,0 @@ -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.MesWcEquipment; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/9/28 12:04 PM - * @Description: - **/ -public interface MesWcEquipmentRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellMonitorLogRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellMonitorLogRepository.java deleted file mode 100644 index 672947b..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellMonitorLogRepository.java +++ /dev/null @@ -1,13 +0,0 @@ -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.MesWorkCellMonitorLog; - -/** - * @Author: Wynne.Lu - * @CreateDate: 2019/9/27 1:58 PM - * @Description: - **/ -public interface MesWorkCellMonitorLogRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellParamCfgRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellParamCfgRepository.java deleted file mode 100644 index 98f4a1c..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellParamCfgRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -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.MesWorkCellParamCfg; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesWorkCellParamCfgRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellParamRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellParamRepository.java deleted file mode 100644 index 3a714cf..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellParamRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -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.MesWorkCellParam; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : wangjie - * @CreateDate : 2019-08-30 - * @Modify: - **/ -@Repository -public interface MesWorkCellParamRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellPointRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellPointRepository.java deleted file mode 100644 index 52319d0..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellPointRepository.java +++ /dev/null @@ -1,17 +0,0 @@ -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.MesWorkCell; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWorkCellPoint; -import org.springframework.stereotype.Repository; - -/** - * @Description :工站队列Dao层接口 - * @Reference : - * @Author : dragon.xu - * @CreateDate : 2019-05-29 14:40 - * @Modify: - **/ -@Repository -public interface MesWorkCellPointRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellRepository.java deleted file mode 100644 index ce59423..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -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.MesWorkCell; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesWorkCellRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellStatusRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellStatusRepository.java deleted file mode 100644 index 1295a8d..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellStatusRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -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.MesWorkCellStatus; -import org.springframework.stereotype.Repository; - -/** - * @Description: - * @Reference: - * @Author: joke.wang - * @CreateDate: 2019\11\15 11:21 - * @Modify: - **/ -@Repository -public interface MesWorkCellStatusRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCenterRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCenterRepository.java deleted file mode 100644 index e24b5db..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCenterRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -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.MesWorkCenter; -import org.springframework.stereotype.Repository; - -/** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: - **/ -@Repository -public interface MesWorkCenterRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkOrderLogRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkOrderLogRepository.java deleted file mode 100644 index fea2dfb..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkOrderLogRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -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.MesWorkOrderLog; -import org.springframework.stereotype.Repository; - -/** - * @Description: - * @Reference: - * @Author: wangjie - * @CreateDate:2019-09-19-17:13 - * @Modify: - **/ -@Repository -public interface MesWorkOrderLogRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkOrderRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkOrderRepository.java deleted file mode 100644 index 40676c4..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkOrderRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -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.MesWorkOrder; -import org.springframework.stereotype.Repository; - -/** - * @Description: - * @Reference: - * @Author: Crish - * @CreateDate:2019-04-17-17:13 - * @Modify: - **/ -@Repository -public interface MesWorkOrderRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java deleted file mode 100644 index 4120d0e..0000000 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java +++ /dev/null @@ -1,411 +0,0 @@ -package cn.estsh.i3plus.pojo.mes.pcn.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.pcn.bean.*; -import org.springframework.util.StringUtils; - -/** - * @Description: - * @Reference: Mes 条件封装 - * @Author: Crish - * @CreateDate:2019-04-22-14:58 - * @Modify: - **/ -public class MesHqlPack { - - - /** - * 通用查询条件 - * - * @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.getNumberBiggerPackContainsZero(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 ad0325f7df980c28e99474002a5e15379540641e Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Fri, 27 Nov 2020 19:22:39 +0800 Subject: [PATCH 04/33] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=A9=E6=B4=A5BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java index d5df633..dc69e01 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java @@ -25,9 +25,16 @@ public class WmsStockFifoModel { @ApiParam(value = "物料集合") List partNos; + @ApiParam(value = "物料") + String partNo; + @ApiParam(value = "存储区集合") List zoneNos; + @ApiParam(value = "存储区") + String zoneNo; + + @ApiParam(value = "物料对应的存储区") Map partToZoneMap; From 2a94ce3e0e3dd0b3eb1f7ab5aa7063768df15e20 Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Fri, 27 Nov 2020 19:37:57 +0800 Subject: [PATCH 05/33] =?UTF-8?q?=E5=8C=85=E8=A3=85=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=E7=BB=91=E5=AE=9A=E8=A7=A3=E7=BB=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/repository/MesPackageDetailRepository.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPackageDetailRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPackageDetailRepository.java index 96f3c6a..37058a9 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPackageDetailRepository.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPackageDetailRepository.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.mes.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; import cn.estsh.i3plus.pojo.mes.bean.MesPackageDetail; +import org.springframework.stereotype.Repository; /** @@ -10,5 +11,6 @@ import cn.estsh.i3plus.pojo.mes.bean.MesPackageDetail; * @CreateDate: 2019/10/19 10:33 上午 * @Description: **/ +@Repository public interface MesPackageDetailRepository extends BaseRepository { } From 970f75f8cf29495b078df56fcd6bf71671c46a83 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Fri, 27 Nov 2020 20:36:01 +0800 Subject: [PATCH 06/33] =?UTF-8?q?=E9=98=9F=E5=88=97=E8=A1=A8=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=88=86=E7=BB=84=E5=8F=B7=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java | 4 ++++ .../java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java | 3 +++ 2 files changed, 7 insertions(+) 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 6f6b2bb..5838d4a 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 @@ -132,6 +132,10 @@ public class MesQueueOrder extends BaseBean implements Serializable { @ApiParam("工作中心") private String workCenterCode; + @Column(name = "GROUP_NO") + @ApiParam("分组号") + private String groupNo; + @Transient @ApiParam("起始车号") private String custFlagNoStart; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java index ef5f899..5807d66 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java @@ -79,6 +79,9 @@ public class MgnBjBoardModel implements Serializable { @ApiParam("工位名称") private String workCellName; + @ApiParam("工位描述") + private String workCellDesc; + @ApiParam("x坐标内容") private List xAxisList; From 7be62a939bf59c47c033f92e7b1cf0974663626a Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 30 Nov 2020 09:23:25 +0800 Subject: [PATCH 07/33] =?UTF-8?q?TJ=E7=9C=8B=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java | 3 +++ 2 files changed, 4 insertions(+) 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 116caa0..4308bde 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 @@ -28,6 +28,7 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_WORK_ORDER", indexes = { @Index(columnList = "ORDER_NO"), + @Index(columnList = "AREA_CODE"), @Index(columnList = "WORK_CENTER_CODE"), @Index(columnList = "WO_STATUS") }, uniqueConstraints = { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java index c77b789..2eca8bb 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java @@ -43,6 +43,9 @@ public class TJMgnBoardModel extends BaseBean implements Serializable { @ApiParam("不合格数量") private Double noQuQty; + @ApiParam("待定数量") + private Double determindQty; + @ApiParam("一次合格率") private String firstPassRate; From 19636e308e381bc31beeae7cf0df96fc5cb6a4fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Mon, 30 Nov 2020 11:35:39 +0800 Subject: [PATCH 08/33] =?UTF-8?q?=E3=80=9012645=2019048-=E5=96=B7=E6=B6=82?= =?UTF-8?q?=E8=B4=A8=E6=A3=80=E6=8A=A5=E8=A1=A8=E7=94=A8=E5=BC=80=E5=A7=8B?= =?UTF-8?q?=E5=92=8C=E7=BB=93=E6=9D=9F=E5=B7=A5=E5=8D=95=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=97=A0=E5=8F=8D=E5=BA=94-20201123=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/IfProductOffLine.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/IfProductOffLine.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java index ea3844d..ff25483 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java @@ -169,12 +169,13 @@ public class IfProductOffLine extends BaseBean implements Serializable { this.qcStatus = qcStatus; } - public IfProductOffLine(String workCenterCode, String partNo, String partName, String packageNo, Double qty, String createDatetime) { + public IfProductOffLine(String workCenterCode, String partNo, String partName, String packageNo, Double qty, String createDatetime, String workOrderNo) { this.workCenterCode = workCenterCode; this.partNo = partNo; this.partName = partName; this.packageNo = packageNo; this.qty = qty; this.createDatetime = createDatetime; + this.workOrderNo = workOrderNo; } } From 4a38aab5b6705c61882799f662b39a4df6762a9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Mon, 30 Nov 2020 13:13:30 +0800 Subject: [PATCH 09/33] =?UTF-8?q?=E4=BB=BB=E5=8A=A1#2989?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java | 8 ++++++++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java | 7 +++++++ 2 files changed, 15 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 eac12a1..1d45817 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 @@ -154,6 +154,14 @@ public class WmsPOMasterDetails extends BaseBean { @ApiParam("备注") private String remark; + @Column(name = "REMARK1") + @ApiParam("备注1") + private String remark1; + + @Column(name = "REMARK2") + @ApiParam("备注2") + private String remark2; + @Transient @ApiParam(value = "散件收货输入数量", example = "0") private Double inputRcQty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java index c414b10..7d9a8fc 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java @@ -179,6 +179,13 @@ public class WmsPoSn extends BaseBean { @ApiParam("物料库位") private String partLocateNo; + @Transient + @ApiParam("备注1") + private String remark1; + + @Transient + @ApiParam("备注2") + private String remark2; public WmsPoSn(){} From ca18bb40cd4497d3bd5f8c34c3cd277350d9cb2f Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Mon, 30 Nov 2020 14:18:39 +0800 Subject: [PATCH 10/33] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=A9=E6=B4=A5?= =?UTF-8?q?=E5=8D=95=E6=8D=AE=E6=98=8E=E7=BB=86=E6=9F=A5=E8=AF=A2=E5=AF=B9?= =?UTF-8?q?=E5=BA=94=E6=9D=A1=E7=A0=81=EF=BC=9A=E5=8D=95=E6=8D=AE=E6=9D=A1?= =?UTF-8?q?=E7=A0=81=E5=A2=9E=E5=8A=A0=E8=A1=8C=E5=8F=B7=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6?= 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 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index d549c1f..c5215d6 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 @@ -2030,8 +2030,9 @@ public class WmsHqlPack { DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringEqualPack(wmsDocMovementSn.getOrderNo(), "orderNo", result); DdlPreparedPack.getStringEqualPack(wmsDocMovementSn.getPartNo(), "partNo", result); - DdlPreparedPack.getStringEqualPack(wmsDocMovementSn.getSrcLocateNo(), "srcLocateNo", result); - DdlPreparedPack.getStringEqualPack(wmsDocMovementSn.getDestLocateNo(), "destLocateNo", result); + if (!StringUtil.isEmpty(wmsDocMovementSn.getItem())) { + DdlPreparedPack.getStringEqualPack(wmsDocMovementSn.getItem(), "item", result); + } DdlPreparedPack.getNumEqualPack(wmsDocMovementSn.getSnType(), "snType", result); getStringBuilderPack(wmsDocMovementSn, result); @@ -2039,6 +2040,7 @@ public class WmsHqlPack { return result; } + /** * 移库单订单条码表 分页查询 * From 7ecbed2cda81eb1e924bf84560ff406623296581 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Mon, 30 Nov 2020 15:02:06 +0800 Subject: [PATCH 11/33] =?UTF-8?q?fix(order):=E6=9C=AA=E5=9B=BA=E5=AE=9A?= =?UTF-8?q?=E5=8D=95=E5=8F=B7=E7=94=9F=E6=88=90=E9=95=BF=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRule.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRule.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRule.java index 6bb092f..ed8ce43 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRule.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRule.java @@ -9,6 +9,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -63,9 +64,15 @@ public class SysOrderNoRule extends BaseBean { @Column(name = "IS_CYCLE") @ApiParam(value = "达到最大值后是否循环",example = "1") - @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description") + @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class) private Integer isCycle; + @Column(name = "IS_FIXED_LENGTH") + @ColumnDefault("2") + @ApiParam(value = "是否固定序号长度长度",example = "1") + @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class) + private Integer isFixedLength; + @Column(name = "SERIAL_NO") @ApiParam(value = "当前流水号",example = "-1") @JsonSerialize(using = ToStringSerializer.class) From 7b17ecbb299b01b44755e1678390408aec918726 Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Mon, 30 Nov 2020 17:35:49 +0800 Subject: [PATCH 12/33] =?UTF-8?q?=E8=A1=A5=E5=85=A8=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-mes-pcn/pom.xml | 55 +++ .../pojo/mes/pcn/bean/IfDismantleRecord.java | 105 ++++++ .../i3plus/pojo/mes/pcn/bean/IfPackageDetail.java | 100 +++++ .../i3plus/pojo/mes/pcn/bean/IfProductOffLine.java | 88 +++++ .../estsh/i3plus/pojo/mes/pcn/bean/MesAction.java | 48 +++ .../i3plus/pojo/mes/pcn/bean/MesActionIf.java | 40 ++ .../i3plus/pojo/mes/pcn/bean/MesActionMethod.java | 49 +++ .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesArea.java | 59 +++ .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesBom.java | 90 +++++ .../i3plus/pojo/mes/pcn/bean/MesCachaQueue.java | 45 +++ .../i3plus/pojo/mes/pcn/bean/MesCellFeed.java | 79 ++++ .../pojo/mes/pcn/bean/MesCellFeedRecord.java | 74 ++++ .../estsh/i3plus/pojo/mes/pcn/bean/MesConfig.java | 56 +++ .../i3plus/pojo/mes/pcn/bean/MesCustProdLine.java | 40 ++ .../i3plus/pojo/mes/pcn/bean/MesCustomer.java | 56 +++ .../i3plus/pojo/mes/pcn/bean/MesCustomerPart.java | 49 +++ .../i3plus/pojo/mes/pcn/bean/MesDataObject.java | 71 ++++ .../i3plus/pojo/mes/pcn/bean/MesDatasource.java | 82 ++++ .../estsh/i3plus/pojo/mes/pcn/bean/MesDefect.java | 81 ++++ .../i3plus/pojo/mes/pcn/bean/MesDefectCause.java | 44 +++ .../i3plus/pojo/mes/pcn/bean/MesDefectRecord.java | 80 ++++ .../pojo/mes/pcn/bean/MesDismantleRecord.java | 97 +++++ .../pojo/mes/pcn/bean/MesEquAlarmRecord.java | 53 +++ .../i3plus/pojo/mes/pcn/bean/MesEquipment.java | 97 +++++ .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesEsop.java | 93 +++++ .../estsh/i3plus/pojo/mes/pcn/bean/MesEvent.java | 52 +++ .../i3plus/pojo/mes/pcn/bean/MesEventAction.java | 54 +++ .../estsh/i3plus/pojo/mes/pcn/bean/MesFiCfg.java | 47 +++ .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesFile.java | 59 +++ .../estsh/i3plus/pojo/mes/pcn/bean/MesKpData.java | 65 ++++ .../i3plus/pojo/mes/pcn/bean/MesKpsnRule.java | 95 +++++ .../i3plus/pojo/mes/pcn/bean/MesLabelTemplate.java | 54 +++ .../pojo/mes/pcn/bean/MesLabelTemplateParam.java | 55 +++ .../estsh/i3plus/pojo/mes/pcn/bean/MesMethod.java | 55 +++ .../i3plus/pojo/mes/pcn/bean/MesMonitorTask.java | 52 +++ .../pojo/mes/pcn/bean/MesMonitorTaskDetail.java | 48 +++ .../i3plus/pojo/mes/pcn/bean/MesNumberRule.java | 60 +++ .../pojo/mes/pcn/bean/MesNumberSerialno.java | 49 +++ .../i3plus/pojo/mes/pcn/bean/MesObjectCfg.java | 60 +++ .../i3plus/pojo/mes/pcn/bean/MesPLCConfigure.java | 62 ++++ .../i3plus/pojo/mes/pcn/bean/MesPackSpec.java | 99 +++++ .../estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java | 119 ++++++ .../i3plus/pojo/mes/pcn/bean/MesPackageDetail.java | 63 ++++ .../i3plus/pojo/mes/pcn/bean/MesPackageTravel.java | 58 +++ .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesPart.java | 93 +++++ .../i3plus/pojo/mes/pcn/bean/MesPartCategory.java | 44 +++ .../i3plus/pojo/mes/pcn/bean/MesPartFormula.java | 45 +++ .../i3plus/pojo/mes/pcn/bean/MesPatternJis.java | 68 ++++ .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcn.java | 87 +++++ .../i3plus/pojo/mes/pcn/bean/MesPcnConnectLog.java | 55 +++ .../i3plus/pojo/mes/pcn/bean/MesPcnSyncCfg.java | 92 +++++ .../pojo/mes/pcn/bean/MesPcnSyncErrorLog.java | 54 +++ .../pojo/mes/pcn/bean/MesPcnSysUserOffline.java | 70 ++++ .../estsh/i3plus/pojo/mes/pcn/bean/MesPcnTask.java | 90 +++++ .../i3plus/pojo/mes/pcn/bean/MesPcnTaskLog.java | 53 +++ .../i3plus/pojo/mes/pcn/bean/MesPlanOrder.java | 144 +++++++ .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java | 112 ++++++ .../estsh/i3plus/pojo/mes/pcn/bean/MesProcess.java | 39 ++ .../pojo/mes/pcn/bean/MesProdBindRecord.java | 106 ++++++ .../estsh/i3plus/pojo/mes/pcn/bean/MesProdCfg.java | 44 +++ .../i3plus/pojo/mes/pcn/bean/MesProdCfgDetail.java | 53 +++ .../i3plus/pojo/mes/pcn/bean/MesProdPack.java | 69 ++++ .../i3plus/pojo/mes/pcn/bean/MesProdRouteCfg.java | 45 +++ .../pojo/mes/pcn/bean/MesProdRouteOptParam.java | 71 ++++ .../pojo/mes/pcn/bean/MesProdScatterCfgBom.java | 55 +++ .../pojo/mes/pcn/bean/MesProduceCategory.java | 40 ++ .../pojo/mes/pcn/bean/MesProduceCtgyPicture.java | 56 +++ .../i3plus/pojo/mes/pcn/bean/MesProduceSn.java | 205 ++++++++++ .../pojo/mes/pcn/bean/MesProduceSnTravel.java | 154 ++++++++ .../i3plus/pojo/mes/pcn/bean/MesProductData.java | 109 ++++++ .../pojo/mes/pcn/bean/MesProductEncodeCfg.java | 50 +++ .../i3plus/pojo/mes/pcn/bean/MesQcCheckData.java | 107 ++++++ .../pojo/mes/pcn/bean/MesQcCheckStandard.java | 108 ++++++ .../i3plus/pojo/mes/pcn/bean/MesQueueJis.java | 71 ++++ .../pojo/mes/pcn/bean/MesQueueJisDetail.java | 62 ++++ .../i3plus/pojo/mes/pcn/bean/MesQueueOrder.java | 90 +++++ .../pojo/mes/pcn/bean/MesQueueOrderDetail.java | 103 +++++ .../i3plus/pojo/mes/pcn/bean/MesRawPartSn.java | 78 ++++ .../estsh/i3plus/pojo/mes/pcn/bean/MesRepair.java | 44 +++ .../i3plus/pojo/mes/pcn/bean/MesRepairRecord.java | 102 +++++ .../estsh/i3plus/pojo/mes/pcn/bean/MesRoute.java | 51 +++ .../i3plus/pojo/mes/pcn/bean/MesRouteProcess.java | 64 ++++ .../pojo/mes/pcn/bean/MesRouteProcessCell.java | 44 +++ .../estsh/i3plus/pojo/mes/pcn/bean/MesScrap.java | 45 +++ .../i3plus/pojo/mes/pcn/bean/MesScrapRecord.java | 71 ++++ .../estsh/i3plus/pojo/mes/pcn/bean/MesShift.java | 68 ++++ .../i3plus/pojo/mes/pcn/bean/MesShiftGroup.java | 47 +++ .../i3plus/pojo/mes/pcn/bean/MesShiftRest.java | 49 +++ .../pojo/mes/pcn/bean/MesSnPhotoRelation.java | 45 +++ .../i3plus/pojo/mes/pcn/bean/MesStationBom.java | 151 ++++++++ .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesStep.java | 102 +++++ .../i3plus/pojo/mes/pcn/bean/MesStepParam.java | 47 +++ .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesTime.java | 40 ++ .../i3plus/pojo/mes/pcn/bean/MesTorqueDetail.java | 97 +++++ .../estsh/i3plus/pojo/mes/pcn/bean/MesTypeCfg.java | 48 +++ .../estsh/i3plus/pojo/mes/pcn/bean/MesWcCheck.java | 56 +++ .../i3plus/pojo/mes/pcn/bean/MesWcCheckRecord.java | 83 +++++ .../i3plus/pojo/mes/pcn/bean/MesWcEquipment.java | 43 +++ .../i3plus/pojo/mes/pcn/bean/MesWorkCell.java | 64 ++++ .../pojo/mes/pcn/bean/MesWorkCellMonitorLog.java | 64 ++++ .../i3plus/pojo/mes/pcn/bean/MesWorkCellParam.java | 48 +++ .../pojo/mes/pcn/bean/MesWorkCellParamCfg.java | 56 +++ .../i3plus/pojo/mes/pcn/bean/MesWorkCellPoint.java | 56 +++ .../pojo/mes/pcn/bean/MesWorkCellStatus.java | 47 +++ .../i3plus/pojo/mes/pcn/bean/MesWorkCenter.java | 57 +++ .../i3plus/pojo/mes/pcn/bean/MesWorkOrder.java | 249 +++++++++++++ .../i3plus/pojo/mes/pcn/bean/MesWorkOrderLog.java | 231 ++++++++++++ .../pojo/mes/pcn/model/ActionRequestBean.java | 38 ++ .../estsh/i3plus/pojo/mes/pcn/model/AttrBean.java | 17 + .../i3plus/pojo/mes/pcn/model/ButtonBean.java | 22 ++ .../pojo/mes/pcn/model/DataAcquisitionModel.java | 35 ++ .../i3plus/pojo/mes/pcn/model/DefectModel.java | 50 +++ .../i3plus/pojo/mes/pcn/model/EsopFileModel.java | 26 ++ .../pojo/mes/pcn/model/FastDfsDownloadModel.java | 31 ++ .../pojo/mes/pcn/model/GenSerialNoModel.java | 72 ++++ .../pojo/mes/pcn/model/MesButtonFlagModel.java | 57 +++ .../i3plus/pojo/mes/pcn/model/MesDefectModel.java | 35 ++ .../pojo/mes/pcn/model/MesProdBindRecordModel.java | 126 +++++++ .../pojo/mes/pcn/model/MesStationBomModel.java | 75 ++++ .../pojo/mes/pcn/model/PLCInteracticeModel.java | 50 +++ .../pojo/mes/pcn/model/PcsObserverStatusModel.java | 25 ++ .../pojo/mes/pcn/model/ProdPackageModel.java | 78 ++++ .../pojo/mes/pcn/model/ProductDataModel.java | 24 ++ .../pojo/mes/pcn/model/QcCheckStandardModel.java | 25 ++ .../i3plus/pojo/mes/pcn/model/QueueJisModel.java | 90 +++++ .../i3plus/pojo/mes/pcn/model/QueueOrderModel.java | 83 +++++ .../i3plus/pojo/mes/pcn/model/RequestModel.java | 155 ++++++++ .../pojo/mes/pcn/model/SnPrintDataModel.java | 27 ++ .../i3plus/pojo/mes/pcn/model/SnPrintModel.java | 27 ++ .../i3plus/pojo/mes/pcn/model/StationBomModel.java | 29 ++ .../pojo/mes/pcn/model/StationResultBean.java | 55 +++ .../i3plus/pojo/mes/pcn/model/StepParamsModel.java | 29 ++ .../pojo/mes/pcn/model/StepPrintSnModel.java | 79 ++++ .../i3plus/pojo/mes/pcn/model/StepResult.java | 69 ++++ .../i3plus/pojo/mes/pcn/model/TorqueModel.java | 71 ++++ .../i3plus/pojo/mes/pcn/model/WcCheckModel.java | 63 ++++ .../repository/IfDismantleRecordRepository.java | 14 + .../pcn/repository/IfPackageDetailRepository.java | 14 + .../pcn/repository/IfProductOffLineRepository.java | 14 + .../mes/pcn/repository/MesActionIfRepository.java | 14 + .../pcn/repository/MesActionMethodRepository.java | 16 + .../mes/pcn/repository/MesActionRepository.java | 17 + .../pojo/mes/pcn/repository/MesAreaRepository.java | 16 + .../pojo/mes/pcn/repository/MesBomRepository.java | 16 + .../repository/MesCellFeedRecordRepository.java | 14 + .../mes/pcn/repository/MesCellFeedRepository.java | 14 + .../mes/pcn/repository/MesConfigRepository.java | 17 + .../pcn/repository/MesCustProdLineRepository.java | 16 + .../pcn/repository/MesCustomerPartRepository.java | 17 + .../mes/pcn/repository/MesCustomerRepository.java | 17 + .../pcn/repository/MesDataObjectRepository.java | 13 + .../pcn/repository/MesDatasourceRepository.java | 13 + .../pcn/repository/MesDefectCauseRepository.java | 14 + .../pcn/repository/MesDefectRecordRepository.java | 14 + .../mes/pcn/repository/MesDefectRepository.java | 14 + .../repository/MesDismantleRecordRepository.java | 14 + .../mes/pcn/repository/MesEquipmentRepository.java | 16 + .../pojo/mes/pcn/repository/MesEsopRepository.java | 17 + .../pcn/repository/MesEventActionRepository.java | 17 + .../mes/pcn/repository/MesEventRepository.java | 17 + .../mes/pcn/repository/MesFiCfgRepository.java | 17 + .../pojo/mes/pcn/repository/MesFileRepository.java | 16 + .../mes/pcn/repository/MesKpDataRepository.java | 17 + .../mes/pcn/repository/MesKpsnRuleRepository.java | 16 + .../MesLabelTemplateParamRepository.java | 14 + .../pcn/repository/MesLabelTemplateRepository.java | 14 + .../mes/pcn/repository/MesMethodRepository.java | 17 + .../repository/MesMonitorTaskDetailRepository.java | 15 + .../pcn/repository/MesMonitorTaskRepository.java | 15 + .../pcn/repository/MesNumberRuleRepository.java | 15 + .../repository/MesNumberSerialnoRepository.java | 16 + .../mes/pcn/repository/MesObjectCfgRepository.java | 13 + .../pcn/repository/MesPLCConfigureRepository.java | 16 + .../mes/pcn/repository/MesPackSpecRepository.java | 16 + .../pcn/repository/MesPackageDetailRepository.java | 13 + .../mes/pcn/repository/MesPackageRepository.java | 13 + .../pcn/repository/MesPackageTravelRepository.java | 13 + .../pcn/repository/MesPartCategoryRepository.java | 16 + .../pojo/mes/pcn/repository/MesPartRepository.java | 16 + .../pcn/repository/MesPatternJisRepository.java | 16 + .../pcn/repository/MesPcnConnectLogRepository.java | 16 + .../pojo/mes/pcn/repository/MesPcnRepository.java | 16 + .../pcn/repository/MesPcnSyncCfgRepository.java | 16 + .../repository/MesPcnSyncErrorLogRepository.java | 16 + .../repository/MesPcnSysUserOfflineRepository.java | 16 + .../pcn/repository/MesPcnTaskLogRepository.java | 16 + .../mes/pcn/repository/MesPcnTaskRepository.java | 16 + .../mes/pcn/repository/MesPlanOrderRepository.java | 16 + .../pojo/mes/pcn/repository/MesPlcRepository.java | 15 + .../mes/pcn/repository/MesProcessRepository.java | 16 + .../repository/MesProdBindRecordRepository.java | 16 + .../pcn/repository/MesProdCfgDetailRepository.java | 16 + .../mes/pcn/repository/MesProdCfgRepository.java | 16 + .../mes/pcn/repository/MesProdPackRepository.java | 16 + .../pcn/repository/MesProdRouteCfgRepository.java | 16 + .../repository/MesProdRouteOptParamRepository.java | 16 + .../repository/MesProdScatterCfgBomRepository.java | 16 + .../repository/MesProduceCategoryRepository.java | 16 + .../MesProduceCtgyPictureRepository.java | 14 + .../mes/pcn/repository/MesProduceSnRepository.java | 16 + .../repository/MesProduceSnTravelRepository.java | 17 + .../pcn/repository/MesProductDataRepository.java | 16 + .../repository/MesProductEncodeCfgRepository.java | 16 + .../pcn/repository/MesQcCheckDataRepository.java | 14 + .../repository/MesQcCheckStandardRepository.java | 14 + .../repository/MesQueueJisDetailRepository.java | 16 + .../mes/pcn/repository/MesQueueJisRepository.java | 16 + .../repository/MesQueueOrderDetailRepository.java | 16 + .../pcn/repository/MesQueueOrderRepository.java | 16 + .../mes/pcn/repository/MesRawPartSnRepository.java | 15 + .../pcn/repository/MesRepairRecordRepository.java | 14 + .../mes/pcn/repository/MesRepairRepository.java | 16 + .../repository/MesRouteProcessCellRepository.java | 16 + .../pcn/repository/MesRouteProcessRepository.java | 16 + .../mes/pcn/repository/MesRouteRepository.java | 16 + .../pcn/repository/MesScrapRecordRepository.java | 14 + .../mes/pcn/repository/MesScrapRepository.java | 16 + .../pcn/repository/MesShiftGroupRepository.java | 16 + .../mes/pcn/repository/MesShiftRepository.java | 17 + .../mes/pcn/repository/MesShiftRestRepository.java | 16 + .../pcn/repository/MesStationBomRepository.java | 16 + .../mes/pcn/repository/MesStepParamRepository.java | 16 + .../pojo/mes/pcn/repository/MesStepRepository.java | 16 + .../pojo/mes/pcn/repository/MesTimeRepository.java | 10 + .../pcn/repository/MesTorqueDetailRepository.java | 17 + .../mes/pcn/repository/MesTypeCfgRepository.java | 14 + .../pcn/repository/MesWcCheckRecordRepository.java | 13 + .../mes/pcn/repository/MesWcCheckRepository.java | 13 + .../pcn/repository/MesWcEquipmentRepository.java | 13 + .../MesWorkCellMonitorLogRepository.java | 13 + .../repository/MesWorkCellParamCfgRepository.java | 16 + .../pcn/repository/MesWorkCellParamRepository.java | 16 + .../pcn/repository/MesWorkCellPointRepository.java | 17 + .../mes/pcn/repository/MesWorkCellRepository.java | 16 + .../repository/MesWorkCellStatusRepository.java | 16 + .../pcn/repository/MesWorkCenterRepository.java | 16 + .../pcn/repository/MesWorkOrderLogRepository.java | 16 + .../mes/pcn/repository/MesWorkOrderRepository.java | 16 + .../i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java | 413 +++++++++++++++++++++ 239 files changed, 11373 insertions(+) create mode 100644 modules/i3plus-pojo-mes-pcn/pom.xml create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfDismantleRecord.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfPackageDetail.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfProductOffLine.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesAction.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesActionIf.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesActionMethod.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesArea.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesBom.java 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/MesCellFeed.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCellFeedRecord.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesConfig.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustProdLine.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustomer.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustomerPart.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDataObject.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDatasource.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefect.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefectCause.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefectRecord.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDismantleRecord.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEquAlarmRecord.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEquipment.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEsop.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEvent.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEventAction.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesFiCfg.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesFile.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesKpData.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesKpsnRule.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesLabelTemplate.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesLabelTemplateParam.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMethod.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMonitorTask.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMonitorTaskDetail.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesNumberRule.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesNumberSerialno.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesObjectCfg.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPLCConfigure.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackSpec.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageTravel.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPart.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPartCategory.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-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPatternJis.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcn.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnConnectLog.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncCfg.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncErrorLog.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSysUserOffline.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTask.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTaskLog.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlanOrder.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProcess.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdBindRecord.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdCfg.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdCfgDetail.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdPack.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdRouteCfg.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdRouteOptParam.java 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/bean/MesProduceCategory.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCtgyPicture.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSnTravel.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProductData.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProductEncodeCfg.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckData.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckStandard.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJis.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJisDetail.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrder.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRawPartSn.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRepair.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRepairRecord.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRoute.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRouteProcess.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRouteProcessCell.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesScrap.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesScrapRecord.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShift.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShiftGroup.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShiftRest.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesSnPhotoRelation.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStationBom.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStep.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStepParam.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTime.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTorqueDetail.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTypeCfg.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcCheck.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcCheckRecord.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcEquipment.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCell.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellMonitorLog.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellParam.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellParamCfg.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellPoint.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellStatus.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCenter.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrderLog.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ActionRequestBean.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/AttrBean.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ButtonBean.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/DataAcquisitionModel.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/DefectModel.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/EsopFileModel.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/FastDfsDownloadModel.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/GenSerialNoModel.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesButtonFlagModel.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesDefectModel.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProdBindRecordModel.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesStationBomModel.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/PLCInteracticeModel.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/PcsObserverStatusModel.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProdPackageModel.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProductDataModel.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QcCheckStandardModel.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueJisModel.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueOrderModel.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/RequestModel.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/SnPrintDataModel.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/SnPrintModel.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationBomModel.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationResultBean.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepParamsModel.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepPrintSnModel.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepResult.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/TorqueModel.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/WcCheckModel.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/IfDismantleRecordRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/IfPackageDetailRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/IfProductOffLineRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesActionIfRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesActionMethodRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesActionRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesAreaRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesBomRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCellFeedRecordRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCellFeedRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesConfigRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCustProdLineRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCustomerPartRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCustomerRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDataObjectRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDatasourceRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDefectCauseRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDefectRecordRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDefectRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDismantleRecordRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEquipmentRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEsopRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEventActionRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEventRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesFiCfgRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesFileRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesKpDataRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesKpsnRuleRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesLabelTemplateParamRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesLabelTemplateRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesMethodRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesMonitorTaskDetailRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesMonitorTaskRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesNumberRuleRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesNumberSerialnoRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesObjectCfgRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPLCConfigureRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackSpecRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackageDetailRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackageRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackageTravelRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPartCategoryRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPartRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPatternJisRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnConnectLogRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnSyncCfgRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnSyncErrorLogRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnSysUserOfflineRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnTaskLogRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnTaskRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPlanOrderRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPlcRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProcessRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdBindRecordRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdCfgDetailRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdCfgRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdPackRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdRouteCfgRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdRouteOptParamRepository.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-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceCategoryRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceCtgyPictureRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceSnRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceSnTravelRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProductDataRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProductEncodeCfgRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQcCheckDataRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQcCheckStandardRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueJisDetailRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueJisRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueOrderDetailRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueOrderRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRawPartSnRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRepairRecordRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRepairRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRouteProcessCellRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRouteProcessRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRouteRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesScrapRecordRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesScrapRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesShiftGroupRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesShiftRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesShiftRestRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesStationBomRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesStepParamRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesStepRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesTimeRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesTorqueDetailRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesTypeCfgRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWcCheckRecordRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWcCheckRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWcEquipmentRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellMonitorLogRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellParamCfgRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellParamRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellPointRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellStatusRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCenterRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkOrderLogRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkOrderRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml new file mode 100644 index 0000000..bf96e57 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -0,0 +1,55 @@ + + + + i3plus-pojo + i3plus.pojo + 1.0-TEST-SNAPSHOT + ../../pom.xml + + 4.0.0 + + i3plus-pojo-mes-pcn + jar + + + + i3plus.pojo + i3plus-pojo-base + + + + + dev + + DEV + + + true + + + + test + + TEST + + + + docker + + DOCKER + + + + prod + + PROD + + + + + ${project.artifactId}-${project.version} + + + \ No newline at end of file diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfDismantleRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfDismantleRecord.java new file mode 100644 index 0000000..eb147e3 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfDismantleRecord.java @@ -0,0 +1,105 @@ +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: joke.wang + * @CreateDate: 2019\11\14 19:36 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "IF_DISMENTLE_RECORD") +@Api("物料拆解表") +public class IfDismantleRecord extends BaseBean implements Serializable { + + private static final long serialVersionUID = -6010207359066736962L; + @Column(name = "DISMANTLE_ID") + @ApiParam("拆解编号") + private String dismantleId; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("产线") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工位") + private String workCellCode; + + @Column(name = "PARENT_PART_NO") + @ApiParam("产品物料编码") + private String parentPartNo; + + @Column(name = "PARENT_PART_NAME") + @ApiParam("产品物料名称") + private String parentPartName; + + @Column(name = "SN") + @ApiParam("产品条码") + private String sn; + + @Column(name = "QTY") + @ApiParam("产品数量") + private Double qty; + + @Column(name = "DISMANTLE_QTY") + @ApiParam("拆解数") + private BigDecimal dismantleQty; + + @Column(name = "ITEM_PART_NO") + @ApiParam("子物料编码") + private String itemPartNo; + + @Column(name = "ITEM_PART_NAME") + @ApiParam("子物料名称") + private String itemPartName; + + @Column(name = "OK_QTY") + @ApiParam("合格数") + private BigDecimal okQty; + + @Column(name = "MISS_QTY") + @ApiParam("缺失数") + private BigDecimal missQty; + + @Column(name = "SCRAP_QTY") + @ApiParam("报废数") + private BigDecimal scrapQty; + + @Column(name = "LOT_NO") + @ApiParam("批次") + private String lotNo; + + @Column(name = "SYNC_STATUS") + @ApiParam("同步状态") + private Integer syncStatus; + + @Column(name = "ERROR_MESSAGE") + @ApiParam("异常消息") + private String errorMessage; + + @Column(name = "ACTION_CODE") + @ApiParam("动作代码") + private String actionCode; + + @Column(name = "IF_CODE") + @ApiParam("接口代码") + private String ifCode; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfPackageDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfPackageDetail.java new file mode 100644 index 0000000..651f8dc --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfPackageDetail.java @@ -0,0 +1,100 @@ +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: joke.wang + * @CreateDate: 2019\11\15 10:01 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "IF_PACKAGE_DETAIL") +@Api("包装明细表") +public class IfPackageDetail extends BaseBean implements Serializable { + + private static final long serialVersionUID = -1873101288426218272L; + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam("物料名称") + private String partName; + + @Column(name = "SERIAL_NUMBER") + @ApiParam("产品条码") + private String serialNumber; + + @Column(name = "PACKAGE_NO") + @ApiParam("包装条码") + private String packageNo; + + @Column(name = "LOT_NO") + @ApiParam("包装批次") + private String lotNo; + + @Column(name = "QTY") + @ApiParam("数量") + private Double qty; + + @Column(name = "PACKAGE_NO2") + @ApiParam("包装编号2") + private String packageNo2; + + @Column(name = "PACKAGE_NO3") + @ApiParam("包装编号3") + private String packageNo3; + + @Column(name = "PACKAGE_NO4") + @ApiParam("包装编号4") + private String packageNo4; + + @Column(name = "ACTION_USER") + @ApiParam("操作人") + private String actionUser; + + @Column(name = "ACTION_DATE_TIME") + @ApiParam("操作时间") + private String actionDateTime; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("产线") + private String workCenterCode; + + @Column(name = "SYNC_STATUS") + @ApiParam("同步状态") + private Integer syncStatus; + + @Column(name = "ERROR_MESSAGE") + @ApiParam("异常消息") + private String errorMessage; + + @Column(name = "ACTION_CODE") + @ApiParam("动作代码") + private String actionCode; + + @Column(name = "IF_CODE") + @ApiParam("接口代码") + private String ifCode; + + @Column(name = "CT_NO") + @ApiParam("容器编号") + private String ctNo; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfProductOffLine.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfProductOffLine.java new file mode 100644 index 0000000..367bb1c --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfProductOffLine.java @@ -0,0 +1,88 @@ +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: joke.wang + * @CreateDate: 2019\11\15 10:12 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "IF_PRODUCT_OFF_LINE") +@Api("生产报工表") +public class IfProductOffLine extends BaseBean implements Serializable { + + private static final long serialVersionUID = 200629529131241418L; + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam("物料名称") + private String partName; + + @Column(name = "PACKAGE_NO") + @ApiParam("包装条码") + private String packageNo; + + @Column(name = "QTY") + @ApiParam("数量") + private Double qty; + + @Column(name = "UNIT") + @ApiParam("单位") + private String unit; + + @Column(name = "LOT_NO") + @ApiParam("生产批次") + private String lotNo; + + @Column(name = "FIX_LOT_NO") + @ApiParam("特殊批次") + private String fixLotNo; + + @Column(name = "ACTION_USER") + @ApiParam("操作人") + private String actionUser; + + @Column(name = "ACTION_DATE_TIME") + @ApiParam("操作时间") + private String actionDateTime; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("产线") + private String workCenterCode; + + @Column(name = "SYNC_STATUS") + @ApiParam("同步状态") + private Integer syncStatus; + + @Column(name = "ERROR_MESSAGE") + @ApiParam("异常消息") + private String errorMessage; + + @Column(name = "ACTION_CODE") + @ApiParam("动作代码") + private String actionCode; + + @Column(name = "IF_CODE") + @ApiParam("接口代码") + private String ifCode; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesAction.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesAction.java new file mode 100644 index 0000000..ac19407 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesAction.java @@ -0,0 +1,48 @@ +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 :mes系统业务动作 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-12 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_ACTION") +@Api("mes系统业务动作") +public class MesAction extends BaseBean implements Serializable { + private static final long serialVersionUID = -6451213228967727835L; + @Column(name = "ACTION_CODE") + @ApiParam("动作代码") + private String actionCode; + + @Column(name = "ACTION_NAME") + @ApiParam("动作名称") + private String actionName; + + @Column(name = "ACTION_TYPE") + @ApiParam("动作类型") + private Integer actionType; + + public int getActionTypeVal() { + return this.actionType == null ? 0 : this.actionType; + } +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesActionIf.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesActionIf.java new file mode 100644 index 0000000..eafb489 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesActionIf.java @@ -0,0 +1,40 @@ +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: joke.wang + * @CreateDate: 2019\11\13 11:47 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_ACTION_IF") +@Api("动作接口配置") +public class MesActionIf extends BaseBean implements Serializable { + + private static final long serialVersionUID = -5058215339453766620L; + @Column(name = "ACTION_CODE") + @ApiParam("动作代码") + private String actionCode; + + @Column(name = "IF_CODE") + @ApiParam("接口代码") + private String ifCode; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesActionMethod.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesActionMethod.java new file mode 100644 index 0000000..b38452f --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesActionMethod.java @@ -0,0 +1,49 @@ +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 :mes系统业务动作方法 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-12 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_ACTION_METHOD") +@Api("系统业务动作方法") +public class MesActionMethod extends BaseBean implements Serializable { + private static final long serialVersionUID = 6249418690993577108L; + @Column(name = "ACTION_CODE") + @ApiParam("动作代码") + private String actionCode; + + @Column(name = "METHOD_CODE") + @ApiParam("方法代码") + private String methodCode; + + @Column(name = "SEQ") + @ApiParam("序号") + private Integer seq; + + public int getSeqVal() { + return this.seq == null ? 0 : this.seq; + } + +} 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 new file mode 100644 index 0000000..d1910a3 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesArea.java @@ -0,0 +1,59 @@ +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; +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.List; + +/** + * @Description :生产区域 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_AREA") +@Api("生产区域") +public class MesArea extends BaseBean implements Serializable { + private static final long serialVersionUID = 1047604067591557689L; + @Column(name = "AREA_CODE") + @ApiParam("区域代码") + private String areaCode; + + @Column(name = "AREA_NAME") + @ApiParam("区域名称") + private String areaName; + + @Transient + @ApiParam(value = "子集列表") + private List childTreeList; + + @Transient + @ApiParam(value = "名称") + private String name; + + // 默认值 -1 + @Transient + @ApiParam(value = "父节点", access = "父节点", example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long parentId; + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesBom.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesBom.java new file mode 100644 index 0000000..7471095 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesBom.java @@ -0,0 +1,90 @@ +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.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; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description :BOM清单 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_BOM") +@Api("BOM清单") +public class MesBom extends BaseBean implements Serializable { + private static final long serialVersionUID = -1772273641263268564L; + @Column(name = "PART_NO") + @ApiParam("父零件号") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam("父零件名称") + private String partName; + + @Column(name = "UNIT") + @ApiParam(value = "单位") + private String unit; + + @Column(name = "QTY") + @ColumnDefault("0") + @ApiParam(value = "数量", example = "0") + private Double qty; + + @Column(name = "ITEM_PART_NO") + @ApiParam("子零件") + private String itemPartNo; + + @Column(name = "ITEM_PART_NAME") + @ApiParam("子零件名称") + private String itemPartName; + + @Column(name = "ITEM_UNIT") + @ApiParam(value = "子零件单位") + private String itemUnit; + + @Column(name = "ITEM_QTY") + @ColumnDefault("0") + @ApiParam(value = "子零件数量", example = "0") + private Double itemQty; + + @Column(name = "BOM_VERSION") + @ApiParam(value = "BOM版本") + private String bomVersion; + + @Column(name = "EFF_START_TIME") + @ApiParam(value = "生效时间") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private String effStartTime; + + @Column(name = "EFF_END_TIME") + @ApiParam(value = "失效时间") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private String effEndTime; + + public double getQtyVal() { + return this.qty == null ? 0.0d : this.qty; + } + + public double getitemQtyVal() { + return this.itemQty == null ? 0.0d : this.itemQty; + } +} 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/MesCellFeed.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCellFeed.java new file mode 100644 index 0000000..60e2d1d --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCellFeed.java @@ -0,0 +1,79 @@ +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 javax.persistence.Version; +import java.io.Serializable; + +/** + * @Description :工位投料信息 + * @Reference : + * @Author : Wynne.Lu + * @CreateDate : 2019-09-17 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_CELL_FEED") +@Api("工位投料信息") +public class MesCellFeed extends BaseBean implements Serializable { + private static final long serialVersionUID = 2412657464618960515L; + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元") + private String workCellCode; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam("物料名称") + private String partName; + + @Column(name = "RAW_TYPE") + @ApiParam("原料类型") + private String rawType; + + @Column(name = "RAW_SN") + @ApiParam("原材料条码") + private String rawSn; + + @Column(name = "RAW_QTY") + @ApiParam("特殊批次") + private Double rawQty; + + @Column(name = "LOT_NO") + @ApiParam("关联批次") + private String lotNo; + + @Column(name = "SUPPLIER_CODE") + @ApiParam("供应商代码") + private String supplierCode; + +// @Version +// @Column(name = "LOCK_VERSION") +// @ApiParam(value = "乐观锁", example = "1") +// public Integer lockVersion; + + public double getRawQtyVal() { + return this.rawQty == null ? 0l : this.rawQty; + } + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCellFeedRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCellFeedRecord.java new file mode 100644 index 0000000..6464445 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCellFeedRecord.java @@ -0,0 +1,74 @@ +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 : siliter.yuan + * @CreateDate : 2020-06-17 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_CELL_FEED_RECORD") +@Api("工位投料履历信息") +public class MesCellFeedRecord extends BaseBean implements Serializable { + private static final long serialVersionUID = 1947971379489107783L; + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元") + private String workCellCode; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam("物料名称") + private String partName; + + @Column(name = "RAW_TYPE") + @ApiParam("原料类型") + private String rawType; + + @Column(name = "RAW_SN") + @ApiParam("原材料条码") + private String rawSn; + + @Column(name = "RAW_QTY") + @ApiParam("原材料数量") + private Double rawQty; + + @Column(name = "LOT_NO") + @ApiParam("关联批次") + private String lotNo; + + @Column(name = "SUPPLIER_CODE") + @ApiParam("供应商代码") + private String supplierCode; + + + public double getRawQtyVal() { + return this.rawQty == null ? 0l : this.rawQty; + } + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesConfig.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesConfig.java new file mode 100644 index 0000000..f8b9558 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesConfig.java @@ -0,0 +1,56 @@ +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 : crish + * @CreateDate : 2019-06-04 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_CONFIG") +@Api("mes配置表") +public class MesConfig extends BaseBean implements Serializable { + private static final long serialVersionUID = -5759669472714287000L; + @Column(name = "CFG_CODE") + @ApiParam("配置代码") + private String cfgCode; + + @Column(name = "CFG_NAME") + @ApiParam("配置名称") + private String cfgName; + + @Column(name = "CFG_TYPE") + @ApiParam("配置类型") + private String cfgType; + + @Column(name = "CFG_KEY") + @ApiParam("配置key") + private String cfgKey; + + @Column(name = "CFG_VALUE") + @ApiParam("配置value") + private String cfgValue; + + @Column(name = "CFG_VAULE_DESC") + @ApiParam("配置value描述") + private String cfgValueDesc; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustProdLine.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustProdLine.java new file mode 100644 index 0000000..8e9a363 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustProdLine.java @@ -0,0 +1,40 @@ +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 :mes系统业务动作 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-12 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_CUST_PROD_LINE") +@Api("客户产线代码") +public class MesCustProdLine extends BaseBean implements Serializable { + private static final long serialVersionUID = 3049432665592161513L; + @Column(name = "CUST_PROD_LINE_CODE") + @ApiParam("客户产线代码") + private String custProdLineCode; + + @Column(name = "CUST_PROD_LINE_NAME") + @ApiParam("客户产线名称") + private String custProdLineName; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustomer.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustomer.java new file mode 100644 index 0000000..21f2ad1 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustomer.java @@ -0,0 +1,56 @@ +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 :mes客户表 + * @Reference : + * @Author : crish + * @CreateDate : 2019-04-22 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_CUSTOMER") +@Api("客户信息") +public class MesCustomer extends BaseBean implements Serializable { + private static final long serialVersionUID = 167635887082538926L; + @Column(name = "CUSTOMER_CODE") + @ApiParam("客户代码") + private String customerCode; + + @Column(name = "CUSTOMER_NAME") + @ApiParam("客户名称") + private String customerName; + + @Column(name = "BRIEF_TEXT") + @ApiParam("客户简称") + private String briefText; + + @Column(name = "ADDRESS") + @ApiParam("客户地址") + private String address; + + @Column(name = "CONTACT") + @ApiParam("客户联系人") + private String contact; + + @Column(name = "TELEPHONE") + @ApiParam("客户电话") + private String telephone; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustomerPart.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustomerPart.java new file mode 100644 index 0000000..0c5f49c --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustomerPart.java @@ -0,0 +1,49 @@ +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 :mes客户表 + * @Reference : + * @Author : yiming.gu + * @CreateDate : 2019-05-20 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_CUSTOMER_PART") +@Api("客户零件关系") +public class MesCustomerPart extends BaseBean implements Serializable { + private static final long serialVersionUID = -4731252848471949263L; + @Column(name = "CUSTOMER_CODE") + @ApiParam("客户代码") + private String customerCode; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "CUSTOMER_PART_NO") + @ApiParam("客户零件号") + private String customerPartNo; + + @Column(name = "CUSTOMER_PART_NAME") + @ApiParam("客户零件描述") + private String customerPartName; + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDataObject.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDataObject.java new file mode 100644 index 0000000..8bded7d --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDataObject.java @@ -0,0 +1,71 @@ +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; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/9/24 7:12 PM + * @Description: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_DATA_OBJECT") +@Api("数据对象") +public class MesDataObject extends BaseBean implements Serializable { + + private static final long serialVersionUID = -1419262751765770535L; + @Column(name = "OBJECT_CODE") + @ApiParam("对象代码") + private String objectCode; + + @Column(name = "OBJECT_NAME") + @ApiParam("对象名称") + private String objectName; + + @Column(name = "DS_CODE") + @ApiParam("数据源代码") + private String dsCode; + + @Column(name = "OPERATE_TYPE") + @ApiParam("操作类型") + private Integer operateType; + + @Column(name = "FIELD_PK") + @ApiParam("主键") + private String fieldPk; + + @Column(name = "READ_FLAG_VALUE") + @ApiParam("读取标志值") + private String readFlagValue; + + @Column(name = "FEED_FIELD") + @ApiParam("反馈字段") + private String feedField; + + @Column(name = "FEED_VALUE") + @ApiParam("反馈值") + private String feedValue; + + @Column(name = "SELF_ADDITION") + @ApiParam("自增列") + private String selfAddition; + + @Column(name = "SELF_ADDITION_VALUE") + @ApiParam("自增列值") + private Long selfAdditionValue; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDatasource.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDatasource.java new file mode 100644 index 0000000..93ea185 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDatasource.java @@ -0,0 +1,82 @@ +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; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/9/24 7:17 PM + * @Description: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_DATASOURCE") +@Api("地址清单") +public class MesDatasource extends BaseBean implements Serializable { + + private static final long serialVersionUID = -7387559860198655900L; + @Column(name = "DS_CODE") + @ApiParam("数据源代码") + private String dsCode; + + @Column(name = "DS_NAME") + @ApiParam("数据源名称") + private String dsName; + + @Column(name = "DS_TYPE") + @ApiParam("数据源类型") + private String dsType; + + @Column(name = "DS_HOST") + @ApiParam("主机") + private String dsHost; + + @Column(name = "DS_PORT") + @ApiParam("端口") + private Integer dsPort; + + @Column(name = "DS_USER") + @ApiParam("用户名") + private String dsUser; + + @Column(name = "DS_PASSWORD") + @ApiParam("密码") + private String dsPassword; + + @Column(name = "DS_DB_NAME") + @ApiParam("数据库名称") + private String dsDbName; + + @Column(name = "EQUIPMENT_CODE") + @ApiParam("设备代码") + private String equipmentCode; + + @Override + public String toString() { + return "MesDatasource{" + + "dsCode='" + dsCode + '\'' + + ", dsName='" + dsName + '\'' + + ", dsType='" + dsType + '\'' + + ", dsHost='" + dsHost + '\'' + + ", dsPort=" + dsPort + + ", dsUser='" + dsUser + '\'' + + ", dsPassword='" + dsPassword + '\'' + + ", dsDbName='" + dsDbName + '\'' + + ", equipmentCode='" + equipmentCode + '\'' + + '}'; + } +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefect.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefect.java new file mode 100644 index 0000000..c42d71d --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefect.java @@ -0,0 +1,81 @@ +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 javax.persistence.Transient; +import java.io.Serializable; +import java.util.List; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\16 14:25 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_DEFECT") +@Api("缺陷表") +public class MesDefect extends BaseBean implements Serializable { + + private static final long serialVersionUID = -6771813937279359333L; + @Column(name = "DEFECT_CODE") + @ApiParam("缺陷代码") + private String defectCode; + + @Column(name = "DEFECT_NAME") + @ApiParam("缺陷名称") + private String defectName; + + @Column(name = "DEFECT_TYPE") + @ApiParam("缺陷类型") + private String defectType; + + @Column(name = "PROD_CFG_TYPE_CODE") + @ApiParam("项目代码") + private String prodCfgTypeCode; + + @Column(name = "DEFECT_FLAG_VALUE") + @ApiParam("缺陷标识值") + private String defectFlagValue; + + @Column(name = "DEFECT_ACTION_TYPE") + @ApiParam("不良处理类型") + private String defectActionType; + + @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-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefectCause.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefectCause.java new file mode 100644 index 0000000..d4f287f --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefectCause.java @@ -0,0 +1,44 @@ +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: joke.wang + * @CreateDate: 2019\10\16 14:28 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_DEFECT_CAUSE") +@Api("缺陷原因表") +public class MesDefectCause extends BaseBean implements Serializable { + + private static final long serialVersionUID = -3867250593038812861L; + @Column(name = "DC_CODE") + @ApiParam("缺陷原因代码") + private String dcCode; + + @Column(name = "DC_NAME") + @ApiParam("缺陷原因名称") + private String dcName; + + @Column(name = "DC_TYPE") + @ApiParam("缺陷原因类型") + private String dcType; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefectRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefectRecord.java new file mode 100644 index 0000000..a97ccef --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefectRecord.java @@ -0,0 +1,80 @@ +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.*; +import java.io.Serializable; +import java.util.List; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\16 19:53 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_DEFECT_RECORD", indexes = { + @Index(columnList = "SERIAL_NUMBER"), + @Index(columnList = "CREATE_DATE_TIME") +}) +@Api("不良信息记录表") +public class MesDefectRecord extends BaseBean implements Serializable { + private static final long serialVersionUID = -2828208776424343584L; + @Column(name = "SERIAL_NUMBER") + @ApiParam("产品条码") + private String serialNumber; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam("物料名称") + private String partName; + + @Column(name = "DEFECT_CODE") + @ApiParam("缺陷代码") + private String defectCode; + + @Column(name = "DEFECT_NAME") + @ApiParam("缺陷名称") + private String defectName; + + @Column(name = "DEFECT_LOCATION") + @ApiParam("缺陷位置") + private String defectLocation; + + @Column(name = "SIDE_LOCATION") + @ApiParam("面位") + private String sideLocation; + + @Column(name = "REPAIR_STATUS") + @ApiParam("维修状态") + private Integer repairStatus; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name = "MEMO") + @ApiParam("备注") + private String memo; + + @Transient + private List mesDefectList; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDismantleRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDismantleRecord.java new file mode 100644 index 0000000..14151ff --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDismantleRecord.java @@ -0,0 +1,97 @@ +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.*; +import java.io.Serializable; +import java.math.BigDecimal; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\16 15:03 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_DISMANTLE_RECORD", indexes = { + @Index(columnList = "SN"), + @Index(columnList = "CREATE_DATE_TIME") +}) +@Api("物料拆解记录表") +public class MesDismantleRecord extends BaseBean implements Serializable { + + private static final long serialVersionUID = -7924346039878218038L; + @Column(name = "DISMANTLE_ID") + @ApiParam("拆解编号") + private String dismantleId; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name = "PARENT_PART_NO") + @ApiParam("产品物料编码") + private String parentPartNo; + + @Column(name = "PARENT_PART_NAME") + @ApiParam("产品物料名称") + private String parentPartName; + + @Column(name = "SN") + @ApiParam("产品条码") + private String sn; + + @Column(name = "QTY") + @ApiParam("产品数量") + private Double qty; + + @Column(name = "DISMANTLE_QTY") + @ApiParam("拆解数") + private BigDecimal dismantleQty; + + @Column(name = "ITEM_PART_NO") + @ApiParam("子物料编码") + private String itemPartNo; + + @Column(name = "ITEM_PART_NAME") + @ApiParam("子物料名称") + private String itemPartName; + + @Column(name = "OK_QTY") + @ApiParam("合格数") + private BigDecimal okQty; + + @Column(name = "MISS_QTY") + @ApiParam("缺失数") + private BigDecimal missQty; + + @Column(name = "SCRAP_QTY") + @ApiParam("报废数") + private BigDecimal scrapQty; + + @Column(name = "MEMO") + @ApiParam("备注") + private String memo; + + @Column(name = "LOT_NO") + @ApiParam("关联批次") + private String lotNo; + + @Transient + private String serialNumber; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEquAlarmRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEquAlarmRecord.java new file mode 100644 index 0000000..25fe6ee --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEquAlarmRecord.java @@ -0,0 +1,53 @@ +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.Index; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/9/23 18:47 + * @desc + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_EQU_ALARM_RECORD", indexes = { + @Index(columnList = "WORK_CENTER_CODE") +}) +@Api("设备自动报警记录表") +public class MesEquAlarmRecord extends BaseBean implements Serializable { + private static final long serialVersionUID = 1675134362612851879L; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("产线") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工位") + private String workCellCode; + + @Column(name = "ALARM_LEVEL") + @ApiParam("报警等级") + private Integer alarmLevel; + + @Column(name = "ALARM_START_TIME") + @ApiParam("报警开始时间") + private String alarmStartTime; + + @Column(name = "ALARM_STOP_TIME") + @ApiParam("报警开始时间") + private String alarmStopTime; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEquipment.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEquipment.java new file mode 100644 index 0000000..df432f3 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEquipment.java @@ -0,0 +1,97 @@ +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; +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 : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_EQUIPMENT") +@Api("生产设备") +public class MesEquipment extends BaseBean implements Serializable { + private static final long serialVersionUID = 7269069290035250108L; + @Column(name = "EQUIPMENT_CODE") + @ApiParam("设备代码") + private String equipmentCode; + + @Column(name = "EQUIPMENT_NAME") + @ApiParam("设备名称") + private String equipmentName; + + @Column(name = "STATUS") + @ApiParam("设备状态") + private Integer status; + + @Column(name = "EQUIPMENT_TYPE") + @ApiParam("设备类型") + private Integer equipmentType; + + @Column(name = "EQUIPMENT_CATEGORY") + @ApiParam("设备类别") + private String equipmentCategory; + + @Column(name = "EQUIPMENT_MODEL") + @ApiParam("型号") + private String equipmentModel; + + @Column(name = "EQUIPMENT_SPEC") + @ApiParam("规格") + private String equipmentSpec; + + @Column(name = "EQUIPMENT_MAKER") + @ApiParam("制造商") + private String equipmentMaker; + + @Column(name = "RELEASE_DATE") + @ApiParam("出厂日期") + private String releaseDate; + + @Column(name = "RECEIVE_DATE") + @ApiParam("接收日期") + private String receiveDate; + + @Column(name = "ENABLE_DATE") + @ApiParam("启用日期") + private String enableDate; + + @Column(name = "CONNECT_TYPE") + @ApiParam("连接类型") + private Integer connectType; + + @Column(name = "MEMO") + @ApiParam("备注") + private String memo; + + @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/MesEsop.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEsop.java new file mode 100644 index 0000000..655c2f4 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEsop.java @@ -0,0 +1,93 @@ +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 javax.persistence.Transient; +import java.io.Serializable; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/7/30 9:30 AM + * @Description: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_ESOP") +@Api("作业指导书信息表(ODS)") +public class MesEsop extends BaseBean implements Serializable { + + private static final long serialVersionUID = -4869646502033099294L; + @Column(name = "PART_NO") + @ApiParam("零件号") + private String partNo; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name = "ROUTE_CODE") + @ApiParam("流程代码") + private String routeCode; + + @Column(name = "PROCESS_CODE") + @ApiParam("工序代码") + private String processCode; + + @Column(name = "STEP_CODE") + @ApiParam("工步代码") + private String stepCode; + + @Column(name = "STEP_SEQ") + @ApiParam("工步序号") + private Integer stepSeq; + + @Column(name = "FILE_ID") + @ApiParam("文件id") + private Long fileId; + + @Transient + @ApiParam("文件名称") + private String fileName; + + @Transient + @ApiParam("文件URL") + private String fileUrl; + + @Transient + @ApiParam("组名") + private String groupName; + + @Transient + @ApiParam("文件原名") + private String fileOriginName; + + @Transient + @ApiParam("文件大小") + private String fileSize; + + @Transient + @ApiParam("文件类型名称") + private String fileType; + + @Transient + @ApiParam("同步标记") + private Integer syncTag = 0; + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEvent.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEvent.java new file mode 100644 index 0000000..cc17b50 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEvent.java @@ -0,0 +1,52 @@ +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 :mes系统业务事件 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-12 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_EVENT") +@Api("系统业务事件") +public class MesEvent extends BaseBean implements Serializable { + private static final long serialVersionUID = -5604724665202938464L; + @Column(name = "EVENT_CODE") + @ApiParam("事件代码") + private String eventCode; + + @Column(name = "EVENT_NAME") + @ApiParam("事件名称") + private String eventName; + + @Column(name = "EVENT_TYPE") + @ApiParam("事件类型") + private Integer eventType; + + @Column(name = "BUTTON_CODE") + @ApiParam("按钮代码") + private String buttonCode; + + public int getEventTypeVal() { + return this.eventType == null ? 0 : this.eventType; + } +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEventAction.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEventAction.java new file mode 100644 index 0000000..2a16eb0 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEventAction.java @@ -0,0 +1,54 @@ +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.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +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 : jack.jia + * @CreateDate : 2019-04-12 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@AllArgsConstructor +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_EVENT_ACTION") +@Api("系统业务事件动作") +public class MesEventAction extends BaseBean implements Serializable { + private static final long serialVersionUID = 3964084375279916831L; + @Column(name = "EVENT_CODE") + @ApiParam("事件代码") + private String eventCode; + + @Column(name = "ACTION_CODE") + @ApiParam("动作代码") + private String actionCode; + + @Column(name = "SEQ") + @ApiParam("序号") + private Integer seq; + + public int getSeqVal() { + return this.seq == null ? 0 : this.seq; + } + + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesFiCfg.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesFiCfg.java new file mode 100644 index 0000000..f128453 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesFiCfg.java @@ -0,0 +1,47 @@ +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; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/10/10 8:37 PM + * @Description: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_FI_CFG") +@Api("首检件配置") +public class MesFiCfg extends BaseBean implements Serializable { + + private static final long serialVersionUID = 1791614973371037158L; + @Column(name = "WORK_CENTER_CODE") + @ApiParam("产线") + private String workCenterCode; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "CUST_CODE") + @ApiParam("客户代码") + private String custCode; + + @Column(name = "FI_QTY") + @ApiParam("首检数量") + private Double fiQty; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesFile.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesFile.java new file mode 100644 index 0000000..a90ed92 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesFile.java @@ -0,0 +1,59 @@ +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; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/12/4 1:28 下午 + * @Description: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_FILE") +@Api("文件表") +public class MesFile extends BaseBean implements Serializable { + + private static final long serialVersionUID = 7017379708394714424L; + @Column(name = "FILE_NAME") + @ApiParam("文件名称") + private String fileName; + + @Column(name = "FILE_URL") + @ApiParam("文件URL") + private String fileUrl; + + @Column(name = "GROUP_NAME") + @ApiParam("组名") + private String groupName; + + @Column(name = "FILE_ORIGIN_NAME") + @ApiParam("文件原名") + private String fileOriginName; + + @Column(name = "FILE_SIZE") + @ApiParam("文件大小") + private String fileSize; + + @Column(name = "FILE_TYPE") + @ApiParam("文件类型名称") + private String fileType; + + @Column(name = "SYNC_TAG") + @ApiParam("同步标记") + private Integer syncTag = 0; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesKpData.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesKpData.java new file mode 100644 index 0000000..243e6a9 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesKpData.java @@ -0,0 +1,65 @@ +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 javax.persistence.Transient; +import java.io.Serializable; + +/** + * @Description :物料关键数据 + * @Reference : + * @Author : crish + * @CreateDate : 2019-05-15 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_KP_DATA") +@Api("生产区域") +public class MesKpData extends BaseBean implements Serializable { + private static final long serialVersionUID = -3332582267186642790L; + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "KEY_DATA_CODE") + @ApiParam("关键数据代码") + private String keyDataCode; + + @Column(name = "KEY_DATA_NAME") + @ApiParam("关键数据名称") + private String keyDataName; + + @Column(name = "KEY_DATA_COUNT") + @ApiParam("关键数据数量") + private Integer keyDataCount; + + @Column(name = "UPPER_LIMIT") + @ApiParam("数据上限") + private Double upperLimit; + + @Column(name = "LOWER_LIMIT") + @ApiParam("数据下限") + private Double lowerLimit; + + @Transient + @ApiParam("扭矩值") + private Double torqueValue; + + @Transient + @ApiParam("是否在范围之内") + private Boolean ok; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesKpsnRule.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesKpsnRule.java new file mode 100644 index 0000000..9ca9ac7 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesKpsnRule.java @@ -0,0 +1,95 @@ +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: Crish + * @CreateDate:2019-04-16-17:36 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_KPSN_RULE") +@Api("关键件条码校验规则") +public class MesKpsnRule extends BaseBean implements Serializable { + private static final long serialVersionUID = 8238308232531730720L; + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "LENGTH") + @ApiParam("长度") + private Integer length; + + @Column(name = "FROM1") + @ApiParam("起始1") + private Integer from1; + + @Column(name = "TO1") + @ApiParam("至1") + private Integer to1; + + @Column(name = "FIX1") + @ApiParam("内容1") + private String fix1; + + @Column(name = "FROM2") + @ApiParam("起始2") + private Integer from2; + + @Column(name = "TO2") + @ApiParam("至2") + private Integer to2; + + @Column(name = "FIX2") + @ApiParam("内容2") + private String fix2; + + @Column(name = "TYPE") + @ApiParam("类型") + private String type; + + @Column(name = "BIND_RULE") + @ApiParam("绑定规则") + private Integer bandRule; + + @Column(name = "SUPPLIER_CODE") + @ApiParam("供应商代码") + private String supplierCode; + + public int getLengthVal() { + return this.length == null ? 0 : this.length; + } + + public int getFrom1Val() { + return this.from1 == null ? 0 : this.from1; + } + + public int getTo1Val() { + return this.to1 == null ? 0 : this.to1; + } + + public int getFrom2Val() { + return this.from2 == null ? 0 : this.from2; + } + + public int getTo2Val() { + return this.to2 == null ? 0 : this.to2; + } +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesLabelTemplate.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesLabelTemplate.java new file mode 100644 index 0000000..589c237 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesLabelTemplate.java @@ -0,0 +1,54 @@ +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.*; +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 = "MES_LABEL_TEMPLATE") +@Api(value = "打印模板", description = "打印模板") +public class MesLabelTemplate extends BaseBean implements Serializable { + + + private static final long serialVersionUID = 3797103812377146878L; + @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-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesLabelTemplateParam.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesLabelTemplateParam.java new file mode 100644 index 0000000..253f29a --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesLabelTemplateParam.java @@ -0,0 +1,55 @@ +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; +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 = "MES_LABEL_TEMPLATE_PARAM") +@Api(value = "打印模板参数", description = "打印模板参数") +public class MesLabelTemplateParam extends BaseBean implements Serializable { + + private static final long serialVersionUID = -3595706874099358555L; + @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-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMethod.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMethod.java new file mode 100644 index 0000000..e8daace --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMethod.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; + +/** + * @Description :mes系统业务方法 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-12 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_METHOD") +@Api("系统业务方法") +public class MesMethod extends BaseBean implements Serializable { + private static final long serialVersionUID = -3629909409034083767L; + @Column(name = "METHOD_CODE") + @ApiParam("方法代码") + private String methodCode; + + @Column(name = "METHOD_NAME") + @ApiParam("方法名称") + private String methodName; + + @Column(name = "CALL_CLASS") + @ApiParam("具体实现类") + private String callClass; + + /** + * 10-执行方法（不需要返回值），20-完成方法（返回ResultBean） + */ + @Column(name = "METHOD_TYPE") + @ApiParam("方法类型") + private Integer methodType; + + public int getMethodTypeVal() { + return this.methodType == null ? 0 : this.methodType; + } +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMonitorTask.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMonitorTask.java new file mode 100644 index 0000000..3e81c47 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMonitorTask.java @@ -0,0 +1,52 @@ +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/1/8 0008 - 17:11 + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_MONITOR_TASK") +@Api("监听任务") +public class MesMonitorTask extends BaseBean implements Serializable { + + private static final long serialVersionUID = -8614480099840448294L; + @Column(name = "TASK_NO") + @ApiParam("任务编号") + private String taskNo; + + @Column(name = "TASK_NAME") + @ApiParam("任务名称") + private String taskName; + + @Column(name = "TASK_OBJECT_TYPE") + @ApiParam("任务对象类型") + private Integer taskObjectType; + + @Column(name = "TASK_STATUS") + @ApiParam("任务状态") + private Integer taskStatus; + + @Column(name = "TASK_EXCEPTION_DESC") + @ApiParam("异常描述") + private String taskExceptionDesc; + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMonitorTaskDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMonitorTaskDetail.java new file mode 100644 index 0000000..891dc65 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMonitorTaskDetail.java @@ -0,0 +1,48 @@ +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/1/8 0008 - 17:19 + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_MONITOR_TASK_DETAIL") +@Api("监听任务明细") +public class MesMonitorTaskDetail extends BaseBean implements Serializable { + + private static final long serialVersionUID = -4811270359386960747L; + @Column(name = "TASK_NO") + @ApiParam("任务编号") + private String taskNo; + + @Column(name = "DATA_OBJECT_NO") + @ApiParam("数据对象编号") + private String dataObjectNo; + +// @Column(name = "STORE_OBJECT_CODE") +// @ApiParam("存储对象代码") +// private String storeObjectCode; +// +// @Column(name = "STORE_FIELD_CODE") +// @ApiParam("存储字段代码") +// private String storeFieldCode; + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesNumberRule.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesNumberRule.java new file mode 100644 index 0000000..9fc51c2 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesNumberRule.java @@ -0,0 +1,60 @@ +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; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/8/22 5:59 PM + * @Description: + **/ + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_NUMBER_RULE") +@Api("条码生成规则") +public class MesNumberRule extends BaseBean implements Serializable { + + private static final long serialVersionUID = -4039194855353751178L; + @Column(name = "RULE_CODE") + @ApiParam("规则代码") + private String ruleCode; + + @Column(name = "RULE_DESC") + @ApiParam("规则描述") + private String ruleDesc; + + @Column(name = "PREFIX") + @ApiParam("前缀") + private String prefix; + + @Column(name = "NUMBER_RULE") + @ApiParam("编码规则") + private String numberRule; + + @Column(name = "SERIALNO_LENGTH") + @ApiParam("序号长度") + private Integer serialnoLength; + + @Column(name = "SERIALNO_INCREMENT") + @ApiParam("增量") + private Integer serialnoIncrement; + + @Column(name = "IS_CYCLE") + @ApiParam("最大值后循环") + private Integer isCycle; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesNumberSerialno.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesNumberSerialno.java new file mode 100644 index 0000000..16436c6 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesNumberSerialno.java @@ -0,0 +1,49 @@ +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 javax.persistence.Version; +import java.io.Serializable; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/8/23 9:14 AM + * @Description: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_NUMBER_SERIALNO") +@Api("编码序号") +public class MesNumberSerialno extends BaseBean implements Serializable { + + private static final long serialVersionUID = -3024166851634742872L; + @Column(name = "CURRENT_NUMBER_PREFIX") + @ApiParam("当前编号前缀") + private String currentNumberPrefix; + + @Column(name = "CURRENT_SERIALNO") + @ApiParam("当前序号") + private Integer currentSerialno; + + @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-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesObjectCfg.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesObjectCfg.java new file mode 100644 index 0000000..5b7c166 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesObjectCfg.java @@ -0,0 +1,60 @@ +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; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/9/24 7:14 PM + * @Description: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_OBJECT_CFG") +@Api("对象结构") +public class MesObjectCfg extends BaseBean implements Serializable { + + private static final long serialVersionUID = -3640782210450491835L; + @Column(name = "OBJECT_CODE") + @ApiParam("对象代码") + private String objectCode; + + @Column(name = "FIELD_CODE") + @ApiParam("字段代码") + private String fieldCode; + + @Column(name = "FIELD_NAME") + @ApiParam("字段名称") + private String fieldName; + + @Column(name = "FIELD_TYPE") + @ApiParam("字段类型") + private String fieldType; + + @Column(name = "FIELD_LENGTH") + @ApiParam("列长度") + private Integer fieldLength; + + @Column(name = "POJO_ATTR") + @ApiParam("对应的pojo属性") + private String pojoAttr; + + @Column(name = "IS_SAVE") + @ApiParam("是否保存 1存 2不存") + private Integer isSave; + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPLCConfigure.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPLCConfigure.java new file mode 100644 index 0000000..38c0363 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPLCConfigure.java @@ -0,0 +1,62 @@ +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 :PLC设备信息配置表 + * @Reference : + * @Author : Crish + * @CreateDate : 2019-05-17 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PLC_CONFIGURE") +@Api("PLC设备信息配置表") +@Deprecated +public class MesPLCConfigure extends BaseBean implements Serializable { + private static final long serialVersionUID = 8274445475806774L; + @Column(name = "IP") + @ApiParam("设备ip") + private String ipAddress; + + @Column(name = "CHANNEL_NAME") + @ApiParam("通道名称") + private String channelName; + + @Column(name = "DEVICE_NAME") + @ApiParam("设备地址") + private String deviceName; + + @Column(name = "TAG_NAME") + @ApiParam("标签地址") + private String tagName; + + @Column(name = "AREA_CODE") + @ApiParam("区域代码") + private String areaCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元") + private String workCellCode; + + @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/MesPackSpec.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackSpec.java new file mode 100644 index 0000000..7ca973d --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackSpec.java @@ -0,0 +1,99 @@ +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.ColumnDefault; +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 : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PACK_SPEC") +@Api("包装规格") +public class MesPackSpec extends BaseBean implements Serializable { + private static final long serialVersionUID = -788654193624068327L; + @Column(name = "SPEC_CODE") + @ApiParam("包装规格代码") + private String specCode; + + @Column(name = "SPEC_NAME") + @ApiParam("包装规格名称") + private String specName; + + @Column(name = "QTY") + @ColumnDefault("0") + @ApiParam(value = "包装数量", example = "0") + private Double qty; + + @Column(name = "QTY2") + @ColumnDefault("0") + @ApiParam(value = "包装数量2", example = "0") + private Double qty2; + + @Column(name = "QTY3") + @ColumnDefault("0") + @ApiParam(value = "包装数量3", example = "0") + private Double qty3; + + @Column(name = "QTY4") + @ColumnDefault("0") + @ApiParam(value = "包装数量4", example = "0") + private Double qty4; + + @Column(name = "IS_MIXED") + @ApiParam("是否混包") + private Integer isMixed; + + @Column(name = "IS_MIXED2") + @ApiParam("是否混包2") + private Integer isMixed2; + + @Column(name = "IS_MIXED3") + @ApiParam("是否混包3") + private Integer isMixed3; + + @Column(name = "IS_MIXED4") + @ApiParam("是否混包4") + private Integer isMixed4; + + + public double getQtyVal() { + return this.qty == null ? 0.0d : this.qty; + } + + public int getIsMixedVal() { + return this.isMixed == null ? 0 : this.isMixed; + } + + public int getIsMixed2Val() { + return this.isMixed2 == null ? 0 : this.isMixed2; + } + + public int getIsMixed3Val() { + return this.isMixed3 == null ? 0 : this.isMixed3; + } + + public int getIsMixed4Val() { + return this.isMixed4 == null ? 0 : this.isMixed4; + } + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java new file mode 100644 index 0000000..5eeff9e --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java @@ -0,0 +1,119 @@ +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.*; +import java.io.Serializable; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/10/18 1:26 下午 + * @Description: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PACKAGE", indexes = {@Index(columnList = "PACKAGE_NO") +}, uniqueConstraints = { + @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "PACKAGE_NO"}) +} +) +@Api("包装规格") +public class MesPackage extends BaseBean implements Serializable { + private static final long serialVersionUID = 2292859018089339608L; + @Column(name = "PACKAGE_NO", nullable = false) + @ApiParam("包装编号") + private String packageNo; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "PART_NAME_RDD") + @ApiParam("物料名称") + private String partNameRdd; + + @Column(name = "QTY") + @ApiParam("数量") + private Double qty; + + @Column(name = "PACK_SPEC_QTY") + @ApiParam("包装规格数量") + private Double packSpecQty; + + @Column(name = "UNIT") + @ApiParam("单位") + private String unit; + + @Column(name = "LOT_NO") + @ApiParam("批号") + private String lotNo; + + @Column(name = "FIX_LOT_NO") + @ApiParam("特殊批号") + private String fixLotNo; + + @Column(name = "PACK_SPEC") + @ApiParam("包装规格") + private String packSpec; + + @Column(name = "IS_SEALED") + @ApiParam("是否封箱") + private Integer isSealed; + + @Column(name = "PRINT_STATUS") + @ApiParam("打印状态10：未打印 20：已打印") + private Integer printStatus; + + @Column(name = "PACK_LEVEL") + @ApiParam("包装层级 1-第一层，2-第二层，3-第三层，4-第四层") + private Integer packLevel; + + @Column(name = "WORK_ORDER_NO") + @ApiParam("生产工单号") + private String workOrderNo; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "MEMO") + @ApiParam("备注") + private String memo; + + @Column(name = "CUST_CODE") + @ApiParam("客户代码") + private String custCode; + + @Transient + @ApiParam("封箱状态") + private String sealStatus; + + @Transient + @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-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java new file mode 100644 index 0000000..a987364 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java @@ -0,0 +1,63 @@ +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.*; +import java.io.Serializable; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/10/18 2:55 下午 + * @Description: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PACKAGE_DETAIL", indexes = {@Index(columnList = "PACKAGE_NO") +}, uniqueConstraints = { + @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "PACKAGE_NO", "SERIAL_NUMBER"}) +} +) +@Api("包装规格明细") +public class MesPackageDetail extends BaseBean implements Serializable { + + private static final long serialVersionUID = 8162606304720621672L; + @Column(name = "PACKAGE_NO", nullable = false) + @ApiParam("包装编码") + private String packageNo; + + @Column(name = "SERIAL_NUMBER", nullable = false) + @ApiParam("过程条码") + private String serialNumber; + + @Column(name = "PART_NO") + @ApiParam("物料编号") + private String partNo; + + @Column(name = "PART_NAME_RDD") + @ApiParam("物料名称") + private String partNameRdd; + + @Column(name = "PACKAGE_NO2") + @ApiParam("包装编码2") + private String packageNo2; + + @Column(name = "PACKAGE_NO3") + @ApiParam("包装编码3") + private String packageNo3; + + @Column(name = "PACKAGE_NO4") + @ApiParam("包装编码4") + private String packageNo4; + + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageTravel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageTravel.java new file mode 100644 index 0000000..72084e3 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageTravel.java @@ -0,0 +1,58 @@ +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.Index; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/10/18 3:23 下午 + * @Description: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PACKAGE_TRAVEL", indexes = {@Index(columnList = "PACKAGE_NO")}) +@Api("包装履历表") +public class MesPackageTravel extends BaseBean implements Serializable { + + private static final long serialVersionUID = -2808747095415676213L; + @Column(name = "PACKAGE_NO") + @ApiParam("包装编码") + private String packageNo; + + @Column(name = "SERIAL_NUMBER") + @ApiParam("过程条码") + private String serialNumber; + + @Column(name = "OP_TYPE") + @ApiParam("操作类型") + private Integer opType; + + @Column(name = "PACKAGE_NO2") + @ApiParam("包装编码2") + private String packageNo2; + + @Column(name = "PACKAGE_NO3") + @ApiParam("包装编码3") + private String packageNo3; + + @Column(name = "PACKAGE_NO4") + @ApiParam("包装编码4") + private String packageNo4; + + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPart.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPart.java new file mode 100644 index 0000000..81365ef --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPart.java @@ -0,0 +1,93 @@ +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 javax.persistence.Transient; +import java.io.Serializable; + +/** + * @Description :物料信息 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PART") +@Api("物料信息") +public class MesPart extends BaseBean implements Serializable { + private static final long serialVersionUID = 3936033255397936854L; + @Column(name = "PART_NO") + @ApiParam("零件号") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam("零件名称") + private String partName; + + @Column(name = "BRIEF_TEXT") + @ApiParam("零件简称") + private String briefText; + + @Column(name = "PART_SPEC") + @ApiParam("零件规格") + private String partSpec; + + @Column(name = "CATEGORY_CODE1") + @ApiParam("分类1") + private String categoryCode1; + + @Column(name = "CATEGORY_CODE2") + @ApiParam("分类2") + private String categoryCode2; + + @Column(name = "CATEGORY_CODE3") + @ApiParam("分类3") + private String categoryCode3; + + @Column(name = "UNIT") + @ApiParam("单位") + private String unit; + + @Column(name = "PACK_SPEC_CODE") + @ApiParam("包装规格代码") + private String packSpecCode; + + @Column(name = "DEFAULT_WORK_CENTER") + @ApiParam("默认工作中心") + private String defaultWorkCenter; + + @Column(name = "PRODUCE_CTGY_CODE") + @ApiParam("产品类型代码") + private String produceCategoryCode; + + @Column(name = "PROCESS_MATCH_TYPE") + @ApiParam("过程编码匹配类型") + private Integer processMatchType; + + @Column(name = "PACKAGE_MATCH_TYPE") + @ApiParam("包装编码匹配类型") + private Integer packageMatchType; + + @Column(name = "PRODUCT_MATCH_TYPE") + @ApiParam("产品编码匹配类型") + private Integer productMatchType; + + @Transient + @ApiParam("分类名称") + private String categoryName; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPartCategory.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPartCategory.java new file mode 100644 index 0000000..949a02f --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPartCategory.java @@ -0,0 +1,44 @@ +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 : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PART_CATEGORY") +@Api("零件种类") +public class MesPartCategory extends BaseBean implements Serializable { + private static final long serialVersionUID = 9076081904146489470L; + @Column(name = "CATEGORY_CODE") + @ApiParam("分类代码") + private String categoryCode; + + @Column(name = "CATEGORY_NAME") + @ApiParam("分类名称") + private String categoryName; + + @Column(name = "CATEGORY_TYPE") + @ApiParam("分类类型") + private String categoryType; +} 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-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPatternJis.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPatternJis.java new file mode 100644 index 0000000..9c8adca --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPatternJis.java @@ -0,0 +1,68 @@ +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.Lob; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description :JIS发运模式 + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-12-25 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PATTERN_JIS") +@Api("JIS发运模式") +public class MesPatternJis extends BaseBean implements Serializable { + + private static final long serialVersionUID = 1119289554542499312L; + @Column(name = "PATTERN_NO") + @ApiParam("模式编号") + private String patternNo; + + @Column(name = "PATTERN_NAME") + @ApiParam("模式名称") + private String patternName; + + @Column(name = "QUEUE_NO") + @ApiParam("显示主队列数") + private Integer queueNo; + + @Column(name = "HANDLE_NO") + @ApiParam("一次处理套数") + private Integer handleNo; + + @Column(name = "PATTERN_DESC") + @ApiParam("描述") + private String patternDesc; + + @Column(name = "PRODUCE_CTGY_CODE") + @ApiParam("产品类型组") + private String produceCategoryCode; + + @Column(name = "PATTERN_TYPE") + @ApiParam("模式类型") + private Integer patternType; + + @Lob + @Column(name = "RULE") + @ApiParam("规则") + private String rule; + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcn.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcn.java new file mode 100644 index 0000000..c19bfa3 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcn.java @@ -0,0 +1,87 @@ +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: yiming.gu + * @CreateDate:2019-04-22-17:20 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PCN") +@Api("PCN节点") +public class MesPcn extends BaseBean implements Serializable { + private static final long serialVersionUID = -7570827672640277097L; + @Column(name = "PCN_CODE") + @ApiParam("PCN代码") + private String pcnCode; + + @Column(name = "PCN_NAME") + @ApiParam("PCN名称") + private String pcnName; + + @Column(name = "AREA_CODE") + @ApiParam("区域") + private String areaCode; + + @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-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnConnectLog.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnConnectLog.java new file mode 100644 index 0000000..faa7f92 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnConnectLog.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; + +/** + * @Description: + * @Reference: + * @Author: yiming.gu + * @CreateDate:2019-04-22-17:20 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PCN_CONNECT_LOG") +@Api("PCN节点连接日志") +public class MesPcnConnectLog extends BaseBean implements Serializable { + private static final long serialVersionUID = -4153357131289178766L; + @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-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncCfg.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncCfg.java new file mode 100644 index 0000000..4d321f8 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncCfg.java @@ -0,0 +1,92 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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 java.io.Serializable; + +/** + * @Description: + * @Reference: + * @Author: yiming.gu + * @CreateDate:2019-04-22-17:32 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PCN_SYNC_CFG") +@Api("MES_PCN_同步配置") +public class MesPcnSyncCfg extends BaseBean implements Serializable { + private static final long serialVersionUID = -6869288362923390521L; + @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("同步方式 2.新增 1.修改") + private Integer syncPattern; + + @Column(name = "SYNC_TYPE") + @ApiParam("同步类型 1.pcn获取mes数据 2.pcn推送数据至mes") + 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(); + + 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-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncErrorLog.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncErrorLog.java new file mode 100644 index 0000000..22810be --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncErrorLog.java @@ -0,0 +1,54 @@ +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.Lob; +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 = "MES_PCN_SYNC_ERRORLOG") +@Api("MES_PCN同步异常日志") +public class MesPcnSyncErrorLog extends BaseBean implements Serializable { + private static final long serialVersionUID = -2249754641660006488L; + @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-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSysUserOffline.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSysUserOffline.java new file mode 100644 index 0000000..fc4f33b --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSysUserOffline.java @@ -0,0 +1,70 @@ +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; +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 : 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-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTask.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTask.java new file mode 100644 index 0000000..8288401 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTask.java @@ -0,0 +1,90 @@ +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 :mes-pcn定时任务工作清单 + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-08-26 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PCN_TASK") +@Api("mes-pcn定时任务工作清单") +public class MesPcnTask extends BaseBean implements Serializable { + + private static final long serialVersionUID = 4777357978430670966L; + @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-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTaskLog.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTaskLog.java new file mode 100644 index 0000000..f0ee69f --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTaskLog.java @@ -0,0 +1,53 @@ +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 :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-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlanOrder.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlanOrder.java new file mode 100644 index 0000000..bfd78e2 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlanOrder.java @@ -0,0 +1,144 @@ +package cn.estsh.i3plus.pojo.mes.pcn.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.*; +import java.io.Serializable; + +/** + * @Description: + * @Reference: + * @Author: Crish + * @CreateDate:2019-04-16-17:36 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PLAN_ORDER", indexes = {@Index(columnList = "ORDER_NO") +}, uniqueConstraints = { + @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO"}) +} +) +@Api("生产主计划") +public class MesPlanOrder extends BaseBean implements Serializable { + private static final long serialVersionUID = 8571104279843276872L; + @Column(name = "ORDER_NO", nullable = false) + @ApiParam("生产计划单号") + private String orderNo; + + @Column(name = "PO_TYPE") + @ApiParam("计划类型") + private Integer planType; + + @Column(name = "PROD_CFG_CODE") + @ApiParam("产品配置代码") + private String prodCfgCode; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "PART_NAME_RDD") + @ApiParam("物料名称") + private String partNameRdd; + + @Column(name = "PLAN_QTY") + @ApiParam("计划数量") + private Double planQty; + + @Column(name = "DECOMPOSE_QTY") + @ApiParam("分解数量") + private Double decomposeQty; + + @Column(name = "STATUS") + @ApiParam("状态") + private Integer status; + + @Column(name = "START_TIME") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam("计划开始时间") + private String startTime; + + @Column(name = "END_TIME") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam("计划结束时间") + private String endTime; + + @Column(name = "DELIVERY_DATE") + @ApiParam("交货日期") + private String deliveryDate; + + @Column(name = "CUST_CODE") + @ApiParam("客户代码") + private String custCode; + + @Column(name = "CUST_ORDER_NO") + @ApiParam("客户订单号") + private String custOrderNo; + + @Column(name = "SOURCE") + @ApiParam("计划来源") + private String source; + + @Column(name = "MEMO") + @ApiParam("备注") + private String memo; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + /********************** 冗余字段 *********************************/ + + @Transient + @ApiParam(value = "区域") + public String areaCode; + + @Transient +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value = "创建日期查询用，查询结束日期", example = "2018-12-31 23:59:59") + public String startTimeStart; + + + @Transient +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value = "创建日期查询用，查询结束日期", example = "2018-12-31 23:59:59") + public String startTimeEnd; + + + @Transient +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value = "计划结束日期查询用，查询结束日期", example = "2018-12-31 23:59:59") + public String endTimeStart; + + @Transient +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value = "计划结束日期查询用，查询结束日期", example = "2018-12-31 23:59:59") + public String endTimeEnd; + + public double getPlanQtyVal() { + return this.planQty == null ? 0.0d : this.planQty; + } + + public double getDecomposeQtyVal() { + return this.decomposeQty == null ? 0.0d : this.decomposeQty; + } + + public int getStatusVal() { + return this.status == null ? 0 : this.status; + } + + public int getPlanTypeVal() { + return this.planType == null ? 0 : this.planType; + } +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java new file mode 100644 index 0000000..5d5a48c --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java @@ -0,0 +1,112 @@ +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 javax.persistence.Transient; +import java.io.Serializable; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/9/25 8:07 PM + * @Description: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PLC") +@Api("PLC配置表") +public class MesPlc extends BaseBean implements Serializable { + + private static final long serialVersionUID = -5346536604317095818L; + @Column(name = "PLC_CODE") + @ApiParam("PLC代码") + private String plcCode; + + @Column(name = "PLC_NAME") + @ApiParam("PLC名称") + private String plcName; + + @Column(name = "PLC_MODEL") + @ApiParam("PLC型号") + private String plcModel; + + @Column(name = "PLC_IP") + @ApiParam("PLC IP") + private String plcIp; + + @Column(name = "CHANNEL") + @ApiParam("通道") + private String channel; + + @Column(name = "TAG_NAME") + @ApiParam("标签名称") + private String tagName; + + @Column(name = "TAG_ADDRESS") + @ApiParam("标签地址") + private String tagAddress; + + @Column(name = "DATA_TYPE") + @ApiParam("标签数据类型") + private String dataType; + + @Column(name = "GROUP_NAME") + @ApiParam("分组名称") + private String groupName; + + @Column(name = "DEVICE") + @ApiParam("驱动") + private String device; + + @Column(name = "EQUIPMENT_CODE") + @ApiParam("设备代码") + private String equipmentCode; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("生产线") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工位") + private String workCellCode; + + @Column(name = "PLC_CFG") + @ApiParam("PLC的值的设定") + private String plcCfg; + + @Column(name = "ANALYSIS_RULE") + @ApiParam("解析规则") + private String analysisRule; + + @Column(name = "IS_ANALYSIS") + @ApiParam("是否解析") + private String isAnalysis; + + @Column(name = "FEED_VALUE") + @ApiParam("反馈值") + private String feedValue; + + @Column(name = "OBJECT_CODE") + @ApiParam("对象代码") + private String objectCode; + + @Transient + @ApiParam("设备名称") + private String equipmentName; + + @Column(name = "TOOLING_CODE ") + @ApiParam("工装代码") + private String toolingCode; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProcess.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProcess.java new file mode 100644 index 0000000..752400b --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProcess.java @@ -0,0 +1,39 @@ +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 : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PROCESS") +@Api("工序") +public class MesProcess extends BaseBean implements Serializable { + private static final long serialVersionUID = -2619648674238082872L; + @Column(name = "PROCESS_CODE") + @ApiParam("工序代码") + private String processCode; + + @Column(name = "PROCESS_NAME") + @ApiParam("工序名称") + private String processName; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdBindRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdBindRecord.java new file mode 100644 index 0000000..8114387 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdBindRecord.java @@ -0,0 +1,106 @@ +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.ColumnDefault; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.*; +import java.io.Serializable; + +/** + * @Description :产品绑定记录表 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PROD_BIND_RECORD", indexes = { + @Index(columnList = "SERIAL_NUMBER"), + @Index(columnList = "KP_SN") +}) +@Api("产品绑定记录表") +public class MesProdBindRecord extends BaseBean implements Serializable { + private static final long serialVersionUID = -4319604821328717354L; + @Column(name = "SERIAL_NUMBER") + @ApiParam(value = "产品条码") + private String serialNumber; + + @Column(name = "PART_NO") + @ApiParam("产品条码零件号") + private String partNo; + + @Column(name = "WORK_ORDER_NO") + @ApiParam("工单号") + private String workOrderNo; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam(value = "工作中心") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam(value = "工作单元") + private String workCellCode; + + @Column(name = "STEP_CODE") + @ApiParam(value = "工步代码") + private String stepCode; + + @Column(name = "ITEM_PART_NO") + @ApiParam("原材料零件号") + private String itemPartNo; + + @Column(name = "KP_SN") + @ApiParam("原材料条码") + private String kpSn; + + @Column(name = "KP_QTY") + @ColumnDefault("0") + @ApiParam(value = "原材料数量", example = "0") + private Double kpQty; + + @Column(name = "SUPPLIER_CODE") + @ApiParam("供应商") + private String supplierCode; + + @Column(name = "LOT_NO") + @ApiParam("关联批次") + private String lotNo; + + @Column(name = "IS_FEED") + @ApiParam("是否投料配置") + private Integer isFeed; + + @Column(name = "VERSION") + @ApiParam("版本") + private String version; + + @Column(name = "RESULT") + @ApiParam(value = "结果") + private String result; + + @Column(name = "is_BIND_KEY") + @ApiParam(value = "是否绑定关键件") + private Integer isBindKey; + + @Column(name = "ACTION_TYPE") + @ApiParam(value = "动作类型") + private Integer actionType; + + public int getIsFeedVal() { + return this.isFeed == null ? 0 : this.isFeed; + } + + public double getQtyVal() { + return this.kpQty == null ? 0.0d : this.kpQty; + } +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdCfg.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdCfg.java new file mode 100644 index 0000000..4ff20da --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdCfg.java @@ -0,0 +1,44 @@ +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 : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PROD_CFG") +@Api("产品配置") +public class MesProdCfg extends BaseBean implements Serializable { + private static final long serialVersionUID = 7487874316722319947L; + @Column(name = "PROD_CFG_CODE") + @ApiParam("产品配置代码") + private String prodCfgCode; + + @Column(name = "PROD_CFG_NAME") + @ApiParam("产品配置名称") + private String prodCfgName; + + @Column(name = "PROD_CFG_Type_CODE") + @ApiParam("产品配置类型代码") + private String prodCfgTypeCode; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdCfgDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdCfgDetail.java new file mode 100644 index 0000000..fd4cf72 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdCfgDetail.java @@ -0,0 +1,53 @@ +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 javax.persistence.Transient; +import java.io.Serializable; + +/** + * @Description :产品配置明细 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PROD_CFG_DETAIL") +@Api("产品配置明细") +public class MesProdCfgDetail extends BaseBean implements Serializable { + private static final long serialVersionUID = -8362302529703401583L; + @Column(name = "PROD_CFG_CODE") + @ApiParam("产品配置代码") + private String prodCfgCode; + + @Column(name = "PART_NO") + @ApiParam("零件号") + private String partNo; + + @Column(name = "IS_VIRTUAL") + @ApiParam("是否虚零件") + private Integer isVirtual; + + @Transient + @ApiParam("零件名称") + private String partName; + + public int getIsVirtualVal() { + return this.isVirtual == null ? 0 : this.isVirtual; + } +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdPack.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdPack.java new file mode 100644 index 0000000..a68bcec --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdPack.java @@ -0,0 +1,69 @@ +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; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/10/18 3:25 下午 + * @Description: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PROD_PACK") +@Api("产品包装关系") +public class MesProdPack extends BaseBean implements Serializable { + + private static final long serialVersionUID = -2621135811864108025L; + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "CUSTOMER_CODE") + @ApiParam("客户代码") + private String customerCode; + + @Column(name = "PACK_SPEC") + @ApiParam("包装规格") + private String packSpec; + + @Column(name = "PROD_LABEL_TEMPLATE") + @ApiParam("产品标签模板") + private String prodLabelTemplate; + + @Column(name = "PACK_LABEL_TEMPLATE") + @ApiParam("包装标签模板") + private String packLabelTemplate; + + @Column(name = "PACK_LABEL_TEMPLATE2") + @ApiParam("包装标签模板2") + private String packLabelTemplate2; + + @Column(name = "PACK_LABEL_TEMPLATE3") + @ApiParam("包装标签模板3") + private String packLabelTemplate3; + + @Column(name = "PACK_LABEL_TEMPLATE4") + @ApiParam("包装标签模板4") + private String packLabelTemplate4; + + @Column(name = "PROD_CFG_TYPE") + @ApiParam("项目") + private String prodCfgType; + + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdRouteCfg.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdRouteCfg.java new file mode 100644 index 0000000..4e8c76d --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdRouteCfg.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 : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PROD_ROUTE_CFG") +@Api("产品类流程配置表") +public class MesProdRouteCfg extends BaseBean implements Serializable { + private static final long serialVersionUID = -3768632071281056796L; + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @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/MesProdRouteOptParam.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdRouteOptParam.java new file mode 100644 index 0000000..169af24 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdRouteOptParam.java @@ -0,0 +1,71 @@ +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 : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PROD_ROUTE_OPT_PARAM") +@Api("产品流程配置操作参数表") +public class MesProdRouteOptParam extends BaseBean implements Serializable { + private static final long serialVersionUID = -932364659894292000L; + @Column(name = "PROD_ROUTE_CFG_ID") + @ApiParam("产品流程ID") + private Long prodRouteCfgId; + + @Column(name = "ROUTE_CODE") + @ApiParam("流程代码") + private String routeCode; + + @Column(name = "PROCESS_CODE") + @ApiParam("工序代码") + private String processCode; + + @Column(name = "STEP_CODE") + @ApiParam("工步代码") + private String stepCode; + + @Column(name = "STEP_SEQ") + @ApiParam("工步顺序") + private Integer stepSeq; + + @Column(name = "PARAM_CODE") + @ApiParam("工步参数代码") + private String paramCode; + + @Column(name = "PARAM_VALUE") + @ApiParam("工步参数值") + private String paramValue; + + public long getProdRouteCfgIdVal() { + return this.prodRouteCfgId == null ? 0l : this.prodRouteCfgId; + } + + public int getStepSeq() { + return this.stepSeq == null ? 0 : this.stepSeq; + } + + public void setStepSeq(int stepSeq) { + this.stepSeq = stepSeq; + } +} 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..f6e32ce --- /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/bean/MesProduceCategory.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCategory.java new file mode 100644 index 0000000..5520632 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCategory.java @@ -0,0 +1,40 @@ +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: Crish + * @CreateDate:2019-04-26-10:25 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PRODUCE_CATEGORY") +@Api("系统业务动作") +public class MesProduceCategory extends BaseBean implements Serializable { + + private static final long serialVersionUID = 4593983703007675620L; + @Column(name = "PRODUCE_CTGY_CODE") + @ApiParam("产品类型代码") + private String produceCategoryCode; + + @Column(name = "PRODUCE_CTGY_NAME") + @ApiParam("产品类型名称") + private String produceCategoryName; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCtgyPicture.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCtgyPicture.java new file mode 100644 index 0000000..aeda2b0 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCtgyPicture.java @@ -0,0 +1,56 @@ +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 javax.persistence.Transient; +import java.io.Serializable; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\16 14:17 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PRODUCE_CTGY_PICTURE") +@Api("产品类型图片表") +public class MesProduceCtgyPicture extends BaseBean implements Serializable { + + private static final long serialVersionUID = -7223382567320219332L; + @Column(name = "PRODUCE_CTGY_CODE") + @ApiParam("产品类型代码") + private String produceCtgyCode; + + @Column(name = "SIDE_LOCATION") + @ApiParam("面位") + private String sideLocation; + + @Column(name = "FILE_ID") + @ApiParam("文件id") + private Long fileId; + + @Transient + @ApiParam("文件名称") + private String fileName; + + @Transient + @ApiParam("文件URL") + private String fileUrl; + + @ApiParam("图片URL") + private String pictureUrl; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java new file mode 100644 index 0000000..6262a8a --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java @@ -0,0 +1,205 @@ +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.*; +import java.io.Serializable; + +/** + * @Description: + * @Reference: + * @Author: Crish + * @CreateDate:2019-04-16-17:36 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PRODUCE_SN", indexes = { + @Index(columnList = "PRODUCT_SN"), + @Index(columnList = "CREATE_DATE_TIME") +}, uniqueConstraints = { + @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "SERIAL_NUMBER"}) +} +) +@Api("产品条码表") +public class MesProduceSn extends BaseBean implements Serializable { + + private static final long serialVersionUID = 6641051790330191326L; + + @Column(name = "SERIAL_NUMBER", nullable = false) + @ApiParam("过程条码") + private String serialNumber; + + @Column(name = "PRODUCT_SN") + @ApiParam("产品条码") + private String productSn; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "PART_NAME_RDD") + @ApiParam("物料名称") + private String partNameRdd; + + @Column(name = "QTY") + @ApiParam("数量") + private Double qty; + + @Column(name = "QC_STATUS") + @ApiParam("质量状态") + private Integer qcStatus; + + @Column(name = "SN_STATUS") + @ApiParam("条码状态") + private Integer snStatus; + + @Column(name = "PRINT_COUNT") + @ApiParam("打印次数") + private Integer printCount; + + @Column(name = "PRINT_STATUS") + @ApiParam("打印状态") + private Integer printStatus; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("生产线") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工位") + private String workCellCode; + + @Column(name = "ROUTE_CODE") + @ApiParam("流程代码") + private String routeCode; + + @Column(name = "PROCESS_CODE") + @ApiParam("工序代码") + private String processCode; + + @Column(name = "NEXT_PROCESS_CODE") + @ApiParam("下一工序代码") + private String nextProcessCode; + + @Column(name = "IN_WC_TIME") + @ApiParam("进产线时间") + private String inWorkCenterTime; + + @Column(name = "OUT_WC_TIME") + @ApiParam("出产线时间") + private String outWorkCenterTime; + + @Column(name = "SHIPPING_TIME") + @ApiParam("发运时间") + private String shippingTime; + + @Column(name = "WORK_ORDER_NO") + @ApiParam("生产工单号") + private String workOrderNo; + + @Column(name = "CUST_SN") + @ApiParam("客户条码") + private String custSn; + + @Column(name = "CUST_PART_NO") + @ApiParam("客户零件号") + private String custPartNo; + + @Column(name = "CUST_CODE") + @ApiParam("客户代码") + private String custCode; + + @Column(name = "SN_TYPE") + @ApiParam("条码类型 10=正常 20=首检件") + private Integer snType; + + @Column(name = "TRAY_NO") + @ApiParam("托盘号") + private String trayNo; +// +// @Version +// @Column(name = "LOCK_VERSION") +// @ApiParam(value = "乐观锁", example = "1") +// public transient Integer lockVersion; + + @Transient + @ApiParam("返回信息") + private String resultMsg; + + @Column(name = "OPERATE_TYPE") + @ApiParam("操作类型") + private Integer operateType; + + @Transient + @ApiParam("下线时间开始") + private String outWorkCenterTimeStart; + + @Transient + @ApiParam("下线时间截止") + private String outWorkCenterTimeEnd; + + public double getQtyVal() { + return this.qty == null ? 0.0d : this.qty; + } + + public int getQcStatusVal() { + return this.qcStatus == null ? 0 : this.qcStatus; + } + + public int getSnStatusVal() { + return this.snStatus == null ? 0 : this.snStatus; + } + + public int getPrintCountVal() { + return this.printCount == null ? 0 : this.printCount; + } + + public int getPrintStatusVal() { + return this.printStatus == null ? 0 : this.printStatus; + } + + public int getSnTypeVal() { + return this.snType == null ? 0 : this.snType; + } + + @Override + public String toString() { + return "MesProduceSn{" + + "serialNumber='" + serialNumber + '\'' + + ", partNo='" + partNo + '\'' + + ", partNameRdd='" + partNameRdd + '\'' + + ", qty=" + qty + + ", qcStatus=" + qcStatus + + ", snStatus=" + snStatus + + ", printCount=" + printCount + + ", printStatus=" + printStatus + + ", workCenterCode='" + workCenterCode + '\'' + + ", workCellCode='" + workCellCode + '\'' + + ", routeCode='" + routeCode + '\'' + + ", processCode='" + processCode + '\'' + + ", nextProcessCode='" + nextProcessCode + '\'' + + ", inWorkCenterTime='" + inWorkCenterTime + '\'' + + ", outWorkCenterTime='" + outWorkCenterTime + '\'' + + ", shippingTime='" + shippingTime + '\'' + + ", workOrderNo='" + workOrderNo + '\'' + + ", custSn='" + custSn + '\'' + + ", custPartNo='" + custPartNo + '\'' + + ", snType=" + snType + + ", trayNo='" + trayNo + '\'' + + ", resultMsg='" + resultMsg + '\'' + + ", operateType=" + operateType + + ", outWorkCenterTimeStart='" + outWorkCenterTimeStart + '\'' + + ", outWorkCenterTimeEnd='" + outWorkCenterTimeEnd + '\'' + + '}'; + } +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSnTravel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSnTravel.java new file mode 100644 index 0000000..5d8ce41 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSnTravel.java @@ -0,0 +1,154 @@ +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.*; +import java.io.Serializable; + +/** + * @Description : 产品条码履历实体类 + * @Reference : + * @Author : dragon.xu + * @CreateDate : 2019-05-29 16:22 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PRODUCE_SN_TRAVEL", indexes = { + @Index(columnList = "SERIAL_NUMBER"), + @Index(columnList = "PRODUCT_SN"), + @Index(columnList = "CREATE_DATE_TIME"), + @Index(columnList = "MODIFY_DATE_TIME") +}) +@Api("产品条码履历表") +public class MesProduceSnTravel extends BaseBean implements Serializable { + private static final long serialVersionUID = -1692487592284871549L; + @Column(name = "SERIAL_NUMBER") + @ApiParam("过程条码") + private String serialNumber; + + @Column(name = "PRODUCT_SN") + @ApiParam("产品条码") + private String productSn; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "PART_NAME_RDD") + @ApiParam("物料名称") + private String partNameRdd; + + @Column(name = "QTY") + @ApiParam("数量") + private Double qty; + + @Column(name = "QC_STATUS") + @ApiParam("质量状态") + private Integer qcStatus; + + @Column(name = "SN_STATUS") + @ApiParam("条码状态") + private Integer snStatus; + + @Column(name = "PRINT_COUNT") + @ApiParam("打印次数") + private Integer printCount; + + @Column(name = "PRINT_STATUS") + @ApiParam("打印状态") + private Integer printStatus; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name = "ROUTE_CODE") + @ApiParam("流程代码") + private String routeCode; + + @Column(name = "PROCESS_CODE") + @ApiParam("工序代码") + private String processCode; + + @Column(name = "NEXT_PROCESS_CODE") + @ApiParam("下一工序代码") + private String nextProcessCode; + + @Column(name = "IN_WC_TIME") + @ApiParam("进产线时间") + private String inWorkCenterTime; + + @Column(name = "OUT_WC_TIME") + @ApiParam("出产线时间") + private String outWorkCenterTime; + + @Column(name = "SHIPPING_TIME") + @ApiParam("发运时间") + private String shippingTime; + + @Column(name = "WORK_ORDER_NO") + @ApiParam("生产工单号") + private String workOrderNo; + + @Column(name = "CUST_SN") + @ApiParam("客户条码") + private String custSn; + + @Column(name = "CUST_CODE") + @ApiParam("客户代码") + private String custCode; + + @Column(name = "CUST_PART_NO") + @ApiParam("客户零件号") + private String custPartNo; + + @Column(name = "SN_TYPE") + @ApiParam("条码类型 10=正常（默认），20=首检件") + private Integer snType; + + @Column(name = "TRAY_NO") + @ApiParam("托盘号") + private String trayNo; + + @Column(name = "OPERATE_TYPE") + @ApiParam("操作类型") + private Integer operateType; + + @Transient + @ApiParam("返回信息") + private String resultMsg; + + public double getQtyVal() { + return this.qty == null ? 0.0d : this.qty; + } + + public int getQcStatusVal() { + return this.qcStatus == null ? 0 : this.qcStatus; + } + + public int getSnStatusVal() { + return this.snStatus == null ? 0 : this.snStatus; + } + + public int getPrintCountVal() { + return this.printCount == null ? 0 : this.printCount; + } + + public int getPrintStatusVal() { + return this.printStatus == null ? 0 : this.printStatus; + } +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProductData.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProductData.java new file mode 100644 index 0000000..600bfc2 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProductData.java @@ -0,0 +1,109 @@ +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.*; +import java.io.Serializable; + +/** + * @Description :生产数据 + * @Reference : + * @Author : Wynne.Lu + * @CreateDate : 2019-10-17 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PRODUCT_DATA", indexes = { + @Index(columnList = "SERIAL_NUMBER"), + @Index(columnList = "PRODUCT_SN"), + @Index(columnList = "OBJECT_CODE"), + @Index(columnList = "MODIFY_DATE_TIME") +}) +@Api("生产数据") +public class MesProductData extends BaseBean implements Serializable { + private static final long serialVersionUID = -2365404168777050771L; + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心") + private String workCenterCode; + + @Column(name = "WORK_CENTER_NAME") + @ApiParam("工作中心名称") + private String workCenterName; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元") + private String workCellCode; + + @Column(name = "WORK_CELL_NAME") + @ApiParam("工作单元名称") + private String workCellName; + + @Column(name = "SERIAL_NUMBER") + @ApiParam("产品条码") + private String serialNumber; + + @Column(name = "PRODUCT_SN") + @ApiParam("产品条码") + private String productSn; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "PART_DESC") + @ApiParam("物料名称") + private String partDesc; + + @Column(name = "EQU_CODE") + @ApiParam("设备代码") + private String equCode; + + @Column(name = "EQU_NAME") + @ApiParam("设备名称") + private String equName; + + @Column(name = "OBJECT_CODE") + @ApiParam("对象代码") + private String objectCode; + + @Column(name = "OBJECT_NAME") + @ApiParam("对象名称") + private String objectName; + + @Column(name = "FIELD_CODE") + @ApiParam("字段代码") + private String fieldCode; + + @Column(name = "FIELD_NAME") + @ApiParam("字段名称") + private String fieldName; + + @Column(name = "FIELD_VALUE") + @ApiParam("字段值") + private String fieldValue; + + @Column(name = "ROW_NO") + @ApiParam("数据行号") + private String rowNo; + + @Column(name = "GROUP_NO") + @ApiParam("数据组号") + private String groupNo; + + @Lob + @Column(name = "LINE_DATA") + @ApiParam("生产数据") + private String lineData; + +} 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 new file mode 100644 index 0000000..b1b3d8c --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProductEncodeCfg.java @@ -0,0 +1,50 @@ +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: wangjie + * @CreateDate:2019-04-16-17:36 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PRODUCT_ENCODE_CFG") +@Api("产品编码配置表") +public class MesProductEncodeCfg extends BaseBean implements Serializable { + + private static final long serialVersionUID = 6641051790330191326L; + + @Column(name = "CODE_TYPE") + @ApiParam("编码类型") + private Integer codeType; + + @Column(name = "MATCH_TYPE") + @ApiParam("匹配类型") + private Integer matchType; + + @Column(name = "MATCH_VALUE") + @ApiParam("匹配值") + private String matchValue; + + @Column(name = "RULE_CODE") + @ApiParam("编码规则代码") + private String ruleCode; + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckData.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckData.java new file mode 100644 index 0000000..b5b9fa2 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckData.java @@ -0,0 +1,107 @@ +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.*; +import java.io.Serializable; +import java.util.List; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\12 16:33 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_QC_CHECK_DATA", indexes = { + @Index(columnList = "CREATE_DATE_TIME"), + @Index(columnList = "SN") +}) +@Api("质量过程检测数据") +public class MesQcCheckData extends BaseBean implements Serializable { + + private static final long serialVersionUID = 3600528549583720850L; + @Column(name = "CHECK_ID") + @ApiParam("检测id") + private String checkId; + + @Column(name = "PART_NO") + @ApiParam("物料编码") + private String partNo; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name = "CHECK_TYPE") + @ApiParam("检测类型") + private Integer checkType; + + @Column(name = "CHECK_ITEM") + @ApiParam("检测项") + private String checkItem; + + @Column(name = "CHECK_STANDARD") + @ApiParam("检测标准") + private String checkStandard; + + @Column(name = "CHECK_GUIDE") + @ApiParam("检测指导") + private String checkGuide; + + @Column(name = "CHECK_FREQUENCY") + @ApiParam("频率") + private String checkFrequency; + + @Column(name = "CHECK_VALUE") + @ApiParam("检测值") + private String checkValue; + + @Column(name = "CHECK_RESULT") + @ApiParam("判定结果") + private String checkResult; + + @Column(name = "SN") + @ApiParam("产品条码") + private String sn; + + @Column(name = "QTY") + @ApiParam("产品数量") + private Integer qty; + + @Column(name = "MEMO") + @ApiParam("备注") + private String memo; + + @Column(name = "ORDER_NO") + @ApiParam("工单号") + private String orderNo; + + @Column(name = "CUST_CODE") + @ApiParam("客户代码") + private String custCode; + + @Transient + @ApiParam("产品条码") + private String serialNumber; + + @Transient + @ApiParam("过程质量检测数据") + private List mesQcCheckStandardList; + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckStandard.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckStandard.java new file mode 100644 index 0000000..be9bfe8 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckStandard.java @@ -0,0 +1,108 @@ +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 javax.persistence.Transient; +import java.io.Serializable; +import java.util.List; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\12 14:46 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_QC_CHECK_STANDARD") +@Api("质量检测标准") +public class MesQcCheckStandard extends BaseBean implements Serializable { + + private static final long serialVersionUID = 1590320231495124712L; + @Column(name = "PART_NO") + @ApiParam("物料编码") + private String partNo; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name = "CHECK_TYPE") + @ApiParam("检测类型") + private Integer checkType; + + @Column(name = "CHECK_ITEM") + @ApiParam("检测项") + private String checkItem; + + @Column(name = "CHECK_STANDARD") + @ApiParam("检测标准") + private String checkStandard; + + @Column(name = "CHECK_GUIDE") + @ApiParam("检测指导") + private String checkGuide; + + @Column(name = "CHECK_FREQUENCY") + @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; + + @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-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJis.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJis.java new file mode 100644 index 0000000..7d4bd81 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJis.java @@ -0,0 +1,71 @@ +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 javax.persistence.Transient; +import java.io.Serializable; + +/** + * @Description :JIS发运队列 + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-12-24 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_QUEUE_JIS") +@Api("JIS发运队列") +public class MesQueueJis extends BaseBean implements Serializable { + + private static final long serialVersionUID = 8028683333028906395L; + @Column(name = "JIS_NO") + @ApiParam("主队列编号") + private String jisNo; + + @Column(name = "PROD_CFG_CODE") + @ApiParam("产品配置代码") + private String prodCfgCode; + + @Column(name = "VIN_CODE") + @ApiParam("vin") + private String vinCode; + + @Column(name = "CAR_NO") + @ApiParam("车号") + private String carNo; + + @Column(name = "SEQ") + @ApiParam("排序") + private Double seq; + + @Column(name = "STATUS") + @ApiParam("状态") + private Integer status; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Transient + @ApiParam("颜色") + private String color; + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJisDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJisDetail.java new file mode 100644 index 0000000..ef3b7d1 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJisDetail.java @@ -0,0 +1,62 @@ +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 :JIS发运队列明细 + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-12-24 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_QUEUE_JIS_DETAIL") +@Api("JIS发运队列明细") +public class MesQueueJisDetail extends BaseBean implements Serializable { + + private static final long serialVersionUID = 829273008952400763L; + @Column(name = "JIS_NO") + @ApiParam("主队列编号") + private String jisNo; + + @Column(name = "PROD_CFG_CODE") + @ApiParam("产品配置代码") + private String prodCfgCode; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "PART_NAME_RDD") + @ApiParam("物料名称") + private String partNameRdd; + + @Column(name = "STATUS") + @ApiParam("状态") + private Integer status; + + @Column(name = "FINAL_STATUS") + @ApiParam("明细整体状态") + private Integer finalStatus; + + @Column(name = "SERIAL_NUMBER") + @ApiParam("产品条码") + private String serialNumber; + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrder.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrder.java new file mode 100644 index 0000000..ea2e7e7 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrder.java @@ -0,0 +1,90 @@ +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.*; +import java.io.Serializable; + +/** + * @Description: + * @Reference: + * @Author: Crish + * @CreateDate:2019-04-16-17:36 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_QUEUE_ORDER", indexes = { + @Index(columnList = "CUST_FLAG_NO") +}, uniqueConstraints = { + @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO"}) +} +) +@Api("生产队列主表") +public class MesQueueOrder extends BaseBean implements Serializable { + private static final long serialVersionUID = 6538031118299400711L; + @Column(name = "ORDER_NO", nullable = false) + @ApiParam("主队列编号") + private String orderNo; + + @Column(name = "VIN_CODE") + @ApiParam("Vin") + private String vinCode; + + @Column(name = "CUST_FLAG_NO") + @ApiParam("客户标识号") + private String custFlagNo; + + @Column(name = "PROD_CFG_CODE") + @ApiParam("产品配置代码") + private String prodCfgCode; + + @Column(name = "PROD_CFG_NAME_RDD") + @ApiParam("产品配置名称") + private String prodCfgNameRdd; + + @Column(name = "SEQ") + @ApiParam("排序") + private Double seq; + + @Column(name = "WORK_ORDER_NO") + @ApiParam("生产工单号") + private String workOrderNo; + + @Column(name = "STATUS") + @ApiParam("状态") + private Integer status; + + @Column(name = "CUST_PROD_LINE_CODE") + @ApiParam("客户产线代码") + private String custProdLineCode; + + @Column(name = "AREA_CODE") + @ApiParam("区域代码") + private String areaCode; + + @Transient + @ApiParam("起始车号") + private String custFlagNoStart; + + @Transient + @ApiParam("截至车号") + private String custFlagNoEnd; + + public int getStatusVal() { + return this.status == null ? 0 : this.status; + } + + public double getSeqVal() { + return this.seq == null ? 0.0d : this.seq; + } +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.java new file mode 100644 index 0000000..61d8c82 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.java @@ -0,0 +1,103 @@ +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.*; +import java.io.Serializable; + +/** + * @Description: + * @Reference: + * @Author: Crish + * @CreateDate:2019-04-16-17:36 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_QUEUE_ORDER_DETAIL", indexes = { + @Index(columnList = "ORDER_NO") +}, uniqueConstraints = { + @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO", "PART_NO"}) +} +) +@Api("生产队列明细") +public class MesQueueOrderDetail extends BaseBean implements Serializable { + private static final long serialVersionUID = 1548933241804083457L; + @Column(name = "ORDER_NO", nullable = false) + @ApiParam("主队列编号") + private String orderNo; + + @Column(name = "PART_NO", nullable = false) + @ApiParam("物料号") + private String partNo; + + @Column(name = "PART_NAME_RDD") + @ApiParam("物料名称") + private String partNameRdd; + + @Column(name = "SERIAL_NUMBER") + @ApiParam("产品条码") + private String serialNumber; + + @Column(name = "SEQ") + @ApiParam("队列明细序号") + private Double seq; + + @Column(name = "QTY") + @ApiParam("数量") + private Double qty; + + @Column(name = "STATUS") + @ApiParam("状态") + private Integer status; + + @Column(name = "WORK_TYPE") + @ApiParam("生产类型") + private String workType; + + @Column(name = "PRODUCE_CATEGORY_CODE") + @ApiParam("产品类型代码") + private String produceCategoryCode; + + @Column(name = "PRODUCE_CATEGORY_NAME_RDD") + @ApiParam("产品类型名称") + private String produceCategoryNameRdd; + + @Transient + @ApiParam("队列序号") + private Double queueSeq; + + public double getQueueSeqVal() { + return this.queueSeq == null ? 0.0d : this.queueSeq; + } + + public double getSeqVal() { + return this.seq == null ? 0.0d : this.seq; + } + + public double getQtyVal() { + return this.qty == null ? 0.0d : this.qty; + } + + 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-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRawPartSn.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRawPartSn.java new file mode 100644 index 0000000..3f3458c --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRawPartSn.java @@ -0,0 +1,78 @@ +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.Index; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description :mes系统业务动作 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-12 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_RAW_PART_SN", indexes = {@Index(columnList = "RAW_SN")}) +@Api("原材料信息") +public class MesRawPartSn extends BaseBean implements Serializable { + private static final long serialVersionUID = 5504323561257182116L; + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam("物料名称") + private String partName; + + @Column(name = "RAW_TYPE") + @ApiParam("原料类型") + private String rawType; + + @Column(name = "RAW_SN") + @ApiParam("原材料条码") + private String rawSn; + + @Column(name = "RAW_QTY") + @ApiParam("数量") + private Double rawQty; + + @Column(name = "LOT_NO") + @ApiParam("生产批次") + private String lotNo; + + @Column(name = "FIX_LOT_NO") + @ApiParam("特殊批次") + private String fixLotNo; + + @Column(name = "STATUS") + @ApiParam("原料状态") + private Integer status; + + @Column(name = "SUPPLIER_CODE") + @ApiParam("供应商代码") + private String supplierCode; + + public double getRawQtyVal() { + return this.rawQty == null ? 0l : this.rawQty; + } + + public int getStatusVal() { + return this.status == null ? 0 : this.status; + } + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRepair.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRepair.java new file mode 100644 index 0000000..785f350 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRepair.java @@ -0,0 +1,44 @@ +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 : crish + * @CreateDate : 2019-08-08 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_REPAIR") +@Api("维修") +public class MesRepair extends BaseBean implements Serializable { + private static final long serialVersionUID = -7520365696308295804L; + @Column(name = "REPAIR_CODE") + @ApiParam("维修代码") + private String repairCode; + + @Column(name = "REPAIR_NAME") + @ApiParam("维修名称") + private String repairName; + + @Column(name = "REPAIR_TYPE") + @ApiParam("维修类型") + private Integer repairType; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRepairRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRepairRecord.java new file mode 100644 index 0000000..e6da731 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRepairRecord.java @@ -0,0 +1,102 @@ +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.*; +import java.io.Serializable; +import java.util.List; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\16 14:33 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_REPAIR_RECORD", indexes = { + @Index(columnList = "SERIAL_NUMBER"), + @Index(columnList = "CREATE_DATE_TIME") +}) +@Api("维修信息记录表") +public class MesRepairRecord extends BaseBean implements Serializable { + + private static final long serialVersionUID = -2453726410779076150L; + @Column(name = "SERIAL_NUMBER") + @ApiParam("产品条码") + private String serialNumber; + + @Column(name = "PART_NO") + @ApiParam("产品物料号") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam("物料名称") + private String partName; + + @Column(name = "DEFECT_CODE") + @ApiParam("缺陷代码") + private String defectCode; + + @Column(name = "DEFECT_NAME") + @ApiParam("缺陷名称") + private String defectName; + + @Column(name = "SIDE_LOCATION") + @ApiParam("产品面位") + private String sideLocation; + + @Column(name = "DEFECT_LOCATION") + @ApiParam("缺陷位置") + private String defectLocation; + + @Column(name = "REPAIR_CODE") + @ApiParam("维修代码") + private String repairCode; + + @Column(name = "REPAIR_NAME") + @ApiParam("维修名称") + private String repairName; + + @Column(name = "DC_CODE") + @ApiParam("缺陷原因代码") + private String dcCode; + + @Column(name = "DC_NAME") + @ApiParam("缺陷原因描述") + private String dcName; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("生产线") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工位") + private String workCellCode; + + @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-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRoute.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRoute.java new file mode 100644 index 0000000..f8b2802 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRoute.java @@ -0,0 +1,51 @@ +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.Lob; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description :流程表 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_ROUTE") +@Api("流程表") +public class MesRoute extends BaseBean implements Serializable { + private static final long serialVersionUID = -7622507229961050740L; + @Column(name = "ROUTE_CODE") + @ApiParam("流程代码") + private String routeCode; + + @Column(name = "ROUTE_NAME") + @ApiParam("流程名称") + private String routeName; + + @Column(name = "ROUTE_TYPE") + @ApiParam("流程类型 10-扫描类型 20-监控类型") + private Integer routeType; + + @Lob + @Column(name = "POSITION") + @ApiParam("GOJS位置") + private String position; + + +} 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 new file mode 100644 index 0000000..556d26f --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRouteProcess.java @@ -0,0 +1,64 @@ +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 : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_ROUTE_PROCESS") +@Api("流程工序关系") +public class MesRouteProcess extends BaseBean implements Serializable { + private static final long serialVersionUID = 3477334942090180010L; + + @Column(name = "ROUTE_CODE") + @ApiParam("流程代码") + private String routeCode; + + @Column(name = "PROCESS_CODE") + @ApiParam("工序代码") + private String processCode; + + @Column(name = "NEXT_PROCESS") + @ApiParam("下一工序") + private String nextProcess; + + @Column(name = "REPAIR_PROCESS") + @ApiParam("维修工序") + private String repairProcess; + + @Column(name = "SEQ") + @ApiParam("顺序") + private Integer seq; + + @Column(name = "IS_NECESSARY") + @ApiParam("是否必须") + private Integer isNecessary; + + public int getSeqVal() { + return this.seq == null ? 0 : this.seq; + } + + public int getIsNecessaryVal() { + return this.isNecessary == null ? 0 : this.isNecessary; + } +} 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 new file mode 100644 index 0000000..5907cec --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRouteProcessCell.java @@ -0,0 +1,44 @@ +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 : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_ROUTE_PROCESS_CELL") +@Api("工序工作单元对照") +public class MesRouteProcessCell extends BaseBean implements Serializable { + private static final long serialVersionUID = -703779336699805482L; + + @Column(name = "ROUTE_CODE") + @ApiParam("流程代码") + private String routeCode; + + @Column(name = "PROCESS_CODE") + @ApiParam("工序代码") + private String processCode; + + @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/MesScrap.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesScrap.java new file mode 100644 index 0000000..a77b075 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesScrap.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 : crish + * @CreateDate : 2019-08-08 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_SCRAP") +@Api("报废原因") +public class MesScrap extends BaseBean implements Serializable { + private static final long serialVersionUID = -6202113707752178624L; + @Column(name = "SCRAP_CODE") + @ApiParam("报废代码") + private String scrapCode; + + @Column(name = "SCRAP_NAME") + @ApiParam("报废名称") + private String scrapName; + + @Column(name = "SCRAP_TYPE") + @ApiParam("报废类型") + private String scrapType; + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesScrapRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesScrapRecord.java new file mode 100644 index 0000000..97ac5d3 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesScrapRecord.java @@ -0,0 +1,71 @@ +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.Index; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\16 14:42 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_SCRAP_RECORD", indexes = { + @Index(columnList = "CREATE_DATE_TIME") +}) +@Api("报废信息记录表") +public class MesScrapRecord extends BaseBean implements Serializable { + + private static final long serialVersionUID = -8519832449647086195L; + @Column(name = "SERIAL_NUMBER") + @ApiParam("产品条码") + private String serialNumber; + + @Column(name = "PART_NO") + @ApiParam("产品物料号") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam("物料名称") + private String partName; + + @Column(name = "DEFECT_CODE") + @ApiParam("缺陷代码") + private String defectCode; + + @Column(name = "SCRAP_CODE") + @ApiParam("报废代码") + private String scrapCode; + + @Column(name = "SCRAP_NAME") + @ApiParam("报废名称") + private String scrapName; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("生产线") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工位") + private String workCellCode; + + @Column(name = "MEMO") + @ApiParam("备注") + private String memo; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShift.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShift.java new file mode 100644 index 0000000..df66c61 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShift.java @@ -0,0 +1,68 @@ +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 :mes系统业务动作 + * @Reference : + * @Author : crish + * @CreateDate : 2019-04-19 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_SHIFT") +@Api("班次信息") +public class MesShift extends BaseBean implements Serializable { + private static final long serialVersionUID = -1174268061355263705L; + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "SHIFT_CODE") + @ApiParam("班次代码") + private String shiftCode; + + @Column(name = "SHIFT_NAME") + @ApiParam("班次名称") + private String shiftName; + + @Column(name = "START_TIME") + @ApiParam("开班时间") + private String startTime; + + @Column(name = "END_TIME") + @ApiParam("下班时间") + private String endTime; + + @Column(name = "WORK_TIMES") + @ApiParam("作业时长") + private Double workTimes; + + @Column(name = "SHIFT_SEQ") + @ApiParam("班次顺序") + private Integer shiftSeq; + + public int getShiftSeqVal() { + return this.shiftSeq == null ? 0 : this.shiftSeq; + } + + public double getWorkTimesVal() { + return this.workTimes == null ? 0.0d : this.workTimes; + } +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShiftGroup.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShiftGroup.java new file mode 100644 index 0000000..7aac2d7 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShiftGroup.java @@ -0,0 +1,47 @@ +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: wangjie + * @CreateDate:2019-09-18-17:36 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_SHIFT_GROUP") +@Api("班组") +public class MesShiftGroup extends BaseBean implements Serializable { + private static final long serialVersionUID = 8962836866086379111L; + @Column(name = "GROUP_CODE") + @ApiParam("班组代码") + private String groupCode; + + @Column(name = "GROUP_NAME") + @ApiParam("班组名称") + private String groupName; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("产线") + private String workCenterCode; + + @Column(name = "SQUAD_LEADER") + @ApiParam("班长") + private String squadLeader; +} 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 new file mode 100644 index 0000000..a7c1232 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShiftRest.java @@ -0,0 +1,49 @@ +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 :mes系统业务动作 + * @Reference : + * @Author : yiming.gu + * @CreateDate : 2019-05-20 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_SHIFT_REST") +@Api("班次休息信息") +public class MesShiftRest extends BaseBean implements Serializable { + private static final long serialVersionUID = -8712815093203320523L; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "SHIFT_CODE") + @ApiParam("班次代码") + private String shiftCode; + + @Column(name = "START_TIME") + @ApiParam("开始时间") + private String startTime; + + @Column(name = "REST_TIMES") + @ApiParam("休息时长") + private Double restTimes; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesSnPhotoRelation.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesSnPhotoRelation.java new file mode 100644 index 0000000..b29fae0 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesSnPhotoRelation.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/18 0018 - 9:07 + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_SN_PHOTO_RELATION") +@Api("条码照片关系") +public class MesSnPhotoRelation extends BaseBean implements Serializable { + + private static final long serialVersionUID = -7732648131003455681L; + + @Column(name = "SERIAL_NUMBER") + @ApiParam("条码") + private String serialNumber; + + @Column(name = "PHOTO_PATH") + @ApiParam("照片路径") + private String photoPath; + + @Column(name = "PHOTO_NAME") + @ApiParam("照片名称") + private String photoName; + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStationBom.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStationBom.java new file mode 100644 index 0000000..b376b32 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStationBom.java @@ -0,0 +1,151 @@ +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.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 java.io.Serializable; + +/** + * @Description :工序物料清单 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_STATION_BOM") +@Api("工序物料清单") +public class MesStationBom extends BaseBean implements Serializable { + private static final long serialVersionUID = -4693067673094931011L; + @Column(name = "PART_NO") + @ApiParam("零件号") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam("产品物料名称") + private String partName; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元") + private String workCellCode; + + @Column(name = "ITEM_PART_NO") + @ApiParam("子零件") + private String itemPartNo; + + @Column(name = "ITEM_PART_NAME") + @ApiParam("原材料物料名称") + private String itemPartName; + + @Column(name = "QTY") + @ColumnDefault("0") + @ApiParam(value = "子零件数量", example = "0") + private Double qty; + + @Column(name = "IS_REPEAT") + @ApiParam(value = "是否可重复") + private Integer isRepeat; + + @Column(name = "IS_CHECK") + @ApiParam(value = "是否检查") + private Integer isCheck; + + @Column(name = "IS_FEED") + @ApiParam(value = "是否投料配置") + private Integer isFeed; + + @Column(name = "IS_BIND_KEY") + @ApiParam(value = "是否绑定关键件") + private Integer isBindKey; + + @Transient + @ApiParam(value = "绑定数量") + private Double boundQty; + + @Transient + @ApiParam("是否已绑定") + private Boolean isBind; + + @Transient + @ApiParam("显示颜色") + private String color; + + @Transient + @ApiParam("关键件代码") + private String keyBarCode; + + @Transient + @ApiParam("产品条码") + private String serialNumber; + + public double getBoundQtyVal() { + return this.boundQty == null ? 0.0d : this.boundQty; + } + + public double getQtyVal() { + return this.qty == null ? 0.0d : this.qty; + } + + public int getIsRepeatVal() { + return this.isRepeat == null ? 0 : this.isRepeat; + } + + public int getIsCheckVal() { + return this.isCheck == null ? 0 : this.isCheck; + } + + public boolean getIsBindVal() { + return this.isBind == null ? false : this.isBind; + } + + public int getIsFeedVal() { + return this.isFeed == null ? 0 : this.isFeed; + } + + @Override + public String toString() { + return "MesStationBom{" + + "partNo='" + partNo + '\'' + + ", itemPartNo='" + itemPartNo + '\'' + + ", qty=" + qty + + ", isRepeat=" + isRepeat + + ", isCheck=" + isCheck + + ", isFeed=" + isFeed + + ", isBind=" + isBind + + ", color='" + color + '\'' + + ", id=" + id + + ", organizeCode='" + organizeCode + '\'' + + ", isValid=" + isValid + + ", isDeleted=" + isDeleted + + ", createUser='" + createUser + '\'' + + ", createDatetime='" + createDatetime + '\'' + + ", modifyUser='" + modifyUser + '\'' + + ", modifyDatetime='" + modifyDatetime + '\'' + + ", createDateTimeStart='" + createDateTimeStart + '\'' + + ", createDateTimeEnd='" + createDateTimeEnd + '\'' + + ", modifyDateTimeStart='" + modifyDateTimeStart + '\'' + + ", modifyDateTimeEnd='" + modifyDateTimeEnd + '\'' + + ", orderByParam='" + orderByParam + '\'' + + ", ascOrDesc=" + ascOrDesc + + '}'; + } +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStep.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStep.java new file mode 100644 index 0000000..0998015 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStep.java @@ -0,0 +1,102 @@ +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 javax.persistence.Transient; +import java.io.Serializable; + +/** + * @Description :工步 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_STEP") +@Api("工步") +public class MesStep extends BaseBean implements Serializable { + private static final long serialVersionUID = -2157306767211269786L; + @Column(name = "STEP_CODE") + @ApiParam("工步代码") + private String stepCode; + + @Column(name = "STEP_NAME") + @ApiParam("工步名称") + private String stepName; + + @Column(name = "STEP_TEXT") + @ApiParam("工步描述") + private String stepText; + + @Column(name = "STEP_TYPE") + @ApiParam("工步类型") + private String stepType; + + @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-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStepParam.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStepParam.java new file mode 100644 index 0000000..dd5a834 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStepParam.java @@ -0,0 +1,47 @@ +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 : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_STEP_PARAM") +@Api("工步参数") +public class MesStepParam extends BaseBean implements Serializable { + private static final long serialVersionUID = -147541368320233093L; + @Column(name = "STEP_CODE") + @ApiParam("工步代码") + private String stepCode; + + @Column(name = "PARAM_CODE") + @ApiParam("参数代码") + private String paramCode; + + @Column(name = "PARAM_NAME") + @ApiParam("参数名称") + private String paramName; + + @Column(name = "PARAM_ATTRIBUTE") + @ApiParam("参数属性") + private String paramAttribute; +} 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 new file mode 100644 index 0000000..0d30d54 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTime.java @@ -0,0 +1,40 @@ +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; + +@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-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 new file mode 100644 index 0000000..b6071b9 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTorqueDetail.java @@ -0,0 +1,97 @@ +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 : 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-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 new file mode 100644 index 0000000..506ed2a --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTypeCfg.java @@ -0,0 +1,48 @@ +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: joke.wang + * @CreateDate: 2019\11\22 16:56 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@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; + + @Column(name = "TYPE_NAME") + @ApiParam("类型名称") + private String typeName; + + @Column(name = "BUSINESS_TYPE_CODE") + @ApiParam("业务类型代码") + private String businessTypeCode; + + @Column(name = "BUSINESS_TYPE_NAME") + @ApiParam("业务类型名称") + private String businessTypeName; +} 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 new file mode 100644 index 0000000..a089f0a --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcCheck.java @@ -0,0 +1,56 @@ +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; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/9/21 1:45 PM + * @Description: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@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; + + @Column(name = "PART_NO") + @ApiParam("产品物料号") + private String partNo; + + @Column(name = "CHECK_TYPE") + @ApiParam("检查类型") + private String checkType; + + @Column(name = "CHECK_OBJ") + @ApiParam("检查对象") + private String checkObj; + + @Column(name = "CHECK_ITEM") + @ApiParam("检查项") + private String checkItem; + + @Column(name = "STANDARD") + @ApiParam("检查标准") + private String standard; + +} 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 new file mode 100644 index 0000000..fbf5699 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcCheckRecord.java @@ -0,0 +1,83 @@ +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.Index; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/9/21 1:57 PM + * @Description: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_WC_CHECK_RECORD", indexes = { + @Index(columnList = "CREATE_DATE_TIME") +}) +@Api("开线检查记录") +public class MesWcCheckRecord extends BaseBean implements Serializable { + private static final long serialVersionUID = -2173902677953303765L; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心") + private String workCenterCode; + + @Column(name = "WORK_ORDER") + @ApiParam("工单号") + private String workOrder; + + @Column(name = "PART_NO") + @ApiParam("产品物料号") + private String partNo; + + @Column(name = "CHECK_TYPE") + @ApiParam("检查类型") + private String checkType; + + @Column(name = "CHECK_OBJ") + @ApiParam("检查对象") + private String checkObj; + + @Column(name = "CHECK_ITEM") + @ApiParam("检查项") + private String checkItem; + + @Column(name = "STANDARD") + @ApiParam("检查标准") + private String standard; + + @Column(name = "CHECK_RESULT") + @ApiParam("检查结果") + private String checkResult; + + @Column(name = "CHECK_VALUE") + @ApiParam("检查值") + private String checkValue; + + @Column(name = "REASON") + @ApiParam("原因") + private String reason; + + @Column(name = "GROUP_CODE") + @ApiParam("组名") + private String groupCode; + + @Column(name = "OVERALL_RESULT") + @ApiParam("总体结果") + private Integer overAllResult; + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcEquipment.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcEquipment.java new file mode 100644 index 0000000..feeef17 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcEquipment.java @@ -0,0 +1,43 @@ +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; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/9/24 2:31 PM + * @Description: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_WC_EQUIPMENT") +@Api("工作单元设备关系表") +public class MesWcEquipment extends BaseBean implements Serializable { + private static final long serialVersionUID = 2088600237918553286L; + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name = "EQUIPMENT_CODE") + @ApiParam("设备代码") + private String equipmentCode; + +} 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 new file mode 100644 index 0000000..e9bd56b --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCell.java @@ -0,0 +1,64 @@ +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 : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_WORK_CELL") +@Api("工作单元") +public class MesWorkCell extends BaseBean implements Serializable { + private static final long serialVersionUID = -493313481197504121L; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name = "WORK_CELL_NAME") + @ApiParam("工作单元名称") + private String workCellName; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心") + private String workCenterCode; + + @Column(name = "AREA_CODE") + @ApiParam("生产区域代码") + private String areaCode; + + @Column(name = "WORK_CELL_TYPE") + @ApiParam("工位类型") + private Integer workCellType; + + @Column(name = "SEQ") + @ApiParam("序号") + private Integer seq; + + @Column(name = "WORK_CELL_IP") + @ApiParam("工作单元IP") + private String workCellIp; + + @Column(name = "WORK_CELL_PORT") + @ApiParam("工作单元端口") + private String workCellPort; +} 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 new file mode 100644 index 0000000..2200ceb --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellMonitorLog.java @@ -0,0 +1,64 @@ +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.*; +import java.io.Serializable; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/10/16 2:42 PM + * @Description: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_WORK_CELL_MONITOR_LOG", indexes = { + @Index(columnList = "CREATE_DATE_TIME") +}) +@Api("工位监控异常信息") +public class MesWorkCellMonitorLog extends BaseBean implements Serializable { + private static final long serialVersionUID = -5634446206963213556L; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元") + private String workCellCode; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "WORK_ORDER_NO") + @ApiParam("工单") + private String workOrderNo; + + @Column(name = "STEP_CODE") + @ApiParam("工步") + private String stepCode; + + @Column(name = "PROCESS_CODE") + @ApiParam("工序") + private String processCode; + + @Column(name = "ROUTE_CODE") + @ApiParam("流程") + private String routeCOde; + + @Lob + @Column(name = "MESSAGE") + @ApiParam("异常信息") + private String message; +} 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 new file mode 100644 index 0000000..2249726 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellParam.java @@ -0,0 +1,48 @@ +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 : wangjie + * @CreateDate : 2019-08-30 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@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; + + @Column(name = "PARAM_NAME") + @ApiParam("参数名称") + private String paramName; + + @Column(name = "PARAM_TYPE") + @ApiParam("参数类型") + private Integer paramType; + + @Column(name = "PARAM_MODEL") + @ApiParam("参数模式") + private Integer paramModel; +} 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 new file mode 100644 index 0000000..a434107 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellParamCfg.java @@ -0,0 +1,56 @@ +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 : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_WORK_CELL_PARAM_CFG") +@Api("工作单元参数配置") +public class MesWorkCellParamCfg extends BaseBean implements Serializable { + private static final long serialVersionUID = 1739991089354361293L; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "PARAM_CODE") + @ApiParam("参数代码") + private String paramCode; + + @Column(name = "PARAM_NAME") + @ApiParam("参数名称") + private String paramName; + + @Column(name = "PARAM_VALUE") + @ApiParam("参数值") + private String paramValue; + + @Column(name = "IS_CHECK") + @ApiParam("是否必须校验") + private Integer isCheck; +} 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 new file mode 100644 index 0000000..0329add --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellPoint.java @@ -0,0 +1,56 @@ +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 : dragon.xu + * @CreateDate : 2019-05-22 17:58 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@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; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name = "QUEUE_SEQ") + @ApiParam("队列主表序号") + private Double queueSeq; + + @Column(name = "QUEUE_DETAIL_SEQ") + @ApiParam("队列明细表序号") + private Double queueDetailSeq; + + public double getQueueSeqVal() { + return this.queueSeq == null ? 0 : this.queueSeq; + } + + public double getQueueDetailSeqVal() { + return this.queueDetailSeq == null ? 0 : this.queueDetailSeq; + } +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellStatus.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellStatus.java new file mode 100644 index 0000000..5932327 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellStatus.java @@ -0,0 +1,47 @@ +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 : crish + * @CreateDate : 2019-06-04 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_WORK_CELL_STATUS") +@Api("工位运行状态") +public class MesWorkCellStatus extends BaseBean implements Serializable { + private static final long serialVersionUID = 102975351699481524L; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("产线") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工位") + private String workCellCode; + + @Column(name = "TIME_OUT_STATUS") + @ApiParam("超时状态") + private Integer timeOutStatus; + + +} 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 new file mode 100644 index 0000000..3d35275 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCenter.java @@ -0,0 +1,57 @@ +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 : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_WORK_CENTER") +@Api("工作中心") +public class MesWorkCenter extends BaseBean implements Serializable { + private static final long serialVersionUID = -1119897685621371682L; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "WORK_CENTER_NAME") + @ApiParam("工作中心名称") + private String workCenterName; + + @Column(name = "ERP_WORK_CENTER") + @ApiParam("ERP工作中心") + private String erpWorkCenter; + + @Column(name = "WORK_VER") + @ApiParam("工作版本") + private String workVer; + + @Column(name = "AREA_CODE") + @ApiParam("生产区域代码") + private String areaCode; + + @Column(name = "RUNNING_STATUS") + @ApiParam("运行状态") + private String runningStatus; + +} 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 new file mode 100644 index 0000000..c4443eb --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java @@ -0,0 +1,249 @@ +package cn.estsh.i3plus.pojo.mes.pcn.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.mes.pcn.model.MesButtonFlagModel; +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-04-16-17:36 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@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; + + @Column(name = "PART_NO", nullable = false) + @ApiParam("物料号") + private String partNo; + + @Column(name = "PART_NAME_RDD") + @ApiParam("物料名称") + private String partNameRdd; + + @Column(name = "PROD_CFG_CODE") + @ApiParam("产品配置代码") + private String prodCfgCode; + + @Column(name = "QTY") + @ApiParam("数量") + private Double qty; + + @Column(name = "COMPLETE_QTY") + @ApiParam("完成数量") + private Double completeQty; + + @Column(name = "REPAIR_QTY") + @ApiParam("返修数量") + private Double repairQty; + + @Column(name = "SCRAP_QTY") + @ApiParam("报废数量") + private Double scrapQty; + + @Column(name = "SEQ") + @ApiParam("工单序号") + private Double seq; + + @Column(name = "WO_STATUS") + @ApiParam("工单状态") + private Integer workOrderStatus; + + @Column(name = "WO_TYPE") + @ApiParam("工单类型") + private Integer workOrderType; + + @Column(name = "NEXT_ORDER") + @ApiParam("下一工单") + private String nextOrder; + + @Column(name = "PLAN_ORDER_NO") + @ApiParam("生产计划单号") + private String planOrderNo; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "AREA_CODE") + @ApiParam("区域代码") + private String areaCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name = "SCHEDULE_DATE") + @ApiParam("排产日期") + private String scheduleDate; + + @Column(name = "CUST_PROD_LINE_CODE") + @ApiParam("客户产线代码") + private String custProdLineCode; + + @Column(name = "SHIFT_CODE") + @ApiParam("班次") + private String shiftCode; + + @Column(name = "START_TIME") + @ApiParam("开始时间") + private String startTime; + + @Column(name = "END_TIME") + @ApiParam("结束时间") + private String endTime; + + @Column(name = "WO_SOURCE") + @ApiParam("工单来源") + private String workOrderSource; + + @Column(name = "MEMO") + @ApiParam("备注") + private String memo; + + @Column(name = "SHIFT_GROUP") + @ApiParam("班组") + private String shiftGroup; + + @Column(name = "APPROVAL_STATUS") + @ApiParam("审批状态") + private Integer approvalStatus; + + @Column(name = "CUST_CODE") + @ApiParam("客户代码") + private String custCode; + + @Column(name = "CUST_ORDER_NO") + @ApiParam("客户订单号") + private String custOrderNo; + + @Column(name = "FI_QTY") + @ApiParam("首检数量") + private Double fiQty; + + @Column(name = "FI_COMPLETE_QTY") + @ApiParam("首检完成数量") + private Double fiCompleteQty; + + @Column(name = "FI_GENERATE_QTY") + @ApiParam("首检生成数量") + private Double fiGenerateQty; + + @Version + @Column(name = "LOCK_VERSION") + @ApiParam(value = "乐观锁", example = "1") + public Integer lockVersion; + + /********************** 冗余字段 *********************************/ + @Transient + @ApiParam(value = "工作中心名称") + public String workCenterName; + + @Transient + @ApiParam(value = "工作单元名称") + public String workCellName; + + @Transient + @ApiParam(value = "客户产线名称") + public String custProdLineName; + + @Transient + @ApiParam(value = "班次名称") + public String shiftName; + + @Transient + @ApiParam(value = "班组名称") + public String shiftGroupName; + + @Transient + @ApiParam(value = "产品配置名称") + public String prodCfgName; + + @Transient + @ApiParam("区域代码名称") + private String areaCodeName; + + @Transient +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value = "计划开始日期查询用，查询开始日期", example = "2018-12-31 23:59:59") + public String startTimeStart; + + + @Transient +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value = "计划开始日期查询用，查询截至日期", example = "2018-12-31 23:59:59") + public String startTimeEnd; + + @Transient +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value = "计划结束日期查询用，查询结束日期起始", example = "2018-12-31 23:59:59") + public String endTimeStart; + + @Transient +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value = "计划结束日期查询用，查询结束日期截至", example = "2018-12-31 23:59:59") + public String endTimeEnd; + + @Transient + @ApiParam("mes生产工单页面按钮控制") + private MesButtonFlagModel mesButtonFlagModel; + + @Transient + @ApiParam("批量打包开窗页面查询工单=1") + private String pageType; + + public double getQtyVal() { + return this.qty == null ? 0.0d : this.qty; + } + + public double getCompleteQtyVal() { + return this.completeQty == null ? 0.0d : this.completeQty; + } + + public double getRepairQtyVal() { + return this.repairQty == null ? 0.0d : this.repairQty; + } + + public double getScrapQtyVal() { + return this.scrapQty == null ? 0.0d : this.scrapQty; + } + + public double getSeqVal() { + return this.seq == null ? 0.0d : this.seq; + } + + public int getWorkOrderStatusVal() { + return this.workOrderStatus == null ? 0 : this.workOrderStatus; + } + + public int getWorkOrderTypeVal() { + return this.workOrderType == null ? 0 : this.workOrderType; + } + + public int getApprovalStatusVal() { + return this.approvalStatus == null ? 0 : this.approvalStatus; + } +} 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 new file mode 100644 index 0000000..caba23a --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrderLog.java @@ -0,0 +1,231 @@ +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.*; +import java.io.Serializable; + +/** + * @Description: + * @Reference: + * @Author: wangjie + * @CreateDate:2019-09-19-17:36 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_WORK_ORDER_LOG", indexes = { + @Index(columnList = "ORDER_NO"), + @Index(columnList = "CREATE_DATE_TIME") +}) +@Api("生产工单日志") +public class MesWorkOrderLog extends BaseBean implements Serializable { + private static final long serialVersionUID = -7018645997937147427L; + + @Column(name = "ORDER_NO") + @ApiParam("工单号") + private String orderNo; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "PART_NAME_RDD") + @ApiParam("物料名称") + private String partNameRdd; + + @Column(name = "PROD_CFG_CODE") + @ApiParam("产品配置代码") + private String prodCfgCode; + + @Column(name = "QTY") + @ApiParam("数量") + private Double qty; + + @Column(name = "COMPLETE_QTY") + @ApiParam("完成数量") + private Double completeQty; + + @Column(name = "REPAIR_QTY") + @ApiParam("返修数量") + private Double repairQty; + + @Column(name = "SCRAP_QTY") + @ApiParam("报废数量") + private Double scrapQty; + + @Column(name = "SEQ") + @ApiParam("工单序号") + private Double seq; + + @Column(name = "WO_STATUS") + @ApiParam("工单状态") + private Integer workOrderStatus; + + @Column(name = "WO_TYPE") + @ApiParam("工单类型") + private Integer workOrderType; + + @Column(name = "NEXT_ORDER") + @ApiParam("下一工单") + private String nextOrder; + + @Column(name = "PLAN_ORDER_NO") + @ApiParam("生产计划单号") + private String planOrderNo; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "AREA_CODE") + @ApiParam("区域代码") + private String areaCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name = "SCHEDULE_DATE") + @ApiParam("排产日期") + private String scheduleDate; + + @Column(name = "CUST_PROD_LINE_CODE") + @ApiParam("客户产线代码") + private String custProdLineCode; + + @Column(name = "SHIFT_CODE") + @ApiParam("班次") + private String shiftCode; + + @Column(name = "START_TIME") + @ApiParam("开始时间") + private String startTime; + + @Column(name = "END_TIME") + @ApiParam("结束时间") + private String endTime; + + @Column(name = "WO_SOURCE") + @ApiParam("工单来源") + private String workOrderSource; + + @Column(name = "MEMO") + @ApiParam("备注") + private String memo; + + @Column(name = "SHIFT_GROUP") + @ApiParam("班组") + private String shiftGroup; + + @Column(name = "APPROVAL_STATUS") + @ApiParam("审批状态") + private Integer approvalStatus; + + @Column(name = "CUST_CODE") + @ApiParam("客户代码") + private String custCode; + + @Column(name = "CUST_ORDER_NO") + @ApiParam("客户订单号") + private String custOrderNo; + + @Column(name = "FI_QTY") + @ApiParam("首检数量") + private Double fiQty; + + @Column(name = "FI_COMPLETE_QTY") + @ApiParam("首检完成数量") + private Double fiCompleteQty; + + @Column(name = "FI_GENERATE_QTY") + @ApiParam("首检生成数量") + private Double fiGenerateQty; + + /********************** 冗余字段 *********************************/ + @Transient + @ApiParam(value = "工作中心名称") + public String workCenterName; + + @Transient + @ApiParam(value = "工作单元名称") + public String workCellName; + + @Transient + @ApiParam(value = "客户产线名称") + public String custProdLineName; + + @Transient + @ApiParam(value = "班次名称") + public String shiftName; + + @Transient + @ApiParam(value = "班组名称") + public String shiftGroupName; + + @Transient + @ApiParam(value = "产品配置名称") + public String prodCfgName; + + @Transient +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value = "计划开始日期查询用，查询开始日期", example = "2018-12-31 23:59:59") + public String startTimeStart; + + + @Transient +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value = "计划开始日期查询用，查询截至日期", example = "2018-12-31 23:59:59") + public String startTimeEnd; + + @Transient +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value = "计划结束日期查询用，查询结束日期起始", example = "2018-12-31 23:59:59") + public String endTimeStart; + + @Transient +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value = "计划结束日期查询用，查询结束日期截至", example = "2018-12-31 23:59:59") + public String endTimeEnd; + + public double getQtyVal() { + return this.qty == null ? 0.0d : this.qty; + } + + public double getCompleteQtyVal() { + return this.completeQty == null ? 0.0d : this.completeQty; + } + + public double getRepairQtyVal() { + return this.repairQty == null ? 0.0d : this.repairQty; + } + + public double getScrapQtyVal() { + return this.scrapQty == null ? 0.0d : this.scrapQty; + } + + public double getSeqVal() { + return this.seq == null ? 0.0d : this.seq; + } + + public int getWorkOrderStatusVal() { + return this.workOrderStatus == null ? 0 : this.workOrderStatus; + } + + public int getWorkOrderTypeVal() { + return this.workOrderType == null ? 0 : this.workOrderType; + } + + public int getApprovalStatusVal() { + return this.approvalStatus == null ? 0 : this.approvalStatus; + } +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ActionRequestBean.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ActionRequestBean.java new file mode 100644 index 0000000..3306bbf --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ActionRequestBean.java @@ -0,0 +1,38 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; +import java.util.Map; + +/** + * @Description : 动作请求参数 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-12 + * @Modify: + **/ +@Data +public class ActionRequestBean implements Serializable { + + @ApiParam("事件代码") + @Deprecated + public String eventCode; + + @ApiParam("按钮代码") + public String buttonCode; + + @ApiParam("单个结果") + public Obj resultObject; + + @ApiParam("List请求集") + public List resultList; + + @ApiParam("Map请求集") + public Map resultMap; + + @ApiParam("目的状态") + private Integer destStatus; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/AttrBean.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/AttrBean.java new file mode 100644 index 0000000..bfdcf1f --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/AttrBean.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ButtonBean.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ButtonBean.java new file mode 100644 index 0000000..5919ee5 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ButtonBean.java @@ -0,0 +1,22 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/DataAcquisitionModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/DataAcquisitionModel.java new file mode 100644 index 0000000..f70aaaa --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/DataAcquisitionModel.java @@ -0,0 +1,35 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/DefectModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/DefectModel.java new file mode 100644 index 0000000..f88ae24 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/DefectModel.java @@ -0,0 +1,50 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesDefect; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import 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-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/EsopFileModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/EsopFileModel.java new file mode 100644 index 0000000..ac086ba --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/EsopFileModel.java @@ -0,0 +1,26 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + + +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesEsop; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesFile; +import io.swagger.annotations.Api; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/12/4 3:09 下午 + * @Description: + **/ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Api("FastDfs文件model") +public class EsopFileModel { + + private MesEsop esop; + + private MesFile file; + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/FastDfsDownloadModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/FastDfsDownloadModel.java new file mode 100644 index 0000000..418ab92 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/FastDfsDownloadModel.java @@ -0,0 +1,31 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/8/19 7:00 PM + * @Description: + **/ + +@Data +@NoArgsConstructor +@AllArgsConstructor +@Api("FastDfs文件model") +public class FastDfsDownloadModel { + + @ApiParam("部分相对路径") + private String dirPath; + + @ApiParam("文件名称") + private String fileName; + + @ApiParam("文件字节") + private byte[] fileByte; + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/GenSerialNoModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/GenSerialNoModel.java new file mode 100644 index 0000000..fd91386 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/GenSerialNoModel.java @@ -0,0 +1,72 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/8/23 11:42 AM + * @Description: + **/ + +@Data +@NoArgsConstructor +@AllArgsConstructor +@Api("生成条码模型") +public class GenSerialNoModel { + + @ApiParam("规则代码") + private String ruleCode; + + @ApiParam("规则描述") + private String ruleDesc; + + @ApiParam("物料号") + private String partNo; + + @ApiParam("客户物料号") + private String custPartNo; + + @ApiParam("客户代码") + private String custCode; + + @ApiParam("过程条码") + private String serialNumber; + + @ApiParam("产地") + private String prodLocation; + + @ApiParam("前缀") + private String prefix; + + @ApiParam("编码规则") + private String numberRule; + + @ApiParam("序号长度") + private Integer serialnoLength; + + @ApiParam("增量") + private Integer serialnoIncrement; + + @ApiParam("最大值后循环") + private Integer isCycle; + + @ApiParam("当前编号前缀") + private String currentNumberPrefix; + + @ApiParam("当前序号") + private Integer currentSerialno; + + @ApiParam("当前编号") + private String currentNumber; + + + public GenSerialNoModel(String ruleCode) { + this.ruleCode = ruleCode; + } + +} 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 new file mode 100644 index 0000000..7883204 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesButtonFlagModel.java @@ -0,0 +1,57 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * @Author: wangjie + * @CreateDate: 2019/8/21 9:19 AM + * @Description: + **/ +@Data +@NoArgsConstructor +@AllArgsConstructor +@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; + + @ApiParam("暂停按钮") + private boolean suspendButton; + + @ApiParam("取消按钮") + private boolean revokeButton; + + @ApiParam("关闭按钮") + private boolean closeButton; + + @ApiParam("完成按钮") + private boolean completeButton; + + @ApiParam("关闭按钮-提醒") + private boolean closeButtonNoticeFlag; + + @ApiParam("维修任务按钮") + private boolean repairButton; + + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesDefectModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesDefectModel.java new file mode 100644 index 0000000..57ba538 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesDefectModel.java @@ -0,0 +1,35 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesDefect; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import javax.persistence.Transient; +import java.util.List; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\24 22:04 + * @Modify: + **/ +@Data +public class MesDefectModel { + + private String defectCode; + + @ApiParam("缺陷名称") + private String defectName; + + @ApiParam("缺陷类型") + private String defectType; + + @Transient + @ApiParam("缺陷类型名称") + private String defectTypeName; + + @Transient + @ApiParam("缺陷分类子集") + private List mesDefectList; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProdBindRecordModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProdBindRecordModel.java new file mode 100644 index 0000000..7bad5fc --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesProdBindRecordModel.java @@ -0,0 +1,126 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\24 22:05 + * @Modify: + **/ +@Data +public class MesProdBindRecordModel { + private Long id; + private String itemPartNo; + private String itemPartName; + private Double qty; + private Integer isValid; + private Integer isDeleted; + private String organizeCode; + private Integer isFeed; + private String workCenterCode; + private String workCellCode; + private String kpSn; + @ApiParam("拆解数") + private Double dismantleQty; + + @ApiParam("产品物料编码") + private String parentPartNo; + @ApiParam("产品物料名称") + private String parentPartName; + @ApiParam("合格数") + private Integer okQty; + @ApiParam("缺失数") + private Integer missQty; + @ApiParam("报废数") + private Integer scrapQty; + @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-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesStationBomModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesStationBomModel.java new file mode 100644 index 0000000..e6504ec --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesStationBomModel.java @@ -0,0 +1,75 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\24 22:04 + * @Modify: + **/ +@Data +public class 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-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/PLCInteracticeModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/PLCInteracticeModel.java new file mode 100644 index 0000000..f3b4227 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/PLCInteracticeModel.java @@ -0,0 +1,50 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + + +import io.swagger.annotations.Api; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Map; + +/** + * @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/PcsObserverStatusModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/PcsObserverStatusModel.java new file mode 100644 index 0000000..ed2bc6c --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/PcsObserverStatusModel.java @@ -0,0 +1,25 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @author Wynne.Lu + * @date 2020/2/21 17:20 + * @desc + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Api("工位监控观察者对象") +public class PcsObserverStatusModel { + + @ApiParam("产线") + private String workCenterCode; + + @ApiParam("运行状况") + private Boolean runningStatus; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProdPackageModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProdPackageModel.java new file mode 100644 index 0000000..ba753cc --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProdPackageModel.java @@ -0,0 +1,78 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + + +import cn.estsh.i3plus.pojo.mes.pcn.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-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProductDataModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProductDataModel.java new file mode 100644 index 0000000..727e482 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProductDataModel.java @@ -0,0 +1,24 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QcCheckStandardModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QcCheckStandardModel.java new file mode 100644 index 0000000..f2ec4a3 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QcCheckStandardModel.java @@ -0,0 +1,25 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + +import cn.estsh.i3plus.pojo.mes.pcn.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-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueJisModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueJisModel.java new file mode 100644 index 0000000..bdb5567 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueJisModel.java @@ -0,0 +1,90 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueOrderModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueOrderModel.java new file mode 100644 index 0000000..1a7965e --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueOrderModel.java @@ -0,0 +1,83 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import javax.persistence.Transient; +import java.io.Serializable; + +/** + * @Description : JIT队列列表Model + * @Reference : + * @Author : dragon.xu + * @CreateDate : 2019-05-22 16:34 + * @Modify: + **/ +@Data +@Api("JIT队列列表Model") +public class QueueOrderModel implements Serializable { + private Long id; + @ApiParam("队列序号") + public Double queueSeq; + @ApiParam("队列明细序号") + public Double queDetailSeq; + @ApiParam("客户标识号") + public String custFlagNo; + @ApiParam("产品配置名称") + public String prodCfgNameRdd; + @ApiParam("产品类型名称") + public String categoryNameRdd; + @ApiParam("产品条码") + public String serialNumber; + @ApiParam("物料号") + public String partNo; + @ApiParam("物料名称") + public String partNameRdd; + @ApiParam("条码状态") + public Integer snStatus; + @ApiParam("生产类型") + public String workType; + @Transient + @ApiParam("显示颜色") + private String color; + @ApiParam("工厂代码") + private String organizeCode; + @ApiParam("展示行数") + private Integer prodNum; + @ApiParam("产线") + private String workCenterCode; + @ApiParam("工位") + private String workCellCode; + + public QueueOrderModel() { + } + + 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; + } + + public QueueOrderModel(Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, + String partNo, String partNameRdd, String workType) { + this.id = id; + this.queueSeq = queueSeq; + this.queDetailSeq = queDetailSeq; + this.custFlagNo = custFlagNo; + this.prodCfgNameRdd = prodCfgNameRdd; + this.categoryNameRdd = categoryNameRdd; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.workType = workType; + } +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/RequestModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/RequestModel.java new file mode 100644 index 0000000..6a85e20 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/RequestModel.java @@ -0,0 +1,155 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + +import cn.estsh.i3plus.pojo.mes.pcn.bean.*; + +import java.util.List; + +/** + * @Description: 生产计划，生产队列，生产工单的复杂请求数据结构的统一请求模型 + * @Reference: + * @Author: Crish + * @CreateDate:2019-04-29-11:58 + * @Modify: + **/ +public class RequestModel { + + private List mesDefectRecordList; // 不良/缺陷记录数据集 + + private List mesRepairRecordList; // 维修记录数据集 + + private List dismantleRecordList; // 拆解记录数据集 + + private List workOrderList; // 工单数据集 + + private List partList; // 物料数据集 + + private List queueOrderList; // 生产队列数据集 + + private Double currentSeq; // 生产队列中的当前序列号 + + private Double nextSeq; // 生产队列中的下一个序列号 + + private Integer srcStatus; // 源状态 + + private Integer destStatus; // 目的状态 + + private List orderNoList;//工单编号 + + private ActionRequestBean actionRequestBean;//工单状态 + + public RequestModel(List queueOrderList, Double currentSeq, Double nextSeq) { + this.queueOrderList = queueOrderList; + this.currentSeq = currentSeq; + this.nextSeq = nextSeq; + } + + public RequestModel(List queueOrderList, Integer srcStatus, Integer destStatus) { + this.queueOrderList = queueOrderList; + this.srcStatus = srcStatus; + this.destStatus = destStatus; + } + + public RequestModel(List workOrderList, List partList) { + this.workOrderList = workOrderList; + 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; + } + + public RequestModel() { + } + + public void setWorkOrderList(List workOrderList) { + this.workOrderList = workOrderList; + } + + public List getPartList() { + return partList; + } + + public void setPartList(List partList) { + this.partList = partList; + } + + public List getQueueOrderList() { + return queueOrderList; + } + + public void setQueueOrderList(List queueOrderList) { + this.queueOrderList = queueOrderList; + } + + public void setOrderNoList(List orderNoList) { + this.orderNoList = orderNoList; + } + + public List getOrderNoList() { + return orderNoList; + } + + public void setActionRequestBean(ActionRequestBean actionRequestBean) { + this.actionRequestBean = actionRequestBean; + } + + public ActionRequestBean getActionRequestBean() { + return actionRequestBean; + } + + public Double getCurrentSeq() { + return currentSeq == null ? 0.0d : currentSeq; + } + + public void setCurrentSeq(Double currentSeq) { + this.currentSeq = currentSeq; + } + + public Double getNextSeq() { + return nextSeq == null ? 0.0d : nextSeq; + } + + public void setNextSeq(Double nextSeq) { + this.nextSeq = nextSeq; + } + + public Integer getSrcStatus() { + return srcStatus == null ? 0 : srcStatus; + } + + public void setSrcStatus(Integer srcStatus) { + this.srcStatus = srcStatus; + } + + public Integer getDestStatus() { + return destStatus == null ? 0 : destStatus; + } + + public void setDestStatus(Integer destStatus) { + this.destStatus = destStatus; + } +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/SnPrintDataModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/SnPrintDataModel.java new file mode 100644 index 0000000..831a997 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/SnPrintDataModel.java @@ -0,0 +1,27 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + +import cn.estsh.i3plus.pojo.mes.pcn.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-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/SnPrintModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/SnPrintModel.java new file mode 100644 index 0000000..0f1d4a6 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/SnPrintModel.java @@ -0,0 +1,27 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationBomModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationBomModel.java new file mode 100644 index 0000000..e894595 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationBomModel.java @@ -0,0 +1,29 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + + +import cn.estsh.i3plus.pojo.mes.pcn.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-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationResultBean.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationResultBean.java new file mode 100644 index 0000000..978fd4b --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationResultBean.java @@ -0,0 +1,55 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepParamsModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepParamsModel.java new file mode 100644 index 0000000..7b2296f --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepParamsModel.java @@ -0,0 +1,29 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; +import java.util.Map; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/11/12 3:50 下午 + * @Description: 下拉工步参数对象 + **/ +@Data +@Api("下拉工步参数对象") +public class StepParamsModel implements Serializable { + private static final long serialVersionUID = -6361645141217616499L; + + @ApiParam("参数代码") + private String paramCode; + + @ApiParam("参数代码") + private Map paramValues; + + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepPrintSnModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepPrintSnModel.java new file mode 100644 index 0000000..c7f4937 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepPrintSnModel.java @@ -0,0 +1,79 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProduceSn; +import com.fasterxml.jackson.annotation.JsonInclude; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.beans.Transient; +import java.util.List; + +/** + * @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-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepResult.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepResult.java new file mode 100644 index 0000000..0ef0670 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepResult.java @@ -0,0 +1,69 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/TorqueModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/TorqueModel.java new file mode 100644 index 0000000..ad0541e --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/TorqueModel.java @@ -0,0 +1,71 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/WcCheckModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/WcCheckModel.java new file mode 100644 index 0000000..e1e1c93 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/WcCheckModel.java @@ -0,0 +1,63 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + + +import cn.estsh.i3plus.pojo.base.enumutil.MesPcnEnumUtil; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWcCheckRecord; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.*; + +/** + * @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-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/IfDismantleRecordRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/IfDismantleRecordRepository.java new file mode 100644 index 0000000..02bca6e --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/IfDismantleRecordRepository.java @@ -0,0 +1,14 @@ +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.IfDismantleRecord; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\15 14:14 + * @Modify: + **/ +public interface IfDismantleRecordRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/IfPackageDetailRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/IfPackageDetailRepository.java new file mode 100644 index 0000000..9a4d6be --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/IfPackageDetailRepository.java @@ -0,0 +1,14 @@ +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.IfPackageDetail; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\15 17:47 + * @Modify: + **/ +public interface IfPackageDetailRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/IfProductOffLineRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/IfProductOffLineRepository.java new file mode 100644 index 0000000..9d362f1 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/IfProductOffLineRepository.java @@ -0,0 +1,14 @@ +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.IfProductOffLine; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\15 17:48 + * @Modify: + **/ +public interface IfProductOffLineRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesActionIfRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesActionIfRepository.java new file mode 100644 index 0000000..5f1dbef --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesActionIfRepository.java @@ -0,0 +1,14 @@ +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.MesActionIf; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\15 11:21 + * @Modify: + **/ +public interface MesActionIfRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesActionMethodRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesActionMethodRepository.java new file mode 100644 index 0000000..d5e2954 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesActionMethodRepository.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.MesActionMethod; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesActionMethodRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesActionRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesActionRepository.java new file mode 100644 index 0000000..80cb307 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesActionRepository.java @@ -0,0 +1,17 @@ +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.MesAction; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesActionRepository extends BaseRepository { + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesAreaRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesAreaRepository.java new file mode 100644 index 0000000..c91b713 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesAreaRepository.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.MesArea; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesAreaRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesBomRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesBomRepository.java new file mode 100644 index 0000000..42b5b30 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesBomRepository.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.MesBom; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesBomRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCellFeedRecordRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCellFeedRecordRepository.java new file mode 100644 index 0000000..6153d23 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCellFeedRecordRepository.java @@ -0,0 +1,14 @@ +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.MesCellFeedRecord; + +/** + * @Description : 工位投料履历持久化类 + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2020-06-17 09:53 + * @Modify: + **/ +public interface MesCellFeedRecordRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCellFeedRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCellFeedRepository.java new file mode 100644 index 0000000..462dff4 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCellFeedRepository.java @@ -0,0 +1,14 @@ +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.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-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesConfigRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesConfigRepository.java new file mode 100644 index 0000000..6b43fa6 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesConfigRepository.java @@ -0,0 +1,17 @@ +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.MesArea; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesConfig; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : crish + * @CreateDate : 2019-06-04 + * @Modify: + **/ +@Repository +public interface MesConfigRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCustProdLineRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCustProdLineRepository.java new file mode 100644 index 0000000..cbca918 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCustProdLineRepository.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.MesCustProdLine; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: Crish + * @CreateDate:2019-04-19-11:15 + * @Modify: + **/ +@Repository +public interface MesCustProdLineRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCustomerPartRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCustomerPartRepository.java new file mode 100644 index 0000000..72e72bc --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCustomerPartRepository.java @@ -0,0 +1,17 @@ +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.MesCustomerPart; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: yiming.gu + * @CreateDate:2019-05-20 + * @Modify: + **/ +@Repository +public interface MesCustomerPartRepository extends BaseRepository { + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCustomerRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCustomerRepository.java new file mode 100644 index 0000000..c006be6 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCustomerRepository.java @@ -0,0 +1,17 @@ +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.MesCustomer; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: Crish + * @CreateDate:2019-04-22-16:12 + * @Modify: + **/ +@Repository +public interface MesCustomerRepository extends BaseRepository { + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDataObjectRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDataObjectRepository.java new file mode 100644 index 0000000..d285a59 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDataObjectRepository.java @@ -0,0 +1,13 @@ +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.MesDataObject; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/9/27 1:59 PM + * @Description: + **/ +public interface MesDataObjectRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDatasourceRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDatasourceRepository.java new file mode 100644 index 0000000..36faed5 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDatasourceRepository.java @@ -0,0 +1,13 @@ +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.MesDatasource; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/9/27 1:58 PM + * @Description: + **/ +public interface MesDatasourceRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDefectCauseRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDefectCauseRepository.java new file mode 100644 index 0000000..c0ecd89 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDefectCauseRepository.java @@ -0,0 +1,14 @@ +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.MesDefectCause; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\16 20:04 + * @Modify: + **/ +public interface MesDefectCauseRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDefectRecordRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDefectRecordRepository.java new file mode 100644 index 0000000..c8a7a7b --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDefectRecordRepository.java @@ -0,0 +1,14 @@ +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.MesDefectRecord; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\16 20:05 + * @Modify: + **/ +public interface MesDefectRecordRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDefectRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDefectRepository.java new file mode 100644 index 0000000..274f334 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDefectRepository.java @@ -0,0 +1,14 @@ +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.MesDefect; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\16 20:04 + * @Modify: + **/ +public interface MesDefectRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDismantleRecordRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDismantleRecordRepository.java new file mode 100644 index 0000000..e093fe2 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesDismantleRecordRepository.java @@ -0,0 +1,14 @@ +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.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-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEquipmentRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEquipmentRepository.java new file mode 100644 index 0000000..9d54073 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEquipmentRepository.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.MesEquipment; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesEquipmentRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEsopRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEsopRepository.java new file mode 100644 index 0000000..103e176 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEsopRepository.java @@ -0,0 +1,17 @@ +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.MesEsop; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wynne.lu + * @CreateDate : 2019-07-30 + * @Modify: + **/ +@Repository +public interface MesEsopRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEventActionRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEventActionRepository.java new file mode 100644 index 0000000..6b15531 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEventActionRepository.java @@ -0,0 +1,17 @@ +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.MesEventAction; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesEventActionRepository extends BaseRepository { + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEventRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEventRepository.java new file mode 100644 index 0000000..cfa330f --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesEventRepository.java @@ -0,0 +1,17 @@ +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.MesEvent; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesEventRepository extends BaseRepository { + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesFiCfgRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesFiCfgRepository.java new file mode 100644 index 0000000..0050530 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesFiCfgRepository.java @@ -0,0 +1,17 @@ +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.MesFiCfg; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesFiCfgRepository extends BaseRepository { + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesFileRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesFileRepository.java new file mode 100644 index 0000000..16383bc --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesFileRepository.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.MesFile; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wynne.lu + * @CreateDate : 2019-07-30 + * @Modify: + **/ +@Repository +public interface MesFileRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesKpDataRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesKpDataRepository.java new file mode 100644 index 0000000..da57b4f --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesKpDataRepository.java @@ -0,0 +1,17 @@ +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.MesArea; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesKpData; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : crish + * @CreateDate : 2019-05-15 + * @Modify: + **/ +@Repository +public interface MesKpDataRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesKpsnRuleRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesKpsnRuleRepository.java new file mode 100644 index 0000000..373ab6d --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesKpsnRuleRepository.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.MesKpsnRule; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesKpsnRuleRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesLabelTemplateParamRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesLabelTemplateParamRepository.java new file mode 100644 index 0000000..ce73083 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesLabelTemplateParamRepository.java @@ -0,0 +1,14 @@ +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.MesLabelTemplateParam; + +/** + * @Description : 打印模板 + * @Reference : + * @Author : crish + * @Date : 2019-08-18 12:03:01.024 + * @Modify : + **/ +public interface MesLabelTemplateParamRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesLabelTemplateRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesLabelTemplateRepository.java new file mode 100644 index 0000000..16f04a4 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesLabelTemplateRepository.java @@ -0,0 +1,14 @@ +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.MesLabelTemplate; + +/** + * @Description : 打印模板 + * @Reference : + * @Author : crish + * @Date : 2019-08-18 12:03:01.024 + * @Modify : + **/ +public interface MesLabelTemplateRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesMethodRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesMethodRepository.java new file mode 100644 index 0000000..d064c63 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesMethodRepository.java @@ -0,0 +1,17 @@ +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.MesMethod; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesMethodRepository extends BaseRepository { + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesMonitorTaskDetailRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesMonitorTaskDetailRepository.java new file mode 100644 index 0000000..46e8f5d --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesMonitorTaskDetailRepository.java @@ -0,0 +1,15 @@ +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.MesMonitorTaskDetail; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : zcg + * @Date : 2020/1/8 0008 - 18:42 + */ +@Repository +public interface MesMonitorTaskDetailRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesMonitorTaskRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesMonitorTaskRepository.java new file mode 100644 index 0000000..95eb821 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesMonitorTaskRepository.java @@ -0,0 +1,15 @@ +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.MesMonitorTask; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : zcg + * @Date : 2020/1/8 0008 - 18:43 + */ +@Repository +public interface MesMonitorTaskRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesNumberRuleRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesNumberRuleRepository.java new file mode 100644 index 0000000..d3b014d --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesNumberRuleRepository.java @@ -0,0 +1,15 @@ +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.MesNumberRule; +import org.springframework.stereotype.Repository; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/8/23 1:22 PM + * @Description: + **/ +@Repository +public interface MesNumberRuleRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesNumberSerialnoRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesNumberSerialnoRepository.java new file mode 100644 index 0000000..11299b0 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesNumberSerialnoRepository.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.MesNumberSerialno; +import org.springframework.stereotype.Repository; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/8/23 1:23 PM + * @Description: + **/ + +@Repository +public interface MesNumberSerialnoRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesObjectCfgRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesObjectCfgRepository.java new file mode 100644 index 0000000..c1a67b2 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesObjectCfgRepository.java @@ -0,0 +1,13 @@ +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.MesObjectCfg; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/9/27 1:59 PM + * @Description: + **/ +public interface MesObjectCfgRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPLCConfigureRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPLCConfigureRepository.java new file mode 100644 index 0000000..d10efa8 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPLCConfigureRepository.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.MesPLCConfigure; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesPLCConfigureRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackSpecRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackSpecRepository.java new file mode 100644 index 0000000..fc409e1 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackSpecRepository.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.MesPackSpec; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesPackSpecRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackageDetailRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackageDetailRepository.java new file mode 100644 index 0000000..6d2fe27 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackageDetailRepository.java @@ -0,0 +1,13 @@ +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.MesPackageDetail; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/10/19 10:33 上午 + * @Description: + **/ +public interface MesPackageDetailRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackageRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackageRepository.java new file mode 100644 index 0000000..eb7c894 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackageRepository.java @@ -0,0 +1,13 @@ +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.MesPackage; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/10/19 10:39 上午 + * @Description: + **/ +public interface MesPackageRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackageTravelRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackageTravelRepository.java new file mode 100644 index 0000000..dde5b62 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPackageTravelRepository.java @@ -0,0 +1,13 @@ +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.MesPackageTravel; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/10/19 2:57 下午 + * @Description: + **/ +public interface MesPackageTravelRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPartCategoryRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPartCategoryRepository.java new file mode 100644 index 0000000..eb12a69 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPartCategoryRepository.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.MesPartCategory; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesPartCategoryRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPartRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPartRepository.java new file mode 100644 index 0000000..0324dd1 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPartRepository.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.MesPart; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesPartRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPatternJisRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPatternJisRepository.java new file mode 100644 index 0000000..87029c6 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPatternJisRepository.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.MesPatternJis; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-12-25 + * @Modify: + **/ +@Repository +public interface MesPatternJisRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnConnectLogRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnConnectLogRepository.java new file mode 100644 index 0000000..c9e3e97 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnConnectLogRepository.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.MesPcnConnectLog; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: yiming.gu + * @CreateDate:2019-04-24-17:13 + * @Modify: + **/ +@Repository +public interface MesPcnConnectLogRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnRepository.java new file mode 100644 index 0000000..1ae09bf --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnRepository.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.MesPcn; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: yiming.gu + * @CreateDate:2019-04-24-17:13 + * @Modify: + **/ +@Repository +public interface MesPcnRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnSyncCfgRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnSyncCfgRepository.java new file mode 100644 index 0000000..256e8da --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnSyncCfgRepository.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.MesPcnSyncCfg; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: yiming.gu + * @CreateDate:2019-04-24-17:13 + * @Modify: + **/ +@Repository +public interface MesPcnSyncCfgRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnSyncErrorLogRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnSyncErrorLogRepository.java new file mode 100644 index 0000000..a217480 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnSyncErrorLogRepository.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.MesPcnSyncErrorLog; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: yiming.gu + * @CreateDate:2019-04-24-17:13 + * @Modify: + **/ +@Repository +public interface MesPcnSyncErrorLogRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnSysUserOfflineRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnSysUserOfflineRepository.java new file mode 100644 index 0000000..111a055 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnSysUserOfflineRepository.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.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-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnTaskLogRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnTaskLogRepository.java new file mode 100644 index 0000000..66621f9 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnTaskLogRepository.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.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-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnTaskRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnTaskRepository.java new file mode 100644 index 0000000..68295ee --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnTaskRepository.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.MesPcnTask; +import org.springframework.stereotype.Repository; + +/** + * @Description :mes-pcn定时任务清单 + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-08-26 + * @Modify: + **/ +@Repository +public interface MesPcnTaskRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPlanOrderRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPlanOrderRepository.java new file mode 100644 index 0000000..c4ba8c9 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPlanOrderRepository.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.MesPlanOrder; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: Crish + * @CreateDate:2019-04-17-17:08 + * @Modify: + **/ +@Repository +public interface MesPlanOrderRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPlcRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPlcRepository.java new file mode 100644 index 0000000..add5aac --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPlcRepository.java @@ -0,0 +1,15 @@ +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.MesPlc; +import org.springframework.stereotype.Repository; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/9/26 7:47 PM + * @Description: + **/ +@Repository +public interface MesPlcRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProcessRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProcessRepository.java new file mode 100644 index 0000000..d931c12 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProcessRepository.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.MesProcess; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesProcessRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdBindRecordRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdBindRecordRepository.java new file mode 100644 index 0000000..2b9ba19 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdBindRecordRepository.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.MesProdBindRecord; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesProdBindRecordRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdCfgDetailRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdCfgDetailRepository.java new file mode 100644 index 0000000..c93700b --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdCfgDetailRepository.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.MesProdCfgDetail; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesProdCfgDetailRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdCfgRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdCfgRepository.java new file mode 100644 index 0000000..1413862 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdCfgRepository.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.MesProdCfg; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesProdCfgRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdPackRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdPackRepository.java new file mode 100644 index 0000000..cf70703 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdPackRepository.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.MesProdPack; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesProdPackRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdRouteCfgRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdRouteCfgRepository.java new file mode 100644 index 0000000..7a55397 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdRouteCfgRepository.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.MesProdRouteCfg; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesProdRouteCfgRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdRouteOptParamRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdRouteOptParamRepository.java new file mode 100644 index 0000000..93e532b --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdRouteOptParamRepository.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.MesProdRouteOptParam; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesProdRouteOptParamRepository extends BaseRepository { +} 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-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceCategoryRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceCategoryRepository.java new file mode 100644 index 0000000..50602d5 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceCategoryRepository.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.MesProduceCategory; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: Crish + * @CreateDate:2019-04-26-10:28 + * @Modify: + **/ +@Repository +public interface MesProduceCategoryRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceCtgyPictureRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceCtgyPictureRepository.java new file mode 100644 index 0000000..2edb306 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceCtgyPictureRepository.java @@ -0,0 +1,14 @@ +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.MesProduceCtgyPicture; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\16 20:35 + * @Modify: + **/ +public interface MesProduceCtgyPictureRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceSnRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceSnRepository.java new file mode 100644 index 0000000..e049715 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceSnRepository.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.MesProduceSn; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: Crish + * @CreateDate:2019-04-17-17:10 + * @Modify: + **/ +@Repository +public interface MesProduceSnRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceSnTravelRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceSnTravelRepository.java new file mode 100644 index 0000000..607e64c --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProduceSnTravelRepository.java @@ -0,0 +1,17 @@ +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.MesProduceSn; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProduceSnTravel; +import org.springframework.stereotype.Repository; + +/** + * @Description : 条码履历Dao层接口 + * @Reference : + * @Author : dragon.xu + * @CreateDate : 2019-05-29 16:36 + * @Modify: + **/ +@Repository +public interface MesProduceSnTravelRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProductDataRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProductDataRepository.java new file mode 100644 index 0000000..eb8debf --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProductDataRepository.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.MesProductData; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesProductDataRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProductEncodeCfgRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProductEncodeCfgRepository.java new file mode 100644 index 0000000..de434ac --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProductEncodeCfgRepository.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.MesProductEncodeCfg; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: wangjie + * @CreateDate:2019-04-17-17:10 + * @Modify: + **/ +@Repository +public interface MesProductEncodeCfgRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQcCheckDataRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQcCheckDataRepository.java new file mode 100644 index 0000000..8c909e7 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQcCheckDataRepository.java @@ -0,0 +1,14 @@ +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.MesQcCheckData; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\12 16:43 + * @Modify: + **/ +public interface MesQcCheckDataRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQcCheckStandardRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQcCheckStandardRepository.java new file mode 100644 index 0000000..1348b9c --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQcCheckStandardRepository.java @@ -0,0 +1,14 @@ +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.MesQcCheckStandard; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\12 14:58 + * @Modify: + **/ +public interface MesQcCheckStandardRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueJisDetailRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueJisDetailRepository.java new file mode 100644 index 0000000..bd19fef --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueJisDetailRepository.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.MesQueueJisDetail; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-12-25 + * @Modify: + **/ +@Repository +public interface MesQueueJisDetailRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueJisRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueJisRepository.java new file mode 100644 index 0000000..8a08948 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueJisRepository.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.MesQueueJis; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-12-25 + * @Modify: + **/ +@Repository +public interface MesQueueJisRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueOrderDetailRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueOrderDetailRepository.java new file mode 100644 index 0000000..82bbefb --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueOrderDetailRepository.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.MesQueueOrderDetail; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: Crish + * @CreateDate:2019-04-17-17:12 + * @Modify: + **/ +@Repository +public interface MesQueueOrderDetailRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueOrderRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueOrderRepository.java new file mode 100644 index 0000000..989e14f --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesQueueOrderRepository.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.MesQueueOrder; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: Crish + * @CreateDate:2019-04-17-17:11 + * @Modify: + **/ +@Repository +public interface MesQueueOrderRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRawPartSnRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRawPartSnRepository.java new file mode 100644 index 0000000..1f048c1 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRawPartSnRepository.java @@ -0,0 +1,15 @@ +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.MesCellFeed; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesRawPartSn; +import org.springframework.stereotype.Repository; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/9/18 10:05 AM + * @Description: + **/ +@Repository +public interface MesRawPartSnRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRepairRecordRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRepairRecordRepository.java new file mode 100644 index 0000000..1325e76 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRepairRecordRepository.java @@ -0,0 +1,14 @@ +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.MesRepairRecord; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\16 20:06 + * @Modify: + **/ +public interface MesRepairRecordRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRepairRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRepairRepository.java new file mode 100644 index 0000000..2e22c77 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRepairRepository.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.MesRepair; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: Crish + * @CreateDate:2019-08-08-17:13 + * @Modify: + **/ +@Repository +public interface MesRepairRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRouteProcessCellRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRouteProcessCellRepository.java new file mode 100644 index 0000000..f217869 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRouteProcessCellRepository.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.MesRouteProcessCell; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesRouteProcessCellRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRouteProcessRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRouteProcessRepository.java new file mode 100644 index 0000000..5749bbd --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRouteProcessRepository.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.MesRouteProcess; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesRouteProcessRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRouteRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRouteRepository.java new file mode 100644 index 0000000..92800fd --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesRouteRepository.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.MesRoute; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesRouteRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesScrapRecordRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesScrapRecordRepository.java new file mode 100644 index 0000000..0f3e5eb --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesScrapRecordRepository.java @@ -0,0 +1,14 @@ +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.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-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesScrapRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesScrapRepository.java new file mode 100644 index 0000000..4dbf260 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesScrapRepository.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.MesScrap; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: Crish + * @CreateDate:2019-08-08-17:13 + * @Modify: + **/ +@Repository +public interface MesScrapRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesShiftGroupRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesShiftGroupRepository.java new file mode 100644 index 0000000..544c627 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesShiftGroupRepository.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.MesShiftGroup; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: wangjie + * @CreateDate:2019-09-18-17:13 + * @Modify: + **/ +@Repository +public interface MesShiftGroupRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesShiftRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesShiftRepository.java new file mode 100644 index 0000000..7f5b1a7 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesShiftRepository.java @@ -0,0 +1,17 @@ +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.MesShift; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: Crish + * @CreateDate:2019-04-19-13:53 + * @Modify: + **/ +@Repository +public interface MesShiftRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesShiftRestRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesShiftRestRepository.java new file mode 100644 index 0000000..b3cc087 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesShiftRestRepository.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.MesShiftRest; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: yiming.gu + * @CreateDate:2019-05-20 + * @Modify: + **/ +@Repository +public interface MesShiftRestRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesStationBomRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesStationBomRepository.java new file mode 100644 index 0000000..f5fd71f --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesStationBomRepository.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.MesStationBom; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesStationBomRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesStepParamRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesStepParamRepository.java new file mode 100644 index 0000000..f7b386f --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesStepParamRepository.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.MesStepParam; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesStepParamRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesStepRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesStepRepository.java new file mode 100644 index 0000000..5f3f562 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesStepRepository.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.MesStep; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesStepRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesTimeRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesTimeRepository.java new file mode 100644 index 0000000..6489cec --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesTimeRepository.java @@ -0,0 +1,10 @@ +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.MesTime; +import org.springframework.stereotype.Repository; + +@Repository +public interface MesTimeRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesTorqueDetailRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesTorqueDetailRepository.java new file mode 100644 index 0000000..d2be5f1 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesTorqueDetailRepository.java @@ -0,0 +1,17 @@ +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.MesArea; +import cn.estsh.i3plus.pojo.mes.pcn.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-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesTypeCfgRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesTypeCfgRepository.java new file mode 100644 index 0000000..02911ac --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesTypeCfgRepository.java @@ -0,0 +1,14 @@ +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.MesTypeCfg; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\12\4 10:34 + * @Modify: + **/ +public interface MesTypeCfgRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWcCheckRecordRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWcCheckRecordRepository.java new file mode 100644 index 0000000..71d7efa --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWcCheckRecordRepository.java @@ -0,0 +1,13 @@ +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.MesWcCheckRecord; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/9/23 7:30 PM + * @Description: + **/ +public interface MesWcCheckRecordRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWcCheckRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWcCheckRepository.java new file mode 100644 index 0000000..cbf9cae --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWcCheckRepository.java @@ -0,0 +1,13 @@ +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.MesWcCheck; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/9/23 7:30 PM + * @Description: + **/ +public interface MesWcCheckRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWcEquipmentRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWcEquipmentRepository.java new file mode 100644 index 0000000..0e70427 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWcEquipmentRepository.java @@ -0,0 +1,13 @@ +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.MesWcEquipment; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/9/28 12:04 PM + * @Description: + **/ +public interface MesWcEquipmentRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellMonitorLogRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellMonitorLogRepository.java new file mode 100644 index 0000000..672947b --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellMonitorLogRepository.java @@ -0,0 +1,13 @@ +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.MesWorkCellMonitorLog; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/9/27 1:58 PM + * @Description: + **/ +public interface MesWorkCellMonitorLogRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellParamCfgRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellParamCfgRepository.java new file mode 100644 index 0000000..98f4a1c --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellParamCfgRepository.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.MesWorkCellParamCfg; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesWorkCellParamCfgRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellParamRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellParamRepository.java new file mode 100644 index 0000000..3a714cf --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellParamRepository.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.MesWorkCellParam; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-08-30 + * @Modify: + **/ +@Repository +public interface MesWorkCellParamRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellPointRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellPointRepository.java new file mode 100644 index 0000000..52319d0 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellPointRepository.java @@ -0,0 +1,17 @@ +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.MesWorkCell; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWorkCellPoint; +import org.springframework.stereotype.Repository; + +/** + * @Description :工站队列Dao层接口 + * @Reference : + * @Author : dragon.xu + * @CreateDate : 2019-05-29 14:40 + * @Modify: + **/ +@Repository +public interface MesWorkCellPointRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellRepository.java new file mode 100644 index 0000000..ce59423 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellRepository.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.MesWorkCell; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesWorkCellRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellStatusRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellStatusRepository.java new file mode 100644 index 0000000..1295a8d --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellStatusRepository.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.MesWorkCellStatus; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\15 11:21 + * @Modify: + **/ +@Repository +public interface MesWorkCellStatusRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCenterRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCenterRepository.java new file mode 100644 index 0000000..e24b5db --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCenterRepository.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.MesWorkCenter; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesWorkCenterRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkOrderLogRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkOrderLogRepository.java new file mode 100644 index 0000000..fea2dfb --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkOrderLogRepository.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.MesWorkOrderLog; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: wangjie + * @CreateDate:2019-09-19-17:13 + * @Modify: + **/ +@Repository +public interface MesWorkOrderLogRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkOrderRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkOrderRepository.java new file mode 100644 index 0000000..40676c4 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkOrderRepository.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.MesWorkOrder; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: Crish + * @CreateDate:2019-04-17-17:13 + * @Modify: + **/ +@Repository +public interface MesWorkOrderRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java new file mode 100644 index 0000000..3db9a90 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java @@ -0,0 +1,413 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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.pcn.bean.*; +import org.springframework.util.StringUtils; + +/** + * @Description: + * @Reference: Mes 条件封装 + * @Author: Crish + * @CreateDate:2019-04-22-14:58 + * @Modify: + **/ +public class MesHqlPack { + + + /** + * 通用查询条件 + * + * @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.getNumberBiggerPackContainsZero(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 d5b2f4a4cd7d99c33b10f650d1bc89c2df3c1791 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Mon, 30 Nov 2020 21:08:33 +0800 Subject: [PATCH 13/33] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E9=98=9F=E5=88=97?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=88=86=E7=BB=84=E5=8F=B7=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/bean/MesBoardShift.java | 4 ++++ .../cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java | 3 ++- .../cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java | 4 ++++ .../i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java | 4 ++-- .../pojo/mes/model/mgn/bj/SparePartStockModel.java | 17 +++++++++++++++++ 5 files changed, 29 insertions(+), 3 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/SparePartStockModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardShift.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardShift.java index 4c1f609..00b7a77 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardShift.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardShift.java @@ -41,4 +41,8 @@ public class MesBoardShift extends BaseBean implements Serializable { @Column(name = "SHIFT_NAME") @ApiParam("班次名称") private String shiftName; + + @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/MesQueueOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java index 5838d4a..755e931 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 @@ -217,7 +217,7 @@ public class MesQueueOrder extends BaseBean implements Serializable { public MesQueueOrder(Long id, Double seq, String partNo, String partNameRdd,Integer boxQty, Integer queueType,Integer status,String createUser, String createDatetime,String modifyUser,String modifyDatetime,String workType,String orderNo, - String workCenterCode, String workCellCode, Double qty, Double finsihQty) { + String workCenterCode, String workCellCode, Double qty, Double finsihQty, String groupNo) { this.id = id; this.seq = seq; this.partNo = partNo; @@ -235,6 +235,7 @@ public class MesQueueOrder extends BaseBean implements Serializable { this.workCellCode = workCellCode; this.qty = qty; this.finsihQty = finsihQty; + this.groupNo = groupNo; } } 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 3af7858..ae19bfc 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 @@ -92,6 +92,10 @@ public class MesStationBom extends BaseBean implements Serializable { private Double feedWarningQty; @Transient + @ApiParam("标准包规数量") + private Double partSpecQty = 0d; + + @Transient @ApiParam("是否已绑定") private Boolean isBind; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java index 5807d66..500b492 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java @@ -18,13 +18,13 @@ public class MgnBjBoardModel implements Serializable { private Integer qty; @ApiParam("jsa数量") - private Integer jsaQty; + private Integer jsaQty = 0; @ApiParam("jsa数量") private Integer jsaRate; @ApiParam("完成数量") private Integer completeQty = 0; @ApiParam("完成率") - private Integer completeRate; + private Integer completeRate = 0; @ApiParam("总数量") private Integer totalQty = 0; @ApiParam("预警数量") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/SparePartStockModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/SparePartStockModel.java new file mode 100644 index 0000000..1c05c3c --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/SparePartStockModel.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.mes.model.mgn.bj; + +import lombok.Data; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/11/29 5:40 PM + * @Modify: + */ +@Data +public class SparePartStockModel { + + private Integer maxQty; + + private Integer minQty; +} From e1783e5e460a9a16c7bbda5508010c7c83e8d256 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Tue, 1 Dec 2020 11:32:01 +0800 Subject: [PATCH 14/33] pom --- modules/i3plus-pojo-mes-pcn/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index bf96e57..d800ecf 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 From 0deb9b4733fa4e3b276beb687529e3e534923db6 Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Tue, 1 Dec 2020 14:31:55 +0800 Subject: [PATCH 15/33] =?UTF-8?q?=E4=B8=AD=E8=88=AA=E8=A5=84=E9=98=B3?= =?UTF-8?q?=E6=BB=91=E9=81=93=E5=B7=A5=E5=8E=82=E9=9C=80=E6=B1=82:?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AE=B9=E5=99=A8=E7=BC=96=E5=8F=B7=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRawPartSn.java | 4 ++++ 1 file changed, 4 insertions(+) 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 dd7a8eb..0561548 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 @@ -70,6 +70,10 @@ public class MesRawPartSn extends BaseBean implements Serializable { @ApiParam("供应商代码") private String supplierCode; + @Column(name = "CT_NO") + @ApiParam("容器编号") + private String ctNo; + public double getRawQtyVal() { return this.rawQty == null ? 0l : this.rawQty; } From 47e6a86ecdd07b7f1d20daae201636e10a3b8d49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Tue, 1 Dec 2020 17:30:53 +0800 Subject: [PATCH 16/33] =?UTF-8?q?=E3=80=90=E5=A4=A9=E6=B4=A5bug=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java | 11 +++++++++++ .../java/cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java | 3 +++ 2 files changed, 14 insertions(+) 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 ef9dddb..34acd47 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 @@ -130,4 +130,15 @@ public class MesDefectRecord extends BaseBean implements Serializable { this.defectName = defectName; this.defectQty = defectQty; } + + public MesDefectRecord(String partNo, String workOrderNo, String partName, String workCenterCode, + String workCellCode, String modifyUser, String modifyDatetime) { + this.partNo = partNo; + this.workOrderNo = workOrderNo; + this.partName = partName; + this.workCenterCode = workCenterCode; + this.workCellCode = workCellCode; + this.modifyUser = modifyUser; + this.modifyDatetime = modifyDatetime; + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java index 2eca8bb..3be6af1 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java @@ -84,6 +84,9 @@ public class TJMgnBoardModel extends BaseBean implements Serializable { @ApiParam("结束工单") private String workOrderNoEnd; + @ApiParam("产线") + private String workCenterCode; + public TJMgnBoardModel() { } From a94b5dd0b034269ef27b864f0c408679ceb7e007 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Tue, 1 Dec 2020 21:37:58 +0800 Subject: [PATCH 17/33] =?UTF-8?q?=E7=9C=8B=E6=9D=BF=E4=BA=A7=E7=BA=BF?= =?UTF-8?q?=E9=85=8D=E7=BD=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/MesBoardLine.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLine.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLine.java index cbc02b8..0768d03 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLine.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLine.java @@ -48,7 +48,7 @@ public class MesBoardLine extends BaseBean implements Serializable { @Column(name = "PLAN_TAKT") @ApiParam("计划节拍") - private Integer planTakt; + private Double planTakt; @Column(name = "PASS_PERCENT_MAX") @ApiParam("良品率上限") @@ -60,7 +60,7 @@ public class MesBoardLine extends BaseBean implements Serializable { @Column(name = "CAR_RUN_TIME") @ApiParam("小车运行时间（分）") - private Integer carRunTime; + private Double carRunTime; @Column(name = "TEST_CAR_SUM") @ApiParam("调试车数") From 785152dbfa1c47d3c136e8a1759a7d5184ed8233 Mon Sep 17 00:00:00 2001 From: "rock.yu" Date: Tue, 1 Dec 2020 23:11:28 +0800 Subject: [PATCH 18/33] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E8=B5=8B=E4=BA=88=E9=BB=98=E8=AE=A4=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataRecord.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataRecord.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataRecord.java index 1496c14..b49778e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataRecord.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataRecord.java @@ -80,8 +80,9 @@ public class WmsInterfaceDataRecord extends BaseBean { @Column(name = "ERP_DOC_NO") private String erpDocNo; + // 必须有默认值 @ApiParam("ERP状态代码") - @Column(name = "ERP_STATUS_CODE") + @Column(name = "ERP_STATUS_CODE", columnDefinition = "varchar(225) default ''") private String erpStatusCode; @ApiParam("ERP状态描述") From a4093d18d1124b73a0bdc3472ba79f617e450c78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Wed, 2 Dec 2020 13:48:57 +0800 Subject: [PATCH 19/33] =?UTF-8?q?=E3=80=9012420=2019048=20=E5=96=B7?= =?UTF-8?q?=E6=B6=82=E4=BA=8C=E6=A3=80=E5=A2=9E=E5=8A=A0UNPACK=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=2020201112=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/MesPackageDetail.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 ca64a64..beb90ed 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 @@ -27,9 +27,9 @@ import java.io.Serializable; @Index(columnList = "SERIAL_NUMBER"), @Index(columnList = "PART_NO"), @Index(columnList = "PACKAGE_NO2") -}, uniqueConstraints = { +}/*, uniqueConstraints = { @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "PACKAGE_NO", "SERIAL_NUMBER"}) -}) +}*/) @Api("包装规格明细") public class MesPackageDetail extends BaseBean implements Serializable { private static final long serialVersionUID = 6980459490465566975L; From 9b57f47af67072371c2b8fdb662a2916ab440934 Mon Sep 17 00:00:00 2001 From: "simon.song" Date: Wed, 2 Dec 2020 16:58:02 +0800 Subject: [PATCH 20/33] =?UTF-8?q?=E4=BF=AE=E6=94=B9pom=E6=96=87=E4=BB=B6?= 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-mongo/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-ics/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mdm/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 +- sonar-project.properties | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index 004fb69..bc7071b 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 650ee5b..f902a7c 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-mongo/pom.xml b/modules/i3plus-pojo-base-mongo/pom.xml index 15ad445..5868e20 100644 --- a/modules/i3plus-pojo-base-mongo/pom.xml +++ b/modules/i3plus-pojo-base-mongo/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 1e17935..d2521de 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 37b8a51..b599490 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 dc13374..9f5788e 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-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index 6df1cc2..ae38208 100644 --- a/modules/i3plus-pojo-ics/pom.xml +++ b/modules/i3plus-pojo-ics/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 123fdc9..1674a47 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 fdcf6e3..04b40d4 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-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml index d266163..6854e65 100644 --- a/modules/i3plus-pojo-mdm/pom.xml +++ b/modules/i3plus-pojo-mdm/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 d800ecf..bf96e57 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 54c8306..bbe0ff9 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 190efa7..be533a6 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 5896851..14e8567 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 aa3dd42..102ab0e 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 80498fc..864c56a 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 076f15a..e755225 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 1351ed3..194f0cb 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 67b0bff..60543fe 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 15d36cd..bdc4cab 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 f06d17f..cc6131f 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 diff --git a/sonar-project.properties b/sonar-project.properties index 268eaf2..0786d8d 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -6,7 +6,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo # defaults to project key sonar.projectName=i3plus-pojo # defaults to 'not provided' -sonar.projectVersion=1.0-DEV-SNAPSHOT +sonar.projectVersion=1.0-TEST-SNAPSHOT # Path is relative to the sonar-project.properties file. Defaults to . #sonar.sources=./ From c20922a4558510af2ea57d0659e2e084d305eba0 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Wed, 2 Dec 2020 17:34:22 +0800 Subject: [PATCH 21/33] =?UTF-8?q?Fix=20bug#12879=20COGI=E8=B0=83=E8=B4=A6?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=87=BA=E5=BA=93=E5=8D=95=E6=A8=A1=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 14d440e..4699854 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 @@ -869,8 +869,9 @@ public class WmsEnumUtil { WITHOUT_PRICE_CENTER_IN(720, "WITHOUT_PRICE_CENTER_OUT", "无成本中心入库"), OTHER_IN(730, "OTHER_IN", "其它入库"), OTHER_OUT(740, "OTHER_OUT", "其它出库"), - COGI_BALANCE(750, "COGI_BALANCE", "COGI调账"), - SUPPLIER_STD_RETURN(760, "SUPPLIER_STD_RETURN", "供应商退货"); //默认DMR + COGI_BALANCE(750, "COGI_BALANCE", "COGI调账入库"), + SUPPLIER_STD_RETURN(760, "SUPPLIER_STD_RETURN", "供应商退货"), + COGI_BALANCE_OUT(770, "COGI_BALANCE", "COGI调账出库");//默认DMR private int value; private String code; From 02d002b9586a54c439cb4915c0c86d10a45937bc Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 3 Dec 2020 12:15:14 +0800 Subject: [PATCH 22/33] =?UTF-8?q?package=20detail=20=E5=A2=9E=E5=8A=A0=20?= =?UTF-8?q?=E8=81=94=E5=90=88=E7=B4=A2=E5=BC=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 beb90ed..0f28b91 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 @@ -26,10 +26,10 @@ import java.io.Serializable; @Index(columnList = "PACKAGE_NO"), @Index(columnList = "SERIAL_NUMBER"), @Index(columnList = "PART_NO"), - @Index(columnList = "PACKAGE_NO2") -}/*, uniqueConstraints = { - @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "PACKAGE_NO", "SERIAL_NUMBER"}) -}*/) + @Index(columnList = "PACKAGE_NO2"), + @Index(columnList = "ORGANIZE_CODE,PACKAGE_NO,SERIAL_NUMBER"), + @Index(columnList = "PACKAGE_NO,SERIAL_NUMBER") +}) @Api("包装规格明细") public class MesPackageDetail extends BaseBean implements Serializable { private static final long serialVersionUID = 6980459490465566975L; From 13868d5cd171046ab35837aa3b57a1ef3b42f267 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 3 Dec 2020 12:36:54 +0800 Subject: [PATCH 23/33] =?UTF-8?q?producesn=20=E5=A2=9E=E5=8A=A0=E7=B4=A2?= =?UTF-8?q?=E5=BC=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java | 1 + 1 file changed, 1 insertion(+) 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 c0b3162..b71d6ac 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 @@ -26,6 +26,7 @@ import java.math.BigDecimal; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PRODUCE_SN", indexes = { + @Index(columnList = "SERIAL_NUMBER"), @Index(columnList = "PRODUCT_SN"), @Index(columnList = "CREATE_DATE_TIME"), @Index(columnList = "PART_NO"), From 28da49aa29e4cf8d062d5cc70e9620d449d72d27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Thu, 3 Dec 2020 15:59:15 +0800 Subject: [PATCH 24/33] =?UTF-8?q?=E3=80=9012422=2019048=20=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=96=B7=E6=B6=82=E6=8A=9B=E5=85=89=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=8A=A5=E8=A1=A8=2020201112=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/MesDefectRecord.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/MesDefectRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java index 34acd47..cb04f19 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 @@ -132,12 +132,13 @@ public class MesDefectRecord extends BaseBean implements Serializable { } public MesDefectRecord(String partNo, String workOrderNo, String partName, String workCenterCode, - String workCellCode, String modifyUser, String modifyDatetime) { + String workCellCode, String serialNumber, String modifyUser, String modifyDatetime) { this.partNo = partNo; this.workOrderNo = workOrderNo; this.partName = partName; this.workCenterCode = workCenterCode; this.workCellCode = workCellCode; + this.serialNumber = serialNumber; this.modifyUser = modifyUser; this.modifyDatetime = modifyDatetime; } From d64a8fd31c26b8b9e3a7510a12cbc7d450fe3720 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 3 Dec 2020 17:11:42 +0800 Subject: [PATCH 25/33] =?UTF-8?q?=E5=B7=A5=E6=AD=A5=E5=8F=82=E6=95=B0=20?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 35 ++++++++++++++++++++++ .../estsh/i3plus/pojo/mes/bean/MesStepParam.java | 4 +++ 2 files changed, 39 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 98ad82a..363e667 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 @@ -3126,6 +3126,41 @@ public class MesEnumUtil { } /** + * 工步参数 是否必填 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_STEP_PARAM_IS_NEED { + TRUE(1, "是"), + FALSE(2, "否"); + + private int value; + private String description; + + MES_STEP_PARAM_IS_NEED(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** * mes工作单元参数类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepParam.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepParam.java index cd1bd7f..99c4596 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 @@ -65,6 +65,10 @@ public class MesStepParam extends BaseBean implements Serializable { @ApiParam("参数对象") private String objectCode; + @Column(name = "IS_NEED") + @ApiParam("是否必填") + private Integer isNeed = 1; + @Column(name = "TYPE") @ApiParam("type") private Integer type = 0; From 2b522ca15de14e354e0574c8cbb9e45871afcc74 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 3 Dec 2020 17:14:21 +0800 Subject: [PATCH 26/33] =?UTF-8?q?=E5=B7=A5=E6=AD=A5=E5=8F=82=E6=95=B0=20?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepParam.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 99c4596..1a6f5b7 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 @@ -66,7 +66,7 @@ public class MesStepParam extends BaseBean implements Serializable { private String objectCode; @Column(name = "IS_NEED") - @ApiParam("是否必填") + @ApiParam("是否必需") private Integer isNeed = 1; @Column(name = "TYPE") From 14c47545e78fa571b0ccf216c005f0f27e8255e4 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Thu, 3 Dec 2020 20:10:43 +0800 Subject: [PATCH 27/33] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=A4=87=E4=BB=B6?= =?UTF-8?q?=E5=BA=93=E5=AD=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/model/mgn/bj/SparePartStockModel.java | 4 ++-- .../src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/SparePartStockModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/SparePartStockModel.java index 1c05c3c..6aaf4fd 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/SparePartStockModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/SparePartStockModel.java @@ -11,7 +11,7 @@ import lombok.Data; @Data public class SparePartStockModel { - private Integer maxQty; + private String maxQty; - private Integer minQty; + private String minQty; } 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 bcde4c8..ee666a5 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 @@ -3327,9 +3327,9 @@ public class MesHqlPack { if (queueJitPlan.getStatus() != null) { DdlPreparedPack.getNumEqualPack(queueJitPlan.getStatus(), "status", packBean); } - if (!StringUtils.isEmpty(queueJitPlan.getCreateDateTimeStart()) || !StringUtils.isEmpty(queueJitPlan.getCreateDateTimeEnd())) { - DdlPreparedPack.timeBuilder(queueJitPlan.getCreateDateTimeStart(), queueJitPlan.getCreateDateTimeEnd(), - "createDatetime", packBean, true); + if (!StringUtils.isEmpty(queueJitPlan.getPlanStartDate()) || !StringUtils.isEmpty(queueJitPlan.getPlanEndDate())) { + DdlPreparedPack.timeBuilder(queueJitPlan.getPlanStartDate(), queueJitPlan.getPlanEndDate(), + "planDate", packBean, true); } if (!StringUtils.isEmpty(queueJitPlan.getCreateDateTimeStart()) || !StringUtils.isEmpty(queueJitPlan.getCreateDateTimeEnd())) { DdlPreparedPack.timeBuilder(queueJitPlan.getCreateDateTimeStart(), queueJitPlan.getCreateDateTimeEnd(), From 56989acba2646c9a8338b0262f3171b5c1dda626 Mon Sep 17 00:00:00 2001 From: "simon.song" Date: Thu, 3 Dec 2020 21:00:02 +0800 Subject: [PATCH 28/33] =?UTF-8?q?12362=2020027-=E7=AE=A1=E7=90=86=E7=AB=AF?= =?UTF-8?q?-=E9=A6=96=E6=A3=80=E6=A3=80=E9=AA=8C=E7=BB=93=E6=9E=9C?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E7=8A=B6=E6=80=81=E5=B7=B2=E5=AE=8C=E6=88=90?= =?UTF-8?q?=E7=9A=84=E5=AF=B9=E5=BA=94=E7=9A=84=E6=95=B0=E9=87=8F=E5=92=8C?= =?UTF-8?q?=E5=B7=B2=E6=A3=80=E6=95=B0=E9=87=8F=E6=98=BE=E7=A4=BA=E6=9C=89?= =?UTF-8?q?=E9=97=AE=E9=A2=98-20201115?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java index ed50194..20ac65a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java @@ -145,4 +145,15 @@ public class MesQcOrder extends BaseBean implements Serializable { @ApiParam("本批次生产总数") private Double locSrcLotNoQty; + @Transient + @ApiParam("客户名称") + private String customerName; + + @Transient + @ApiParam("班次") + private String shiftName; + + @Transient + @ApiParam("班长") + private String squadLeader; } From 8dcb1703c91ce885e752268da9c0ac867228b88b Mon Sep 17 00:00:00 2001 From: "simon.song" Date: Fri, 4 Dec 2020 11:29:31 +0800 Subject: [PATCH 29/33] =?UTF-8?q?=E9=A6=96=E6=A3=80=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E5=80=BC=E5=AD=97=E6=AE=B5=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java index 03c2cd2..e808b1b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java @@ -125,7 +125,7 @@ public class MesQcOrderDetail extends BaseBean implements Serializable { @Transient @ApiParam("检测值") - private String checkValue; + private String checkValue = ""; @Transient @ApiParam("质检单检测记录id") From b5c994a18ba14b14cad04a08e7d92119d1f8b3bf Mon Sep 17 00:00:00 2001 From: Jason Date: Sun, 6 Dec 2020 21:20:36 +0800 Subject: [PATCH 30/33] =?UTF-8?q?sweb=E5=90=8C=E4=B8=80=E4=BE=9B=E5=BA=94?= =?UTF-8?q?=E5=95=86=E7=BC=96=E7=A0=81=E5=91=BD=E5=90=8D=E4=B8=BAVendorNo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/sweb/bean/SwebDocMovementDetails.java | 4 +- .../pojo/sweb/bean/SwebDocMovementMaster.java | 4 +- .../i3plus/pojo/sweb/bean/SwebDocMovementSn.java | 4 -- .../pojo/sweb/bean/SwebProcurementPlanOrder.java | 4 +- .../i3plus/pojo/sweb/bean/SwebPurchaseOrder.java | 4 +- .../pojo/sweb/bean/SwebPurchaseOrderDetails.java | 4 +- .../i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java | 4 +- .../i3plus/pojo/sweb/bean/SwebRequireAlarm.java | 4 +- .../i3plus/pojo/sweb/bean/SwebVendorAlarm.java | 4 +- .../estsh/i3plus/pojo/sweb/bean/SwebVendorRel.java | 4 +- .../i3plus/pojo/sweb/bean/SwebVendorStock.java | 4 +- .../pojo/sweb/bean/SwebVendorSupplierCapcity.java | 4 +- .../i3plus/pojo/sweb/bean/WmsMovementToSweb.java | 48 --------------- .../modelbean/SwebPOBatchInsertEnterModel.java | 2 +- .../modelbean/SwebPOBatchInsertItemEnterModel.java | 2 +- .../modelbean/SwebPODetailsUpdateHistoryModel.java | 2 +- .../sweb/modelbean/SwebPOForPubListEnterModel.java | 2 +- .../modelbean/SwebPOForPubListResultItemModel.java | 4 +- .../repository/WmsMovementToSwebRepository.java | 9 --- .../i3plus/pojo/sweb/sqlpack/SwebHqlPack.java | 68 ++++++++++------------ .../pojo/wms/bean/SwebProcurementPlanOrder.java | 4 +- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 2 +- 22 files changed, 63 insertions(+), 128 deletions(-) delete mode 100644 modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/WmsMovementToSweb.java delete mode 100644 modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/WmsMovementToSwebRepository.java diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementDetails.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementDetails.java index 187829f..3e369ee 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementDetails.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementDetails.java @@ -32,8 +32,8 @@ public class SwebDocMovementDetails extends BaseBean { private static final long serialVersionUID = -1232334350341792942L; @ApiParam("供应商编号") - @Column(name = "VENDOR_CODE") - private String vendorCode; + @Column(name = "VENDOR_NO") + private String vendorNo; @ApiParam("供应商名称") @Column(name = "VENDOR_NAME") diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementMaster.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementMaster.java index 56aaa79..4a66228 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementMaster.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementMaster.java @@ -92,8 +92,8 @@ public class SwebDocMovementMaster extends BaseBean { private String refNo; @ApiParam("供应商编号") - @Column(name = "VENDOR_CODE") - private String vendorCode; + @Column(name = "VENDOR_NO") + private String vendorNo; @ApiParam("供应商名称") @Column(name = "VENDOR_NAME") diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementSn.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementSn.java index 1dcc1c6..72140ab 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementSn.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementSn.java @@ -75,10 +75,6 @@ public class SwebDocMovementSn extends BaseBean { @ApiParam(value = "条码类型") private Integer snType; - @ApiParam("供应商编号") - @Column(name = "VENDOR_CODE") - private String vendorCode; - @ApiParam("供应商名称") @Column(name = "VENDOR_NAME") private String vendorName; diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebProcurementPlanOrder.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebProcurementPlanOrder.java index e627eee..7b0b55b 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebProcurementPlanOrder.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebProcurementPlanOrder.java @@ -42,8 +42,8 @@ public class SwebProcurementPlanOrder extends BaseBean { private Integer orderStatus; @ApiParam("供应商代码") - @Column(name = "VENDOR_CODE") - private String vendorCode; + @Column(name = "VENDOR_NO") + private String vendorNo; @ApiParam("供应商名称") @Column(name = "VENDOR_NAME") diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrder.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrder.java index 329db54..887b7ea 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrder.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrder.java @@ -37,8 +37,8 @@ public class SwebPurchaseOrder extends BaseBean { public String orderNo; @ApiParam("供应商编号") - @Column(name = "VENDOR_CODE") - private String vendorCode; + @Column(name = "VENDOR_NO") + private String vendorNo; @ApiParam("供应商名称") @Column(name = "VENDOR_NAME") diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java index cbe1519..79d8e38 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java @@ -36,8 +36,8 @@ public class SwebPurchaseOrderDetails extends BaseBean { private String orderNo; @ApiParam("供应商编号") - @Column(name = "VENDOR_CODE") - private String vendorCode; + @Column(name = "VENDOR_NO") + private String vendorNo; @ApiParam("供应商名称") @Column(name = "VENDOR_NAME") diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java index 0b95c97..628c218 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java @@ -36,8 +36,8 @@ public class SwebPurchaseOrderSn extends BaseBean { private String orderNo; @ApiParam("供应商编号") - @Column(name = "VENDOR_CODE") - private String vendorCode; + @Column(name = "VENDOR_NO") + private String vendorNo; @ApiParam("供应商名称") @Column(name = "VENDOR_NAME") diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebRequireAlarm.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebRequireAlarm.java index 5807d18..3b26310 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebRequireAlarm.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebRequireAlarm.java @@ -37,9 +37,9 @@ public class SwebRequireAlarm extends BaseBean { @ApiParam("物料名称") private String partName; - @Column(name = "VENDOR_CODE") + @Column(name = "VENDOR_NO") @ApiParam("供应商代码") - private String vendorCode; + private String vendorNo; @Column(name = "VENDOR_NAME") @ApiParam("供应商名称") diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorAlarm.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorAlarm.java index b8acd2d..fc98a68 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorAlarm.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorAlarm.java @@ -35,9 +35,9 @@ public class SwebVendorAlarm extends BaseBean { @ApiParam("物料名称") private String partName; - @Column(name = "VENDOR_CODE") + @Column(name = "VENDOR_NO") @ApiParam("供应商代码") - private String vendorCode; + private String vendorNo; @Column(name = "VENDOR_NAME") @ApiParam("供应商名称") diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorRel.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorRel.java index d4afe0c..446612c 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorRel.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorRel.java @@ -38,6 +38,6 @@ public class SwebVendorRel extends BaseBean { private String vendorName; @ApiParam("供应商代码") - @Column(name = "VENDOR_CODE") - private String vendorCode; + @Column(name = "VENDOR_NO") + private String vendorNo; } diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorStock.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorStock.java index 4d7e3b7..106d1ee 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorStock.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorStock.java @@ -37,9 +37,9 @@ public class SwebVendorStock extends BaseBean { @ApiParam("物料名称") private String partName; - @Column(name = "VENDOR_CODE") + @Column(name = "VENDOR_NO") @ApiParam("供应商代码") - private String vendorCode; + private String vendorNo; @Column(name = "VENDOR_NAME") @ApiParam("供应商名称") diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorSupplierCapcity.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorSupplierCapcity.java index f0f2d7e..9361a39 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorSupplierCapcity.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorSupplierCapcity.java @@ -30,9 +30,9 @@ import javax.persistence.Transient; public class SwebVendorSupplierCapcity extends BaseBean { private static final long serialVersionUID = 2327910806789997252L; - @Column(name = "VENDOR_CODE") + @Column(name = "VENDOR_NO") @ApiParam("供应商代码") - private String vendorCode; + private String vendorNo; @Column(name = "VENDOR_NAME") @ApiParam("供应商名称") diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/WmsMovementToSweb.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/WmsMovementToSweb.java deleted file mode 100644 index 0733e25..0000000 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/WmsMovementToSweb.java +++ /dev/null @@ -1,48 +0,0 @@ -package cn.estsh.i3plus.pojo.sweb.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 io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.hibernate.annotations.DynamicInsert; -import org.hibernate.annotations.DynamicUpdate; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; - -/** - * @Description : - * @Reference : - * @Author : jason.niu - * @CreateDate : 2020-05-28 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "WMS_MOVEMENT_TO_SWEB") -@Api("库存移动单处理成功后的记录") -public class WmsMovementToSweb extends BaseBean { - private static final long serialVersionUID = 49215041475324487L; - - @Column(name = "ORDER_NO") - @ApiParam("单号") - public String orderNo; - - /** - * 状态:1=创建,10=待处理,20=已处理 - */ - @Column(name="ITEM_STATUS") - @ApiParam(value = "状态", example = "0") - public Integer itemStatus; - - @Column(name = "SYNC_STATUS") - @ApiParam("同步状态") - private Integer syncStatus; -} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOBatchInsertEnterModel.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOBatchInsertEnterModel.java index bad9575..890ff90 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOBatchInsertEnterModel.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOBatchInsertEnterModel.java @@ -23,7 +23,7 @@ public class SwebPOBatchInsertEnterModel extends BaseBean { private String orderNo; @ApiParam("供应商编号") - private String vendorCode; + private String vendorNo; @ApiParam("供应商名称") private String vendorName; diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOBatchInsertItemEnterModel.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOBatchInsertItemEnterModel.java index 03b46e7..604e860 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOBatchInsertItemEnterModel.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOBatchInsertItemEnterModel.java @@ -24,7 +24,7 @@ public class SwebPOBatchInsertItemEnterModel implements Serializable { private String partName; @ApiParam("供应商编号") - private String vendorCode; + private String vendorNo; @ApiParam("供应商名称") private String vendorName; diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPODetailsUpdateHistoryModel.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPODetailsUpdateHistoryModel.java index e0e7a1f..a6b71a5 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPODetailsUpdateHistoryModel.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPODetailsUpdateHistoryModel.java @@ -21,7 +21,7 @@ public class SwebPODetailsUpdateHistoryModel extends BaseBean { private String orderNo; @ApiParam("供应商编号") - private String vendorCode; + private String vendorNo; @ApiParam(value = "零件号") private String partNo; diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListEnterModel.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListEnterModel.java index 0f47fc7..46dda5b 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListEnterModel.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListEnterModel.java @@ -19,7 +19,7 @@ public class SwebPOForPubListEnterModel extends BaseBean { private String orderNo; @ApiParam("供应商编号") - private String vendorCode; + private String vendorNo; @ApiParam(value = "订单类型", example = "1") public Integer orderType; diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListResultItemModel.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListResultItemModel.java index d8e7886..ac0d652 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListResultItemModel.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListResultItemModel.java @@ -28,8 +28,8 @@ public class SwebPOForPubListResultItemModel extends BaseBean { private String partNo; @ApiParam("供应商编号") - @Column(name = "VENDOR_CODE") - private String vendorCode; + @Column(name = "VENDOR_NO") + private String vendorNo; @ApiParam("供应商名称") @Column(name = "VENDOR_NAME") diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/WmsMovementToSwebRepository.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/WmsMovementToSwebRepository.java deleted file mode 100644 index 83a31be..0000000 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/WmsMovementToSwebRepository.java +++ /dev/null @@ -1,9 +0,0 @@ -package cn.estsh.i3plus.pojo.sweb.repository; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.sweb.bean.WmsMovementToSweb; -import org.springframework.stereotype.Repository; - -@Repository -public interface WmsMovementToSwebRepository extends BaseRepository { -} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java index 6575cee..c9f9ddf 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java @@ -52,7 +52,7 @@ public class SwebHqlPack { DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringLikerPack(purchaseOrder.getOrderNo(), "orderNo", result); DdlPreparedPack.getNumEqualPack(purchaseOrder.getOrderSource(), "orderSource", result); - DdlPreparedPack.getInPackList(vendorNos, "vendorCode", result); + DdlPreparedPack.getInPackList(vendorNos, "vendorNo", result); if (!StringUtil.isEmpty(purchaseOrder.getExpectedTimeStart()) && !StringUtil.isEmpty(purchaseOrder.getExpectedTimeEnd())) { DdlPreparedPack.timeBuilder(purchaseOrder.getExpectedTimeStart(), purchaseOrder.getExpectedTimeEnd(), "expectedTime", result, false); @@ -67,10 +67,10 @@ public class SwebHqlPack { DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringLikerPack(purchaseOrder.getOrderNo(), "orderNo", result); DdlPreparedPack.getNumEqualPack(purchaseOrder.getOrderSource(), "orderSource", result); - if (StringUtil.isEmpty(purchaseOrder.getVendorCode())) { - DdlPreparedPack.getInPackList(vendorNos, "vendorCode", result); + if (StringUtil.isEmpty(purchaseOrder.getVendorNo())) { + DdlPreparedPack.getInPackList(vendorNos, "vendorNo", result); } else { - DdlPreparedPack.getStringEqualPack(purchaseOrder.getVendorCode(), "vendorCode", result); + DdlPreparedPack.getStringEqualPack(purchaseOrder.getVendorNo(), "vendorNo", result); } if (!StringUtil.isEmpty(purchaseOrder.getExpectedTimeStart()) && !StringUtil.isEmpty(purchaseOrder.getExpectedTimeEnd())) { DdlPreparedPack.timeBuilder(purchaseOrder.getExpectedTimeStart(), @@ -113,7 +113,7 @@ public class SwebHqlPack { HqlPack.getNumNOEqualPack(SwebEnumUtil.ORDER_MASTER_STATUS.RECEIPT.getValue(),"itemStatus",result); HqlPack.getStringEqualPack(model.getOrderNo(), "orderNo", result); - HqlPack.getStringEqualPack(model.getVendorCode(), "vendorCode", result); + HqlPack.getStringEqualPack(model.getVendorNo(), "vendorNo", result); HqlPack.getNumEqualPack(model.getOrderType(), "orderType", result); HqlPack.getStringEqualPack(model.getPartNo(), "partNo", result); // 封装有效状态和删除状态 @@ -127,7 +127,7 @@ public class SwebHqlPack { public static DdlPackBean getPurchaseOrderDetailsWhereHql(SwebPOForPubListEnterModel model) { DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringEqualPack(model.getOrderNo(), "orderNo", result); - DdlPreparedPack.getStringEqualPack(model.getVendorCode(), "vendorCode", result); + DdlPreparedPack.getStringEqualPack(model.getVendorNo(), "vendorNo", result); DdlPreparedPack.getNumEqualPack(model.getOrderType(), "orderType", result); DdlPreparedPack.getStringEqualPack(model.getPartNo(), "partNo", result); // 封装有效状态和删除状态 @@ -139,7 +139,7 @@ public class SwebHqlPack { public static DdlPackBean getProcurementPlanOrderWhereHql(SwebProcurementPlanOrder swebProcurementPlanOrder) { DdlPackBean result = new DdlPackBean(); - DdlPreparedPack.getStringEqualPack(swebProcurementPlanOrder.getVendorCode(), "vendorCode", result); + DdlPreparedPack.getStringEqualPack(swebProcurementPlanOrder.getVendorNo(), "vendorNo", result); DdlPreparedPack.getStringLikerPack(swebProcurementPlanOrder.getOrderNo(), "orderNo", result); DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result); return buildHql(swebProcurementPlanOrder, result); @@ -156,7 +156,7 @@ public class SwebHqlPack { public static DdlPackBean getVendorRelWhereHql(SwebVendorRel vendorRel) { DdlPackBean result = new DdlPackBean(); - DdlPreparedPack.getStringLikerPack(vendorRel.getVendorCode(), "vendorCode", result); + DdlPreparedPack.getStringLikerPack(vendorRel.getVendorNo(), "vendorNo", result); DdlPreparedPack.getStringLikerPack(vendorRel.getPlannerCode(), "plannerCode", result); DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result); return buildHql(vendorRel, result); @@ -165,19 +165,17 @@ public class SwebHqlPack { public static DdlPackBean getPurchaseOrderDetailsPublishListQtyWhereHql(SwebPurchaseOrderDetails details) { DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringEqualPack(details.getOrderNo(), "orderNo", result); - DdlPreparedPack.getStringEqualPack(details.getVendorCode(), "vendorCode", result); + DdlPreparedPack.getStringEqualPack(details.getVendorNo(), "vendorNo", result); DdlPreparedPack.getStringEqualPack(details.getPartNo(), "partNo", result); DdlPreparedPack.getNumEqualPack(details.getItemStatus(), "itemStatus", result); - //DdlPreparedPack.getNumEqualPack(details.getOrderType(), "orderType", result); return buildHql(details, result); } public static DdlPackBean getPurchaseOrderDetailsPublishListStatusWhereHql(SwebPurchaseOrderDetails details) { DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringEqualPack(details.getOrderNo(), "orderNo", result); - DdlPreparedPack.getStringEqualPack(details.getVendorCode(), "vendorCode", result); + DdlPreparedPack.getStringEqualPack(details.getVendorNo(), "vendorNo", result); DdlPreparedPack.getStringEqualPack(details.getPartNo(), "partNo", result); - //DdlPreparedPack.getNumEqualPack(details.getOrderType(), "orderType", result); return buildHql(details, result); } @@ -189,9 +187,7 @@ public class SwebHqlPack { public static DdlPackBean getPODetailsPublishListUpdatePublishStatusWhereHql(SwebPurchaseOrderDetails details) { DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringEqualPack(details.getOrderNo(), "orderNo", result); - DdlPreparedPack.getStringEqualPack(details.getVendorCode(), "vendorCode", result); - //DdlPreparedPack.getNumEqualPack(details.getOrderType(), "orderType", result); -// DdlPreparedPack.getNumEqualPack(SwebEnumUtil.ORDER_DETAILS_STATUS.CREATE.getValue(), "itemStatus", result); + DdlPreparedPack.getStringEqualPack(details.getVendorNo(), "vendorNo", result); return buildHql(details, result); } @@ -212,17 +208,17 @@ public class SwebHqlPack { DdlPreparedPack.getStringLikerPack(details.getOrderNo(), "orderNo", result); DdlPreparedPack.getStringLikerPack(details.getPartNo(), "partNo", result); DdlPreparedPack.getNumEqualPack(details.getItemStatus(), "itemStatus", result); - DdlPreparedPack.getStringLikerPack(details.getVendorCode(), "vendorCode", result); + DdlPreparedPack.getStringLikerPack(details.getVendorNo(), "vendorNo", result); DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result); return buildHql(details, result); } - public static DdlPackBean getVendorSupplierCapcity(SwebVendorSupplierCapcity capcity, List vendorCodes) { + public static DdlPackBean getVendorSupplierCapcity(SwebVendorSupplierCapcity capcity, List vendorNos) { DdlPackBean result = new DdlPackBean(); - if (vendorCodes.size() == 1) { - DdlPreparedPack.getStringLikerPack(vendorCodes.get(0), "vendorCode", result); - } else if (vendorCodes.size() > 1){ - DdlPreparedPack.getInPackList(vendorCodes, "vendorCode", result); + if (vendorNos.size() == 1) { + DdlPreparedPack.getStringLikerPack(vendorNos.get(0), "vendorNo", result); + } else if (vendorNos.size() > 1){ + DdlPreparedPack.getInPackList(vendorNos, "vendorNo", result); } DdlPreparedPack.getStringLikerPack(capcity.getPartNo(), "partNo", result); DdlPreparedPack.getNumEqualPack(capcity.getStatus(), "status", result); @@ -236,12 +232,12 @@ public class SwebHqlPack { return buildHql(capcity, result); } - public static DdlPackBean getSwebRequireAlarm(SwebRequireAlarm alarm, List vendorCodes) { + public static DdlPackBean getSwebRequireAlarm(SwebRequireAlarm alarm, List vendorNos) { DdlPackBean result = new DdlPackBean(); - if (vendorCodes.size() == 1) { - DdlPreparedPack.getStringLikerPack(vendorCodes.get(0), "vendorCode", result); - } else if (vendorCodes.size() > 1){ - DdlPreparedPack.getInPackList(vendorCodes, "vendorCode", result); + if (vendorNos.size() == 1) { + DdlPreparedPack.getStringLikerPack(vendorNos.get(0), "vendorNo", result); + } else if (vendorNos.size() > 1){ + DdlPreparedPack.getInPackList(vendorNos, "vendorNo", result); } DdlPreparedPack.getStringLikerPack(alarm.getPartNo(), "partNo", result); if (!StringUtil.isEmpty(alarm.getDateStart())) { @@ -254,24 +250,24 @@ public class SwebHqlPack { return buildHql(alarm, result); } - public static DdlPackBean getSwebVendorStock(SwebVendorStock stock, List vendorCodes) { + public static DdlPackBean getSwebVendorStock(SwebVendorStock stock, List vendorNos) { DdlPackBean result = new DdlPackBean(); - if (vendorCodes.size() == 1) { - DdlPreparedPack.getStringLikerPack(vendorCodes.get(0), "vendorCode", result); - } else if (vendorCodes.size() > 1){ - DdlPreparedPack.getInPackList(vendorCodes, "vendorCode", result); + if (vendorNos.size() == 1) { + DdlPreparedPack.getStringLikerPack(vendorNos.get(0), "vendorNo", result); + } else if (vendorNos.size() > 1){ + DdlPreparedPack.getInPackList(vendorNos, "vendorNo", result); } DdlPreparedPack.getStringLikerPack(stock.getPartNo(), "partNo", result); DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, result); return buildHql(stock, result); } - public static DdlPackBean getSwebVendorAlarm(SwebVendorAlarm alarm, List vendorCodes) { + public static DdlPackBean getSwebVendorAlarm(SwebVendorAlarm alarm, List vendorNos) { DdlPackBean result = new DdlPackBean(); - if (vendorCodes.size() == 1) { - DdlPreparedPack.getStringLikerPack(vendorCodes.get(0), "vendorCode", result); - } else if (vendorCodes.size() > 1){ - DdlPreparedPack.getInPackList(vendorCodes, "vendorCode", result); + if (vendorNos.size() == 1) { + DdlPreparedPack.getStringLikerPack(vendorNos.get(0), "vendorNo", result); + } else if (vendorNos.size() > 1){ + DdlPreparedPack.getInPackList(vendorNos, "vendorNo", result); } DdlPreparedPack.getStringLikerPack(alarm.getOrderNo(), "orderNo", result); DdlPreparedPack.getStringLikerPack(alarm.getPartNo(), "partNo", result); diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SwebProcurementPlanOrder.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SwebProcurementPlanOrder.java index dff1e11..bf2c50b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SwebProcurementPlanOrder.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SwebProcurementPlanOrder.java @@ -41,12 +41,12 @@ public class SwebProcurementPlanOrder extends BaseBean { @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String orderNo; - @Column(name = "VENDOR_CODE") + @Column(name = "VENDOR_NO") @ApiParam(value = "供应商代码") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, dataSrc = "cn.estsh.i3plus.pojo.wms.bean.BasVendor", searchColumnName = "vendorNo,vendorName", listColumnName = "vendorNo,vendorName", explicitColumnName = "vendorNo") - private String vendorCode; + private String vendorNo; @Column(name = "VENDOR_NAME") @ApiParam(value = "供应商名称") 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 c5215d6..e99fb40 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 @@ -176,7 +176,7 @@ public class WmsHqlPack { DdlPreparedPack.getNumEqualPack(swebProcurementPlanOrder.getOrganizeCode(), "organizeCode", packBean); DdlPreparedPack.getStringEqualPack(swebProcurementPlanOrder.getPartNo(), "partNo", packBean); DdlPreparedPack.getStringEqualPack(swebProcurementPlanOrder.getPartName(), "partName", packBean); - DdlPreparedPack.getStringEqualPack(swebProcurementPlanOrder.getVendorCode(), "vendorCode", packBean); + DdlPreparedPack.getStringEqualPack(swebProcurementPlanOrder.getVendorNo(), "vendorNo", packBean); DdlPreparedPack.getStringEqualPack(swebProcurementPlanOrder.getVendorName(), "vendorName", packBean); DdlPreparedPack.getStringRightLikerPack(swebProcurementPlanOrder.getOrderNo(), "orderNo", packBean); DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean); From ffbc5d605e32e503030b434198534f325d21e71f Mon Sep 17 00:00:00 2001 From: Jason Date: Sun, 6 Dec 2020 21:24:58 +0800 Subject: [PATCH 31/33] =?UTF-8?q?=E5=96=9C=E5=BE=B7=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=B0=86PO=E5=8F=8AASN=E8=AE=A2=E5=8D=95=E7=9A=84=E5=BA=93?= =?UTF-8?q?=E5=AD=98=E6=9D=A1=E7=A0=81=E6=89=93=E5=8D=B0=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E7=BD=AE=E4=B8=BA=E5=B7=B2=E6=89=93=E5=8D=B0=E7=9A=84JOB?= 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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 1d45817..8eb49bb 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 @@ -337,10 +337,10 @@ public class WmsPOMasterDetails extends BaseBean { this.qty = qty; } - public WmsPOMasterDetails(String orderNo, String remark, Integer item,String partNo,String partNameRdd, Double qty, + public WmsPOMasterDetails(String orderNo, String erpSrcNo, Integer item,String partNo,String partNameRdd, Double qty, Double rcQty, Integer itemStatus) { this.orderNo = orderNo; - this.remark = remark; + this.erpSrcNo = erpSrcNo; this.item = item; this.partNo = partNo; this.partNameRdd = partNameRdd; From a62b10dc9d050af1798b9c975a600e9c99e77158 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Mon, 7 Dec 2020 09:38:19 +0800 Subject: [PATCH 32/33] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=90=88=E5=B9=B6?= =?UTF-8?q?=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/SwebProcurementPlanOrder.java | 4 ++-- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SwebProcurementPlanOrder.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SwebProcurementPlanOrder.java index bf2c50b..dff1e11 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SwebProcurementPlanOrder.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SwebProcurementPlanOrder.java @@ -41,12 +41,12 @@ public class SwebProcurementPlanOrder extends BaseBean { @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String orderNo; - @Column(name = "VENDOR_NO") + @Column(name = "VENDOR_CODE") @ApiParam(value = "供应商代码") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, isRequire = 2, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.OBJ, dataSrc = "cn.estsh.i3plus.pojo.wms.bean.BasVendor", searchColumnName = "vendorNo,vendorName", listColumnName = "vendorNo,vendorName", explicitColumnName = "vendorNo") - private String vendorNo; + private String vendorCode; @Column(name = "VENDOR_NAME") @ApiParam(value = "供应商名称") 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 e99fb40..f10ed68 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 @@ -176,7 +176,7 @@ public class WmsHqlPack { DdlPreparedPack.getNumEqualPack(swebProcurementPlanOrder.getOrganizeCode(), "organizeCode", packBean); DdlPreparedPack.getStringEqualPack(swebProcurementPlanOrder.getPartNo(), "partNo", packBean); DdlPreparedPack.getStringEqualPack(swebProcurementPlanOrder.getPartName(), "partName", packBean); - DdlPreparedPack.getStringEqualPack(swebProcurementPlanOrder.getVendorNo(), "vendorNo", packBean); + DdlPreparedPack.getStringEqualPack(swebProcurementPlanOrder.getVendorCode(), "vendorNo", packBean); DdlPreparedPack.getStringEqualPack(swebProcurementPlanOrder.getVendorName(), "vendorName", packBean); DdlPreparedPack.getStringRightLikerPack(swebProcurementPlanOrder.getOrderNo(), "orderNo", packBean); DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean); From 5c1164a9381e51714f6ed8293876de5dad223d7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Mon, 7 Dec 2020 11:00:04 +0800 Subject: [PATCH 33/33] =?UTF-8?q?=E5=A2=A8=E8=A5=BF=E5=93=A5WMS=E6=8A=A5?= =?UTF-8?q?=E5=B7=A5=E4=B8=9A=E5=8A=A1=E6=96=B0=E5=A2=9E=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=EF=BC=9A=E9=80=9A=E7=94=A8=E8=84=9A=E6=9C=AC=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3+=E7=94=9F=E4=BA=A7=E7=89=88=E6=9C=ACDAO?= =?UTF-8?q?=E5=B1=82+=E7=94=9F=E4=BA=A7=E8=AE=A1=E5=88=92=E4=B8=BB?= =?UTF-8?q?=E8=A1=A8=E8=AE=A1=E5=88=92=E7=8A=B6=E6=80=81FINISH(25,=20"FINI?= =?UTF-8?q?SH",=20"=E5=B7=B2=E5=AE=8C=E6=88=90")?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 1 + .../wms/repository/WmsProductVersionRepository.java | 17 +++++++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsProductVersionRepository.java 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 14d440e..e844a72 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 @@ -5096,6 +5096,7 @@ public class WmsEnumUtil { public enum WORK_ORDER_PLAN_STATUS { CREATE(10, "CREATE", "创建"), PLANNED(20, "PLANNED", "处理中"), + FINISH(25, "FINISH", "已完成"), CLOSE(30, "CLOSE", "已关闭"); private int value; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsProductVersionRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsProductVersionRepository.java new file mode 100644 index 0000000..dc6b275 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsProductVersionRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.MesPpMaster; +import cn.estsh.i3plus.pojo.wms.bean.WmsProductVersion; +import org.springframework.stereotype.Repository; + +/** + * @Description 生产版本DAO层 + * @Reference + * @Author dragon + * @CreateDate 2020/12/4 18:49 + * @Modify + */ +@Repository +public interface WmsProductVersionRepository extends BaseRepository { +}