Merge branch 'dev' into test

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEvent.java

@@ -40,6 +40,10 @@ public class MesEvent extends BaseBean {
     @ApiParam("事件类型")
     private Integer eventType;
 
+    @Column(name="BUTTON_CODE")
+    @ApiParam("按钮代码")
+    private String buttonCode;
+
     public int getEventTypeVal() {
         return this.eventType == null ? 0 : this.eventType;
     }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java

@@ -346,6 +346,23 @@ public class MesHqlPack {
     }
 
     /**
+     * MES 上传文件FastDfs封装
+     * @param mesESOP
+     * @return
+     */
+    public static DdlPackBean getMesESOP(MesESOP mesESOP, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(mesESOP, organizeCode);
+        if (StringUtils.isNotEmpty(mesESOP.getWorkCenterCode())){
+            DdlPreparedPack.getStringEqualPack(mesESOP.getWorkCenterCode(), "workCenterCode", packBean);
+        }
+        if (StringUtils.isNotEmpty(mesESOP.getPartNo())){
+            DdlPreparedPack.getStringEqualPack(mesESOP.getPartNo(), "partNo", packBean);
+        }
+
+        return packBean;
+    }
+
+    /**
      * MES工序信息查询条件封装
      * @param process
      * @return