Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java

@@ -656,7 +656,7 @@ public class WmsEnumUtil {
 
 
     /**
-     * 作业任务状态
+     * 作业任务状态、移库单条码操作状态
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum TASK_INFO_STATUS {

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java

@@ -112,9 +112,13 @@ public class WmsDocMovementMaster extends BaseBean {
     private String desrAreaNo;
 
     @Column(name = "IS_PART")
-    @ApiParam(value = "是否散件")
+    @ApiParam(value = "是否散件", example = "1")
     private Integer isPart;
 
+    @Column(name = "IS_SN")
+    @ApiParam(value = "是否指定条码", example = "1")
+    private Integer isSn;
+
     @Transient
     @ApiParam(value = "发运单号")
     private String shipOrderNo;

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java

@@ -58,10 +58,10 @@ public class WmsDocMovementSn extends BaseBean {
     public String unit;
 
     /**
-     * 状态:同库存条码状态一致
+     * 状态：操作状态
      */
     @Column(name="SN_STATUS")
-    @ApiParam(value = "状态", example = "10")
+    @ApiParam(value = "操作状态", example = "10")
     public Integer snStatus;
 
     @Column(name="SN")

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

@@ -0,0 +1,42 @@
+package cn.estsh.i3plus.pojo.wms.engine.rule;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import lombok.AllArgsConstructor;
+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;
+
+/**
+ * 业务规则持久化实体类
+ *
+ * @author Rock.Yu
+ * @since 2019-04-16 09:27
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@AllArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "DROOLS_RULE_PERSISTENCE")
+@Api("系统动态业务规则")
+public class EngineRulePersistence extends BaseBean {
+    // 规则调用的唯一编号，例如：WMS_RECEIVE_0001
+    @Column(name = "RULE_NO", length = 50)
+    private String ruleNo;
+    // 规则的中文名称
+    @Column(name = "RULE_NAME", length = 50)
+    private String ruleName;
+    // 规则的具体内容
+    @Column(name = "RULE_CONTENT", columnDefinition = "TEXT")
+    private String ruleContent;
+    // 规则的描述，包含规则的用法，参数说明等
+    @Column(name = "RULE_REMARK", length = 2000)
+    private String ruleRemark;
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IEngineRulePersistenceRepository.java

@@ -0,0 +1,22 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.engine.rule.EngineRulePersistence;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 规则引擎持久化类
+ * @Reference :
+ * @Author : Rock.Yu
+ * @CreateDate : 2019-04-16 09:53
+ * @Modify:
+ **/
+@Repository
+public interface IEngineRulePersistenceRepository extends BaseRepository<EngineRulePersistence, Long> {
+    /**
+     * 按照规则编号查询规则实体
+     * @param ruleNo 规则编号
+     * @return 规则实体
+     */
+    EngineRulePersistence findByRuleNo(String ruleNo);
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IEngineScriptPersistenceRepository.java

@@ -7,10 +7,26 @@ import org.springframework.stereotype.Repository;
 
 import java.util.List;
 
+/**
+ * @Description : 脚本引擎持久化类
+ * @Reference :
+ * @Author : Rock.Yu
+ * @CreateDate : 2019-04-16 09:53
+ * @Modify:
+ **/
 @Repository
-public interface IEngineScriptPersistenceDao extends BaseRepository<EngineScriptPersistence, Long> {
+public interface IEngineScriptPersistenceRepository extends BaseRepository<EngineScriptPersistence, Long> {
+    /**
+     * 按照脚本编号查询脚本实体对象
+     * @param scriptNo 脚本编号
+     * @return 脚本实体对象
+     */
     EngineScriptPersistence findByScriptNo(String scriptNo);
 
+    /**
+     * 查找所有的脚本语言类型
+     * @return 数据库中已经存在的脚本语言类型
+     */
     @Query("select t.languageType from EngineScriptPersistence t group by t.languageType")
     List findGroupByLanguageType();
 }