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

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

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

@@ -5,7 +5,6 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
-import io.swagger.models.auth.In;
 import lombok.Data;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
@@ -15,7 +14,7 @@ import javax.persistence.Entity;
 import javax.persistence.Table;
 
 /**
- * @Description : 仓库交易记录表
+ * @Description : 库存交易记录表
  * @Reference :
  * @Author : jimmy.zeng
  * @CreateDate : 2018-11-01 13:21
@@ -26,7 +25,7 @@ import javax.persistence.Table;
 @Table(name="WMS_TRANS")
 @DynamicInsert
 @DynamicUpdate
-@Api(value="仓库交易记录表",description = "仓库交易记录表")
+@Api(value="库存交易记录表",description = "库存交易记录表")
 public class WmsTrans extends BaseBean{
 
     @Column(name="ORDER_NO")
@@ -52,7 +51,7 @@ public class WmsTrans extends BaseBean{
 
     @Column(name="TRANS_STATUS")
     @ApiParam(value ="交易状态")
-    private String Trans_status;
+    private Integer transStatus;
 
     @Column(name="QTY")
     @ApiParam(value ="需求数")
@@ -70,29 +69,25 @@ public class WmsTrans extends BaseBean{
     @ApiParam(value ="单位")
     private String unit;
 
-    @Column(name="SRC_LOC_ID")
+    @Column(name="LOC_ID")
-    @ApiParam(value ="来源库位id")
+    @ApiParam(value ="库位id")
     @JsonSerialize(using = ToStringSerializer.class)
-    private Long srcLocId;
+    private Long locId;
 
-    @Column(name="SRC_LOC_CODE")
+    @Column(name="LOC_CODE")
-    @ApiParam(value ="来源库位代码")
+    @ApiParam(value ="库位代码")
-    private String srcLocCode;
+    private String locCode;
 
-    @Column(name="DEST_LOC_ID")
+    @Column(name="GROUP_ID")
-    @ApiParam(value ="目标库位id")
+    @ApiParam(value ="分组id")
     @JsonSerialize(using = ToStringSerializer.class)
-    private Long destLocId;
+    private Long groupId;
 
-    @Column(name="DEST_LOC_CODE")
+    public Long getLocId() {
-    @ApiParam(value ="目标库位代码")
+        if(locId != null) {
-    private String destLocCode;
+            return locId.longValue();
-
-    public Long getSrcLocId() {
-        if(srcLocId != null) {
-            return srcLocId.longValue();
         }else{
-            return srcLocId;
+            return locId;
         }
     }
 
@@ -103,12 +98,4 @@ public class WmsTrans extends BaseBean{
             return partId;
         }
     }
-
-    public Long getDestLocId() {
-        if(destLocId != null) {
-            return destLocId.longValue();
-        }else{
-            return destLocId;
-        }
-    }
 }

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

@@ -51,7 +51,7 @@ public class WmsTransRcd extends BaseBean{
 
     @Column(name="TRANS_STATUS")
     @ApiParam(value ="交易状态")
-    private Integer TransStatus;
+    private Integer transStatus;
 
     @Column(name="QTY")
     @ApiParam(value ="需求数")
@@ -69,29 +69,25 @@ public class WmsTransRcd extends BaseBean{
     @ApiParam(value ="单位")
     private String unit;
 
-    @Column(name="SRC_LOC_ID")
+    @Column(name="LOC_ID")
-    @ApiParam(value ="来源库位id")
+    @ApiParam(value ="库位id")
     @JsonSerialize(using = ToStringSerializer.class)
-    private Long srcLocId;
+    private Long locId;
 
-    @Column(name="SRC_LOC_CODE")
+    @Column(name="LOC_CODE")
-    @ApiParam(value ="来源库位代码")
+    @ApiParam(value ="库位代码")
-    private String srcLocCode;
+    private String locCode;
 
-    @Column(name="DEST_LOC_ID")
+    @Column(name="GROUP_ID")
-    @ApiParam(value ="目标库位id")
+    @ApiParam(value ="分组id")
     @JsonSerialize(using = ToStringSerializer.class)
-    private Long destLocId;
+    private Long groupId;
 
-    @Column(name="DEST_LOC_CODE")
+    public Long getLocId() {
-    @ApiParam(value ="目标库位代码")
+        if(locId != null) {
-    private String destLocCode;
+            return locId.longValue();
-
-    public Long getSrcLocId() {
-        if(srcLocId != null) {
-            return srcLocId.longValue();
         }else{
-            return srcLocId;
+            return locId;
         }
     }
 
@@ -102,12 +98,4 @@ public class WmsTransRcd extends BaseBean{
             return partId;
         }
     }
-
-    public Long getDestLocId() {
-        if(destLocId != null) {
-            return destLocId.longValue();
-        }else{
-            return destLocId;
-        }
-    }
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTransRcdRepository.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.WmsTransRcd;
+
+/**
+ * @Description : 仓库交易归档表
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2018-11-02 9:50
+ * @Modify:
+ **/
+public interface WmsTransRcdRepository extends BaseRepository<WmsTransRcd, Long> {
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTransRepository.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.WmsTrans;
+
+/**
+ * @Description : 仓库交易记录表
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2018-11-02 9:49
+ * @Modify:
+ **/
+public interface WmsTransRepository extends BaseRepository<WmsTrans, Long> {
+}

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

@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsTransType;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 交易类型表
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2018-11-02 9:49
+ * @Modify:
+ **/
+public interface WmsTransTypeRepository extends BaseRepository<WmsTransType, Long> {
+}

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

@@ -1,11 +1,8 @@
 package cn.estsh.i3plus.pojo.wms.sqlpack;
 
-import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.HqlPack;
 import cn.estsh.i3plus.pojo.wms.bean.InterfaceDevice;
 import cn.estsh.i3plus.pojo.wms.bean.WareHouse;
-import cn.estsh.i3plus.pojo.wms.bean.WmsField;
-import cn.estsh.i3plus.pojo.wms.bean.WmsObject;
 
 /**
  * @Description : 仓库管理对象封装
@@ -77,4 +74,14 @@ public class WmsHqlPack {
         return result.toString();
     }
 
+
+    public static String packHqlWmsTransType(WmsTransType wmsTransType) {
+        StringBuffer result = new StringBuffer();
+
+        //查询参数封装
+        HqlPack.getStringEqualPack(wmsTransType.getTransCode(),"transCode",result);
+        HqlPack.getStringEqualPack(wmsTransType.getTransName(),"transName",result);
+
+        return result.toString();
+    }
 }