库存交易规则

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

@@ -37,11 +37,11 @@ public class WmsTrans extends BaseBean{
     private String sn;
 
     @Column(name="PART_ID")
-    @ApiParam(value ="零件id")
+    @ApiParam(value ="零件id",example = "-1")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long partId;
 
-    @Column(name="PART_No")
+    @Column(name="PART_NO")
     @ApiParam(value ="零件编号")
     private String partNo;
 
@@ -50,7 +50,7 @@ public class WmsTrans extends BaseBean{
     private String partNameRdd;
 
     @Column(name="TRANS_STATUS")
-    @ApiParam(value ="交易状态")
+    @ApiParam(value ="交易状态",example = "1")
     private Integer transStatus;
 
     @Column(name="QTY")
@@ -70,7 +70,7 @@ public class WmsTrans extends BaseBean{
     private String unit;
 
     @Column(name="LOC_ID")
-    @ApiParam(value ="库位id")
+    @ApiParam(value ="库位id",example = "-1")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long locId;
 
@@ -79,7 +79,7 @@ public class WmsTrans extends BaseBean{
     private String locCode;
 
     @Column(name="GROUP_ID")
-    @ApiParam(value ="分组id")
+    @ApiParam(value ="分组id",example = "-1")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long groupId;
 

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

@@ -37,11 +37,11 @@ public class WmsTransRcd extends BaseBean{
     private String sn;
 
     @Column(name="PART_ID")
-    @ApiParam(value ="零件id")
+    @ApiParam(value ="零件id",example = "-1")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long partId;
 
-    @Column(name="PART_No")
+    @Column(name="PART_NO")
     @ApiParam(value ="零件编号")
     private String partNo;
 
@@ -50,7 +50,7 @@ public class WmsTransRcd extends BaseBean{
     private String partNameRdd;
 
     @Column(name="TRANS_STATUS")
-    @ApiParam(value ="交易状态")
+    @ApiParam(value ="交易状态",example = "1")
     private Integer transStatus;
 
     @Column(name="QTY")
@@ -70,7 +70,7 @@ public class WmsTransRcd extends BaseBean{
     private String unit;
 
     @Column(name="LOC_ID")
-    @ApiParam(value ="库位id")
+    @ApiParam(value ="库位id",example = "-1")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long locId;
 
@@ -79,7 +79,7 @@ public class WmsTransRcd extends BaseBean{
     private String locCode;
 
     @Column(name="GROUP_ID")
-    @ApiParam(value ="分组id")
+    @ApiParam(value ="分组id",example = "-1")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long groupId;
 

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

@@ -1,8 +1,6 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-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 lombok.Data;
@@ -30,7 +28,6 @@ public class WmsTransType extends BaseBean{
 
     @Column(name="TRANS_CODE")
     @ApiParam(value ="交易代码")
-    @JsonSerialize(using = ToStringSerializer.class)
     private String transCode;
 
     @Column(name="TRANS_NAME")

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

@@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.wms.sqlpack;
 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.WmsTrans;
 import cn.estsh.i3plus.pojo.wms.bean.WmsTransType;
 
 /**
@@ -42,6 +43,11 @@ public class WmsHqlPack {
         return null;
     }
 
+    /**
+     * 交易类型信息 分页查询
+     * @param wmsTransType
+     * @return
+     */
     public static String packHqlWmsTransType(WmsTransType wmsTransType) {
         StringBuffer result = new StringBuffer();
 
@@ -51,4 +57,20 @@ public class WmsHqlPack {
 
         return result.toString();
     }
+
+    /**
+     * 库存交易记录信息 分页查询
+     * @param wmsTrans
+     * @return
+     */
+    public static String packHqlWmsTrans(WmsTrans wmsTrans) {
+        StringBuffer result = new StringBuffer();
+
+        //查询参数封装
+        HqlPack.getStringEqualPack(wmsTrans.getTransCode(),"transCode",result);
+        HqlPack.getNumEqualPack(wmsTrans.getSn(),"sn",result);
+        HqlPack.timeBuilder(wmsTrans.getCreateDatetime(),null,"createDatetime",result,true);
+
+        return result.toString();
+    }
 }