From 2e4f792afabfb8da0a3e16f7862952ab6b583a1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= Date: Mon, 20 May 2019 13:32:01 +0800 Subject: [PATCH 1/4] =?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 --- .../main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java | 5 +++++ .../main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java | 1 + 2 files changed, 6 insertions(+) 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 64780b0..26f776b 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 @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; +import java.util.List; /** * @Description : 安灯队列 @@ -236,6 +237,10 @@ public class AndonManageQueue extends BaseBean { private Long avgResolveTime; @Transient + @ApiParam(value = "查询条件：ANDON状态") + private List statusList; + + @Transient @ApiParam(value = "比例", example = "0") private Double proportion; 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 f8b6377..6eca0eb 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 @@ -172,6 +172,7 @@ public class AndonHqlPack { DdlPreparedPack.getStringEqualPack(andonManageQueue.getEquipmentCode(), "equipmentCode", result); DdlPreparedPack.getStringEqualPack(andonManageQueue.getAlarmCode(), "alarmCode", result); DdlPreparedPack.getStringEqualPack(andonManageQueue.getActionCode(), "actionCode", result); + DdlPreparedPack.getStringEqualPack(andonManageQueue.getAndonOrderNo(), "andonOrderNo", result); DdlPreparedPack.getInPackArray(obj, "statusCode", result); getStringBuilderPack(andonManageQueue, result); From 7caec34dad91770e0a5c8932b38995af82c18762 Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Mon, 20 May 2019 13:37:58 +0800 Subject: [PATCH 2/4] =?UTF-8?q?PLC=E8=AE=BE=E5=A4=87=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E5=AE=9E=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: crish <570360737@qq.com> --- .../i3plus/pojo/mes/pcn/bean/MesPLCConfigure.java | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 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 2ad8ec6..548db37 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,17 +32,17 @@ public class MesPLCConfigure extends BaseBean { @ApiParam("设备ip") private String ipAddress; - @Column(name="AREA_CODE") - @ApiParam("区域代码") - private String channelName; - - @Column(name="AREA_NAME") - @ApiParam("区域名称") + @Column(name="DEVICE_NAME") + @ApiParam("设备地址") private String deviceName; + @Column(name="TAG_NAME") + @ApiParam("标签地址") + private String tagName; + @Column(name="AREA_CODE") @ApiParam("区域代码") - private String tagName; + private String areaCode; @Column(name="WORK_CELL_CODE") @ApiParam("工作单元") @@ -52,8 +52,4 @@ public class MesPLCConfigure extends BaseBean { @ApiParam("工作中心") private String workCenterCode; - @Column(name="AREA_CODE") - @ApiParam("区域代码") - private String areaCode; - } From 090fdca1838824b932383041a1fbde0a6de35267 Mon Sep 17 00:00:00 2001 From: "yiming.gu" Date: Mon, 20 May 2019 13:50:27 +0800 Subject: [PATCH 3/4] =?UTF-8?q?MES=E6=96=B0=E5=A2=9E=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E9=9B=B6=E4=BB=B6=E5=85=B3=E7=B3=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/bean/MesCustomer.java | 12 ++-- .../i3plus/pojo/mes/bean/MesCustomerPart.java | 43 +++++++++++++ .../mes/repository/MesCustomerPartRepository.java | 17 +++++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 74 ++++++++++++++++++++++ 4 files changed, 140 insertions(+), 6 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerPart.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesCustomerPartRepository.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomer.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomer.java index f7191c8..456094a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomer.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomer.java @@ -30,25 +30,25 @@ import javax.persistence.Table; public class MesCustomer extends BaseBean { @Column(name="CUSTOMER_CODE") @ApiParam("客户代码") - private String CUSTOMER_CODE; + private String customerCode; @Column(name="CUSTOMER_NAME") @ApiParam("客户名称") - private String CUSTOMER_NAME; + private String customerName; @Column(name="BRIEF_TEXT") @ApiParam("客户简称") - private String BRIEF_TEXT; + private String briefText; @Column(name="ADDRESS") @ApiParam("客户地址") - private String ADDRESS; + private String address; @Column(name="CONTACT") @ApiParam("客户联系人") - private String CONTACT; + private String contact; @Column(name="TELEPHONE") @ApiParam("客户电话") - private String TELEPHONE; + private String telephone; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerPart.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerPart.java new file mode 100644 index 0000000..c121d91 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerPart.java @@ -0,0 +1,43 @@ +package cn.estsh.i3plus.pojo.mes.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 : yiming.gu + * @CreateDate : 2019-05-20 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_CUSTOMER_PART") +@Api("客户零件关系") +public class MesCustomerPart extends BaseBean { + @Column(name="CUSTOMER_CODE") + @ApiParam("客户代码") + private String customerCode; + + @Column(name="PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name="CUSTOMER_PART_NO") + @ApiParam("客户零件号") + private String customerPartNo; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesCustomerPartRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesCustomerPartRepository.java new file mode 100644 index 0000000..904790d --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesCustomerPartRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesCustomerPart; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: yiming.gu + * @CreateDate:2019-05-20 + * @Modify: + **/ +@Repository +public interface MesCustomerPartRepository extends BaseRepository { + +} diff --git a/modules/i3plus-pojo-mes/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 0e9ac7f..f48202e 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 @@ -403,4 +403,78 @@ public class MesHqlPack { return packBean; } + + /** + * MES BOM信息查询条件封装 + * @param bom + * @return + */ + public static DdlPackBean getMesBom(MesBom bom, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(bom, organizeCode); + if (StringUtils.isNotEmpty(bom.getPartNo())){ + DdlPreparedPack.getStringEqualPack(bom.getPartNo(), "partNo", packBean); + } + if (StringUtils.isNotEmpty(bom.getItemPartNo())){ + DdlPreparedPack.getStringEqualPack(bom.getItemPartNo(), "itemPartNo", packBean); + } + if (StringUtils.isNotEmpty(bom.getBomVersion())){ + DdlPreparedPack.getStringEqualPack(bom.getBomVersion(), "bomVersion", packBean); + } + + return packBean; + } + + /** + * MES 客户信息查询条件封装 + * @param customer + * @return + */ + public static DdlPackBean getMesCustomer(MesCustomer customer, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(customer, organizeCode); + if (StringUtils.isNotEmpty(customer.getCustomerCode())){ + DdlPreparedPack.getStringEqualPack(customer.getCustomerCode(), "customerCode", packBean); + } + if (StringUtils.isNotEmpty(customer.getCustomerName())){ + DdlPreparedPack.getStringLikerPack(customer.getCustomerName(), "customerName", packBean); + } + + return packBean; + } + + /** + * MES 客户产线信息查询条件封装 + * @param custProdLine + * @return + */ + public static DdlPackBean getMesCustProdLine(MesCustProdLine custProdLine, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(custProdLine, organizeCode); + if (StringUtils.isNotEmpty(custProdLine.getCustProdLineCode())){ + DdlPreparedPack.getStringEqualPack(custProdLine.getCustProdLineCode(), "custProdLineCode", packBean); + } + if (StringUtils.isNotEmpty(custProdLine.getCustProdLineName())){ + DdlPreparedPack.getStringLikerPack(custProdLine.getCustProdLineName(), "custProdLineName", packBean); + } + + return packBean; + } + + /** + * MES 客户零件关系信息查询条件封装 + * @param customerPart + * @return + */ + public static DdlPackBean getMesCustomerPart(MesCustomerPart customerPart, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(customerPart, organizeCode); + if (StringUtils.isNotEmpty(customerPart.getCustomerCode())){ + DdlPreparedPack.getStringEqualPack(customerPart.getCustomerCode(), "customerCode", packBean); + } + if (StringUtils.isNotEmpty(customerPart.getPartNo())){ + DdlPreparedPack.getStringEqualPack(customerPart.getPartNo(), "partNo", packBean); + } + if (StringUtils.isNotEmpty(customerPart.getCustomerPartNo())){ + DdlPreparedPack.getStringEqualPack(customerPart.getCustomerPartNo(), "customerPartNo", packBean); + } + + return packBean; + } } From 5841ae2ed2333a0f04f63e741ebbd21feaa72a81 Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Mon, 20 May 2019 13:57:39 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E9=94=99=E8=AF=AF=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: crish <570360737@qq.com> --- .../i3plus/pojo/mes/pcn/repository/MesPLCConfigureRepository.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPLCConfigureRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPLCConfigureRepository.java index cce563e..2aa1ee2 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPLCConfigureRepository.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPLCConfigureRepository.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.mes.pcn.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; import cn.estsh.i3plus.pojo.mes.pcn.bean.MesArea; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPLCConfigure; import org.springframework.stereotype.Repository; /** @@ -12,5 +13,5 @@ import org.springframework.stereotype.Repository; * @Modify: **/ @Repository -public interface MesPLCConfigureRepository extends BaseRepository { +public interface MesPLCConfigureRepository extends BaseRepository { }