From 245596ee0b3e524bbbde924c054767188f2d4026 Mon Sep 17 00:00:00 2001 From: "yihang.lv" Date: Tue, 21 May 2019 19:53:01 +0800 Subject: [PATCH 1/7] =?UTF-8?q?sweb=20=E5=AF=BC=E5=85=A5=E9=9D=9E=E6=A0=87?= =?UTF-8?q?=E5=87=86=E5=8C=85=E8=A3=85=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java index 7b4026d..9bfe0df 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java @@ -127,7 +127,7 @@ public class SwebHqlPack { } /** - * 将该供应商下该单号状态全部改为已发布状态 where sql + * 将该供应商下该单号状态全部改为已发布状态 where sql（只查询状态为新建的订单） * @param details * @return */ @@ -136,6 +136,7 @@ public class SwebHqlPack { DdlPreparedPack.getStringEqualPack(details.getOrderNo(), "orderNo", result); DdlPreparedPack.getStringEqualPack(details.getVendorCode(), "vendorCode", result); DdlPreparedPack.getNumEqualPack(details.getOrderType(), "orderType", result); + DdlPreparedPack.getNumEqualPack(SwebEnumUtil.ORDER_DETAILS_STATUS.CREATE.getValue(), "itemStatus", result); return buildHql(details, result); } From d0840978de375b45ea3a9807b84793f07e1d3e16 Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Tue, 21 May 2019 21:54:22 +0800 Subject: [PATCH 2/7] =?UTF-8?q?PLC=E6=95=B0=E6=8D=AE=E9=87=87=E9=9B=86?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: crish <570360737@qq.com> --- .../estsh/i3plus/pojo/mes/pcn/bean/MesPLCConfigure.java | 4 ++++ .../estsh/i3plus/pojo/mes/pcn/bean/MesTorqueDetail.java | 17 +++++++++++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPLCConfigure.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPLCConfigure.java index 548db37..0d139b8 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPLCConfigure.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPLCConfigure.java @@ -32,6 +32,10 @@ public class MesPLCConfigure extends BaseBean { @ApiParam("设备ip") private String ipAddress; + @Column(name="CHANNEL_NAME") + @ApiParam("通道名称") + private String channelName; + @Column(name="DEVICE_NAME") @ApiParam("设备地址") private String deviceName; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTorqueDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTorqueDetail.java index f99cd7f..52296a7 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTorqueDetail.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTorqueDetail.java @@ -28,6 +28,7 @@ import javax.persistence.Table; @Table(name="MES_TORQUE_DETAIL") @Api("扭矩信息记录表") public class MesTorqueDetail extends BaseBean { + @Column(name="SN") @ApiParam("过程条码") private String serialNumber; @@ -61,8 +62,8 @@ public class MesTorqueDetail extends BaseBean { private String ok; @Column(name="PART_NO") - @ApiParam("扭矩是否合格") - private String partNO; + @ApiParam("物料号") + private String partNo; @Column(name="p_set") @ApiParam("螺丝枪PSET设置值") @@ -79,4 +80,16 @@ public class MesTorqueDetail extends BaseBean { @Column(name="FINALANGLE") @ApiParam("最终扭矩") private Integer finalAngle; + + @Column(name="WORK_ORDER_NO") + @ApiParam("工单号") + private String workOrderNo; + + @Column(name="KEY_DATA_CODE") + @ApiParam("关键数据代码") + private String keyDataCode; + + @Column(name="RESULT_MSG") + @ApiParam("扭矩判定结果") + private String resultMsg; } From 26fc821d1ac14e5a04cf7047fea61c7245d8c701 Mon Sep 17 00:00:00 2001 From: "yiming.gu" Date: Wed, 22 May 2019 10:48:07 +0800 Subject: [PATCH 3/7] =?UTF-8?q?MES=20model=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/bean/MesPartScheduleBom.java | 12 ++-- .../i3plus/pojo/mes/model/SysOrganizeModel.java | 46 ++++++++++++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 82 ++++++++++++++++++++++ 3 files changed, 136 insertions(+), 4 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SysOrganizeModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartScheduleBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartScheduleBom.java index fa81998..228465a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartScheduleBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartScheduleBom.java @@ -33,17 +33,21 @@ public class MesPartScheduleBom extends BaseBean { @Column(name="ITEM_PART_NO") @ApiParam("关联物料号") - private Integer itemPartNo; + private String itemPartNo; @Column(name="ITEM_QTY") @ApiParam("用量") - private String itemQty; + private Double itemQty; @Column(name="SCHEDULE_TYPE") @ApiParam("排程类型") - private Double scheduleType; + private Integer scheduleType; + + public double getItemQtyVal() { + return this.itemQty == null ? 0.0d : this.itemQty; + } public double getScheduletTypeVal() { - return this.scheduleType == null ? 0.0d : this.scheduleType; + return this.scheduleType == null ? 0 : this.scheduleType; } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SysOrganizeModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SysOrganizeModel.java new file mode 100644 index 0000000..a3d574c --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SysOrganizeModel.java @@ -0,0 +1,46 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.mes.bean.MesArea; +import io.swagger.annotations.ApiParam; + +import javax.persistence.Transient; +import java.util.List; + +public class SysOrganizeModel { + + @Transient + @ApiParam(value ="父节点") + private Long parentId; + + @Transient + @ApiParam(value ="名称") + private String name; + + @Transient + @ApiParam(value ="子集列表") + private List childTreeList; + + public List getChildTreeList() { + return childTreeList; + } + + public void setChildTreeList(List childTreeList) { + this.childTreeList = childTreeList; + } + + public Long getParentId() { + return parentId; + } + + public void setParentId(Long parentId) { + this.parentId = parentId; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } +} 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 65347c7..06b8339 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 @@ -632,4 +632,86 @@ public class MesHqlPack { return packBean; } + + /** + * MES 物料分类信息查询条件封装 + * @param partCategory + * @return + */ + public static DdlPackBean getMesPartCategory(MesPartCategory partCategory, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(partCategory, organizeCode); + if (StringUtils.isNotEmpty(partCategory.getCategoryCode())){ + DdlPreparedPack.getStringEqualPack(partCategory.getCategoryCode(), "categoryCode", packBean); + } + if (StringUtils.isNotEmpty(partCategory.getCategoryName())){ + DdlPreparedPack.getStringLikerPack(partCategory.getCategoryName(), "categoryName", packBean); + } + + return packBean; + } + + /** + * MES 包装规格信息查询条件封装 + * @param packSpec + * @return + */ + public static DdlPackBean getMesPackSpec(MesPackSpec packSpec, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(packSpec, organizeCode); + if (StringUtils.isNotEmpty(packSpec.getSpecCode())){ + DdlPreparedPack.getStringEqualPack(packSpec.getSpecCode(), "specCode", packBean); + } + if (StringUtils.isNotEmpty(packSpec.getSpecName())){ + DdlPreparedPack.getStringLikerPack(packSpec.getSpecName(), "specName", packBean); + } + + return packBean; + } + + /** + * MES 产品类型信息查询条件封装 + * @param produceCategory + * @return + */ + public static DdlPackBean getMesProduceCategory(MesProduceCategory produceCategory, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(produceCategory, organizeCode); + if (StringUtils.isNotEmpty(produceCategory.getProduceCategoryCode())){ + DdlPreparedPack.getStringEqualPack(produceCategory.getProduceCategoryCode(), "produceCategoryCode", packBean); + } + if (StringUtils.isNotEmpty(produceCategory.getProduceCategoryName())){ + DdlPreparedPack.getStringLikerPack(produceCategory.getProduceCategoryName(), "produceCategoryName", packBean); + } + + return packBean; + } + + /** + * MES 关键件条码规则信息查询条件封装 + * @param kpsnRule + * @return + */ + public static DdlPackBean getMesKpsnRule(MesKpsnRule kpsnRule, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(kpsnRule, organizeCode); + if (StringUtils.isNotEmpty(kpsnRule.getPartNo())){ + DdlPreparedPack.getStringEqualPack(kpsnRule.getPartNo(), "partNo", packBean); + } + + return packBean; + } + + /** + * MES 产品排程清单信息查询条件封装 + * @param partScheduleBom + * @return + */ + public static DdlPackBean getMesPartScheduleBom(MesPartScheduleBom partScheduleBom, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(partScheduleBom, organizeCode); + if (StringUtils.isNotEmpty(partScheduleBom.getPartNo())){ + DdlPreparedPack.getStringEqualPack(partScheduleBom.getPartNo(), "partNo", packBean); + } + if (StringUtils.isNotEmpty(partScheduleBom.getItemPartNo())){ + DdlPreparedPack.getStringLikerPack(partScheduleBom.getItemPartNo(), "itemPartNo", packBean); + } + + return packBean; + } } From b581cbee63b30be177a22d3e33f1ef48fd1d9119 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= Date: Wed, 22 May 2019 13:01:13 +0800 Subject: [PATCH 4/7] =?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/AndonManageRecord.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) 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 05c7e9d..eb0887c 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 @@ -130,14 +130,26 @@ public class AndonManageRecord extends BaseBean { @ApiParam(value = "呼叫人") private String callUser; + @Transient + @ApiParam(value = "呼叫人名字") + private String callUserName; + @Column(name = "CONFIRM_USER") @ApiParam(value = "响应人") private String confirmUser; + @Transient + @ApiParam(value = "响应人名字") + private String confirmUserName; + @Column(name = "RESET_USER") @ApiParam(value = "解决人") private String resetUser; + @Transient + @ApiParam(value = "解决人名字") + private String resetUserName; + @Column(name = "IS_SHIFT_CALL") @ApiParam(value = "是否转呼", example = "1") private Integer isShiftCall; From 85c4f94dcb6feb1bc0f7594fb3e5862c8f64806d Mon Sep 17 00:00:00 2001 From: "yiming.gu" Date: Wed, 22 May 2019 13:20:58 +0800 Subject: [PATCH 5/7] =?UTF-8?q?MES=20model=E8=BD=AC=E7=A7=BB=E8=87=B3pojo-?= =?UTF-8?q?mes=E7=9B=AE=E5=BD=95=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/model}/MesRouteModel.java | 4 +--- .../pojo/mes/model}/MesRouteProcessModel.java | 3 +-- .../i3plus/pojo/model/mes/SysOrganizeModel.java | 23 ---------------------- 3 files changed, 2 insertions(+), 28 deletions(-) rename modules/{i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes => i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model}/MesRouteModel.java (78%) rename modules/{i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes => i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model}/MesRouteProcessModel.java (91%) delete mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/SysOrganizeModel.java diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/MesRouteModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesRouteModel.java similarity index 78% rename from modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/MesRouteModel.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesRouteModel.java index 46163cf..670a8bc 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/MesRouteModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesRouteModel.java @@ -1,7 +1,5 @@ -package cn.estsh.i3plus.pojo.model.mes; +package cn.estsh.i3plus.pojo.mes.model; -import cn.estsh.i3plus.pojo.mes.bean.MesRouteProcess; -import cn.estsh.i3plus.pojo.model.wms.WmsActionGroupDetailsModel; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/MesRouteProcessModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesRouteProcessModel.java similarity index 91% rename from modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/MesRouteProcessModel.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesRouteProcessModel.java index 14a8d46..1ce5e08 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/MesRouteProcessModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesRouteProcessModel.java @@ -1,9 +1,8 @@ -package cn.estsh.i3plus.pojo.model.mes; +package cn.estsh.i3plus.pojo.mes.model; import cn.estsh.i3plus.pojo.mes.bean.MesProdRouteOptParam; import cn.estsh.i3plus.pojo.mes.bean.MesRouteProcess; import cn.estsh.i3plus.pojo.mes.bean.MesRouteProcessStep; -import cn.estsh.i3plus.pojo.wms.bean.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; 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 deleted file mode 100644 index 6880ac3..0000000 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/SysOrganizeModel.java +++ /dev/null @@ -1,23 +0,0 @@ -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 00086912bc9621fdf62f391be18e06385ff8d65e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= Date: Wed, 22 May 2019 17:22:59 +0800 Subject: [PATCH 6/7] =?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 --- .../bean/AndonManageQueue.java | 87 +++++++++++++++++++++- 1 file changed, 84 insertions(+), 3 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 26f776b..933464b 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 @@ -226,15 +226,15 @@ public class AndonManageQueue extends BaseBean { @Transient @ApiParam(value = "ANDON次数（用于报表统计）", example = "0") - private Integer andonCount; + private Long andonCount; @Transient @ApiParam(value = "平均响应时长", example = "0") - private Long avgSignTime; + private Double avgSignTime; @Transient @ApiParam(value = "平均解决时长", example = "0") - private Long avgResolveTime; + private Double avgResolveTime; @Transient @ApiParam(value = "查询条件：ANDON状态") @@ -257,4 +257,85 @@ public class AndonManageQueue extends BaseBean { public Integer getPriorityLevel() { return this.priorityLevel == null ? 0 : this.priorityLevel; } + + /** + * 工位统计 构造函数 + * @param workCenterCode + * @param workCellCode + * @param equipmentCode + * @param shiftCode + * @param alarmCode + * @param andonCount + */ + public AndonManageQueue(String workCenterCode, String workCellCode, String equipmentCode, String shiftCode, String alarmCode, Long andonCount) { + this.workCenterCode = workCenterCode; + this.workCellCode = workCellCode; + this.equipmentCode = equipmentCode; + this.shiftCode = shiftCode; + this.alarmCode = alarmCode; + this.andonCount = andonCount; + } + + /** + * 原因统计 构造函数 + * @param workCenterCode + * @param workCellCode + * @param alarmCode + * @param ecCode + * @param ecNameRdd + * @param emCode + * @param emNameRdd + * @param avgSignTime + * @param avgResolveTime + * @param andonCount + */ + public AndonManageQueue(String workCenterCode, String workCellCode, String alarmCode, String ecCode, String ecNameRdd, String emCode, String emNameRdd, Double avgSignTime, Double avgResolveTime, Long andonCount) { + this.alarmCode = alarmCode; + this.workCenterCode = workCenterCode; + this.workCellCode = workCellCode; + this.ecCode = ecCode; + this.ecNameRdd = ecNameRdd; + this.emCode = emCode; + this.emNameRdd = emNameRdd; + this.andonCount = andonCount; + this.avgSignTime = avgSignTime; + this.avgResolveTime = avgResolveTime; + } + + /** + * 人员统计 构造函数 + * @param resetUser + * @param alarmCode + * @param andonCount + * @param proportion + * @param avgSignTime + * @param avgResolveTime + */ + public AndonManageQueue(String resetUser, String alarmCode, Long andonCount, Double proportion, Double avgSignTime, Double avgResolveTime) { + this.alarmCode = alarmCode; + this.resetUser = resetUser; + this.andonCount = andonCount; + this.avgSignTime = avgSignTime; + this.avgResolveTime = avgResolveTime; + this.proportion = proportion; + } + + /** + * 柏拉图统计 构造函数 + * @param alarmCode + * @param ecCode + * @param ecNameRdd + * @param proportion + * @param andonCount + */ + public AndonManageQueue(String alarmCode, String ecCode, String ecNameRdd, Double proportion, Long andonCount) { + this.alarmCode = alarmCode; + this.ecCode = ecCode; + this.ecNameRdd = ecNameRdd; + this.andonCount = andonCount; + this.proportion = proportion; + } + + public AndonManageQueue() { + } } From 76e553234e594492363262412bb8f119d89ef512 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Wed, 22 May 2019 18:03:01 +0800 Subject: [PATCH 7/7] =?UTF-8?q?MES-JIT=E9=98=9F=E5=88=97=E7=BB=84=E4=BB=B6?= =?UTF-8?q?+WMS-GOJS=E4=BD=8D=E7=BD=AE=E5=AD=97=E6=AE=B5=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?@Lob=E6=B3=A8=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/bean/MesWorkCellPoint.java | 45 +++++++++++++++++++++ .../i3plus/pojo/mes/model/QueueOrderModel.java | 46 ++++++++++++++++++++++ .../estsh/i3plus/pojo/wms/bean/WmsActionGroup.java | 6 +-- 3 files changed, 93 insertions(+), 4 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPoint.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPoint.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPoint.java new file mode 100644 index 0000000..603ff15 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPoint.java @@ -0,0 +1,45 @@ +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; +import java.util.List; + +/** + * @Description : 工站队列 + * @Reference : + * @Author : dragon.xu + * @CreateDate : 2019-05-22 17:58 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_WORK_CELL_POINT") +@Api("工站队列") +public class MesWorkCellPoint extends BaseBean { + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name = "QUEUE_SEQ") + @ApiParam("队列主表序号") + private String queueSeq; + + @Column(name = "QUEUE_DETAIL_SEQ") + @ApiParam("队列明细表序号") + private String queueDetailSeq; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java new file mode 100644 index 0000000..c3e984f --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java @@ -0,0 +1,46 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description : JIT队列列表Model + * @Reference : + * @Author : dragon.xu + * @CreateDate : 2019-05-22 16:34 + * @Modify: + **/ +@Data +@Api("JIT队列列表Model") +public class QueueOrderModel implements Serializable { + @ApiParam("队列ID") + public Long queueId; + @ApiParam("队列明细ID") + public Long queueDetailId; + @ApiParam("队列序号") + public Integer queueSeq; + @ApiParam("队列明细序号") + public Integer queDetailSeq; + @ApiParam("客户标识号") + public String custFlagNo; + @ApiParam("产品配置名称") + public String prodCfgName; + @ApiParam("产品类型名称") + public String categoryName; + @ApiParam("产品条码") + public String serialNumber; + @ApiParam("物料号") + public String partNo; + @ApiParam("物料ID") + public Long partId; + @ApiParam("条码状态") + public Integer snStatus; + @ApiParam("生产类型") + public String workType; + + +} 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 28139af..48c1efe 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 @@ -10,10 +10,7 @@ import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; +import javax.persistence.*; /** * @Description : 作业流程 @@ -67,6 +64,7 @@ public class WmsActionGroup extends BaseBean { @ApiParam(value = "任务自动初始化", example = "0") private Integer autoInit; + @Lob @Column(name = "POSITION") @ApiParam(value = "GOJS位置") private String position;