|  |  |  | @ -6,6 +6,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; | 
		
	
		
			
				|  |  |  |  | import cn.estsh.i3plus.pojo.base.enumutil.MesPcnEnumUtil; | 
		
	
		
			
				|  |  |  |  | import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; | 
		
	
		
			
				|  |  |  |  | import cn.estsh.i3plus.pojo.mes.bean.*; | 
		
	
		
			
				|  |  |  |  | import org.springframework.util.CollectionUtils; | 
		
	
		
			
				|  |  |  |  | import org.springframework.util.StringUtils; | 
		
	
		
			
				|  |  |  |  | 
 | 
		
	
		
			
				|  |  |  |  | /** | 
		
	
	
		
			
				
					|  |  |  | @ -177,6 +178,11 @@ public class MesPcnHqlPack { | 
		
	
		
			
				|  |  |  |  |             DdlPreparedPack.getNumEqualPack(mesWorkOrder.getIsValid(), "isValid", packBean); | 
		
	
		
			
				|  |  |  |  |         } | 
		
	
		
			
				|  |  |  |  | 
 | 
		
	
		
			
				|  |  |  |  |         // 工单管理,查询下达,启动,暂停状态
 | 
		
	
		
			
				|  |  |  |  |         if (!CollectionUtils.isEmpty(mesWorkOrder.getStatusList())){ | 
		
	
		
			
				|  |  |  |  |             DdlPreparedPack.getInPackList(mesWorkOrder.getStatusList(), "workOrderStatus", packBean); | 
		
	
		
			
				|  |  |  |  |         } | 
		
	
		
			
				|  |  |  |  | 
 | 
		
	
		
			
				|  |  |  |  |         // 时间段查询
 | 
		
	
		
			
				|  |  |  |  |         if (!StringUtils.isEmpty(mesWorkOrder.getStartTimeStart()) || !StringUtils.isEmpty(mesWorkOrder.getStartTimeEnd())) { | 
		
	
		
			
				|  |  |  |  |             DdlPreparedPack.timeBuilder( | 
		
	
	
		
			
				
					|  |  |  | 
 |