From 5daf6d960fe432c2419d235c17cd9e3a71be35ce Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Mon, 6 May 2019 09:32:24 +0800 Subject: [PATCH 1/4] =?UTF-8?q?hqpPack=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> --- .../cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) 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 23436d1..63e0908 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 @@ -145,14 +145,14 @@ public class MesHqlPack { } // 时间段查询 - DdlPreparedPack.timeBuilder( - mesWorkOrder.getStartTimeStart(), - mesWorkOrder.getStartTimeEnd(), - "startTime", packBean, true); - DdlPreparedPack.timeBuilder( - mesWorkOrder.getEndTimeStart(), - mesWorkOrder.getEndTimeEnd(), - "endTime", packBean, true); +// DdlPreparedPack.timeBuilder( +// mesWorkOrder.getStartTimeStart(), +// mesWorkOrder.getStartTimeEnd(), +// "startTime", packBean, true); +// DdlPreparedPack.timeBuilder( +// mesWorkOrder.getEndTimeStart(), +// mesWorkOrder.getEndTimeEnd(), +// "endTime", packBean, true); DdlPreparedPack.getOrderDefault(mesWorkOrder); DdlPreparedPack.getOrderByPack(new Object[]{"2"},new String[]{mesWorkOrder.getOrderByParam()} , packBean); return packBean; From 7e8730ea9fecea10b0fe536d4a754ba48239b2f3 Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Mon, 6 May 2019 09:49:58 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E5=8A=9F=E8=83=BD=E6=8E=A5=E5=8F=A3=20=E6=B6=88?= =?UTF-8?q?=E6=81=AF=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java | 7 ++++--- .../java/cn/estsh/i3plus/pojo/form/bean/BfButton.java | 4 ++-- .../java/cn/estsh/i3plus/pojo/form/bean/BfMethod.java | 6 ++++++ .../cn/estsh/i3plus/pojo/form/bean/BfMethodDetail.java | 6 +++++- .../estsh/i3plus/pojo/form/bean/BfRefButtonMethod.java | 8 ++++++++ .../cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java | 17 +++++++++++++++++ 6 files changed, 42 insertions(+), 6 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java index 752316c..4a39acd 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java @@ -1053,9 +1053,10 @@ public class ImppEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MESSAGE_RECEIVER_TYPE { - INTERNAL(1, "内部人员接收"), - EXTERNAL(2, "外部人员接收"), - URGENT(3, "紧急联系人接收"); + INTERNAL(1, "内部人员"), + EXTERNAL(2, "外部人员"), + URGENT(3, "紧急联系人"), + SUPPLIER(4, "供应商"); private int value; private String description; diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfButton.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfButton.java index 2b9622f..8dc3a8f 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfButton.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfButton.java @@ -38,9 +38,9 @@ public class BfButton extends BaseBean { @ApiParam(value = "触发方式") private Integer triggerMode; - public Integer getTriggerMode() { + public int getTriggerModeVal() { if (triggerMode == null) { - return null; + return 0; } else { return triggerMode.intValue(); } diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethod.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethod.java index e88a130..7594492 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethod.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethod.java @@ -13,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 +48,8 @@ public class BfMethod extends BaseBean { @Column(name="METHOD_DESCRIPTION") @ApiParam(value ="功能描述") private String methodDescription; + + @Transient + @ApiParam(value ="表单功能自定义按钮") + private List bfButtonList; } diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetail.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetail.java index e6176e0..dec8a80 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetail.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetail.java @@ -13,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 : @@ -57,5 +59,7 @@ public class BfMethodDetail extends BaseBean { @ApiParam(value ="表单元素名称") private String elementNameRdd; - + @Transient + @ApiParam(value ="表单功能自定义按钮") + private List bfButtonList; } diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfRefButtonMethod.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfRefButtonMethod.java index 69eac9f..14eefa8 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfRefButtonMethod.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfRefButtonMethod.java @@ -44,6 +44,14 @@ public class BfRefButtonMethod extends BaseBean { @ApiParam(value ="按钮位置类型") private Integer buttonPositionType; + public int getButtonPositionTypeVal(){ + if(buttonId == null){ + return 0; + } else { + return buttonPositionType.intValue(); + } + } + @Column(name="BUTTON_POSITION_REF_ID") @ApiParam(value ="按钮位置关联id") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java index c8ce167..dfb3cd4 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java @@ -297,4 +297,21 @@ public final class FormHqlPack { return ddlPackBean; } + + /** + * 元素信息复杂查询 + * @param bfElement 查询条件 + * @return DdlPackBean + */ + public static DdlPackBean packHqlBfElement(BfElement bfElement){ + DdlPackBean ddlPackBean = new DdlPackBean(); + + DdlPreparedPack.getStringLikerPack(bfElement.getElementName(), "elementName", ddlPackBean); + DdlPreparedPack.getStringLikerPack(bfElement.getElementCode(), "elementCode", ddlPackBean); + DdlPreparedPack.getNumEqualPack(bfElement.getDataObjectId(), "dataObjectId", ddlPackBean); + DdlPreparedPack.getNumEqualPack(bfElement.getElementType(), "elementType", ddlPackBean); + DdlPreparedPack.getNumEqualPack(bfElement.getIsDeleted(), "isDeleted", ddlPackBean); + + return ddlPackBean; + } } From 038484e7ac1c2411ec984cfc83d895073cfbd2b1 Mon Sep 17 00:00:00 2001 From: jiajack Date: Mon, 6 May 2019 09:57:02 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=B7=A5=E6=AD=A5=E8=B0=83=E5=BA=A6?= =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 77 ++++++++++++++++++++++ .../estsh/i3plus/pojo/mes/pcn/model/AttrBean.java | 17 +++++ .../i3plus/pojo/mes/pcn/model/ButtonBean.java | 19 ++++++ .../pojo/mes/pcn/model/StationRequestBean.java | 2 +- .../pojo/mes/pcn/model/StationResultBean.java | 30 ++++++--- 5 files changed, 134 insertions(+), 11 deletions(-) create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/AttrBean.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ButtonBean.java 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 1c24500..bc9b23c 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 @@ -494,4 +494,81 @@ public class MesEnumUtil { return tmp; } } + + /** + * 工位程序交互时的业务类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum STATION_BUSI_TYPE{ + MESSAGE("message","返回信息"), + STEP_LIST("stepList","工步列表"), + STEP_CONTENT("stepContent","工步内容"), + MODULE_CONTENT("moduleContent","组件内容"), + TASK_COMPLETE("taskComplete","整个扫描完成"); + + private String value; + private String description; + + STATION_BUSI_TYPE(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (val.equals(values()[i].value) ) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 工位程序交互时的数据类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum STATION_DATA_TYPE{ + TABLE("table","表格"), + TEXT("text","正常文本"), + EXP_TEXT("exp_text","异常文本"), + IMAGE("image","图片"), + BUTTON("button","按钮"); + + private String value; + private String description; + + STATION_DATA_TYPE(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (val.equals(values()[i].value) ) { + tmp = values()[i].description; + } + } + return tmp; + } + } + } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/AttrBean.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/AttrBean.java new file mode 100644 index 0000000..bfdcf1f --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/AttrBean.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +@Data +public class AttrBean implements Serializable { + + @ApiParam("属性名称") + private String attrName; + + @ApiParam("属性名称别名") + private String attrNameAlias; + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ButtonBean.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ButtonBean.java new file mode 100644 index 0000000..57aeff5 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ButtonBean.java @@ -0,0 +1,19 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +@Data +public class ButtonBean implements Serializable { + @ApiParam(value = "按钮名称") + private String buttonName; + + // 执行类方法,sql,或者标记 + @ApiParam(value = "执行内容") + private String methodContent; + + @ApiParam(value = "按钮描述") + private String buttonDesc; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationRequestBean.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationRequestBean.java index e214056..1431f93 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationRequestBean.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationRequestBean.java @@ -47,7 +47,7 @@ public class StationRequestBean implements Serializable { private String userInfo; /** - * heartBit:心跳，scan：扫描 + * doScan-扫描，doModule-处理组件,initModule-初始化组件 */ @ApiParam("业务类型") private String busiType; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationResultBean.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationResultBean.java index 41aace7..904acc5 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationResultBean.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationResultBean.java @@ -6,6 +6,7 @@ import lombok.Data; import java.io.Serializable; import java.util.List; +import java.util.Map; /** * @Description : 工位结果bean @@ -15,23 +16,32 @@ import java.util.List; * @Modify: **/ @Data -public class StationResultBean implements Serializable { +public class StationResultBean implements Serializable { /** - * 根据客户端所需数据结构，约定不同数据类型,message:信息、stepList:工步列表、stepHtml：工步内容 + * 根据客户端所需数据结构，约定不同数据类型,message:信息、stepList:工步列表、stepContent：工步内容、 + * moduleContent组件内容,taskComplete整个扫描完成 */ - @ApiParam("数据类型") - private String flagType; + @ApiParam("业务类型") + private String busiType; - @ApiParam("是否错误信息") - private boolean error; + /** + * 对于相同业务类型的数据，区分不同数据类型。 + * 比如：包含table-表格，text-正常文本，expText-异常文本，button-按钮， + * image-图片 + */ + @ApiParam("数据类型") + private String dataType; @ApiParam("执行结果信息") private String message; - @ApiParam("工步展示信息") - private String stepHtml; + @ApiParam("List结果集") + private List ResultList; + + @ApiParam("Map结果集") + public Map resultMap; - @ApiParam("工步清单") - private List stepList; + @ApiParam("List结果集的属性") + private List dataAttrList; } From f39abebd90b3577dcf3f3bf2af9af2efda9ff6e0 Mon Sep 17 00:00:00 2001 From: jimmy <1622218722@qq.com> Date: Mon, 6 May 2019 11:21:25 +0800 Subject: [PATCH 4/4] =?UTF-8?q?qc=20HQL=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) 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 6191b78..e12f9fc 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 @@ -1083,18 +1083,18 @@ public class WmsHqlPack { * @param wmsQCMaster * @return */ - public static String packHqlWmsQCMasterPart(WmsQCMaster wmsQCMaster) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsQCMasterPart(WmsQCMaster wmsQCMaster) { + DdlPackBean result = new DdlPackBean(); //查询参数封装 - HqlPack.getInPack(String.join(",", WmsEnumUtil.QC_INFO_STATUS.CREATE.getValue() + "", - WmsEnumUtil.QC_INFO_STATUS.FINISH.getValue() + ""), "orderStatus", result); - HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isPart", result); + DdlPreparedPack.getInPackArray(new Object[]{WmsEnumUtil.QC_INFO_STATUS.CREATE.getValue() , + WmsEnumUtil.QC_INFO_STATUS.FINISH.getValue()}, "orderStatus", result); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isPart", result); //单号 - HqlPack.getStringEqualPack(wmsQCMaster.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringEqualPack(wmsQCMaster.getOrderNo(), "orderNo", result); getStringBuilderPack(wmsQCMaster, result); - return result.toString(); + return result; } /**