controller&service合并

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

@@ -94,44 +94,22 @@ public class WmsHqlPack {
     }
 
     /**
-     * 物流路线明细查询条件封装
+     * 物流路线子表查询条件封装
      *
-     * @param wmsRoutingDetail
+     * @param routingCode
      * @return
      */
-    public static String packHqlWmsRoutingDetail(WmsRoutingDetail wmsRoutingDetail) {
+    public static String packHqlWmsRoutingChildren(String routingCode) {
         StringBuffer result = new StringBuffer();
-        HqlPack.getStringLikerPack(wmsRoutingDetail.getRoutingCode(), "routingCode", result);
-        HqlPack.getStringLikerPack(wmsRoutingDetail.getOpStep(), "opStep", result);
-        HqlPack.getNumEqualPack(wmsRoutingDetail.getOkSeq(), "okSeq", result);
-        HqlPack.getNumEqualPack(wmsRoutingDetail.getNgSeq(), "ngSeq", result);
-        HqlPack.getNumEqualPack(wmsRoutingDetail.getSeq(), "seq", result);
-        HqlPack.getNumEqualPack(wmsRoutingDetail.getParentSeq(), "parentSeq", result);
-        HqlPack.timeBuilder(wmsRoutingDetail.getCreateDateTimeStart(), wmsRoutingDetail.getCreateDateTimeEnd(), "createDatetime", result, true);
-        HqlPack.getNumEqualPack(wmsRoutingDetail.getIsValid(), "isValid", result);
-        HqlPack.getStringEqualPack(wmsRoutingDetail.getOrganizeCode(), "organizeCode", result);
-        return result.toString();
-    }
+        HqlPack.getStringLikerPack(routingCode, "routingCode", result);
 
-    /**
-     * 物流路线分配查询条件封装
-     *
-     * @param wmsRoutingAssign
-     * @return
-     */
-    public static String packHqlWmsRoutingAssign(WmsRoutingAssign wmsRoutingAssign) {
-        StringBuffer result = new StringBuffer();
-        HqlPack.getStringLikerPack(wmsRoutingAssign.getWhNo(), "whNo", result);
-        HqlPack.getStringLikerPack(wmsRoutingAssign.getZoneNo(), "zoneNo", result);
-        HqlPack.getStringLikerPack(wmsRoutingAssign.getLocateNo(), "locateNo", result);
-        HqlPack.getStringLikerPack(wmsRoutingAssign.getPartNo(), "partNo", result);
-        HqlPack.getStringLikerPack(wmsRoutingAssign.getVendorNo(), "vendorNo", result);
-        HqlPack.getStringLikerPack(wmsRoutingAssign.getRoutingCode(), "routingCode", result);
-        HqlPack.timeBuilder(wmsRoutingAssign.getCreateDateTimeStart(), wmsRoutingAssign.getCreateDateTimeEnd(), "createDatetime", result, true);
-        HqlPack.getStringEqualPack(wmsRoutingAssign.getOrganizeCode(), "organizeCode", result);
+        HqlPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", result);
+        HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(),
+                "isDeleted", result);
         return result.toString();
     }
 
+
     /**
      * 物流路线主表查询条件封装
      *
@@ -142,10 +120,11 @@ public class WmsHqlPack {
         StringBuffer result = new StringBuffer();
         HqlPack.getStringLikerPack(wmsRoutingMaster.getRoutingCode(), "routingCode", result);
         HqlPack.getStringLikerPack(wmsRoutingMaster.getRoutingName(), "routingName", result);
-        HqlPack.getNumEqualPack(wmsRoutingMaster.getSeq(), "seq", result);
-        HqlPack.timeBuilder(wmsRoutingMaster.getCreateDateTimeStart(), wmsRoutingMaster.getCreateDateTimeEnd(), "createDatetime", result, true);
-        HqlPack.getNumEqualPack(wmsRoutingMaster.getIsValid(), "isValid", result);
+
         HqlPack.getStringEqualPack(wmsRoutingMaster.getOrganizeCode(), "organizeCode", result);
+        HqlPack.getNumEqualPack(wmsRoutingMaster.getIsValid(), "isValid", result);
+        HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(),
+                "isDeleted", result);
         return result.toString();
     }
 
@@ -159,14 +138,13 @@ public class WmsHqlPack {
         StringBuffer result = new StringBuffer();
 
         HqlPack.getStringLikerPack(wmsPart.getPartNo(), "partNo", result);
+        HqlPack.getStringLikerPack(wmsPart.getPartName(), "partName", result);
         HqlPack.timeBuilder(wmsPart.getCreateDateTimeStart(), wmsPart.getCreateDateTimeEnd(), "createDatetime", result, true);
         HqlPack.getStringLikerPack(wmsPart.getPartSpec(), "partSpec", result);
         HqlPack.getStringLikerPack(wmsPart.getPartType(), "partType", result);
-        HqlPack.getStringLikerPack(wmsPart.getAbc(), "abc", result);
-        HqlPack.getNumEqualPack(wmsPart.getIqc(), "iqc", result);
-        HqlPack.getStringLikerPack(wmsPart.getPartGroup(), "partGroup", result);
-        HqlPack.getStringEqualPack(wmsPart.getOrganizeCode(), "organizeCode", result);
 
+        HqlPack.getStringEqualPack(wmsPart.getOrganizeCode(), "organizeCode", result);
+        HqlPack.getNumEqualPack(wmsPart.getIsValid(), "isValid", result);
         HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(),
                 "isDeleted", result);
 
@@ -454,14 +432,18 @@ public class WmsHqlPack {
      */
     public static String packHqlBasCustomer(BasCustomer basCustomer) {
         StringBuffer result = new StringBuffer();
-        //有效性
-        HqlPack.getNumEqualPack(basCustomer.getIsValid(), "isValid", result);
+
         //客户编号
         HqlPack.getStringLikerPack(basCustomer.getCustNo(), "custNo", result);
-        //聯係人
-        HqlPack.getStringLikerPack(basCustomer.getCustOwner(), "custOwner", result);
-        //電話號碼
-        HqlPack.getStringLikerPack(basCustomer.getCustTel(), "custTel", result);
+        //客户简称
+        HqlPack.getStringLikerPack(basCustomer.getCustName(), "custName", result);
+        //客户全称
+        HqlPack.getStringLikerPack(basCustomer.getCustDesc(), "custDesc", result);
+
+        HqlPack.getStringEqualPack(basCustomer.getOrganizeCode(), "organizeCode", result);
+        HqlPack.getNumEqualPack(basCustomer.getIsValid(), "isValid", result);
+        HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(),
+                "isDeleted", result);
         return result.toString();
     }