|  |  | @ -30,10 +30,9 @@ import org.springframework.stereotype.Service; | 
			
		
	
		
		
			
				
					
					|  |  |  | import javax.annotation.Resource; |  |  |  | import javax.annotation.Resource; | 
			
		
	
		
		
			
				
					
					|  |  |  | import java.awt.geom.QuadCurve2D; |  |  |  | import java.awt.geom.QuadCurve2D; | 
			
		
	
		
		
			
				
					
					|  |  |  | import java.math.BigDecimal; |  |  |  | import java.math.BigDecimal; | 
			
		
	
		
		
			
				
					
					|  |  |  | import java.util.ArrayList; |  |  |  | import java.text.ParseException; | 
			
				
				
			
		
	
		
		
			
				
					
					|  |  |  | import java.util.Date; |  |  |  | import java.text.SimpleDateFormat; | 
			
				
				
			
		
	
		
		
			
				
					
					|  |  |  | import java.util.List; |  |  |  | import java.util.*; | 
			
				
				
			
		
	
		
		
			
				
					
					|  |  |  | import java.util.Map; |  |  |  |  | 
			
		
	
		
		
	
		
		
	
		
		
	
		
		
			
				
					
					|  |  |  | import java.util.stream.Collectors; |  |  |  | import java.util.stream.Collectors; | 
			
		
	
		
		
			
				
					
					|  |  |  | 
 |  |  |  | 
 | 
			
		
	
		
		
			
				
					
					|  |  |  | @Service |  |  |  | @Service | 
			
		
	
	
		
		
			
				
					|  |  | @ -500,6 +499,7 @@ public class IoPurChangeService { | 
			
		
	
		
		
			
				
					
					|  |  |  |         //对计划单里面的供应商进行分组
 |  |  |  |         //对计划单里面的供应商进行分组
 | 
			
		
	
		
		
			
				
					
					|  |  |  |         Map<String, List<PurOrderDetailEntity>> map = purOrderDetailEntities.stream().collect(Collectors.groupingBy(PurOrderDetailEntity::getSupId)); |  |  |  |         Map<String, List<PurOrderDetailEntity>> map = purOrderDetailEntities.stream().collect(Collectors.groupingBy(PurOrderDetailEntity::getSupId)); | 
			
		
	
		
		
			
				
					
					|  |  |  |         BasicBusTypeChangeEntity basicBusTypeChangeEntity = basicBusTypeChangeService.selectByOriginAction(ConstantStatus.BUS_ORDER_CGDD); |  |  |  |         BasicBusTypeChangeEntity basicBusTypeChangeEntity = basicBusTypeChangeService.selectByOriginAction(ConstantStatus.BUS_ORDER_CGDD); | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |         Integer beforeTime = basicBusTypeChangeEntity.getBeforeTime(); | 
			
		
	
		
		
			
				
					
					|  |  |  |         String billNo = ""; |  |  |  |         String billNo = ""; | 
			
		
	
		
		
			
				
					
					|  |  |  |         if (purOrderEntity.getStatus() == ConstantStatus.APPLY_AUDIT_ED) { |  |  |  |         if (purOrderEntity.getStatus() == ConstantStatus.APPLY_AUDIT_ED) { | 
			
		
	
		
		
			
				
					
					|  |  |  |             for (Map.Entry<String, List<PurOrderDetailEntity>> m : map.entrySet()) { |  |  |  |             for (Map.Entry<String, List<PurOrderDetailEntity>> m : map.entrySet()) { | 
			
		
	
	
		
		
			
				
					|  |  | @ -518,9 +518,24 @@ public class IoPurChangeService { | 
			
		
	
		
		
			
				
					
					|  |  |  |                     ioOrderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK); |  |  |  |                     ioOrderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK); | 
			
		
	
		
		
			
				
					
					|  |  |  |                     ioOrderEntity.setDealStatus(ConstantStatus.ORDER_STATUS_PROCESS); |  |  |  |                     ioOrderEntity.setDealStatus(ConstantStatus.ORDER_STATUS_PROCESS); | 
			
		
	
		
		
			
				
					
					|  |  |  |                 } |  |  |  |                 } | 
			
		
	
		
		
			
				
					
					|  |  |  | 
 |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  |                 ioOrderEntity.setOrderType(1); |  |  |  |                 ioOrderEntity.setOrderType(1); | 
			
		
	
		
		
			
				
					
					|  |  |  |                 ioOrderEntity.setCreateTime(new Date()); |  |  |  | 
 | 
			
				
				
			
		
	
		
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |                 //根据单据设置时间间隔推移
 | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |                 Date currentTime = new Date();//当前日期
 | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |                 Calendar cal =Calendar.getInstance(); | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |                 cal.setTime(currentTime); | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |                 cal.add(Calendar.HOUR_OF_DAY,beforeTime); | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |                 SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");//定义新的日期格式
 | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |                 String dateString = formatter.format(cal.getTime()); | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |                 Date date = null; | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |                 try { | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |                     date = formatter.parse(dateString);//parse():String--->date
 | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |                     System.out.println("转化为date格式:" + date); | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |                 } catch (ParseException e) { | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |                     e.printStackTrace(); | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |                 } | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  | 
 | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |                 ioOrderEntity.setCreateTime(date); | 
			
		
	
		
		
			
				
					
					|  |  |  | //                ioOrderEntity.setCreateUser(postPurOrderRequest.getPurOrderEntity().getAuditUser());
 |  |  |  | //                ioOrderEntity.setCreateUser(postPurOrderRequest.getPurOrderEntity().getAuditUser());
 | 
			
		
	
		
		
			
				
					
					|  |  |  |                 ioOrderEntity.setUpdateTime(new Date()); |  |  |  |                 ioOrderEntity.setUpdateTime(new Date()); | 
			
		
	
		
		
			
				
					
					|  |  |  | //                ioOrderEntity.setUpdateUser(postPurOrderRequest.getPurOrderEntity().getAuditUser());
 |  |  |  | //                ioOrderEntity.setUpdateUser(postPurOrderRequest.getPurOrderEntity().getAuditUser());
 | 
			
		
	
	
		
		
			
				
					|  |  | 
 |