From 8a69224e05ca8be79fa80dd8a32ddf7178012982 Mon Sep 17 00:00:00 2001
From: Silliter <sliter.yuan@estsh.com>
Date: Tue, 23 Apr 2019 18:28:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=85=A5=E5=BA=93=E5=92=8C?=
 =?UTF-8?q?=E8=B4=A8=E6=A3=80=E6=98=8E=E7=BB=86=E5=A4=84=E7=90=86=E4=B8=9A?=
 =?UTF-8?q?=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/pojo/base/tool/DdlPreparedPack.java     | 10 +++++++++
 .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java  | 24 +++++++++++++++++++++-
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java
index 384b1bb..1082439 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java
@@ -242,6 +242,16 @@ public class DdlPreparedPack {
      * @param columnName 列名
      * @param packBean
      */
+    public static void getStringNotNullPack(String columnName, DdlPackBean packBean) {
+        packBean.addColumnQuery(null," and model." + columnName + " is not null", null);
+    }
+
+    /**
+     * 封装String对象成equal语句
+     *
+     * @param columnName 列名
+     * @param packBean
+     */
     public static void getStringEqualPackOr(String val, String columnName, DdlPackBean packBean) {
         if (val != null && val.trim().length() > 0) {
             packBean.addColumnQuery(columnName," or model." + columnName + " = :m_" + columnName, val);
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
index b6a45ce..12cca86 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
@@ -1021,13 +1021,35 @@ public class WmsHqlPack {
         HqlPack.getStringEqualPack(wmsMoveSn.getOrderNo(), "orderNo", result);
         HqlPack.getStringEqualPack(wmsMoveSn.getPartNo(), "partNo", result);
         HqlPack.getStringLikerPack(wmsMoveSn.getPartNameRdd(), "partNameRdd", result);
-
+        HqlPack.getStringEqualPack(wmsMoveSn.getRemark(), "remark", result);
         getStringBuilderPack(wmsMoveSn, result);
 
         return result.toString();
     }
 
     /**
+     * 针对质检查询库存移动条码条件封装
+     * @param sn
+     * @return
+     */
+    public static DdlPackBean packHqlWmsMoveSnForQC(List<String> orderList, String sn, String organizeCode) {
+        DdlPackBean result = new DdlPackBean();
+        DdlPreparedPack.getStringEqualPack(sn, "sn", result);
+        DdlPreparedPack.getInPackList(orderList, "orderNo", result);
+        DdlPreparedPack.getStringNotNullPack("remark", result);
+
+        // 判断工厂代码是否为空
+        if (StringUtils.isNotBlank(organizeCode)) {
+            DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", result);
+        }
+
+        // 封装有效状态和删除状态
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", result);
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
+        return result;
+    }
+
+    /**
      * 质检单信息 查询条件封装
      *
      * @param wmsQCMaster