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

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java

@@ -1,5 +1,7 @@
 package cn.estsh.i3plus.pojo.base.enumutil;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+
 /**
  * @Description :
  * @Reference :
@@ -8,4 +10,70 @@ package cn.estsh.i3plus.pojo.base.enumutil;
  * @Modify:
  **/
 public class WmsEnumUtil {
+    /**
+     * 消息队列，队列名称
+     * 1: success_queue
+     * 2: fail_queue
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum QUEUE_NAME{
+
+        SUCCESS_QUEUE(1,"success_queue","成功消息队列"),
+        FAIL_QUEUE(1,"fail_queue","成功消息队列");
+
+        private int value;
+        private String name;
+        private String description;
+
+        QUEUE_NAME() {
+        }
+
+        QUEUE_NAME(int value, String name, String description) {
+            this.value = value;
+            this.name = name;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfCode(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].name;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static String codeOfDescription(String code) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].name.equals(code)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
 }

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

@@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import java.util.List;
 
 /**
  * @Description :
@@ -78,4 +79,10 @@ public class WmsObject extends BaseBean {
     @ApiParam("自定义业务拦截")
     private String bizIntercept;
 
+    @ApiParam("元数据字段列表")
+    private transient List<WmsField> fiedList;
+
+    @ApiParam("自定义按钮列表")
+    private transient List<WmsButton> btnList;
+
 }

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

@@ -78,6 +78,13 @@ public class WmsTrans extends BaseBean{
     @ApiParam(value ="库位代码")
     private String locCode;
 
+    @ApiParam(value ="目标库位id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private transient Long targetLocId;
+
+    @ApiParam(value ="目标库位代码")
+    private transient String targetLocCode;
+
     @Column(name="GROUP_ID")
     @ApiParam(value ="分组id",example = "-1")
     @JsonSerialize(using = ToStringSerializer.class)

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

@@ -0,0 +1,44 @@
+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 org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description : 交易代码方法表
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2018-11-04 12:19
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="WMS_TRANS_CODE")
+@DynamicInsert
+@DynamicUpdate
+@Api(value="交易代码方法表",description = "交易代码方法表")
+public class WmsTransCode extends BaseBean{
+
+    @Column(name="TRANS_CODE")
+    @ApiParam(value ="交易代码")
+    private String transCode;
+
+    @Column(name="CLASS_PATH")
+    @ApiParam(value ="类路径")
+    private String classPath;
+
+    @Column(name="ATTRIBUTE")
+    @ApiParam(value ="属性")
+    private String attribute;
+
+    @Column(name="METHOD_NAME")
+    @ApiParam(value ="方法名")
+    private String methodName;
+}

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

@@ -0,0 +1,21 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsTrans;
+import cn.estsh.i3plus.pojo.wms.bean.WmsTransCode;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 交易代码方法表
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2018-11-04 14:47
+ * @Modify:
+ **/
+@Repository
+public interface WmsTransCodeRepository extends BaseRepository<WmsTransCode, Long> {
+    @Query("from WmsTransCode wtc where wtc.transCode =:code and wtc.isValid = 1")
+    WmsTransCode findWmsTransCodeByCode(@Param("code") String code);
+}

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

@@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.wms.repository;
 
 import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
 import cn.estsh.i3plus.pojo.wms.bean.WmsTransRcd;
+import org.springframework.stereotype.Repository;
 
 /**
  * @Description : 仓库交易归档表
@@ -10,5 +11,6 @@ import cn.estsh.i3plus.pojo.wms.bean.WmsTransRcd;
  * @CreateDate : 2018-11-02 9:50
  * @Modify:
  **/
+@Repository
 public interface WmsTransRcdRepository extends BaseRepository<WmsTransRcd, Long> {
 }

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

@@ -2,6 +2,10 @@ package cn.estsh.i3plus.pojo.wms.repository;
 
 import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
 import cn.estsh.i3plus.pojo.wms.bean.WmsTrans;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+import org.springframework.stereotype.Repository;
 
 /**
  * @Description : 仓库交易记录表
@@ -10,5 +14,10 @@ import cn.estsh.i3plus.pojo.wms.bean.WmsTrans;
  * @CreateDate : 2018-11-02 9:49
  * @Modify:
  **/
+@Repository
 public interface WmsTransRepository extends BaseRepository<WmsTrans, Long> {
+
+    @Modifying
+    @Query("delete from WmsTrans w where w.groupId =:groupId and w.isValid = 1")
+    void deleteByGroupId(@Param("groupId") Long groupId);
 }

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

@@ -11,5 +11,6 @@ import org.springframework.stereotype.Repository;
  * @CreateDate : 2018-11-02 9:49
  * @Modify:
  **/
+@Repository
 public interface WmsTransTypeRepository extends BaseRepository<WmsTransType, Long> {
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java

@@ -100,8 +100,8 @@ public class WmsHqlPack {
         StringBuffer result = new StringBuffer();
 
         //查询参数封装
-        HqlPack.getStringEqualPack(wmsTransType.getTransCode(),"transCode",result);
-        HqlPack.getStringEqualPack(wmsTransType.getTransName(),"transName",result);
+        HqlPack.getStringLikerPack(wmsTransType.getTransCode(),"transCode",result);
+        HqlPack.getStringLikerPack(wmsTransType.getTransName(),"transName",result);
 
         return result.toString();
     }