From eda257bf2300f380055110f8019693ea8ef475ae Mon Sep 17 00:00:00 2001 From: jimmy <1622218722@qq.com> Date: Tue, 16 Apr 2019 09:41:50 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=9B=98=E7=82=B9PDA=E7=AB=AF=EF=BC=8C?= =?UTF-8?q?=E8=BE=93=E5=85=A5=E6=95=B0=E9=87=8F=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 224393a..5ccdb20 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/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 { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java index 1c3e91f..1f090fe 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java +++ b/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") From 404ad6bad8b35f064fa91b920d5e58acaa35733c Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Tue, 16 Apr 2019 09:45:02 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BA=A4=E6=98=93=E5=A4=84=E7=90=86?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E7=94=9F=E6=88=90=E7=A7=BB=E5=BA=93=E5=8D=95?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B1=9E=E6=80=A7=E2=80=9C=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E6=8C=87=E5=AE=9A=E6=9D=A1=E7=A0=81=E2=80=9D=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E4=B8=BA=E6=98=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java index a367909..7fda75e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java +++ b/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; From e58b28ecc4294529c600a39f1779a082a2483d76 Mon Sep 17 00:00:00 2001 From: "Rock.Yu" Date: Tue, 16 Apr 2019 11:40:02 +0800 Subject: [PATCH 3/3] =?UTF-8?q?1.=20=E5=AE=8C=E5=96=84=E8=A7=84=E5=88=99?= =?UTF-8?q?=E5=BC=95=E6=93=8E=EF=BC=8C=E5=A2=9E=E5=8A=A0=E4=BA=86=E8=A7=84?= =?UTF-8?q?=E5=88=99=E5=AD=98=E5=82=A8=E5=9C=A8=E6=95=B0=E6=8D=AE=E5=BA=93?= =?UTF-8?q?=E7=9A=84=E5=8A=9F=E8=83=BD=202.=20=E4=BF=AE=E6=94=B9=E8=84=9A?= =?UTF-8?q?=E6=9C=AC=E5=BC=95=E6=93=8E=20repository=20=E5=91=BD=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/engine/rule/EngineRulePersistence.java | 42 ++++++++++++++++++++++ .../IEngineRulePersistenceRepository.java | 22 ++++++++++++ ...ava => IEngineScriptPersistenceRepository.java} | 18 +++++++++- 3 files changed, 81 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/EngineRulePersistence.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IEngineRulePersistenceRepository.java rename modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/{IEngineScriptPersistenceDao.java => IEngineScriptPersistenceRepository.java} (50%) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/EngineRulePersistence.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/EngineRulePersistence.java new file mode 100644 index 0000000..41077b8 --- /dev/null +++ b/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; +} 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 new file mode 100644 index 0000000..6074b25 --- /dev/null +++ b/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 { + /** + * 按照规则编号查询规则实体 + * @param ruleNo 规则编号 + * @return 规则实体 + */ + EngineRulePersistence findByRuleNo(String ruleNo); +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IEngineScriptPersistenceDao.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IEngineScriptPersistenceRepository.java similarity index 50% rename from modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IEngineScriptPersistenceDao.java rename to modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IEngineScriptPersistenceRepository.java index a44d246..fe7448d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IEngineScriptPersistenceDao.java +++ b/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 { +public interface IEngineScriptPersistenceRepository extends BaseRepository { + /** + * 按照脚本编号查询脚本实体对象 + * @param scriptNo 脚本编号 + * @return 脚本实体对象 + */ EngineScriptPersistence findByScriptNo(String scriptNo); + /** + * 查找所有的脚本语言类型 + * @return 数据库中已经存在的脚本语言类型 + */ @Query("select t.languageType from EngineScriptPersistence t group by t.languageType") List findGroupByLanguageType(); }