|  |  | @ -1756,13 +1756,13 @@ public class WmsHqlPack { | 
			
		
	
		
		
			
				
					
					|  |  |  |      * @param groupDataAuth |  |  |  |      * @param groupDataAuth | 
			
		
	
		
		
			
				
					
					|  |  |  |      * @return |  |  |  |      * @return | 
			
		
	
		
		
			
				
					
					|  |  |  |      */ |  |  |  |      */ | 
			
		
	
		
		
			
				
					
					|  |  |  |     public static DdlPackBean packHqlWmsTaskDetail(Map<String, List<WmsDataAuth>> groupDataAuth, String refSrc, String organizeCode) { |  |  |  |     /*public static DdlPackBean packHqlWmsTaskDetail(Map<String, List<WmsDataAuth>> groupDataAuth, String refSrc, String organizeCode) { | 
			
				
				
			
		
	
		
		
	
		
		
			
				
					
					|  |  |  |         DdlPackBean result = new DdlPackBean(); |  |  |  |         DdlPackBean result = new DdlPackBean(); | 
			
		
	
		
		
			
				
					
					|  |  |  |         Set<Map.Entry<String, List<WmsDataAuth>>> entries = groupDataAuth.entrySet(); |  |  |  |         Set<Map.Entry<String, List<WmsDataAuth>>> entries = groupDataAuth.entrySet(); | 
			
		
	
		
		
			
				
					
					|  |  |  |         //拼sql
 |  |  |  |         //拼sql
 | 
			
		
	
		
		
			
				
					
					|  |  |  |         entries.stream().filter(o -> !Strings.isNullOrEmpty(o.getKey())); |  |  |  |         entries.stream().filter(o -> !Strings.isNullOrEmpty(o.getKey())); | 
			
		
	
		
		
			
				
					
					|  |  |  | 
 |  |  |  | 
 | 
			
		
	
		
		
			
				
					
					|  |  |  |         /*for (Map.Entry<String, List<WmsDataAuth>> map : entries) { |  |  |  |         *//*for (Map.Entry<String, List<WmsDataAuth>> map : entries) {
 | 
			
				
				
			
		
	
		
		
	
		
		
			
				
					
					|  |  |  | 
 |  |  |  | 
 | 
			
		
	
		
		
			
				
					
					|  |  |  |             String key = map.getKey(); |  |  |  |             String key = map.getKey(); | 
			
		
	
		
		
			
				
					
					|  |  |  |             List<WmsDataAuth> valueList = map.getValue(); |  |  |  |             List<WmsDataAuth> valueList = map.getValue(); | 
			
		
	
	
		
		
			
				
					|  |  | @ -1785,22 +1785,24 @@ public class WmsHqlPack { | 
			
		
	
		
		
			
				
					
					|  |  |  |                     packMutilConditionHql(mapList, "PART_NO", "partNo", result); |  |  |  |                     packMutilConditionHql(mapList, "PART_NO", "partNo", result); | 
			
		
	
		
		
			
				
					
					|  |  |  |                 } |  |  |  |                 } | 
			
		
	
		
		
			
				
					
					|  |  |  |             } |  |  |  |             } | 
			
		
	
		
		
			
				
					
					|  |  |  |         }*/ |  |  |  |         }*//*
 | 
			
				
				
			
		
	
		
		
	
		
		
			
				
					
					|  |  |  | 
 |  |  |  | 
 | 
			
		
	
		
		
			
				
					
					|  |  |  |         //转换封装后的hql
 |  |  |  |         //转换封装后的hql
 | 
			
		
	
		
		
			
				
					
					|  |  |  |         /*String packedHql = result.getPackedHql(); |  |  |  |         *//*String packedHql = result.getPackedHql();
 | 
			
				
				
			
		
	
		
		
	
		
		
			
				
					
					|  |  |  |         if(packedHql.startsWith(" or")){ |  |  |  |         if(packedHql.startsWith(" or")){ | 
			
		
	
		
		
			
				
					
					|  |  |  |             packedHql = " and (" + packedHql.substring(3,packedHql.length()) + ") "; |  |  |  |             packedHql = " and (" + packedHql.substring(3,packedHql.length()) + ") "; | 
			
		
	
		
		
			
				
					
					|  |  |  |             System.out.println(packedHql); |  |  |  |             System.out.println(packedHql); | 
			
		
	
		
		
			
				
					
					|  |  |  |         } |  |  |  |         } | 
			
		
	
		
		
			
				
					
					|  |  |  | 
 |  |  |  | 
 | 
			
		
	
		
		
			
				
					
					|  |  |  |         result.setWhereAppend(packedHql);*/ |  |  |  |         result.setWhereAppend(packedHql);*//*
 | 
			
				
				
			
		
	
		
		
	
		
		
			
				
					
					|  |  |  |         // 通用数据拼接
 |  |  |  |         // 通用数据拼接
 | 
			
		
	
		
		
			
				
					
					|  |  |  |         WmsDataAuth wmsDataAuth = new WmsDataAuth(); |  |  |  |         WmsDataAuth wmsDataAuth = new WmsDataAuth(); | 
			
		
	
		
		
			
				
					
					|  |  |  |         wmsDataAuth.setOrganizeCode(organizeCode); |  |  |  |         wmsDataAuth.setOrganizeCode(organizeCode); | 
			
		
	
		
		
			
				
					
					|  |  |  |         getStringBuilderPack(wmsDataAuth, result); |  |  |  |         getStringBuilderPack(wmsDataAuth, result); | 
			
		
	
		
		
			
				
					
					|  |  |  |         return result; |  |  |  |         return result; | 
			
		
	
		
		
			
				
					
					|  |  |  |     } |  |  |  |     }*/ | 
			
				
				
			
		
	
		
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  | 
 | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  | 
 | 
			
		
	
		
		
			
				
					
					|  |  |  | 
 |  |  |  | 
 | 
			
		
	
		
		
			
				
					
					|  |  |  |     /** |  |  |  |     /** | 
			
		
	
		
		
			
				
					
					|  |  |  |      * 把 List<Map> 中的一组数据重新封装到List<String>中 |  |  |  |      * 把 List<Map> 中的一组数据重新封装到List<String>中 | 
			
		
	
	
		
		
			
				
					|  |  | @ -1845,7 +1847,7 @@ public class WmsHqlPack { | 
			
		
	
		
		
			
				
					
					|  |  |  |      * @param orderList |  |  |  |      * @param orderList | 
			
		
	
		
		
			
				
					
					|  |  |  |      * @return |  |  |  |      * @return | 
			
		
	
		
		
			
				
					
					|  |  |  |      */ |  |  |  |      */ | 
			
		
	
		
		
			
				
					
					|  |  |  |     public static DdlPackBean packHqlAndIn(WmsTaskInfo bean, String columnName, List<String> orderList, Map<String, List<WmsDataAuth>> groupDataAuth) { |  |  |  |     /*public static DdlPackBean packHqlAndIn(WmsTaskInfo bean, String columnName, List<String> orderList, Map<String, List<WmsDataAuth>> groupDataAuth) { | 
			
				
				
			
		
	
		
		
	
		
		
			
				
					
					|  |  |  |         DdlPackBean packBean = new DdlPackBean(); |  |  |  |         DdlPackBean packBean = new DdlPackBean(); | 
			
		
	
		
		
			
				
					
					|  |  |  |         Set<Map.Entry<String, List<WmsDataAuth>>> entries = groupDataAuth.entrySet(); |  |  |  |         Set<Map.Entry<String, List<WmsDataAuth>>> entries = groupDataAuth.entrySet(); | 
			
		
	
		
		
			
				
					
					|  |  |  |         //拼sql
 |  |  |  |         //拼sql
 | 
			
		
	
	
		
		
			
				
					|  |  | @ -1865,13 +1867,13 @@ public class WmsHqlPack { | 
			
		
	
		
		
			
				
					
					|  |  |  |             } |  |  |  |             } | 
			
		
	
		
		
			
				
					
					|  |  |  |         } |  |  |  |         } | 
			
		
	
		
		
			
				
					
					|  |  |  |         //转换封装后的hql
 |  |  |  |         //转换封装后的hql
 | 
			
		
	
		
		
			
				
					
					|  |  |  |         /*String packedHql = packBean.getPackedHql(); |  |  |  |         *//*String packedHql = packBean.getPackedHql();
 | 
			
				
				
			
		
	
		
		
	
		
		
			
				
					
					|  |  |  |         if(packedHql.startsWith(" or")){ |  |  |  |         if(packedHql.startsWith(" or")){ | 
			
		
	
		
		
			
				
					
					|  |  |  |             packedHql = " and (" + packedHql.substring(3,packedHql.length()) + ") "; |  |  |  |             packedHql = " and (" + packedHql.substring(3,packedHql.length()) + ") "; | 
			
		
	
		
		
			
				
					
					|  |  |  |             System.out.println(packedHql); |  |  |  |             System.out.println(packedHql); | 
			
		
	
		
		
			
				
					
					|  |  |  |         } |  |  |  |         } | 
			
		
	
		
		
			
				
					
					|  |  |  | 
 |  |  |  | 
 | 
			
		
	
		
		
			
				
					
					|  |  |  |         packBean.setWhereAppend(packedHql);*/ |  |  |  |         packBean.setWhereAppend(packedHql);*//*
 | 
			
				
				
			
		
	
		
		
	
		
		
			
				
					
					|  |  |  |         DdlPreparedPack.getInPackList(orderList, columnName, packBean); |  |  |  |         DdlPreparedPack.getInPackList(orderList, columnName, packBean); | 
			
		
	
		
		
			
				
					
					|  |  |  |         DdlPreparedPack.getStringRightLikerPack(bean.getOrderNo(), "orderNo", packBean); |  |  |  |         DdlPreparedPack.getStringRightLikerPack(bean.getOrderNo(), "orderNo", packBean); | 
			
		
	
		
		
			
				
					
					|  |  |  |         DdlPreparedPack.getNumNOEqualPack(bean.getTaskStatus(), "taskStatus", packBean); |  |  |  |         DdlPreparedPack.getNumNOEqualPack(bean.getTaskStatus(), "taskStatus", packBean); | 
			
		
	
	
		
		
			
				
					|  |  | @ -1880,7 +1882,7 @@ public class WmsHqlPack { | 
			
		
	
		
		
			
				
					
					|  |  |  | 
 |  |  |  | 
 | 
			
		
	
		
		
			
				
					
					|  |  |  |         DdlPreparedPack.getOrderByPack(new Object[]{2}, new String[]{"createDatetime"}, packBean); |  |  |  |         DdlPreparedPack.getOrderByPack(new Object[]{2}, new String[]{"createDatetime"}, packBean); | 
			
		
	
		
		
			
				
					
					|  |  |  |         return packBean; |  |  |  |         return packBean; | 
			
		
	
		
		
			
				
					
					|  |  |  |     } |  |  |  |     }*/ | 
			
				
				
			
		
	
		
		
	
		
		
			
				
					
					|  |  |  | 
 |  |  |  | 
 | 
			
		
	
		
		
			
				
					
					|  |  |  |     /** |  |  |  |     /** | 
			
		
	
		
		
			
				
					
					|  |  |  |      * 根据条件查询dataAuth |  |  |  |      * 根据条件查询dataAuth | 
			
		
	
	
		
		
			
				
					|  |  | 
 |