|  |  | @ -1479,11 +1479,11 @@ public class CtqyyClient extends CommonHttpClient { | 
			
		
	
		
		
			
				
					
					|  |  |  |             if (CollUtil.isNotEmpty(ioInfos)) { |  |  |  |             if (CollUtil.isNotEmpty(ioInfos)) { | 
			
		
	
		
		
			
				
					
					|  |  |  |                 //数据处理以thr_order,thr_order_detail 主子返回
 |  |  |  |                 //数据处理以thr_order,thr_order_detail 主子返回
 | 
			
		
	
		
		
			
				
					
					|  |  |  |                 Map<String, List<VYpzsIoInfo>> groupedByPhysicCode = ioInfos.stream() |  |  |  |                 Map<String, List<VYpzsIoInfo>> groupedByPhysicCode = ioInfos.stream() | 
			
		
	
		
		
			
				
					
					|  |  |  |                         .collect(Collectors.groupingBy(VYpzsIoInfo::getPHYSIC_CODE)); |  |  |  |                         .collect(Collectors.groupingBy(VYpzsIoInfo::getRECEIPT_NUMBER)); | 
			
				
				
			
		
	
		
		
	
		
		
			
				
					
					|  |  |  |                 groupedByPhysicCode.forEach((key, value) -> { |  |  |  |                 groupedByPhysicCode.forEach((key, value) -> { | 
			
		
	
		
		
			
				
					
					|  |  |  |                     VYpzsIoInfo info = value.get(0); |  |  |  |                     VYpzsIoInfo info = value.get(0); | 
			
		
	
		
		
			
				
					
					|  |  |  |                     IoCollectOrder collectOrder = new IoCollectOrder(); |  |  |  |                     IoCollectOrder collectOrder = new IoCollectOrder(); | 
			
		
	
		
		
			
				
					
					|  |  |  |                     collectOrder.setBillNo(info.getPHYSIC_CODE()); |  |  |  |                     collectOrder.setBillNo(info.getRECEIPT_NUMBER()); | 
			
				
				
			
		
	
		
		
	
		
		
			
				
					
					|  |  |  |                     collectOrder.setBillTime(DateUtil.parseDate(info.getKEEP_BOOK_TIME())); |  |  |  |                     collectOrder.setBillTime(DateUtil.parseDate(info.getKEEP_BOOK_TIME())); | 
			
		
	
		
		
			
				
					
					|  |  |  |                     collectOrder.setFromCorp(info.getCONSIGNOR()); |  |  |  |                     collectOrder.setFromCorp(info.getCONSIGNOR()); | 
			
		
	
		
		
			
				
					
					|  |  |  |                     collectOrder.setFromCorpName(info.getCONSIGNOR_NAME()); |  |  |  |                     collectOrder.setFromCorpName(info.getCONSIGNOR_NAME()); | 
			
		
	
	
		
		
			
				
					|  |  | @ -1499,7 +1499,7 @@ public class CtqyyClient extends CommonHttpClient { | 
			
		
	
		
		
			
				
					
					|  |  |  |                         detail.setBatchNo(entity.getBATCH_NO()); |  |  |  |                         detail.setBatchNo(entity.getBATCH_NO()); | 
			
		
	
		
		
			
				
					
					|  |  |  |                         detail.setCount(entity.getQUANTITY()); |  |  |  |                         detail.setCount(entity.getQUANTITY()); | 
			
		
	
		
		
			
				
					
					|  |  |  |                         detail.setYbbm(entity.getCOUNTRY_CODE()); |  |  |  |                         detail.setYbbm(entity.getCOUNTRY_CODE()); | 
			
		
	
		
		
			
				
					
					|  |  |  |                         detail.setOrderIdFk(info.getPHYSIC_CODE()); |  |  |  |                         detail.setOrderIdFk(collectOrder.getBillNo()); | 
			
				
				
			
		
	
		
		
	
		
		
			
				
					
					|  |  |  |                         detail.setMeasureUnit(entity.getPACK_UNIT1()); |  |  |  |                         detail.setMeasureUnit(entity.getPACK_UNIT1()); | 
			
		
	
		
		
			
				
					
					|  |  |  |                         detail.setGgxh(entity.getPACK_SPEC() + ":" + entity.getPHYSIC_UNIT()); |  |  |  |                         detail.setGgxh(entity.getPACK_SPEC() + ":" + entity.getPHYSIC_UNIT()); | 
			
		
	
		
		
			
				
					
					|  |  |  |                         detailList.add(detail); |  |  |  |                         detailList.add(detail); | 
			
		
	
	
		
		
			
				
					|  |  | 
 |