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/WmsConfig.java

@@ -0,0 +1,61 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+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;
+
+/**
+ * @Description : wms系统参数配置
+ * @Reference :
+ * @Author : siliter
+ * @CreateDate : 2019-03-07 09:58
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="WMS_CONFIG")
+@Api(value="系统配置",description = "WMS系统配置")
+public class WmsConfig extends BaseBean {
+
+    @Column(name="NAME")
+    @ApiParam(value ="名称")
+    private String name;
+
+    @Column(name="CONFIG_TYPE")
+    @ApiParam(value ="参数类型ID（枚举：1.系统配置...）" , example ="-1")
+    private Integer configType;
+
+    @Column(name="CONFIG_CODE")
+    @ApiParam(value ="参数代码")
+    private String configCode;
+
+    // 枚举 ImppEnumUtil.SYS_CONFIG_GROUP
+    @Column(name="CONFIG_GROUP")
+    @ApiParam(value ="参数组")
+    private Integer configGroup;
+
+    // 枚举 ImppEnumUtil.SYS_VALUE_TYPE
+    @Column(name="CONFIG_VALUE_TYPE")
+    @ApiParam(value ="参数值类型")
+    private String configValueType;
+
+    @Column(name="CONFIG_VALUE")
+    @ApiParam(value ="参数值")
+    private String configValue;
+
+    @Column(name="CONFIG_DESCRIPTION")
+    @ApiParam(value ="参数描述")
+    private String configDescription;
+
+}

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

@@ -26,7 +26,7 @@ import javax.persistence.Table;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Table(name="WMS_DOC_MOVEMENT_SN")
-@Api("PO条码信息")
+@Api("移库条码信息")
 public class WmsDocMovementSn extends BaseBean {
 
     @Column(name="ORDER_NO")

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

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsConfig;
+
+/**
+ * @Description : 系统配置
+ * @Reference :
+ * @Author : amy
+ * @CreateDate : 2019-03-07 10:00
+ * @Modify:
+ **/
+public interface WmsConfigRepository extends BaseRepository<WmsConfig, Long> {
+}

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

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsDocMovementSn;
+
+/**
+ * @Description : 移库单条码
+ * @Reference :
+ * @Author : hansen.ke
+ * @CreateDate : 2019-03-07 11:44
+ * @Modify:
+ **/
+public interface WmsDocMovementSnRepository extends BaseRepository<WmsDocMovementSn, Long> {
+}