From 02044789dca555500327c84abfec3819e9707af6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E5=AD=A6=E6=9D=B0?= <rock.yu@qq.com>
Date: Sat, 6 Jul 2019 16:57:16 +0800
Subject: [PATCH] =?UTF-8?q?1.=20TO=20ERP=20=E5=A2=9E=E5=8A=A0=E5=8D=95?=
 =?UTF-8?q?=E6=8D=AE=E8=A1=8C=E5=8F=B7=E5=AD=97=E6=AE=B5=202.=20=E8=84=9A?=
 =?UTF-8?q?=E6=9C=AC=E5=BC=95=E6=93=8E=20&=20=E8=A7=84=E5=88=99=E5=BC=95?=
 =?UTF-8?q?=E6=93=8E=20=E5=A2=9E=E5=8A=A0=E5=B7=A5=E5=8E=82=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java     | 4 ++++
 .../i3plus/pojo/wms/repository/IEngineRulePersistenceRepository.java  | 3 ++-
 .../pojo/wms/repository/IEngineScriptPersistenceRepository.java       | 4 ++--
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java
index d65afe3..d8d2132 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java
+++ b/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;
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IEngineRulePersistenceRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IEngineRulePersistenceRepository.java
index 6074b25..fe96950 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IEngineRulePersistenceRepository.java
+++ b/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);
 }
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IEngineScriptPersistenceRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IEngineScriptPersistenceRepository.java
index fe7448d..7db7273 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IEngineScriptPersistenceRepository.java
+++ b/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();
 }