搜索

eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/service/impl/CustomerOrderServiceImpl.java

@@ -111,12 +111,12 @@ public class CustomerOrderServiceImpl implements CustomerOrderService {
 
 
                 if(!StringUtils.isEmpty(criteria.getCustomerOrderCode())){
-                    Predicate customerOrderCodePredicate = criteriaBuilder.equal(root.get("customerOrderCode"), criteria.getCustomerOrderCode());
+                    Predicate customerOrderCodePredicate = criteriaBuilder.like(root.get("customerOrderCode").as(String.class), "%" + criteria.getCustomerOrderCode() + "%");
                     targetPredicateList.add(customerOrderCodePredicate);
                 }
 
                 if(!StringUtils.isEmpty(criteria.getCustomerName())){
-                    Predicate customerNamePredicate = criteriaBuilder.equal(root.get("customerName"), criteria.getCustomerName());
+                    Predicate customerNamePredicate = criteriaBuilder.like(root.get("customerName").as(String.class), "%" + criteria.getCustomerName() + "%");
                     targetPredicateList.add(customerNamePredicate);
                 }
 

eladmin-system/src/main/java/me/zhengjie/modules/wms/invoice/service/dto/InvoiceQueryCriteria.java

@@ -10,4 +10,10 @@ import me.zhengjie.annotation.Query;
 */
 @Data
 public class InvoiceQueryCriteria {
+
+    // 客户订单编号
+    private String customerOrderCode;
+
+    // 客户名称
+    private String customerName;
 }

eladmin-system/src/main/java/me/zhengjie/modules/wms/invoice/service/impl/InvoiceServiceImpl.java

@@ -112,6 +112,17 @@ public class InvoiceServiceImpl implements InvoiceService {
                 Predicate statusPredicate = criteriaBuilder.equal(root.get("status"), 1);
                 targetPredicateList.add(statusPredicate);
 
+
+                if(!me.zhengjie.utils.StringUtils.isEmpty(criteria.getCustomerOrderCode())){
+                    Predicate customerOrderCodePredicate = criteriaBuilder.like(root.get("customerOrderCode").as(String.class), "%" + criteria.getCustomerOrderCode() + "%");
+                    targetPredicateList.add(customerOrderCodePredicate);
+                }
+
+                if(!me.zhengjie.utils.StringUtils.isEmpty(criteria.getCustomerName())){
+                    Predicate customerNamePredicate = criteriaBuilder.like(root.get("customerName").as(String.class),"%" +  criteria.getCustomerName() + "%");
+                    targetPredicateList.add(customerNamePredicate);
+                }
+
                 criteriaQuery.orderBy(criteriaBuilder.desc(root.get("createTime")));
 
                 if(CollectionUtils.isEmpty(targetPredicateList)){

eladmin-system/src/main/java/me/zhengjie/modules/wms/outSourceProductSheet/service/dto/OutSourceProcessSheetQueryCriteria.java

@@ -10,4 +10,13 @@ import me.zhengjie.annotation.Query;
 */
 @Data
 public class OutSourceProcessSheetQueryCriteria {
+
+    // 委外加工单单据编号
+    private String outSourceProcessSheetCode;
+
+    // 委外公司
+    private String outSourceCompanyName;
+
+    // 委外公司负责人
+    private String outSourceAdminName;
 }

eladmin-system/src/main/java/me/zhengjie/modules/wms/outSourceProductSheet/service/impl/OutSourceProcessSheetServiceImpl.java

@@ -100,6 +100,21 @@ public class OutSourceProcessSheetServiceImpl implements OutSourceProcessSheetSe
 
                 criteriaQuery.orderBy(criteriaBuilder.desc(root.get("createTime")));
 
+                if(!me.zhengjie.utils.StringUtils.isEmpty(criteria.getOutSourceAdminName())){
+                    Predicate customerOrderCodePredicate = criteriaBuilder.like(root.get("outSourceProcessSheetCode").as(String.class), "%" + criteria.getOutSourceAdminName() + "%");
+                    targetPredicateList.add(customerOrderCodePredicate);
+                }
+
+                if(!me.zhengjie.utils.StringUtils.isEmpty(criteria.getOutSourceCompanyName())){
+                    Predicate customerOrderCodePredicate = criteriaBuilder.like(root.get("outSourceCompanyName").as(String.class), "%" + criteria.getOutSourceCompanyName() + "%");
+                    targetPredicateList.add(customerOrderCodePredicate);
+                }
+
+                if(!me.zhengjie.utils.StringUtils.isEmpty(criteria.getOutSourceProcessSheetCode())){
+                    Predicate customerOrderCodePredicate = criteriaBuilder.like(root.get("outSourceProcessSheetCode").as(String.class), "%" + criteria.getOutSourceProcessSheetCode() + "%");
+                    targetPredicateList.add(customerOrderCodePredicate);
+                }
+
                 if(CollectionUtils.isEmpty(targetPredicateList)){
                     return null;
                 }else{

eladmin-system/src/main/java/me/zhengjie/modules/wms/purchase/service/dto/ConsumablesPurchaseOrderQueryCriteria.java

@@ -10,4 +10,7 @@ import me.zhengjie.annotation.Query;
 */
 @Data
 public class ConsumablesPurchaseOrderQueryCriteria{
+
+    // 耗材单据编号
+    private String consumablesPurchaseOrderCode;
 }

eladmin-system/src/main/java/me/zhengjie/modules/wms/purchase/service/dto/ProductPurchaseOrderQueryCriteria.java

@@ -10,4 +10,7 @@ import me.zhengjie.annotation.Query;
 */
 @Data
 public class ProductPurchaseOrderQueryCriteria{
+
+    // 采购单据编号
+    private String productPurchaseOrderCode;
 }

eladmin-system/src/main/java/me/zhengjie/modules/wms/purchase/service/impl/ConsumablesPurchaseOrderServiceImpl.java

@@ -94,6 +94,13 @@ public class ConsumablesPurchaseOrderServiceImpl implements ConsumablesPurchaseO
                 Predicate statusPredicate = criteriaBuilder.equal(root.get("status"), 1);
                 targetPredicateList.add(statusPredicate);
 
+
+                if(!me.zhengjie.utils.StringUtils.isEmpty(criteria.getConsumablesPurchaseOrderCode())){
+                    Predicate customerOrderCodePredicate = criteriaBuilder.like(root.get("consumablesPurchaseOrderCode").as(String.class), "%" + criteria.getConsumablesPurchaseOrderCode() + "%");
+                    targetPredicateList.add(customerOrderCodePredicate);
+                }
+
+
                 if(CollectionUtils.isEmpty(targetPredicateList)){
                     return null;
                 }else{

eladmin-system/src/main/java/me/zhengjie/modules/wms/purchase/service/impl/ProductPurchaseOrderServiceImpl.java

@@ -95,6 +95,12 @@ public class ProductPurchaseOrderServiceImpl implements ProductPurchaseOrderServ
                 Predicate statusPredicate = criteriaBuilder.equal(root.get("status"), 1);
                 targetPredicateList.add(statusPredicate);
 
+                if(!me.zhengjie.utils.StringUtils.isEmpty(criteria.getProductPurchaseOrderCode())){
+                    Predicate customerOrderCodePredicate = criteriaBuilder.like(root.get("productPurchaseOrderCode").as(String.class), "%" + criteria.getProductPurchaseOrderCode() + "%");
+                    targetPredicateList.add(customerOrderCodePredicate);
+                }
+
+
                 if(CollectionUtils.isEmpty(targetPredicateList)){
                     return null;
                 }else{

eladmin-system/src/main/java/me/zhengjie/modules/wms/qualityCheckSheet/service/dto/QualityCheckSheetQueryCriteria.java

@@ -10,4 +10,8 @@ import me.zhengjie.annotation.Query;
 */
 @Data
 public class QualityCheckSheetQueryCriteria{
+
+    // 质量检验单单据编号
+    private String qualityCheekSheetCode;
+
 }

eladmin-system/src/main/java/me/zhengjie/modules/wms/qualityCheckSheet/service/impl/QualityCheckSheetServiceImpl.java

@@ -102,6 +102,11 @@ public class QualityCheckSheetServiceImpl implements QualityCheckSheetService {
                 Predicate statusPredicate = criteriaBuilder.equal(root.get("status"), 1);
                 targetPredicateList.add(statusPredicate);
 
+                if(!me.zhengjie.utils.StringUtils.isEmpty(criteria.getQualityCheekSheetCode())){
+                    Predicate customerOrderCodePredicate = criteriaBuilder.like(root.get("qualityCheekSheetCode").as(String.class), "%" + criteria.getQualityCheekSheetCode() + "%");
+                    targetPredicateList.add(customerOrderCodePredicate);
+                }
+
                 criteriaQuery.orderBy(criteriaBuilder.desc(root.get("createTime")));
 
                 if(CollectionUtils.isEmpty(targetPredicateList)){