Merge remote-tracking branch 'origin/dev' into test

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;
 

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;
+        }
+    }
+
 }

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();
         }

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<BfButton> bfButtonList;
 }

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<BfButton> bfButtonList;
 }

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)

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;
+    }
 }

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;
+
+}

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;
+}

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;

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<T> 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<T>  ResultList;
+
+    @ApiParam("Map结果集")
+    public Map<String, Object> resultMap;
 
-    @ApiParam("工步清单")
-    private List<MesStep>  stepList;
+    @ApiParam("List结果集的属性")
+    private List<AttrBean> dataAttrList;
 }

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;

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;
     }
 
     /**