库存，库存条码，库存交易信息，库存交易条码V1

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

@@ -839,4 +839,103 @@ public class WmsEnumUtil {
             return tmp;
         }
     }
+    /**
+     * 业务表：库存条码状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum STOCK_SN_STATUS {
+        CREATE(1, "创建"),
+        RECEIVED(10, "已收货"),
+        QUALITY_TESTED(20, "已质检"),
+        PUTIN_STORE(30, "已入库"),
+        WAIT_OUT_STORE(40, "待出库"),
+        IS_OUT_STORE(50, "已出库"),
+        ON_THE_WAY(60, "在途"),
+        QUARANTINED(70, "已隔离"),
+        BREAK_BUG(80, "破包"),
+        FROZEN(90, "冻结"),
+        CANCEL(100, "作废");
+
+        private int value;
+        private String description;
+
+        STOCK_SN_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOf(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 int descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+    /**
+     * 业务表：库存条码质检状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum STOCK_SN_QC_STATUS {
+        CREATE(1, "未质检"),
+        RECEIVED(10, "质检合格"),
+        QUALITY_TESTED(20, "质检不合格"),
+        PUTIN_STORE(30, "已退货");
+
+        private int value;
+        private String description;
+
+        STOCK_SN_QC_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOf(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 int descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
 }

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

@@ -1,10 +1,7 @@
 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.ApiModelProperty;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -29,37 +26,38 @@ import javax.persistence.Table;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Api(value = "库存信息", description = "库存信息")
-public class WmsStockQuant extends BaseBean{
+public class WmsStockQuan extends BaseBean {
+
+    @Column(name = "WH_NO")
+    @ApiParam(value = "仓库代码")
+    private String whNo;
+
+    @Column(name = "ZONE_NO")
+    @ApiParam(value = "存储区编号")
+    private String zoneNo;
+
+    @Column(name = "LOCATE_NO")
+    @ApiParam(value = "库位代码")
+    private String locateNo;
 
     @Column(name = "PART_NO")
-    @ApiParam(value ="零件编号")
+    @ApiParam(value = "物料编号")
     private String partNo;
 
     @Column(name = "PART_NAME_RDD")
-    @ApiParam(value ="零件名称")
+    @ApiParam(value = "物料名称")
     private String partNameRdd;
 
-    @Column(name="QTY")
-    @ApiParam(value = "可用数量", example = "0")
-    public Double qty;
-
     @Column(name = "UNIT")
     @ApiParam("单位")
     public String unit;
 
+    @Column(name = "QTY")
+    @ApiParam(value = "可用数量", example = "0")
+    public Double qty;
+
     @Column(name = "TOTAL_QTY")
     @ApiParam(value = "总数量", example = "0")
     private Double totalQty;
 
-    @Column(name="ZONE_NO")
-    @ApiParam(value ="存储区编号")
-    private String zoneNo;
-
-    @Column(name="WH_NO")
-    @ApiParam(value ="仓库代码")
-    private String whNo;
-
-    @Column(name="LOCATE_NO")
-    @ApiParam(value ="库位代码")
-    private String locateNo;
 }

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

@@ -0,0 +1,132 @@
+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;
+import java.util.Date;
+
+/**
+ * @Description : 库存条码信息
+ * @Reference :
+ * @Author : dragon.xu
+ * @CreateDate : 2018-11-17 14:50
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name = "WMS_STOCK_SN")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api(value = "库存条码信息", description = "库存条码信息")
+public class WmsStockSn extends BaseBean {
+
+    @Column(name = "WH_NO")
+    @ApiParam(value = "仓库代码")
+    private String whNo;
+
+    @Column(name = "ZONE_NO")
+    @ApiParam(value = "存储区编号")
+    private String zoneNo;
+
+    @Column(name = "LOCATE_NO")
+    @ApiParam(value = "库位代码")
+    private String locateNo;
+
+    @Column(name = "PART_NO")
+    @ApiParam(value = "物料编号")
+    private String partNo;
+
+    @Column(name = "PART_NAME_RDD")
+    @ApiParam(value = "物料名称")
+    private String partNameRdd;
+
+    @Column(name = "LOT_NO")
+    @ApiParam("批次编码")
+    public String lotNo;
+
+    @Column(name = "DATE_CODE")
+    @ApiParam(value = "生产日期")
+    public String dateCode;
+
+    @Column(name = "LEFT_CODE")
+    @ApiParam(value = "有效期")
+    private String leftCode;
+
+    @Column(name = "VENDOR_NO")
+    @ApiParam(value = "供应商编码")
+    public String vendorNo;
+
+    @Column(name = "FIX_LOT_NO")
+    @ApiParam(value = "特殊批次")
+    private String fixLotNo;
+
+    @Column(name = "CUST_NO")
+    @ApiParam(value = "客户编码")
+    private String custNo;
+
+    @Column(name = "SHIPPING_FLAG")
+    @ApiParam(value = "发往地")
+    private String shippingFlag;
+
+    @Column(name = "SN")
+    @ApiParam(value = "条码")
+    private String sn;
+
+    @Column(name = "SN_2D")
+    @ApiParam(value = "二维码")
+    private String sn2d;
+
+    @Column(name = "PACKAGE_NO")
+    @ApiParam(value = "包装编号")
+    private String packageNo;
+
+    @Column(name = "UNIT")
+    @ApiParam(value = "单位")
+    private String unit;
+
+    @Column(name = "QTY")
+    @ApiParam(value = "数量", example = "0")
+    private Double qty;
+    /**
+     * 1=未质检,10=质检合格,20=质检不合格,30=已退货
+     */
+    @Column(name = "QC_STATUS")
+    @ApiParam(value = "质检状态", example = "0")
+    private Integer qcStatus;
+    /**
+     * :1=创建,10=已收货,20=已质检,30=已入库,40=待出库,50=已出库,
+     * 60=在途,70=已隔离,80=破包,90=冻结,100=作废
+     */
+    @Column(name = "SN_STATUS")
+    @ApiParam(value = "条码状态", example = "0")
+    private Integer snStatus;
+    /**
+     * 1:已打印；2：未打印
+     */
+    @Column(name = "PRINTED")
+    @ApiParam(value = "是否打印", example = "0")
+    private Integer printed;
+
+    @Column(name = "PDATE")
+    @ApiParam(value = "打印时间")
+    private Date pdate;
+    /**
+     * 1=ASN,10=PO,20=SO
+     */
+    @Column(name = "REF_TYPE")
+    @ApiParam(value = "关联单据类型", example = "0")
+    private Integer refType;
+
+    @Column(name = "REF_SRC")
+    @ApiParam(value = "关联单号")
+    private String refSrc;
+}

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

