From 5fa2b67880701349c2e187e3441eb80140eb0820 Mon Sep 17 00:00:00 2001 From: alwaysfrin <39822157+alwaysfrin@users.noreply.github.com> Date: Mon, 13 May 2019 14:39:53 +0800 Subject: [PATCH 01/19] =?UTF-8?q?=E5=AE=89=E7=81=AF=E6=BA=90=E7=A0=81?= =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E9=94=99=E8=AF=AF=EF=BC=8C=E9=87=8D=E6=96=B0?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/{ => main}/java/cn.estsh.i3plus.pojo.andon/bean/AndonAction.java | 0 .../{ => main}/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmCause.java | 0 .../java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmResponseCfg.java | 0 .../{ => main}/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmType.java | 0 .../{ => main}/java/cn.estsh.i3plus.pojo.andon/bean/AndonEventCause.java | 0 .../{ => main}/java/cn.estsh.i3plus.pojo.andon/bean/AndonHaltType.java | 0 .../{ => main}/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java | 0 .../java/cn.estsh.i3plus.pojo.andon/bean/AndonManageRecord.java | 0 .../src/{ => main}/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLC.java | 0 .../{ => main}/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLCRecord.java | 0 .../{ => main}/java/cn.estsh.i3plus.pojo.andon/bean/AndonResponse.java | 0 .../java/cn.estsh.i3plus.pojo.andon/bean/AndonResponseObject.java | 0 .../src/{ => main}/java/cn.estsh.i3plus.pojo.andon/bean/AndonStatus.java | 0 .../cn.estsh.i3plus.pojo.andon/repository/IAndonActionRepository.java | 0 .../cn.estsh.i3plus.pojo.andon/repository/IAndonAlarmCauseRepository.java | 0 .../repository/IAndonAlarmResponseCfgRepository.java | 0 .../cn.estsh.i3plus.pojo.andon/repository/IAndonAlarmTypeRepository.java | 0 .../cn.estsh.i3plus.pojo.andon/repository/IAndonEventCauseRepository.java | 0 .../cn.estsh.i3plus.pojo.andon/repository/IAndonHaltTypeRepository.java | 0 .../repository/IAndonManagetQueueRepository.java | 0 .../repository/IAndonManagetRecordRepository.java | 0 .../cn.estsh.i3plus.pojo.andon/repository/IAndonPLCRecordRepository.java | 0 .../java/cn.estsh.i3plus.pojo.andon/repository/IAndonPLCRepository.java | 0 .../repository/IAndonResponseObjectRepository.java | 0 .../cn.estsh.i3plus.pojo.andon/repository/IAndonResponseRepository.java | 0 .../cn.estsh.i3plus.pojo.andon/repository/IAndonStatusRepository.java | 0 .../{ => main}/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java | 0 27 files changed, 0 insertions(+), 0 deletions(-) rename modules/i3plus-pojo-andon/src/{ => main}/java/cn.estsh.i3plus.pojo.andon/bean/AndonAction.java (100%) rename modules/i3plus-pojo-andon/src/{ => main}/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmCause.java (100%) rename modules/i3plus-pojo-andon/src/{ => main}/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmResponseCfg.java (100%) rename modules/i3plus-pojo-andon/src/{ => main}/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmType.java (100%) rename modules/i3plus-pojo-andon/src/{ => main}/java/cn.estsh.i3plus.pojo.andon/bean/AndonEventCause.java (100%) rename modules/i3plus-pojo-andon/src/{ => main}/java/cn.estsh.i3plus.pojo.andon/bean/AndonHaltType.java (100%) rename modules/i3plus-pojo-andon/src/{ => main}/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java (100%) rename modules/i3plus-pojo-andon/src/{ => main}/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageRecord.java (100%) rename modules/i3plus-pojo-andon/src/{ => main}/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLC.java (100%) rename modules/i3plus-pojo-andon/src/{ => main}/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLCRecord.java (100%) rename modules/i3plus-pojo-andon/src/{ => main}/java/cn.estsh.i3plus.pojo.andon/bean/AndonResponse.java (100%) rename modules/i3plus-pojo-andon/src/{ => main}/java/cn.estsh.i3plus.pojo.andon/bean/AndonResponseObject.java (100%) rename modules/i3plus-pojo-andon/src/{ => main}/java/cn.estsh.i3plus.pojo.andon/bean/AndonStatus.java (100%) rename modules/i3plus-pojo-andon/src/{ => main}/java/cn.estsh.i3plus.pojo.andon/repository/IAndonActionRepository.java (100%) rename modules/i3plus-pojo-andon/src/{ => main}/java/cn.estsh.i3plus.pojo.andon/repository/IAndonAlarmCauseRepository.java (100%) rename modules/i3plus-pojo-andon/src/{ => main}/java/cn.estsh.i3plus.pojo.andon/repository/IAndonAlarmResponseCfgRepository.java (100%) rename modules/i3plus-pojo-andon/src/{ => main}/java/cn.estsh.i3plus.pojo.andon/repository/IAndonAlarmTypeRepository.java (100%) rename modules/i3plus-pojo-andon/src/{ => main}/java/cn.estsh.i3plus.pojo.andon/repository/IAndonEventCauseRepository.java (100%) rename modules/i3plus-pojo-andon/src/{ => main}/java/cn.estsh.i3plus.pojo.andon/repository/IAndonHaltTypeRepository.java (100%) rename modules/i3plus-pojo-andon/src/{ => main}/java/cn.estsh.i3plus.pojo.andon/repository/IAndonManagetQueueRepository.java (100%) rename modules/i3plus-pojo-andon/src/{ => main}/java/cn.estsh.i3plus.pojo.andon/repository/IAndonManagetRecordRepository.java (100%) rename modules/i3plus-pojo-andon/src/{ => main}/java/cn.estsh.i3plus.pojo.andon/repository/IAndonPLCRecordRepository.java (100%) rename modules/i3plus-pojo-andon/src/{ => main}/java/cn.estsh.i3plus.pojo.andon/repository/IAndonPLCRepository.java (100%) rename modules/i3plus-pojo-andon/src/{ => main}/java/cn.estsh.i3plus.pojo.andon/repository/IAndonResponseObjectRepository.java (100%) rename modules/i3plus-pojo-andon/src/{ => main}/java/cn.estsh.i3plus.pojo.andon/repository/IAndonResponseRepository.java (100%) rename modules/i3plus-pojo-andon/src/{ => main}/java/cn.estsh.i3plus.pojo.andon/repository/IAndonStatusRepository.java (100%) rename modules/i3plus-pojo-andon/src/{ => main}/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java (100%) diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonAction.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAction.java similarity index 100% rename from modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonAction.java rename to modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAction.java diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmCause.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmCause.java similarity index 100% rename from modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmCause.java rename to modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmCause.java diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmResponseCfg.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmResponseCfg.java similarity index 100% rename from modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmResponseCfg.java rename to modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmResponseCfg.java diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmType.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmType.java similarity index 100% rename from modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmType.java rename to modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmType.java diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonEventCause.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonEventCause.java similarity index 100% rename from modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonEventCause.java rename to modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonEventCause.java diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonHaltType.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonHaltType.java similarity index 100% rename from modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonHaltType.java rename to modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonHaltType.java diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java similarity index 100% rename from modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java rename to modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageRecord.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageRecord.java similarity index 100% rename from modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageRecord.java rename to modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageRecord.java diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLC.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLC.java similarity index 100% rename from modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLC.java rename to modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLC.java diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLCRecord.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLCRecord.java similarity index 100% rename from modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLCRecord.java rename to modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLCRecord.java diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonResponse.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonResponse.java similarity index 100% rename from modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonResponse.java rename to modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonResponse.java diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonResponseObject.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonResponseObject.java similarity index 100% rename from modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonResponseObject.java rename to modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonResponseObject.java diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonStatus.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonStatus.java similarity index 100% rename from modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonStatus.java rename to modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonStatus.java diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonActionRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonActionRepository.java similarity index 100% rename from modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonActionRepository.java rename to modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonActionRepository.java diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonAlarmCauseRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonAlarmCauseRepository.java similarity index 100% rename from modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonAlarmCauseRepository.java rename to modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonAlarmCauseRepository.java diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonAlarmResponseCfgRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonAlarmResponseCfgRepository.java similarity index 100% rename from modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonAlarmResponseCfgRepository.java rename to modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonAlarmResponseCfgRepository.java diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonAlarmTypeRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonAlarmTypeRepository.java similarity index 100% rename from modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonAlarmTypeRepository.java rename to modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonAlarmTypeRepository.java diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonEventCauseRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonEventCauseRepository.java similarity index 100% rename from modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonEventCauseRepository.java rename to modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonEventCauseRepository.java diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonHaltTypeRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonHaltTypeRepository.java similarity index 100% rename from modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonHaltTypeRepository.java rename to modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonHaltTypeRepository.java diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonManagetQueueRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonManagetQueueRepository.java similarity index 100% rename from modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonManagetQueueRepository.java rename to modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonManagetQueueRepository.java diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonManagetRecordRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonManagetRecordRepository.java similarity index 100% rename from modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonManagetRecordRepository.java rename to modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonManagetRecordRepository.java diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonPLCRecordRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonPLCRecordRepository.java similarity index 100% rename from modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonPLCRecordRepository.java rename to modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonPLCRecordRepository.java diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonPLCRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonPLCRepository.java similarity index 100% rename from modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonPLCRepository.java rename to modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonPLCRepository.java diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonResponseObjectRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonResponseObjectRepository.java similarity index 100% rename from modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonResponseObjectRepository.java rename to modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonResponseObjectRepository.java diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonResponseRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonResponseRepository.java similarity index 100% rename from modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonResponseRepository.java rename to modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonResponseRepository.java diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonStatusRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonStatusRepository.java similarity index 100% rename from modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/repository/IAndonStatusRepository.java rename to modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonStatusRepository.java diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java similarity index 100% rename from modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java rename to modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java From e02f61c51fd0eca38078dc7b3ce91e68b6a3593f Mon Sep 17 00:00:00 2001 From: Silliter Date: Mon, 13 May 2019 14:40:25 +0800 Subject: [PATCH 02/19] =?UTF-8?q?=E5=AE=89=E7=81=AF=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLC.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLC.java b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLC.java index ae88bf0..9f154de 100644 --- a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLC.java +++ b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLC.java @@ -71,4 +71,8 @@ public class AndonPLC extends BaseBean { @Column(name = "GROUP_NO") @ApiParam(value = "分组号") private String groupNo; + + @Column(name = "ALARM_CODE") + @ApiParam(value = "安灯类型代码") + private String alarmCode; } From b1f513d7866f75e63fcf7aff1b9d7488573fd3f5 Mon Sep 17 00:00:00 2001 From: "yiming.gu" Date: Mon, 13 May 2019 15:13:24 +0800 Subject: [PATCH 03/19] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=AE=BE=E5=A4=87pojo?= =?UTF-8?q?=EF=BC=8C=E7=BB=84=E7=BB=87=E6=A8=A1=E5=9E=8Bmodel?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/bean/MesArea.java | 19 +++++ .../estsh/i3plus/pojo/mes/bean/MesEquipment.java | 59 +++++++++++++++ .../cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java | 18 +++++ .../estsh/i3plus/pojo/mes/bean/MesWorkCenter.java | 18 +++++ .../estsh/i3plus/pojo/mes/model/ProdOrgModel.java | 63 ++++++++++++++++ .../mes/repository/MesEquipmentRepository.java | 16 ++++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 86 +++++++++++++++++++++- modules/i3plus-pojo-model/pom.xml | 4 + .../i3plus/pojo/model/mes/SysOrganizeModel.java | 23 ++++++ 9 files changed, 302 insertions(+), 4 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipment.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdOrgModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquipmentRepository.java create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/SysOrganizeModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesArea.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesArea.java index 411b45c..1592590 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesArea.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesArea.java @@ -2,6 +2,8 @@ package cn.estsh.i3plus.pojo.mes.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -12,6 +14,8 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; +import java.util.List; /** * @Description :生产区域 @@ -35,4 +39,19 @@ public class MesArea extends BaseBean { @Column(name="AREA_NAME") @ApiParam("区域名称") private String areaName; + + @Transient + @ApiParam(value ="子集列表") + private List childTreeList; + + @Transient + @ApiParam(value ="名称") + private String name; + + // 默认值 -1 + @Transient + @ApiParam(value ="父节点" , access ="父节点" ,example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long parentId; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipment.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipment.java new file mode 100644 index 0000000..a7b1e75 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipment.java @@ -0,0 +1,59 @@ +package cn.estsh.i3plus.pojo.mes.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; + +/** + * @Description :生产区域 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_EQUIPMENT") +@Api("生产设备") +public class MesEquipment extends BaseBean { + @Column(name="EQUIPMENT_CODE") + @ApiParam("设备代码") + private String equipmentCode; + + @Column(name="EQUIPMENT_NAME") + @ApiParam("设备名称") + private String equipmentName; + + @Column(name="STATUS") + @ApiParam("设备状态") + private String status; + + @Column(name="WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Transient + @ApiParam(value ="名称") + private String name; + + // 默认值 -1 + @Transient + @ApiParam(value ="父节点" , access ="父节点" ,example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long parentId; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java index 9a42ad8..9969c7c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.mes.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -11,6 +13,8 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; +import java.util.List; /** * @Description :工作单元 @@ -42,4 +46,18 @@ public class MesWorkCell extends BaseBean { @Column(name = "AREA_CODE") @ApiParam("生产区域代码") private String areaCode; + + @Transient + @ApiParam(value ="子集列表") + private List childTreeList; + + @Transient + @ApiParam(value ="名称") + private String name; + + // 默认值 -1 + @Transient + @ApiParam(value ="父节点" , access ="父节点" ,example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long parentId; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java index e293fe0..6e21747 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.mes.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -11,6 +13,8 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; +import java.util.List; /** * @Description :工作中心 @@ -46,4 +50,18 @@ public class MesWorkCenter extends BaseBean { @Column(name = "AREA_CODE") @ApiParam("生产区域代码") private String areaCode; + + @Transient + @ApiParam(value ="子集列表") + private List childTreeList; + + @Transient + @ApiParam(value ="名称") + private String name; + + // 默认值 -1 + @Transient + @ApiParam(value ="父节点" , access ="父节点" ,example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long parentId; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdOrgModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdOrgModel.java new file mode 100644 index 0000000..56d40ff --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdOrgModel.java @@ -0,0 +1,63 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Entity; + +/** + * @Description: + * @Reference: + * @Author: yiming.gu + * @CreateDate:2019-04-18-14:16 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api("生产区域") +public class ProdOrgModel extends BaseBean { + + @ApiParam("区域名称") + private String areaName; + + @ApiParam("区域代码") + private String areaCode; + + @ApiParam("工作中心代码") + private String workCenterCode; + + @ApiParam("工作中心名称") + private String workCenterName; + + @ApiParam("ERP工作中心") + private String erpWorkCenter; + + @ApiParam("工作版本") + private String workVer; + + @ApiParam("工作单元代码") + private String workCellCode; + + @ApiParam("工作单元名称") + private String workCellName; + + @ApiParam("设备代码") + private String equipmentCode; + + @ApiParam("设备名称") + private String equipmentName; + + @ApiParam("设备状态") + private String status; + + @ApiParam("当前级") + private Integer level; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquipmentRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquipmentRepository.java new file mode 100644 index 0000000..b5a0329 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquipmentRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesEquipment; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesEquipmentRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index 63e0908..3efc847 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -5,10 +5,7 @@ import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.MesEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; -import cn.estsh.i3plus.pojo.mes.bean.MesPart; -import cn.estsh.i3plus.pojo.mes.bean.MesPlanOrder; -import cn.estsh.i3plus.pojo.mes.bean.MesQueueOrder; -import cn.estsh.i3plus.pojo.mes.bean.MesWorkOrder; +import cn.estsh.i3plus.pojo.mes.bean.*; import org.apache.commons.lang3.StringUtils; /** @@ -183,4 +180,85 @@ public class MesHqlPack { DdlPreparedPack.getOrderByPack(new Object[]{"2"},new String[]{mesQueueOrder.getOrderByParam()} , packBean); return packBean; } + + /** + * 通用查询条件 + * @param organizeCode + * @return + */ + public static DdlPackBean getAllBaseDataByNormalPro(BaseBean baseBean, String organizeCode) { + DdlPackBean packBean = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", packBean); + DdlPreparedPack.getNumEqualPack(baseBean.getIsValid(), "isValid", packBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", packBean); + return packBean; + } + + /** + * MES区域信息查询条件封装 + * @param mesArea + * @return + */ + public static DdlPackBean getMesArea(MesArea mesArea, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesArea, organizeCode); + if (StringUtils.isNotEmpty(mesArea.getAreaCode())) { + DdlPreparedPack.getStringEqualPack(mesArea.getAreaCode(), "areaCode", packBean); + } + + return packBean; + } + + /** + * MES工作中心信息查询条件封装 + * @param mesWorkCenter + * @return + */ + public static DdlPackBean getMesWorkCenter(MesWorkCenter mesWorkCenter, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesWorkCenter, organizeCode); + if (StringUtils.isNotEmpty(mesWorkCenter.getWorkCenterCode())) { + DdlPreparedPack.getStringEqualPack(mesWorkCenter.getWorkCenterCode(), "workCenterCode", packBean); + } + if (StringUtils.isNotEmpty(mesWorkCenter.getAreaCode())){ + DdlPreparedPack.getStringEqualPack(mesWorkCenter.getAreaCode(), "areaCode", packBean); + } + + return packBean; + } + + /** + * MES工作单元信息查询条件封装 + * @param mesWorkCell + * @return + */ + public static DdlPackBean getMesWorkCell(MesWorkCell mesWorkCell, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesWorkCell, organizeCode); + if (StringUtils.isNotEmpty(mesWorkCell.getWorkCenterCode())) { + DdlPreparedPack.getStringEqualPack(mesWorkCell.getWorkCenterCode(), "workCenterCode", packBean); + } + if (StringUtils.isNotEmpty(mesWorkCell.getAreaCode())){ + DdlPreparedPack.getStringEqualPack(mesWorkCell.getAreaCode(), "areaCode", packBean); + } + if (StringUtils.isNotEmpty(mesWorkCell.getWorkCellCode())){ + DdlPreparedPack.getStringEqualPack(mesWorkCell.getWorkCellCode(), "workCellCode", packBean); + } + + return packBean; + } + + /** + * MES设备信息查询条件封装 + * @param mesEquipment + * @return + */ + public static DdlPackBean getMesEquipment(MesEquipment mesEquipment, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesEquipment, organizeCode); + if (StringUtils.isNotEmpty(mesEquipment.getWorkCellCode())){ + DdlPreparedPack.getStringEqualPack(mesEquipment.getWorkCellCode(), "workCellCode", packBean); + } + if (StringUtils.isNotEmpty(mesEquipment.getEquipmentCode())){ + DdlPreparedPack.getStringEqualPack(mesEquipment.getEquipmentCode(), "equipmentCode", packBean); + } + + return packBean; + } } diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index 642c9a6..7250b00 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -42,6 +42,10 @@ i3plus.pojo i3plus-pojo-form + + i3plus.pojo + i3plus-pojo-mes + diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/SysOrganizeModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/SysOrganizeModel.java new file mode 100644 index 0000000..6880ac3 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/SysOrganizeModel.java @@ -0,0 +1,23 @@ +package cn.estsh.i3plus.pojo.model.mes; + +import cn.estsh.i3plus.pojo.mes.bean.MesArea; +import cn.estsh.i3plus.pojo.platform.bean.SysOrganize; +import io.swagger.annotations.ApiParam; + +import javax.persistence.Transient; +import java.util.List; + +public class SysOrganizeModel extends SysOrganize{ + + @Transient + @ApiParam(value ="子集列表") + private List childTreeList; + + public List getChildTreeList() { + return childTreeList; + } + + public void setChildTreeList(List childTreeList) { + this.childTreeList = childTreeList; + } +} From 68a66c67b0ec478cd2e651d9def04cd3b2b7aaba Mon Sep 17 00:00:00 2001 From: "yiming.gu" Date: Mon, 13 May 2019 15:35:10 +0800 Subject: [PATCH 04/19] =?UTF-8?q?=E8=AE=BE=E5=A4=87pojo=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E4=B8=AD=E5=BF=83=E4=BB=A3=E7=A0=81=EF=BC=8C?= =?UTF-8?q?=E5=8C=BA=E5=9F=9F=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn.estsh.i3plus.pojo.andon/bean/MesArea.java | 57 ++++++++++++++++++ .../bean/MesEquipment.java | 67 ++++++++++++++++++++++ .../bean/MesWorkCell.java | 63 ++++++++++++++++++++ .../bean/MesWorkCenter.java | 67 ++++++++++++++++++++++ .../repository/MesAreaRepository.java | 16 ++++++ .../repository/MesEquipmentRepository.java | 16 ++++++ .../repository/MesWorkCellRepository.java | 16 ++++++ .../repository/MesWorkCenterRepository.java | 16 ++++++ .../estsh/i3plus/pojo/mes/bean/MesEquipment.java | 8 +++ 9 files changed, 326 insertions(+) create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesArea.java create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesEquipment.java create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesWorkCell.java create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesWorkCenter.java create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/MesAreaRepository.java create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/MesEquipmentRepository.java create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/MesWorkCellRepository.java create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/MesWorkCenterRepository.java diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesArea.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesArea.java new file mode 100644 index 0000000..2241c79 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesArea.java @@ -0,0 +1,57 @@ +package cn.estsh.i3plus.pojo.andon.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; +import java.util.List; + +/** + * @Description :生产区域 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_AREA") +@Api("生产区域") +public class MesArea extends BaseBean { + @Column(name="AREA_CODE") + @ApiParam("区域代码") + private String areaCode; + + @Column(name="AREA_NAME") + @ApiParam("区域名称") + private String areaName; + + @Transient + @ApiParam(value ="子集列表") + private List childTreeList; + + @Transient + @ApiParam(value ="名称") + private String name; + + // 默认值 -1 + @Transient + @ApiParam(value ="父节点" , access ="父节点" ,example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long parentId; + +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesEquipment.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesEquipment.java new file mode 100644 index 0000000..7959144 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesEquipment.java @@ -0,0 +1,67 @@ +package cn.estsh.i3plus.pojo.andon.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; + +/** + * @Description :生产区域 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_EQUIPMENT") +@Api("生产设备") +public class MesEquipment extends BaseBean { + @Column(name="EQUIPMENT_CODE") + @ApiParam("设备代码") + private String equipmentCode; + + @Column(name="EQUIPMENT_NAME") + @ApiParam("设备名称") + private String equipmentName; + + @Column(name="STATUS") + @ApiParam("设备状态") + private String status; + + @Column(name="WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name="WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name="AREA_CODE") + @ApiParam("区域代码") + private String areaCode; + + @Transient + @ApiParam(value ="名称") + private String name; + + // 默认值 -1 + @Transient + @ApiParam(value ="父节点" , access ="父节点" ,example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long parentId; +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesWorkCell.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesWorkCell.java new file mode 100644 index 0000000..112dc97 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesWorkCell.java @@ -0,0 +1,63 @@ +package cn.estsh.i3plus.pojo.andon.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; +import java.util.List; + +/** + * @Description :工作单元 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_WORK_CELL") +@Api("工作单元") +public class MesWorkCell extends BaseBean { + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name = "WORK_CELL_NAME") + @ApiParam("工作单元名称") + private String workCellName; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心") + private String workCenterCode; + + @Column(name = "AREA_CODE") + @ApiParam("生产区域代码") + private String areaCode; + + @Transient + @ApiParam(value ="子集列表") + private List childTreeList; + + @Transient + @ApiParam(value ="名称") + private String name; + + // 默认值 -1 + @Transient + @ApiParam(value ="父节点" , access ="父节点" ,example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long parentId; +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesWorkCenter.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesWorkCenter.java new file mode 100644 index 0000000..ab85f95 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesWorkCenter.java @@ -0,0 +1,67 @@ +package cn.estsh.i3plus.pojo.andon.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; +import java.util.List; + +/** + * @Description :工作中心 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_WORK_CENTER") +@Api("工作中心") +public class MesWorkCenter extends BaseBean { + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "WORK_CENTER_NAME") + @ApiParam("工作中心名称") + private String workCenterName; + + @Column(name = "ERP_WORK_CENTER") + @ApiParam("ERP工作中心") + private String erpWorkCenter; + + @Column(name = "WORK_VER") + @ApiParam("工作版本") + private String workVer; + + @Column(name = "AREA_CODE") + @ApiParam("生产区域代码") + private String areaCode; + + @Transient + @ApiParam(value ="子集列表") + private List childTreeList; + + @Transient + @ApiParam(value ="名称") + private String name; + + // 默认值 -1 + @Transient + @ApiParam(value ="父节点" , access ="父节点" ,example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long parentId; +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/MesAreaRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/MesAreaRepository.java new file mode 100644 index 0000000..f4e8bb7 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/MesAreaRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.MesArea; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesAreaRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/MesEquipmentRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/MesEquipmentRepository.java new file mode 100644 index 0000000..caba161 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/MesEquipmentRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.MesEquipment; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesEquipmentRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/MesWorkCellRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/MesWorkCellRepository.java new file mode 100644 index 0000000..320270f --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/MesWorkCellRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.MesWorkCell; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesWorkCellRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/MesWorkCenterRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/MesWorkCenterRepository.java new file mode 100644 index 0000000..63f1233 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/MesWorkCenterRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.MesWorkCenter; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesWorkCenterRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipment.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipment.java index a7b1e75..ee94479 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipment.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipment.java @@ -47,6 +47,14 @@ public class MesEquipment extends BaseBean { @ApiParam("工作单元代码") private String workCellCode; + @Column(name="WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name="AREA_CODE") + @ApiParam("区域代码") + private String areaCode; + @Transient @ApiParam(value ="名称") private String name; From 060fa564da59a4bc2130bfa54931a4711eb1f345 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= Date: Mon, 13 May 2019 16:11:53 +0800 Subject: [PATCH 05/19] =?UTF-8?q?=E6=9B=B4=E6=96=B0AndonHqlPack?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bean/MesWorkCenter.java | 7 +++ .../sqlpack/AndonHqlPack.java | 55 ++++++++++++++++++++++ 2 files changed, 62 insertions(+) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesWorkCenter.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesWorkCenter.java index ab85f95..2fc7aec 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesWorkCenter.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesWorkCenter.java @@ -64,4 +64,11 @@ public class MesWorkCenter extends BaseBean { @ApiParam(value ="父节点" , access ="父节点" ,example = "-1") @JsonSerialize(using = ToStringSerializer.class) private Long parentId; + + public MesWorkCenter(String organizeCode) { + this.organizeCode = organizeCode; + } + + public MesWorkCenter() { + } } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java index 12b3098..34e5258 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java @@ -1,5 +1,13 @@ package cn.estsh.i3plus.pojo.andon.sqlpack; +import cn.estsh.i3plus.pojo.andon.bean.MesWorkCell; +import cn.estsh.i3plus.pojo.andon.bean.MesWorkCenter; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; +import org.apache.commons.lang3.StringUtils; + /** * @Description : 安灯对象查询封装 * @Reference : @@ -8,4 +16,51 @@ package cn.estsh.i3plus.pojo.andon.sqlpack; * @Modify: **/ public class AndonHqlPack { + /** + * 封装公用查询参数 + * + * @param bean 实体对象 + * @param hqlStr 查询语句 + * @return 封装完成的查询语句 + */ + public static DdlPackBean getStringBuilderPack(BaseBean bean, DdlPackBean hqlStr) { + + // 判断工厂代码是否为空 + if (StringUtils.isNotBlank(bean.getOrganizeCode())) { + DdlPreparedPack.getStringEqualPack(bean.getOrganizeCode(), "organizeCode", hqlStr); + } + + // 封装有效状态和删除状态 + DdlPreparedPack.getNumEqualPack(bean.getIsValid(), "isValid", hqlStr); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", hqlStr); + + return hqlStr; + } + + /** + * 按条件查询工作中心 + * @param mesWorkCenter + * @return + */ + public static DdlPackBean packHqlMesWorkCenter(MesWorkCenter mesWorkCenter){ + DdlPackBean result = new DdlPackBean(); + + getStringBuilderPack(mesWorkCenter, result); + + return result; + } + + /** + * 按条件查询工作单元（工位） + * @param mesWorkCell + * @return + */ + public static DdlPackBean packHqlMesWorkCell(MesWorkCell mesWorkCell){ + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringEqualPack(mesWorkCell.getWorkCenterCode(), "workCenterCode", result); + getStringBuilderPack(mesWorkCell, result); + + return result; + } } From fe23d7003fd681060e2565d01f74757f1941d93b Mon Sep 17 00:00:00 2001 From: "yihang.lv" Date: Mon, 13 May 2019 18:02:04 +0800 Subject: [PATCH 06/19] =?UTF-8?q?sweb=20po=E8=AF=A6=E6=83=85=E7=BA=A7?= =?UTF-8?q?=E8=81=94=E6=9F=A5=E8=AF=A2=E9=87=8D=E5=86=99=EF=BC=8C=E5=8F=91?= =?UTF-8?q?=E5=B8=83=E8=AE=A2=E5=8D=95=E6=8E=A5=E5=8F=A3=E9=87=8D=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/sweb/bean/SwebPurchaseOrderDetails.java | 10 +++++++-- .../i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java | 8 +++++++ .../pojo/sweb/modelbean/SwebLoginUserModel.java | 3 +++ .../sweb/modelbean/SwebPOForPubListEnterModel.java | 3 +++ .../SwebPOUpdatePublishForPublishModel.java | 25 ++++++++++++++++++++++ 5 files changed, 47 insertions(+), 2 deletions(-) create mode 100644 modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOUpdatePublishForPublishModel.java 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 d54f472..eb78593 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 @@ -66,8 +66,11 @@ public class SwebPurchaseOrderDetails extends BaseBean { @Column(name = "UNIT") private String unit; + /** + * 不冗余主表数据 + */ @ApiParam(value = "行项目状态", example = "1") - @Column(name = "ITEM_STATUS") + @Transient private Integer itemStatus; @Column(name = "BOX_QTY") @@ -131,7 +134,10 @@ public class SwebPurchaseOrderDetails extends BaseBean { @ApiParam("是否为钢卷料") private Integer isSteel; - @Column(name = "EXPECTED_TIME") + /** + * 不冗余主表数据 + */ + @Transient @ApiParam(value = "预计到货日期") public String expectedTime; 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 4dc38bb..895d0e0 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 @@ -34,6 +34,14 @@ public class SwebPurchaseOrderSn extends BaseBean { @ApiParam("单据明细编号") private String orderNo; + @ApiParam("供应商编号") + @Column(name = "VENDOR_CODE") + private String vendorCode; + + @ApiParam("供应商名称") + @Column(name = "VENDOR_NAME") + private String vendorName; + @Column(name = "PART_NO") @ApiParam(value = "零件号") private String partNo; diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebLoginUserModel.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebLoginUserModel.java index 3594480..1c9cb27 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebLoginUserModel.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebLoginUserModel.java @@ -20,6 +20,9 @@ public class SwebLoginUserModel implements Serializable { @ApiParam(value = "用户ID") private Long id; + @ApiParam(value = "用户code（供应商编号）") + private String code; + @ApiParam(value = "用户名") private String userName; 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 fc22889..4f50d7f 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 @@ -23,6 +23,9 @@ public class SwebPOForPubListEnterModel extends BaseBean { @ApiParam(value = "订单类型", example = "1") public Integer orderType; + @ApiParam(value = "订单状态", example = "10") + public Integer orderStatus; + @ApiParam(value = "预计到货日期开始日期") public String expectedTimeStart; diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOUpdatePublishForPublishModel.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOUpdatePublishForPublishModel.java new file mode 100644 index 0000000..31ee5c5 --- /dev/null +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOUpdatePublishForPublishModel.java @@ -0,0 +1,25 @@ +package cn.estsh.i3plus.pojo.sweb.modelbean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.bean.ListPager; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description : 待发布订单列表发布输入模型 + * @Reference : + * @Author : jack.lv + * @CreateDate : 2019-05-13 13:13 + * @Modify: + **/ +@Data +public class SwebPOUpdatePublishForPublishModel extends BaseBean { + + @ApiParam(value = "拆分请求时间数量列表", example = "1") + private List reqTimeList; + + @ApiParam(value = "列表项", example = "1") + private SwebPOForPubListResultItemModel item; +} From f844f89f5d7f4ee1b7d527575455058a6dba21d1 Mon Sep 17 00:00:00 2001 From: "yiming.gu" Date: Mon, 13 May 2019 18:25:16 +0800 Subject: [PATCH 07/19] =?UTF-8?q?andon=E6=96=B0=E5=A2=9E=E7=8F=AD=E6=AC=A1?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn.estsh.i3plus.pojo.andon/bean/MesShift.java | 46 ++++++++++++++++++++++ .../repository/MesShiftRepository.java | 16 ++++++++ 2 files changed, 62 insertions(+) create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesShift.java create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/MesShiftRepository.java diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesShift.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesShift.java new file mode 100644 index 0000000..43cfce1 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesShift.java @@ -0,0 +1,46 @@ +package cn.estsh.i3plus.pojo.andon.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description :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 { + @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="WORK_TIMES") + @ApiParam("作业时长") + private String workTimes; +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/MesShiftRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/MesShiftRepository.java new file mode 100644 index 0000000..9ddbf9e --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/MesShiftRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.MesShift; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: Crish + * @CreateDate:2019-04-19-13:53 + * @Modify: + **/ +@Repository +public interface MesShiftRepository extends BaseRepository { +} From 0e090c7e08733ae374eccbcee42d3d09f4fa7ebf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= Date: Mon, 13 May 2019 18:27:36 +0800 Subject: [PATCH 08/19] =?UTF-8?q?=E4=BC=98=E5=8C=96POJO?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bean/AndonAlarmCause.java | 4 ++ .../bean/AndonEventCause.java | 4 ++ .../bean/AndonEventMethod.java | 46 ++++++++++++++++++++++ .../sqlpack/AndonHqlPack.java | 31 +++++++++++++++ 4 files changed, 85 insertions(+) create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonEventMethod.java diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmCause.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmCause.java index 5487c78..5299981 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmCause.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmCause.java @@ -39,4 +39,8 @@ public class AndonAlarmCause extends BaseBean { @Column(name = "PARENT_AC_CODE") @ApiParam(value = "父阶原因代码") private String parentAcCode; + + @Column(name = "ALARM_CODE") + @ApiParam(value = "安灯类型") + private String alarmCode; } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonEventCause.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonEventCause.java index 1ed305d..c91b9b9 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonEventCause.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonEventCause.java @@ -39,4 +39,8 @@ public class AndonEventCause extends BaseBean { @Column(name = "PARENT_EC_CODE") @ApiParam(value = "父阶原因代码") private String parentEcCode; + + @Column(name = "ALARM_CODE") + @ApiParam(value = "安灯类型") + private String alarmCode; } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonEventMethod.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonEventMethod.java new file mode 100644 index 0000000..f214629 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonEventMethod.java @@ -0,0 +1,46 @@ +package cn.estsh.i3plus.pojo.andon.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : ANDON_事件处理方法 + * @Reference : + * @Author : hansen.ke + * @CreateDate : 2019-05-13 17:16 + * @Modify: + **/ +@Data +@Entity +@Table(name="ANDON_EVENT_METHOD") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api("ANDON_事件处理方法") +public class AndonEventMethod extends BaseBean { + + @Column(name = "EM_CODE") + @ApiParam(value = "事件方法代码") + private String emCode; + + @Column(name = "EM_NAME") + @ApiParam(value = "事件方法描述") + private String emName; + + @Column(name = "PARENT_EM_CODE") + @ApiParam(value = "父阶方法代码") + private String parentEmCode; + + @Column(name = "ALARM_CODE") + @ApiParam(value = "安灯类型") + private String alarmCode; +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java index 34e5258..db59c17 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java @@ -1,5 +1,7 @@ package cn.estsh.i3plus.pojo.andon.sqlpack; +import cn.estsh.i3plus.pojo.andon.bean.AndonAlarmCause; +import cn.estsh.i3plus.pojo.andon.bean.MesEquipment; import cn.estsh.i3plus.pojo.andon.bean.MesWorkCell; import cn.estsh.i3plus.pojo.andon.bean.MesWorkCenter; import cn.estsh.i3plus.pojo.base.bean.BaseBean; @@ -63,4 +65,33 @@ public class AndonHqlPack { return result; } + + /** + * 按条件查询设备 + * @param mesEquipment + * @return + */ + public static DdlPackBean packHqlMesEquipment(MesEquipment mesEquipment){ + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringEqualPack(mesEquipment.getWorkCenterCode(), "workCenterCode", result); + DdlPreparedPack.getStringEqualPack(mesEquipment.getWorkCellCode(), "workCellCode", result); + getStringBuilderPack(mesEquipment, result); + + return result; + } + + /** + * 按条件查询ANDON呼叫原因 + * @param andonAlarmCause + * @return + */ + public static DdlPackBean packHqlAndonAlarmCause(AndonAlarmCause andonAlarmCause){ + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringEqualPack(andonAlarmCause.getAlarmCode(), "alarmCode", result); + getStringBuilderPack(andonAlarmCause, result); + + return result; + } } From 4895b3ae85db5038a137a7bfd7db69d113ba4305 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= Date: Mon, 13 May 2019 19:23:15 +0800 Subject: [PATCH 09/19] =?UTF-8?q?ANDON=E5=AE=9E=E4=BD=93=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn.estsh.i3plus.pojo.andon/bean/MesShift.java | 13 +++++++++++++ .../sqlpack/AndonHqlPack.java | 19 +++++++++++++++---- 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesShift.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesShift.java index 43cfce1..533c56a 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesShift.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesShift.java @@ -28,6 +28,11 @@ import javax.persistence.Table; @Table(name="MES_SHIFT") @Api("班次信息") public class MesShift extends BaseBean { + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心") + private String workCenterCode; + @Column(name="SHIFT_CODE") @ApiParam("班次代码") private String shiftCode; @@ -43,4 +48,12 @@ public class MesShift extends BaseBean { @Column(name="WORK_TIMES") @ApiParam("作业时长") private String workTimes; + + public MesShift() { + } + + public MesShift(String workCenterCode,String organizeCode) { + this.workCenterCode = workCenterCode; + this.organizeCode = organizeCode; + } } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java index db59c17..098f73b 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java @@ -1,9 +1,6 @@ package cn.estsh.i3plus.pojo.andon.sqlpack; -import cn.estsh.i3plus.pojo.andon.bean.AndonAlarmCause; -import cn.estsh.i3plus.pojo.andon.bean.MesEquipment; -import cn.estsh.i3plus.pojo.andon.bean.MesWorkCell; -import cn.estsh.i3plus.pojo.andon.bean.MesWorkCenter; +import cn.estsh.i3plus.pojo.andon.bean.*; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; @@ -82,6 +79,20 @@ public class AndonHqlPack { } /** + * 按条件查询班次 + * @param mesShift + * @return + */ + public static DdlPackBean packHqlMesShift(MesShift mesShift){ + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringEqualPack(mesShift.getWorkCenterCode(), "workCenterCode", result); + getStringBuilderPack(mesShift, result); + + return result; + } + + /** * 按条件查询ANDON呼叫原因 * @param andonAlarmCause * @return From 47bd2c0aa7edeea06f29c1ff7aac403890efd79c Mon Sep 17 00:00:00 2001 From: Silliter Date: Mon, 13 May 2019 19:28:22 +0800 Subject: [PATCH 10/19] =?UTF-8?q?=E5=AE=89=E7=81=AF=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn.estsh.i3plus.pojo.andon/bean/AndonPLC.java | 8 ++++ .../sqlpack/AndonHqlPack.java | 50 ++++++++++++++++++++++ .../i3plus/pojo/base/enumutil/AndonEnumUtil.java | 49 +++++++++++++++++++++ .../i3plus/pojo/model/andon/AndonOpcModel.java | 32 ++++++++++++++ 4 files changed, 139 insertions(+) create mode 100644 modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/andon/AndonOpcModel.java diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLC.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLC.java index 9f154de..8bccd4e 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLC.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLC.java @@ -75,4 +75,12 @@ public class AndonPLC extends BaseBean { @Column(name = "ALARM_CODE") @ApiParam(value = "安灯类型代码") private String alarmCode; + + @Column(name = "TAG_BUSINESS_TYPE") + @ApiParam(value = "标签业务类型") + private String tagBusinessType; + + @Column(name = "IS_ALARM_STATUS") + @ApiParam(value = "是否按灯状态", example = "1") + private Integer isAlarmStatus; } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java index 12b3098..d0a22e1 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java @@ -1,5 +1,12 @@ package cn.estsh.i3plus.pojo.andon.sqlpack; +import cn.estsh.i3plus.pojo.andon.bean.AndonPLC; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; +import org.apache.commons.lang3.StringUtils; + /** * @Description : 安灯对象查询封装 * @Reference : @@ -8,4 +15,47 @@ package cn.estsh.i3plus.pojo.andon.sqlpack; * @Modify: **/ public class AndonHqlPack { + /** + * 封装公用查询参数 + * + * @param bean 实体对象 + * @param hqlStr 查询语句 + * @return 封装完成的查询语句 + */ + public static DdlPackBean getStringBuilderPack(BaseBean bean, DdlPackBean hqlStr) { + + // 判断工厂代码是否为空 + if (StringUtils.isNotBlank(bean.getOrganizeCode())) { + DdlPreparedPack.getStringEqualPack(bean.getOrganizeCode(), "organizeCode", hqlStr); + } + + // 封装有效状态和删除状态 + DdlPreparedPack.getNumEqualPack(bean.getIsValid(), "isValid", hqlStr); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", hqlStr); + + return hqlStr; + } + + /** + * 按灯PLC查询条件 + * + * @param andonPLC plc实体 + * @return + */ + public static DdlPackBean packHqlAndonPLCInfo(AndonPLC andonPLC) { + DdlPackBean result = new DdlPackBean(); + + //查询参数封装 + DdlPreparedPack.getStringEqualPack(andonPLC.getWorkCellCode(), "workCenterCode", result); + DdlPreparedPack.getStringEqualPack(andonPLC.getWorkCellCode(), "workCellCode", result); + DdlPreparedPack.getStringEqualPack(andonPLC.getNodeIP(), "nodeIP", result); + DdlPreparedPack.getStringEqualPack(andonPLC.getChannelName(), "channelName", result); + DdlPreparedPack.getStringEqualPack(andonPLC.getTagName(), "tagName", result); + DdlPreparedPack.getStringEqualPack(andonPLC.getTagAddress(), "tagAddress", result); + DdlPreparedPack.getStringEqualPack(andonPLC.getTagType(), "tagType", result); + DdlPreparedPack.getStringEqualPack(andonPLC.getAlarmCode(), "alarmCode", result); + + getStringBuilderPack(andonPLC, result); + return result; + } } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java new file mode 100644 index 0000000..1f6e33a --- /dev/null +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java @@ -0,0 +1,49 @@ +package cn.estsh.i3plus.pojo.base.enumutil; + +import com.fasterxml.jackson.annotation.JsonFormat; + +/** + * @Description : + * @Reference : + * @Author : silliter + * @CreateDate : 2019-05-13 15:53 + * @Modify: + **/ +public class AndonEnumUtil { + /** + * 按灯状态 + * 10-是，20-否 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum IS_ALARM_STATUS{ + + YES(10,"需要按灯"), + ON(20,"不需要按灯"); + + private int value; + private String description; + + IS_ALARM_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/andon/AndonOpcModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/andon/AndonOpcModel.java new file mode 100644 index 0000000..94ef1a2 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/andon/AndonOpcModel.java @@ -0,0 +1,32 @@ +package cn.estsh.i3plus.pojo.model.andon; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +@Data +public class AndonOpcModel { + + /** + * 通常为localhost + */ + @ApiParam("opcserver地址-ip") + private String host; + + /** + * opcserver的名称 + */ + @ApiParam("opcserver名称") + private String serverProgId; + + /** + * 一般为channel + */ + @ApiParam("第一层路径") + private String accessPath; + + /** + * 一般为device.tag + */ + @ApiParam("剩余路径名称") + private String itemName; +} From c9c470a27f8a8fde4254f5d40d0864827ee424ba Mon Sep 17 00:00:00 2001 From: Silliter Date: Mon, 13 May 2019 21:42:46 +0800 Subject: [PATCH 11/19] =?UTF-8?q?=E5=BC=80=E5=8F=91=E7=89=A9=E7=90=86?= =?UTF-8?q?=E5=AE=89=E7=81=AF=E4=B8=9A=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sqlpack/AndonHqlPack.java | 17 ++++ .../i3plus/pojo/base/enumutil/AndonEnumUtil.java | 97 ++++++++++++++++++++++ .../i3plus/pojo/model/andon/AndonResultBean.java | 30 +++++++ 3 files changed, 144 insertions(+) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/andon/AndonResultBean.java diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java index 66591c5..034e022 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java @@ -135,4 +135,21 @@ public class AndonHqlPack { return result; } + + /** + * 按条件查询按灯队列信息 + * @param andonManageQueue + * @return + */ + public static DdlPackBean packHqlAndonManageQueue(AndonManageQueue andonManageQueue){ + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringEqualPack(andonManageQueue.getWorkCellCode(), "workCellCode", result); + DdlPreparedPack.getStringEqualPack(andonManageQueue.getWorkCenterCode(), "workCenterCode", result); + DdlPreparedPack.getStringEqualPack(andonManageQueue.getEquipmentCode(), "equipmentCode", result); + DdlPreparedPack.getStringEqualPack(andonManageQueue.getAlarmCode(), "alarmCode", result); + getStringBuilderPack(andonManageQueue, result); + + return result; + } } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java index 1f6e33a..37f53bd 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java @@ -46,4 +46,101 @@ public class AndonEnumUtil { return tmp; } } + + /** + * 按灯业务状态 + * 安灯状态=10，工号 =20 ，读取状态=30 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ALARM_BUSI_FLAG{ + + ALARM_FLAG("10","按灯状态"), + USER_CODE("20","工号"), + READ_FLAG("30", "读取状态"); + + private String value; + private String description; + + ALARM_BUSI_FLAG(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + } + + /** + * 按灯标识 + * 1-呼叫，2-签到，3-解决 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ALARM_FLAG{ + + CALL(1,"呼叫"), + SIGN(2,"签到"), + RESOLVE(3, "解决"), + CANCEL(4, "撤销"); + + private int value; + private String description; + + ALARM_FLAG(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 按灯动作标志 + * 呼叫=10，签到 =20 ，撤销=30，40-解决，50-转呼 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ANDON_ACTION_FLAG{ + + CALL_ACTION("10","呼叫动作"), + SIGN_ACTION("20","签到动作"), + CANCEL_ACTION("30", "撤销动作"), + RESOLVE_ACTION("40", "解决动作"), + SHIFG_CALL_ACTION("50", "转呼动作"); + + private String value; + private String description; + + ANDON_ACTION_FLAG(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + } } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/andon/AndonResultBean.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/andon/AndonResultBean.java new file mode 100644 index 0000000..8455e8e --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/andon/AndonResultBean.java @@ -0,0 +1,30 @@ +package cn.estsh.i3plus.pojo.model.andon; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +@Data +public class AndonResultBean { + + @ApiParam("是否成功") + private boolean success; + + @ApiParam("处理信息") + private String msg; + + @ApiParam("处理结果") + private String result; + + public AndonResultBean(boolean success, String msg) { + super(); + this.success = success; + this.msg = msg; + } + + public AndonResultBean(boolean success, String msg, String result) { + super(); + this.success = success; + this.msg = msg; + this.result = result; + } +} From 1b702d0821a939888d8bac2ed55cae0d4a13d906 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= Date: Mon, 13 May 2019 21:57:37 +0800 Subject: [PATCH 12/19] =?UTF-8?q?ANDON=5FHQLPACK=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java index 66591c5..afa1a84 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java @@ -135,4 +135,18 @@ public class AndonHqlPack { return result; } + + /** + * 按条件查询ANDON事件原因 + * @param andonEventCause + * @return + */ + public static DdlPackBean packHqlAndonEventCause(AndonEventCause andonEventCause){ + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringEqualPack(andonEventCause.getAlarmCode(), "alarmCode", result); + getStringBuilderPack(andonEventCause, result); + + return result; + } } From 8ccc265f0d9735f78b3232d9164f38feda2afb9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= Date: Tue, 14 May 2019 09:51:08 +0800 Subject: [PATCH 13/19] =?UTF-8?q?ANDON=E6=9E=9A=E4=B8=BE=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java index 37f53bd..dbc7b6b 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java @@ -82,16 +82,18 @@ public class AndonEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ALARM_FLAG{ - CALL(1,"呼叫"), - SIGN(2,"签到"), - RESOLVE(3, "解决"), - CANCEL(4, "撤销"); + CALL(1,"10","呼叫"), + SIGN(2,"20","签到"), + RESOLVE(3,"30","解决"), + CANCEL(4,"40", "撤销"); private int value; + private String code; private String description; - ALARM_FLAG(int value, String description) { + ALARM_FLAG(int value,String code, String description) { this.value = value; + this.code = code; this.description = description; } @@ -99,6 +101,8 @@ public class AndonEnumUtil { return value; } + public String getCode(){ return code; } + public String getDescription() { return description; } From ba368a032728128cc4a8b482ad9e8f76af19bcad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= Date: Tue, 14 May 2019 10:16:30 +0800 Subject: [PATCH 14/19] =?UTF-8?q?ANDON=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ndonManagetQueueRepository.java => IAndonManageQueueRepository.java} | 2 +- ...onManagetRecordRepository.java => IAndonManageRecordRepository.java} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/{IAndonManagetQueueRepository.java => IAndonManageQueueRepository.java} (80%) rename modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/{IAndonManagetRecordRepository.java => IAndonManageRecordRepository.java} (80%) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonManagetQueueRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonManageQueueRepository.java similarity index 80% rename from modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonManagetQueueRepository.java rename to modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonManageQueueRepository.java index e4027cc..4300b50 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonManagetQueueRepository.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonManageQueueRepository.java @@ -12,5 +12,5 @@ import org.springframework.stereotype.Repository; * @Modify: **/ @Repository -public interface IAndonManagetQueueRepository extends BaseRepository { +public interface IAndonManageQueueRepository extends BaseRepository { } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonManagetRecordRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonManageRecordRepository.java similarity index 80% rename from modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonManagetRecordRepository.java rename to modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonManageRecordRepository.java index 13623d0..42bb09c 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonManagetRecordRepository.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonManageRecordRepository.java @@ -12,5 +12,5 @@ import org.springframework.stereotype.Repository; * @Modify: **/ @Repository -public interface IAndonManagetRecordRepository extends BaseRepository { +public interface IAndonManageRecordRepository extends BaseRepository { } From 486dda639f730f283367af88d7c880dd2c87802f Mon Sep 17 00:00:00 2001 From: "yiming.gu" Date: Tue, 14 May 2019 10:39:32 +0800 Subject: [PATCH 15/19] =?UTF-8?q?pcn=E9=98=9F=E5=88=97pojo=20vin=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E6=94=B9=E4=B8=BAstring=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 38 ++++++++++++++++++++++ .../i3plus/pojo/mes/pcn/bean/MesQueueOrder.java | 2 +- 2 files changed, 39 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index bc9b23c..84e4777 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 @@ -571,4 +571,42 @@ public class MesEnumUtil { } } + /** + * 组织模型树形菜单level + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PROD_ORG_LEVEL{ + + LEVEL_ONE(1,"一级目录"), + LEVEL_TWO(1,"二级目录"), + LEVEL_THREE(1,"三级目录"), + LEVEL_FOUR(1,"四级目录"); + + private int value; + private String description; + + PROD_ORG_LEVEL(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val ) { + tmp = values()[i].description; + } + } + return tmp; + } + } + } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrder.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrder.java index 32e27cb..26675f7 100644 --- 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 @@ -33,7 +33,7 @@ public class MesQueueOrder extends BaseBean { @Column(name="VIN_CODE") @ApiParam("Vin") - private Integer vinCode; + private String vinCode; @Column(name="CUST_FLAG_NO") @ApiParam("客户标识号") From 593a062e9f8ca9eaef8ddc56c8e15aec948f1f4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= Date: Tue, 14 May 2019 10:40:23 +0800 Subject: [PATCH 16/19] =?UTF-8?q?ANDON=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/AndonEnumUtil.java | 39 ++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java index dbc7b6b..e1e7d77 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java @@ -147,4 +147,43 @@ public class AndonEnumUtil { return description; } } + + /** + * 优先级别 + * 1 - 一级，2 - 二级，3 - 三级，4 - 四级 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ALARM_PRIORITY{ + + FIRST(1,"一级"), + SECOND(2,"二级"), + THIRD(3,"三级"), + FOURTH(4,"四级"); + + private int value; + private String description; + + ALARM_PRIORITY(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } } From 275a99159356e8005f248dbf8bc043511a24f642 Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Tue, 14 May 2019 10:44:04 +0800 Subject: [PATCH 17/19] =?UTF-8?q?=E5=AE=9E=E4=BD=93=E5=B1=9E=E6=80=A7?= =?UTF-8?q?=E4=B8=8D=E6=AD=A3=E7=A1=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: crish <570360737@qq.com> --- .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) 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 index 5b4c453..91149c5 100644 --- 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 @@ -28,12 +28,16 @@ import javax.persistence.Table; @Api("生产队列明细") public class MesQueueOrderDetail extends BaseBean { @Column(name="ORDER_NO") - @ApiParam("工单号") + @ApiParam("主队列编号") private String orderNo; @Column(name="PART_NO") @ApiParam("物料号") - private Integer partNo; + private String partNo; + + @Column(name="PART_NAME_RDD") + @ApiParam("物料名称") + private String partNameRdd; @Column(name="SERIAL_NUMBER") @ApiParam("产品条码") @@ -53,7 +57,7 @@ public class MesQueueOrderDetail extends BaseBean { @Column(name="WORK_TYPE") @ApiParam("生产类型") - private String workType; + private String workOrderType; @Column(name="PRODUCE_CATEGORY") @ApiParam("产品类型") From c7e5fc732e8c923c366c4fbfa8a03020879246ec Mon Sep 17 00:00:00 2001 From: "yiming.gu" Date: Tue, 14 May 2019 11:03:03 +0800 Subject: [PATCH 18/19] =?UTF-8?q?mes=E7=BB=84=E7=BB=87=E6=A8=A1=E5=9E=8B?= =?UTF-8?q?=E8=8F=9C=E5=8D=95=E7=AD=89=E7=BA=A7=E6=9E=9A=E4=B8=BE=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 84e4777..437d602 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 @@ -578,9 +578,9 @@ public class MesEnumUtil { public enum PROD_ORG_LEVEL{ LEVEL_ONE(1,"一级目录"), - LEVEL_TWO(1,"二级目录"), - LEVEL_THREE(1,"三级目录"), - LEVEL_FOUR(1,"四级目录"); + LEVEL_TWO(2,"二级目录"), + LEVEL_THREE(3,"三级目录"), + LEVEL_FOUR(4,"四级目录"); private int value; private String description; From 95789ab615a9e86955d18a152e3b7f5efd516e2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= Date: Tue, 14 May 2019 11:28:55 +0800 Subject: [PATCH 19/19] =?UTF-8?q?ANDON=E5=AE=9E=E4=BD=93=E6=9E=9A=E4=B8=BE?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java | 2 +- .../java/cn.estsh.i3plus.pojo.andon/bean/AndonManageRecord.java | 2 +- .../java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java | 9 ++++----- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java index b241d49..7928693 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java @@ -181,7 +181,7 @@ public class AndonManageQueue extends BaseBean { @Column(name = "EC_DESC") @ApiParam(value = "事件具体原因") - private String ec_desc; + private String ecDesc; @Column(name = "EM_CODE") @ApiParam(value = "事件方法代码") diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageRecord.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageRecord.java index 38e3bbd..bdc2403 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageRecord.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageRecord.java @@ -181,7 +181,7 @@ public class AndonManageRecord extends BaseBean { @Column(name = "EC_DESC") @ApiParam(value = "事件具体原因") - private String ec_desc; + private String ecDesc; @Column(name = "EM_CODE") @ApiParam(value = "事件方法代码") diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java index e1e7d77..da0802d 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java @@ -150,15 +150,14 @@ public class AndonEnumUtil { /** * 优先级别 - * 1 - 一级，2 - 二级，3 - 三级，4 - 四级 + * 10 - 一级，20 - 二级，30 - 三级 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ALARM_PRIORITY{ - FIRST(1,"一级"), - SECOND(2,"二级"), - THIRD(3,"三级"), - FOURTH(4,"四级"); + FIRST(10,"一级"), + SECOND(20,"二级"), + THIRD(30,"三级"); private int value; private String description;