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