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

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

@@ -153,6 +153,10 @@ public class WmsMoveToERP extends BaseBean {
     @ApiParam("是否同步")
     public Integer isSync = CommonEnumUtil.FALSE;
 
+    @Column(name="REF_ITEM")
+    @ApiParam("关联单据行号")
+    public String refItem;
+
     @ApiParam(value = "待出库数量", example = "0")
     @Transient
     private Long waitingCounts;

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

@@ -15,8 +15,9 @@ import org.springframework.stereotype.Repository;
 public interface IEngineRulePersistenceRepository extends BaseRepository<EngineRulePersistence, Long> {
     /**
      * 按照规则编号查询规则实体
+     * @param organizeCode 工厂代码
      * @param ruleNo 规则编号
      * @return 规则实体
      */
-    EngineRulePersistence findByRuleNo(String ruleNo);
+    EngineRulePersistence findByOrganizeCodeAndRuleNo(String organizeCode, String ruleNo);
 }

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

@@ -21,12 +21,12 @@ public interface IEngineScriptPersistenceRepository extends BaseRepository<Engin
      * @param scriptNo 脚本编号
      * @return 脚本实体对象
      */
-    EngineScriptPersistence findByScriptNo(String scriptNo);
+    EngineScriptPersistence findByOrganizeCodeAndScriptNo(String organizeCode, String scriptNo);
 
     /**
      * 查找所有的脚本语言类型
      * @return 数据库中已经存在的脚本语言类型
      */
-    @Query("select t.languageType from EngineScriptPersistence t group by t.languageType")
+    @Query("select t.languageType from EngineScriptPersistence t group by t.organizeCode, t.languageType")
     List findGroupByLanguageType();
 }