Merge remote-tracking branch 'origin/master'

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

@@ -1,9 +1,11 @@
 package cn.estsh.i3plus.pojo.wms.sqlpack;
 
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.HqlPack;
 import cn.estsh.i3plus.pojo.wms.bean.*;
+import org.apache.commons.lang3.StringUtils;
 
 /**
  * @Description : 仓库管理对象封装
@@ -13,6 +15,28 @@ import cn.estsh.i3plus.pojo.wms.bean.*;
  * @Modify:
  **/
 public class WmsHqlPack {
+
+    /**
+     * 封装公用查询参数
+     * @param bean 实体对象
+     * @param hqlStr 查询语句
+     * @return 封装完成的查询语句
+     */
+    public static String getStringBuilderPack(BaseBean bean, StringBuffer hqlStr) {
+
+        if (hqlStr != null && hqlStr.toString().trim().length() > 0) {
+            if (StringUtils.isNotBlank(bean.getOrganizeCode())) {
+                hqlStr.append(" and model.organizeCode = " + bean.getOrganizeCode());
+            } else if (bean.getIsValid() > 0) {
+                hqlStr.append(" and model.isValid = " + bean.getIsValid());
+            }
+
+            hqlStr.append(" and model.isDeleted = " + CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue());
+        }
+
+        return hqlStr.toString();
+    }
+
     /**
      * PO订单明细表 分页查询
      *
@@ -91,8 +115,10 @@ public class WmsHqlPack {
         HqlPack.getNumEqualPack(wmsPOMaster.getPoStatus(), "poStatus", result);
         HqlPack.getStringLikerPack(wmsPOMaster.getVendorNo(), "vendorNo", result);
         HqlPack.getStringLikerPack(wmsPOMaster.getSrc(), "src", result);
-        HqlPack.getNumEqualPack(wmsPOMaster.getIsValid(), "isValid", result);
-        HqlPack.getNumEqualPack(wmsPOMaster.getIsDeleted(), "isDeleted", result);
+//        HqlPack.getNumEqualPack(wmsPOMaster.getIsValid(), "isValid", result);
+//        HqlPack.getNumEqualPack(wmsPOMaster.getIsDeleted(), "isDeleted", result);
+
+        getStringBuilderPack(wmsPOMaster, result);
 
         return result.toString();
     }
@@ -168,6 +194,8 @@ public class WmsHqlPack {
         HqlPack.getStringLikerPack(wmsIbCheckPlan.getPartNo(), "partNo", result);
         HqlPack.getStringLikerPack(wmsIbCheckPlan.getPartNameRdd(), "partNameRdd", result);
         HqlPack.getNumEqualPack(wmsIbCheckPlan.getIsValid(), "isValid", result);
+        HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
+        HqlPack.getStringEqualPack(wmsIbCheckPlan.getOrganizeCode(),"organizeCode",result);
 
         return result.toString();
     }
@@ -186,6 +214,8 @@ public class WmsHqlPack {
         HqlPack.getStringLikerPack(wmsLocatePart.getPartNo(), "partNo", result);
         HqlPack.getStringLikerPack(wmsLocatePart.getPartName(), "partName", result);
         HqlPack.getNumEqualPack(wmsLocatePart.getIsValid(), "isValid", result);
+        HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
+        HqlPack.getStringEqualPack(wmsLocatePart.getOrganizeCode(),"organizeCode",result);
 
         return result.toString();
     }
@@ -206,6 +236,8 @@ public class WmsHqlPack {
         HqlPack.getStringLikerPack(wmsLocate.getWhNo(), "whNo", result);
         HqlPack.getStringLikerPack(wmsLocate.getZoneNo(), "zoneNo", result);
         HqlPack.getNumEqualPack(wmsLocate.getIsValid(), "isValid", result);
+        HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
+        HqlPack.getStringEqualPack(wmsLocate.getOrganizeCode(),"organizeCode",result);
 
         return result.toString();
     }
@@ -290,7 +322,9 @@ public class WmsHqlPack {
         HqlPack.getStringLikerPack(wmsTransType.getProgCode(), "progCode", result);
         HqlPack.getStringLikerPack(wmsTransType.getOrganizeCode(), "organizeCode", result);
         HqlPack.getNumEqualPack(wmsTransType.getIsValid(), "isValid", result);
-        HqlPack.getNumEqualPack(wmsTransType.getIsDeleted(), "isDeleted", result);
+        HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
+        HqlPack.getStringEqualPack(wmsTransType.getOrganizeCode(),"organizeCode",result);
+
         return result.toString();
     }
 
@@ -307,6 +341,9 @@ public class WmsHqlPack {
         HqlPack.getStringEqualPack(wmsTrans.getTransCode(), "transCode", result);
         HqlPack.getStringEqualPack(wmsTrans.getSn(), "sn", result);
         HqlPack.timeBuilder(wmsTrans.getCreateDatetime(), null, "createDatetime", result, true);
+        HqlPack.getNumEqualPack(wmsTrans.getIsValid(), "isValid", result);
+        HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
+
         return result.toString();
     }