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 { /** * 按照规则编号查询规则实体 + * @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