@@ -28,10 +28,6 @@ import javax.persistence.Table;
 @Api("库存交易信息")
 public class WmsTransQuan extends BaseBean {
 
-    @Column(name="ORDER_NO")
-    @ApiParam("单号")
-    public String orderNo;
-
     @Column(name = "WH_NO")
     @ApiParam("仓库代码")
     public String whNo;
@@ -56,36 +52,33 @@ public class WmsTransQuan extends BaseBean {
     @ApiParam("条码")
     public String sn;
 
-    @Column(name="QTY")
-    @ApiParam(value = "需求数量", example = "0")
-    public Double qty;
-
     @Column(name = "UNIT")
     @ApiParam("单位")
     public String unit;
 
     /**
-     * 质检状态:0=未质检,10=质检中,20=质检合格,
+     * 关联交易类型表
-     * 30=质检不合格,40=已退货
      */
-    @Column(name="QC_STATUS")
+    @Column(name = "TRANS_CODE")
-    @ApiParam(value = "质检状态", example = "1")
+    @ApiParam(value = "交易类型代码")
-    public Integer qcStatus;
+    public String transCode;
 
-    /**
+    @Column(name = "QTY")
-     * 条码状态:0=创建,10=已收货,20=已质检,
+    @ApiParam(value = "交易数量", example = "0")
-     * 30=已入库,40=待出库,50=已出库,
+    public Double qty;
-     * 60=在途,70=已隔离,80=破包,90=冻结,100=作废
+
-     */
+    @Column(name = "TRANS_NO")
-    @Column(name="STATUS")
+    @ApiParam(value = "事务编号", example = "1")
-    @ApiParam(value = "条码状态", example = "1")
+    public Long transNo;
-    public Integer status;
 
     /**
-     * 处理状态:0=已创建,5=已盘,10=已冻结
+     * ASN,PO,SO
-     * ,20=已解冻,30=取消冻结
      */
-    @Column(name="TRANS_STATUS")
+    @Column(name = "REF_TYPE")
-    @ApiParam(value = "处理状态", example = "1")
+    @ApiParam(value = "关联单据类型", example = "1")
-    public Integer transStatus;
+    public Integer refType;
+
+    @Column(name = "REF_SRC")
+    @ApiParam(value = "关联单号")
+    public String refSrc;
 }

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

@@ -1,15 +0,0 @@
-package cn.estsh.i3plus.pojo.wms.repository;
-
-import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
-import cn.estsh.i3plus.pojo.wms.bean.WmsStockQuant;
-import cn.estsh.i3plus.pojo.wms.bean.WmsTransRcd;
-
-/**
- * @Description : 库存表
- * @Reference :
- * @Author : jessica.chen
- * @CreateDate : 2018-11-02 17:08
- * @Modify:
- **/
-public interface WmsStockQuantRepository extends BaseRepository<WmsStockQuant, Long> {
-}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsStockSnRepository.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.WmsStockSn;
+
+/**
+* @Description : 库存条码dao层
+* @Reference :
+* @Author : dragon.xu
+* @CreateDate : 2018-11-17 15:53
+* @Modify:
+**/
+public interface WmsStockSnRepository extends BaseRepository<WmsStockSn, Long> {
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTransQuanRepository.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.WmsTransQuan;
+
+/**
+* @Description : 库存业务dao层
+* @Reference :
+* @Author : dragon.xu
+* @CreateDate : 2018-11-17 15:57
+* @Modify:
+**/
+public interface WmsTransQuanRepository extends BaseRepository<WmsTransQuan, Long> {
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTransSnRepository.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.WmsTransSn;
+
+/**
+* @Description : 库存业务条码dao层
+* @Reference :
+* @Author : dragon.xu
+* @CreateDate : 2018-11-17 15:57
+* @Modify:
+**/
+public interface WmsTransSnRepository extends BaseRepository<WmsTransSn, Long> {
+}

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

@@ -18,6 +18,7 @@ public class WmsHqlPack {
 
     /**
      * 封装公用查询参数
+     *
      * @param bean   实体对象
      * @param hqlStr 查询语句
      * @return 封装完成的查询语句
@@ -70,8 +71,7 @@ public class WmsHqlPack {
         //查询参数封装
         HqlPack.getStringLikerPack(wmsDocMovementDetails.getOrderNo(), "orderNo", result);
 
-        HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),
+        getStringBuilderPack(wmsDocMovementDetails, result);
-                "isDeleted", result);
         return result.toString();
     }
 
@@ -90,10 +90,7 @@ public class WmsHqlPack {
         HqlPack.getNumEqualPack(wmsDocMovementMaster.getBusiType(), "busiType", result);
         HqlPack.getStringLikerPack(wmsDocMovementMaster.getCustomerNo(), "customerNo", result);
 
-        HqlPack.getStringEqualPack(wmsDocMovementMaster.getOrganizeCode(), "organizeCode", result);
+        getStringBuilderPack(wmsDocMovementMaster, result);
-        HqlPack.getNumEqualPack(wmsDocMovementMaster.getIsValid(), "isValid", result);
-        HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),
-                "isDeleted", result);
         return result.toString();
     }
 
@@ -127,9 +124,7 @@ public class WmsHqlPack {
     public static String packHqlWmsRoutingChildren(String routingCode) {
         StringBuffer result = new StringBuffer();
         HqlPack.getStringLikerPack(routingCode, "routingCode", result);
-
+        HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
-        HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),
-                "isDeleted", result);
         return result.toString();
     }
 
@@ -145,10 +140,7 @@ public class WmsHqlPack {
         HqlPack.getStringLikerPack(wmsRoutingMaster.getRoutingCode(), "routingCode", result);
         HqlPack.getStringLikerPack(wmsRoutingMaster.getRoutingName(), "routingName", result);
 
-        HqlPack.getStringEqualPack(wmsRoutingMaster.getOrganizeCode(), "organizeCode", result);
+        getStringBuilderPack(wmsRoutingMaster, result);
-        HqlPack.getNumEqualPack(wmsRoutingMaster.getIsValid(), "isValid", result);
-        HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),
-                "isDeleted", result);
         return result.toString();
     }
 
@@ -166,11 +158,7 @@ public class WmsHqlPack {
         HqlPack.getStringLikerPack(wmsPart.getPartSpec(), "partSpec", result);
         HqlPack.getStringLikerPack(wmsPart.getPartType(), "partType", result);
 
-        HqlPack.getStringEqualPack(wmsPart.getOrganizeCode(), "organizeCode", result);
+        getStringBuilderPack(wmsPart, result);
-        HqlPack.getNumEqualPack(wmsPart.getIsValid(), "isValid", result);
-        HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),
-                "isDeleted", result);
-
         return result.toString();
     }
 
@@ -667,4 +655,70 @@ public class WmsHqlPack {
 
         return result.toString();
     }
+
+    /**
+     * 业务：库存条码查询封装
+     *
+     * @param wmsStockSn
+     * @return
+     */
+    public static String packWmsStockSn(WmsStockSn wmsStockSn) {
+        StringBuffer result = new StringBuffer();
+        //查询参数封装
+        HqlPack.getStringEqualPack(wmsStockSn.getLocateNo(), "locateNo", result);
+        HqlPack.getStringEqualPack(wmsStockSn.getPartNo(), "partNo", result);
+
+        getStringBuilderPack(wmsStockSn, result);
+        return result.toString();
+    }
+
+    /**
+     * 业务：库存查询封装
+     *
+     * @param wmsStockQuan
+     * @return
+     */
+    public static String packWmsStockQuan(WmsStockQuan wmsStockQuan) {
+        StringBuffer result = new StringBuffer();
+        //查询参数封装
+        HqlPack.getStringLikerPack(wmsStockQuan.getWhNo(), "whNo", result);
+        HqlPack.getStringLikerPack(wmsStockQuan.getZoneNo(), "zoneNo", result);
+        HqlPack.getStringLikerPack(wmsStockQuan.getLocateNo(), "locateNo", result);
+        HqlPack.getStringLikerPack(wmsStockQuan.getPartNo(), "partNo", result);
+
+        getStringBuilderPack(wmsStockQuan, result);
+        return result.toString();
+    }
+
+    /**
+     * 业务：库存交易条码查询封装(根据交易编码查询所有未删除的)
+     *
+     * @param tranNo
+     * @return
+     */
+    public static String packWmsTransSn(String tranNo) {
+        StringBuffer result = new StringBuffer();
+        //查询参数封装
+        HqlPack.getStringEqualPack(tranNo, "tranNo", result);
+        HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
+        return result.toString();
+    }
+
+    /**
+     * 业务：库存交易查询封装
+     *
+     * @param wmsTransQuan
+     * @return
+     */
+    public static String packWmsTransQuan(WmsTransQuan wmsTransQuan) {
+        StringBuffer result = new StringBuffer();
+        //查询参数封装
+        HqlPack.getStringLikerPack(wmsTransQuan.getWhNo(), "whNo", result);
+        HqlPack.getStringLikerPack(wmsTransQuan.getZoneNo(), "zoneNo", result);
+        HqlPack.getStringLikerPack(wmsTransQuan.getLocateNo(), "locateNo", result);
+        HqlPack.getStringLikerPack(wmsTransQuan.getPartNo(), "partNo", result);
+
+        getStringBuilderPack(wmsTransQuan, result);
+        return result.toString();
+    }
 }