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 1/5] =?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 2/5] =?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 3/5] =?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; From cca408fcf023a09d7f0f7befcedf3c819fa32ff2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Tue, 14 May 2019 11:54:54 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E7=9B=91=E6=8E=A7=E5=8F=B0=EF=BC=9A?= =?UTF-8?q?=E9=98=B2=E6=AD=A2=E5=87=BA=E7=8E=B0=E8=B4=9F=E5=BA=93=E5=AD=98?= =?UTF-8?q?+=E6=B5=81=E7=A8=8B=E9=85=8D=E7=BD=AE=EF=BC=9A=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E6=B7=BB=E5=8A=A0POSITION=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/WmsActionGroup.java | 25 ++++------------------ .../pojo/wms/bean/WmsActionGroupDetails.java | 2 +- 2 files changed, 5 insertions(+), 22 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java index df3f6d5..28139af 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java @@ -52,42 +52,25 @@ public class WmsActionGroup extends BaseBean { @JsonSerialize(using = ToStringSerializer.class) private Long initAmId; -// @Transient -// @ApiParam(value = "初始化组件名称") -// private String initAmName; - @Column(name = "DETAILS_AM_ID") @ApiParam(value = "明细处理组件编号", example = "0") @JsonSerialize(using = ToStringSerializer.class) private Long detailsAmId; -// @Transient -// @ApiParam(value = "明细处理组件名称") -// private String detailsAmName; - - @Column(name = "SUBMIT_AM_ID") - @ApiParam(value = "提交组件编号", example = "0") - @JsonSerialize(using = ToStringSerializer.class) - private Long submitAmId; - -// @Transient -// @ApiParam(value = "提交组件名称") -// private String submitAmName; - @Column(name = "END_AM_ID") @ApiParam(value = "结束组件编号", example = "0") @JsonSerialize(using = ToStringSerializer.class) private Long endAmId; -// -// @Transient -// @ApiParam(value = "结束组件名称") -// private String endAmName; // 1=true, 2 = false @Column(name = "AUTO_INIT") @ApiParam(value = "任务自动初始化", example = "0") private Integer autoInit; + @Column(name = "POSITION") + @ApiParam(value = "GOJS位置") + private String position; + public Long getInitAmId() { if (initAmId != null) { return initAmId.longValue(); diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java index 54a9528..beb6129 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java @@ -27,7 +27,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="WMS_ACTION_GROUP_DETAILS") +@Table(name = "WMS_ACTION_GROUP_DETAILS") @Api("作业流程明细") public class WmsActionGroupDetails extends BaseBean { From dfba307e43191a7f9b996f8529de28e3cd2e2169 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= Date: Tue, 14 May 2019 11:58:45 +0800 Subject: [PATCH 5/5] =?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 c612f1d..e31b84d 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 @@ -137,6 +137,20 @@ public class AndonHqlPack { } /** + * 按条件查询ANDON事件处理方法 + * @param andonEventMethod + * @return + */ + public static DdlPackBean packHqlAndonAlarmEventMethod(AndonEventMethod andonEventMethod){ + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringEqualPack(andonEventMethod.getAlarmCode(), "alarmCode", result); + getStringBuilderPack(andonEventMethod, result); + + return result; + } + + /** * 按条件查询ANDON事件原因 * @param andonEventCause * @return