更改模块且新增模块

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

@@ -40,9 +40,9 @@ public class WmsQCDetails extends BaseBean {
     /**
      * 状态:N=正常,C=行取消
      */
-    @Column(name="STATUS")
+    @Column(name="ITEM_STATUS")
     @ApiParam(value = "状态", example = "1")
-    public Integer status;
+    public Integer itemStatus;
 
     @Column(name="REMARK")
     @ApiParam("备注")
@@ -56,6 +56,10 @@ public class WmsQCDetails extends BaseBean {
     @ApiParam(value = "实检数量", example = "0")
     public Double factQty;
 
+    @Column(name="PASS_QTY")
+    @ApiParam(value = "实检数量", example = "0")
+    public Double passQty;
+
     @Column(name="REJECT_QTY")
     @ApiParam(value = "不合格数量", example = "0")
     public Double rejectQty;

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

@@ -36,16 +36,16 @@ public class WmsQCMaster extends BaseBean {
      * 业务类型:IQC=进料检验,IPQC=在线检验,
      * FQC=成品检验,OQC=出货检验
      */
-    @Column(name="TYPE")
+    @Column(name="ORDER_TYPE")
     @ApiParam("业务类型")
-    public String type;
+    public String orderType;
 
     /**
      * 状态:0=新建,5=待处理,10=已完成,90=已关闭,91=已取消
      */
-    @Column(name="STATUS")
+    @Column(name="ORDER_STATUS")
     @ApiParam(value = "状态", example = "0")
-    public Integer status;
+    public Integer orderStatus;
 
     @Column(name="REMARK")
     @ApiParam("备注")
@@ -74,4 +74,10 @@ public class WmsQCMaster extends BaseBean {
     @Column(name="IB_NO")
     @ApiParam("入库单号")
     public String ibNo;
+
+    @ApiParam(value ="客户简称")
+    private transient String custName;
+
+    @ApiParam(value = "供应商简称")
+    private transient String VendorDesc;
 }

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

@@ -39,9 +39,9 @@ public class WmsQCTrans extends BaseBean {
     /**
      * 状态:0=创建,10=已处理
      */
-    @Column(name="STATUS")
+    @Column(name="ITEM_STATUS")
     @ApiParam(value = "状态", example = "0")
-    public Integer status;
+    public Integer itemStatus;
 
     @Column(name="REMARK")
     @ApiParam("备注")
@@ -63,6 +63,10 @@ public class WmsQCTrans extends BaseBean {
     @ApiParam("物料编码")
     public String partNo;
 
+    @Column(name="PART_NAME_RDD")
+    @ApiParam("物料名称")
+    public String partNameRdd;
+
     @Column(name="SN")
     @ApiParam("条码")
     public String sn;

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

@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsQCDetails;
+import cn.estsh.i3plus.pojo.wms.bean.WmsQCMaster;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 质检单明细数据库操作类
+ * @Reference :
+ * @Author : jessica.chen
+ * @CreateDate : 2018-11-18 11:25
+ * @Modify:
+ **/
+@Repository
+public interface WmsQCDetailsRepository extends BaseRepository<WmsQCDetails, Long> {
+}

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

@@ -0,0 +1,18 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsAreaOwner;
+import cn.estsh.i3plus.pojo.wms.bean.WmsQCMaster;
+import org.springframework.stereotype.Repository;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Description : 质检单数据库操作类
+ * @Reference :
+ * @Author : jessica.chen
+ * @CreateDate : 2018-11-18 10:25
+ * @Modify:
+ **/
+@Repository
+public interface WmsQCMasterRepository extends BaseRepository<WmsQCMaster, Long> {
+}

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

@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsQCDetails;
+import cn.estsh.i3plus.pojo.wms.bean.WmsQCTrans;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 质检单操作明细数据库操作类
+ * @Reference :
+ * @Author : jessica.chen
+ * @CreateDate : 2018-11-18 11:25
+ * @Modify:
+ **/
+@Repository
+public interface WmsQCTransRepository extends BaseRepository<WmsQCTrans, Long> {
+}

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

@@ -832,4 +832,58 @@ public class WmsHqlPack {
         getStringBuilderPack(wmsTransQuan, result);
         return result.toString();
     }
+
+    /**
+     * 质检单信息 查询条件封装
+     *
+     * @param wmsQCMaster
+     * @return
+     */
+    public static String packHqlWmsQCMaster(WmsQCMaster wmsQCMaster) {
+        StringBuffer result = new StringBuffer();
+        //单号
+        HqlPack.getStringLikerPack(wmsQCMaster.getOrderNo(), "orderNo", result);
+        //业务类型
+        HqlPack.getStringEqualPack(wmsQCMaster.getOrderType(), "orderType", result);
+        //采购单号
+        HqlPack.getStringLikerPack(wmsQCMaster.getPoNo(), "poNo", result);
+        //ASN单号
+        HqlPack.getStringLikerPack(wmsQCMaster.getAsnNo(), "asnNo", result);
+        //入库单号
+        HqlPack.getStringLikerPack(wmsQCMaster.getIbNo(), "ibNo", result);
+
+        getStringBuilderPack(wmsQCMaster, result);
+        return result.toString();
+    }
+
+    /**
+     * 质检单明细信息 查询条件封装
+     *
+     * @param wmsQCDetails
+     * @return
+     */
+    public static String packHqlWmsQCDetails(WmsQCDetails wmsQCDetails) {
+        StringBuffer result = new StringBuffer();
+        //单号
+        HqlPack.getStringEqualPack(wmsQCDetails.getOrderNo(), "orderNo", result);
+        getStringBuilderPack(wmsQCDetails, result);
+        return result.toString();
+    }
+
+    /**
+     * 质检单操作明细信息 查询条件封装
+     *
+     * @param wmsQCTrans
+     * @return
+     */
+    public static String packHqlWmsQCTrans(WmsQCTrans wmsQCTrans) {
+        StringBuffer result = new StringBuffer();
+        //单号
+        HqlPack.getStringEqualPack(wmsQCTrans.getOrderNo(), "orderNo", result);
+        //行号
+        HqlPack.getStringEqualPack(wmsQCTrans.getItem(), "item", result);
+        getStringBuilderPack(wmsQCTrans, result);
+        return result.toString();
+    }
+
 }