| 
					
				 | 
			
			
				@@ -134,6 +134,9 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getCreateBy())){//创建人 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             queryWrapper.like("a.create_by",syPreAssembledPackingListVo.getCreateBy()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getCustomer())){//客户简称 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            queryWrapper.like("a.customer_Abbreviation",syPreAssembledPackingListVo.getCustomerAbbreviation()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getCreateTime())){//创建时间 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             queryWrapper.like("a.create_time",syPreAssembledPackingListVo.getCreateTime()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -841,6 +844,9 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getId())){//查询id 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             queryWrapper.eq("a.id",syPreAssembledPackingListVo.getId()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getCustomer())){//客户简称 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            queryWrapper.like("a.customer_Abbreviation",syPreAssembledPackingListVo.getCustomerAbbreviation()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getOrderNumber())){//订单号 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             queryWrapper.like("a.order_number",syPreAssembledPackingListVo.getOrderNumber()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -937,6 +943,9 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getId())){//查询id 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             queryWrapper.eq("a.id",syPreAssembledPackingListVo.getId()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getCustomer())){//客户简称 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            queryWrapper.like("a.customer_Abbreviation",syPreAssembledPackingListVo.getCustomerAbbreviation()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getOrderNumber())){//订单号 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             queryWrapper.like("a.order_number",syPreAssembledPackingListVo.getOrderNumber()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -1068,6 +1077,9 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getId())){//查询id 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             queryWrapper.eq("a.id",syPreAssembledPackingListVo.getId()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getCustomer())){//客户简称 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            queryWrapper.like("a.customer_Abbreviation",syPreAssembledPackingListVo.getCustomerAbbreviation()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getOrderNumber())){//订单号 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             queryWrapper.like("a.order_number",syPreAssembledPackingListVo.getOrderNumber()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 |