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

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfRefButtonMethod.java

@@ -46,7 +46,8 @@ public class BfRefButtonMethod extends BaseBean {
 
     @Column(name="BUTTON_POSITION_REF_ID")
     @ApiParam(value ="按钮位置关联id")
-    private String buttonPositionRefId;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long buttonPositionRefId;
 
     @Column(name="BUTTON_POSITION_REF_NAME_RDD")
     @ApiParam(value ="按钮位置关联名称")

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java

@@ -247,4 +247,37 @@ public final class FormHqlPack {
 
         return ddlPackBean;
     }
+
+    /**
+     * 拦截器明细查询条件
+     * @param bfInterceptDetail 查询条件
+     * @return DdlPackBean
+     */
+    public static DdlPackBean packHqlBfInterceptDetail(BfInterceptDetail bfInterceptDetail) {
+        DdlPackBean ddlPackBean = new DdlPackBean();
+
+        DdlPreparedPack.getNumEqualPack(bfInterceptDetail.getInterceptId(), "interceptId", ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(bfInterceptDetail.getInterceptTargetId(), "interceptTargetId", ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(bfInterceptDetail.getInterceptType(), "interceptType", ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(bfInterceptDetail.getInterceptProcessResult(), "interceptProcessResult", ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(bfInterceptDetail.getInterceptPosition(), "interceptPosition", ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(bfInterceptDetail.getIsDeleted(), "isDeleted", ddlPackBean);
+
+        ddlPackBean.setOrderByStr(bfInterceptDetail.orderBy());
+
+        return ddlPackBean;
+    }
+
+    /**
+     * 根据id数组查询按钮功能关系
+     * @return
+     */
+    public static DdlPackBean packHqlBfRefButtonMethodByRefIds(Long[] ids) {
+        DdlPackBean ddlPackBean = new DdlPackBean();
+
+        DdlPreparedPack.getInPackArray(ids, "buttonPositionRefId", ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", ddlPackBean);
+
+        return ddlPackBean;
+    }
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDefectRecordRepositoty.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesDefectRecord;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: Crish
+ * @CreateDate:2019-04-17-17:01
+ * @Modify:
+ **/
+@Repository
+public interface MesDefectRecordRepositoty extends BaseRepository<MesDefectRecord, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesKeyDataRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesKeyData;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: Crish
+ * @CreateDate:2019-04-17-17:03
+ * @Modify:
+ **/
+@Repository
+public interface MesKeyDataRepository extends BaseRepository<MesKeyData, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesKpsnRuleReposity.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesKpsnRule;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: Crish
+ * @CreateDate:2019-04-17-17:04
+ * @Modify:
+ **/
+@Repository
+public interface MesKpsnRuleReposity extends BaseRepository<MesKpsnRule, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartScheduleBomRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesPartScheduleBom;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: Crish
+ * @CreateDate:2019-04-17-17:07
+ * @Modify:
+ **/
+@Repository
+public interface MesPartScheduleBomRepository extends BaseRepository<MesPartScheduleBom, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPlanOrderRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesPlanOrder;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: Crish
+ * @CreateDate:2019-04-17-17:08
+ * @Modify:
+ **/
+@Repository
+public interface MesPlanOrderRepository extends BaseRepository<MesPlanOrder, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProduceSnRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesProduceSn;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: Crish
+ * @CreateDate:2019-04-17-17:10
+ * @Modify:
+ **/
+@Repository
+public interface MesProduceSnRepository extends BaseRepository<MesProduceSn, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueOrderDetailRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesQueueOrderDetail;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: Crish
+ * @CreateDate:2019-04-17-17:12
+ * @Modify:
+ **/
+@Repository
+public interface MesQueueOrderDetailRepository extends BaseRepository<MesQueueOrderDetail, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueOrderRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesQueueOrder;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: Crish
+ * @CreateDate:2019-04-17-17:11
+ * @Modify:
+ **/
+@Repository
+public interface MesQueueOrderRepository extends BaseRepository<MesQueueOrder, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkOrderRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesWorkOrder;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: Crish
+ * @CreateDate:2019-04-17-17:13
+ * @Modify:
+ **/
+@Repository
+public interface MesWorkOrderRepository extends BaseRepository<MesWorkOrder, Long> {
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/EngineRulePersistence.java

@@ -8,6 +8,7 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
+import org.springframework.data.annotation.Transient;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -41,4 +42,7 @@ public class EngineRulePersistence extends BaseBean {
     // 规则的描述，包含规则的用法，参数说明等
     @Column(name = "RULE_REMARK", length = 2000)
     private String ruleRemark;
+    // 加载好的规则引擎对象
+    @Transient
+    private transient Object kieSession;
 }