From 9b82b0be2a6d5c334a90e147d1f80ec645704fdf Mon Sep 17 00:00:00 2001 From: wangjie Date: Fri, 20 Sep 2019 11:47:34 +0800 Subject: [PATCH 1/4] =?UTF-8?q?mes=E7=8F=AD=E7=BB=84=E7=BB=B4=E6=8A=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java | 3 --- .../cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 18 ++++++++++++++++++ 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java index 308024e..13a3217 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java @@ -1,7 +1,6 @@ package cn.estsh.i3plus.pojo.mes.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.base.enumutil.MesEnumUtil; import cn.estsh.i3plus.pojo.mes.model.MesWorkOrderButtonModel; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -14,8 +13,6 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; -import java.util.Arrays; -import java.util.List; /** * @Description: 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 f6995fd..0ee655a 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 @@ -363,6 +363,24 @@ public class MesHqlPack { } /** + * MES班组信息查询条件封装 + * @param shiftGroup + * @param organizeCode + * @return + */ + public static DdlPackBean getMesShiftGroup(MesShiftGroup shiftGroup, String organizeCode) { + + DdlPackBean packBean = getAllBaseDataByNormalPro(shiftGroup, organizeCode); + if (StringUtils.isNotEmpty(shiftGroup.getGroupCode())) { + DdlPreparedPack.getStringLikerPack(shiftGroup.getGroupCode(), "groupCode", packBean); + } + if (StringUtils.isNotEmpty(shiftGroup.getGroupName())) { + DdlPreparedPack.getStringLikerPack(shiftGroup.getGroupName(), "groupName", packBean); + } + return packBean; + } + + /** * MES班次休息信息查询条件封装 * * @param shiftRest From 53dd9cface0e506ff7e76b4382bb862599e57c27 Mon Sep 17 00:00:00 2001 From: "bleakney.liu" Date: Fri, 20 Sep 2019 15:22:20 +0800 Subject: [PATCH 2/4] =?UTF-8?q?add=20=E7=89=A9=E6=B5=81=E8=B7=AF=E7=BA=BFp?= =?UTF-8?q?ojo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/WmsPartRouting.java | 2 +- .../estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java | 13 +++++---- ...pository.java => WmsRoutingRuleRepository.java} | 2 +- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 32 ++++++++++++++++++++++ 4 files changed, 42 insertions(+), 7 deletions(-) rename modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/{WmsRoutingRoleRepository.java => WmsRoutingRuleRepository.java} (86%) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartRouting.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartRouting.java index 0be04b6..5adc7d5 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartRouting.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartRouting.java @@ -37,7 +37,7 @@ public class WmsPartRouting extends BaseBean { @Column(name = "ROUTING_CODE") @ApiParam(value = "线路编号") - private String areaNo; + private String routingCode; public WmsPartRouting(){} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java index d013c16..9d5414b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java @@ -51,13 +51,13 @@ public class WmsRoutingRule extends BaseBean { @ApiParam(value = "规则类型(10 推动规则，20 补货规则)", example ="10") private Integer ruleType; - @Column(name = "ZONE_NO_SRC") + @Column(name = "SRC_ZONE_NO") @ApiParam(value = "源存储区") - private String zoneNoSrc; + private String srcZoneNo; - @Column(name = "ZONE_NO_TARGET") + @Column(name = "DEST_ZONE_NO") @ApiParam(value = "目标存储区" , example = "2") - private String zoneNoTarget; + private String destZoneNo; @Column(name = "OP_TYPE_CODE") @ApiParam(value = "作业类型" , example = "2") @@ -79,7 +79,10 @@ public class WmsRoutingRule extends BaseBean { @ApiParam(value = "延迟时间单位(M:分钟，D:天)") private String delayUnit; - + @Column(name = "ROUTING_CODE") + @ApiParam(value = "线路代码") + private String routingCode; + public WmsRoutingRule(){} } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsRoutingRoleRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsRoutingRuleRepository.java similarity index 86% rename from modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsRoutingRoleRepository.java rename to modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsRoutingRuleRepository.java index f081961..5a8967f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsRoutingRoleRepository.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsRoutingRuleRepository.java @@ -12,6 +12,6 @@ import org.springframework.stereotype.Repository; * @Modify: **/ @Repository -public interface WmsRoutingRoleRepository extends BaseRepository { +public interface WmsRoutingRuleRepository extends BaseRepository { } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index ced5ed7..38ae263 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -2359,4 +2359,36 @@ public class WmsHqlPack { return result; } + + + + /** + * 业务：库存查询封装 + * + * @param wmsStockQuan + * @return + */ + public static DdlPackBean packWmsRouting(WmsRouting wmsRouting) { + DdlPackBean result = new DdlPackBean(); + + + DdlPreparedPack.getStringEqualPack(wmsRouting.getRoutingCode(), "routingCode", result); + DdlPreparedPack.getStringEqualPack(wmsRouting.getRoutingName(), "routingName", result); + + getStringBuilderPack(wmsRouting, result); + + return result; + } + + public static DdlPackBean packWmsRoutingRule(WmsRoutingRule wmsRoutingRule) { + DdlPackBean result = new DdlPackBean(); + + + DdlPreparedPack.getNumEqualPack(wmsRoutingRule.getRuleType(), "ruleType", result); +// DdlPreparedPack.getStringEqualPack(wmsRouting.getRoutingName(), "routingName", result); + + getStringBuilderPack(wmsRoutingRule, result); + + return result; + } } From 2d911c425768c060fb0e326addab1fd92e4d2f1e Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Fri, 20 Sep 2019 15:40:33 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=AE=89=E7=81=AF=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java | 2 -- 1 file changed, 2 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 1505f7f..cc0ebe0 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 @@ -363,8 +363,6 @@ public class AndonEnumUtil { } - - /** * ANDON类型：MM=物料 QM=质量 EQ=设备 GY=工艺 JC=检测 */ From 9f0f6da4c7f27fc111ac932e1685910b47908b4b Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Fri, 20 Sep 2019 18:59:04 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=AE=89=E7=81=AF=E5=8E=9F=E5=9B=A0?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=8A=A5=E8=A1=A8=E5=A2=9E=E5=8A=A0=E5=8F=91?= =?UTF-8?q?=E7=94=9F=E9=A2=91=E6=AC=A1=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) 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 27925ec..e03b224 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 @@ -333,6 +333,10 @@ public class AndonManageQueue extends BaseBean { @ApiParam(value = "周发生次数") private int weekendsTime; + @Transient + @ApiParam(value = "事件统计报表该事件描述的总次数") + private int acCodeTime; + // 是否转呼 public Integer getIsShiftCall() { return this.isShiftCall == null ? 0 : this.isShiftCall; @@ -380,7 +384,9 @@ public class AndonManageQueue extends BaseBean { * @param confirmTime * @param resetTime */ - public AndonManageQueue(String workCenterCode,String workCenterNameRdd,String workCellCode,String workCellNameRdd,String alarmCode,String ecCode,String ecNameRdd,String emCode,String emNameRdd, String callTime,String confirmTime,String resetTime){ + public AndonManageQueue(String acCode, String acNameRdd, String workCenterCode,String workCenterNameRdd,String workCellCode,String workCellNameRdd,String alarmCode,String ecCode,String ecNameRdd,String emCode,String emNameRdd, String callTime,String confirmTime,String resetTime){ + this.acCode = acCode; + this.acNameRdd = acNameRdd; this.workCenterCode = workCenterCode; this.workCenterNameRdd = workCenterNameRdd; this.workCellCode = workCellCode;