|  |  | @ -15,6 +15,7 @@ import com.glxp.sale.admin.entity.thrsys.ThrProductsEntity; | 
			
		
	
		
		
			
				
					
					|  |  |  | import com.glxp.sale.admin.req.basic.CombineRequest; |  |  |  | import com.glxp.sale.admin.req.basic.CombineRequest; | 
			
		
	
		
		
			
				
					
					|  |  |  | import com.glxp.sale.admin.req.basic.RemoveRelRequest; |  |  |  | import com.glxp.sale.admin.req.basic.RemoveRelRequest; | 
			
		
	
		
		
			
				
					
					|  |  |  | import com.glxp.sale.admin.req.basic.UdiInfoRequest; |  |  |  | import com.glxp.sale.admin.req.basic.UdiInfoRequest; | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  | import com.glxp.sale.admin.req.basic.UdiRelevanceRequest; | 
			
		
	
		
		
			
				
					
					|  |  |  | import com.glxp.sale.admin.req.receipt.ProductInfoFilterRequest; |  |  |  | import com.glxp.sale.admin.req.receipt.ProductInfoFilterRequest; | 
			
		
	
		
		
			
				
					
					|  |  |  | import com.glxp.sale.admin.req.thrsys.FilterThrProductsRequest; |  |  |  | import com.glxp.sale.admin.req.thrsys.FilterThrProductsRequest; | 
			
		
	
		
		
			
				
					
					|  |  |  | import com.glxp.sale.admin.res.PageSimpleResponse; |  |  |  | import com.glxp.sale.admin.res.PageSimpleResponse; | 
			
		
	
	
		
		
			
				
					|  |  | @ -163,7 +164,9 @@ public class UdiContrastController { | 
			
		
	
		
		
			
				
					
					|  |  |  |         String time = DateUtil.formatDateTime(new Date()); |  |  |  |         String time = DateUtil.formatDateTime(new Date()); | 
			
		
	
		
		
			
				
					
					|  |  |  |         udiRelevanceEntity.setUpdateTime(time); |  |  |  |         udiRelevanceEntity.setUpdateTime(time); | 
			
		
	
		
		
			
				
					
					|  |  |  |         udiRelevanceEntity.setModifyTime(time); |  |  |  |         udiRelevanceEntity.setModifyTime(time); | 
			
		
	
		
		
			
				
					
					|  |  |  |         udiRelevanceService.updateUdiRelevance(udiRelevanceEntity); |  |  |  |         UdiRelevanceRequest udiRelevanceRequest=new UdiRelevanceRequest(); | 
			
				
				
			
		
	
		
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |         BeanUtils.copyProperties(udiRelevanceEntity,udiRelevanceRequest); | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |         udiRelevanceService.updateUdiRelevance(udiRelevanceRequest); | 
			
		
	
		
		
			
				
					
					|  |  |  |         return ResultVOUtils.success("切换成功!"); |  |  |  |         return ResultVOUtils.success("切换成功!"); | 
			
		
	
		
		
			
				
					
					|  |  |  |     } |  |  |  |     } | 
			
		
	
		
		
			
				
					
					|  |  |  | 
 |  |  |  | 
 | 
			
		
	
	
		
		
			
				
					|  |  | @ -189,7 +192,9 @@ public class UdiContrastController { | 
			
		
	
		
		
			
				
					
					|  |  |  |             return ResultVOUtils.error(500, "已存在相同的对照关系,对照失败!"); |  |  |  |             return ResultVOUtils.error(500, "已存在相同的对照关系,对照失败!"); | 
			
		
	
		
		
			
				
					
					|  |  |  |         } else { |  |  |  |         } else { | 
			
		
	
		
		
			
				
					
					|  |  |  |             try { |  |  |  |             try { | 
			
		
	
		
		
			
				
					
					|  |  |  |                 udiRelevanceService.updateUdiRelevance(udiRelevanceEntity); |  |  |  |                 UdiRelevanceRequest udiRelevanceRequest=new UdiRelevanceRequest(); | 
			
				
				
			
		
	
		
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |                 BeanUtils.copyProperties(udiRelevanceEntity,udiRelevanceRequest); | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |                 udiRelevanceService.updateUdiRelevance(udiRelevanceRequest); | 
			
		
	
		
		
			
				
					
					|  |  |  |             } catch (Exception e) { |  |  |  |             } catch (Exception e) { | 
			
		
	
		
		
			
				
					
					|  |  |  |                 return ResultVOUtils.error(500, "已存在相同的对照关系,对照失败!"); |  |  |  |                 return ResultVOUtils.error(500, "已存在相同的对照关系,对照失败!"); | 
			
		
	
		
		
			
				
					
					|  |  |  |             } |  |  |  |             } | 
			
		
	
	
		
		
			
				
					|  |  | @ -241,7 +246,9 @@ public class UdiContrastController { | 
			
		
	
		
		
			
				
					
					|  |  |  |             udiRelevanceEntity.setPrice(""); |  |  |  |             udiRelevanceEntity.setPrice(""); | 
			
		
	
		
		
			
				
					
					|  |  |  |             udiRelevanceEntity.setManufactory(""); |  |  |  |             udiRelevanceEntity.setManufactory(""); | 
			
		
	
		
		
			
				
					
					|  |  |  |             udiRelevanceEntity.setMeasname(""); |  |  |  |             udiRelevanceEntity.setMeasname(""); | 
			
		
	
		
		
			
				
					
					|  |  |  |             udiRelevanceService.updateUdiRelevance(udiRelevanceEntity); |  |  |  |             UdiRelevanceRequest udiRelevanceRequest=new UdiRelevanceRequest(); | 
			
				
				
			
		
	
		
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |             BeanUtils.copyProperties(udiRelevanceEntity,udiRelevanceRequest); | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |             udiRelevanceService.updateUdiRelevance(udiRelevanceRequest); | 
			
		
	
		
		
			
				
					
					|  |  |  |         } catch (Exception e) { |  |  |  |         } catch (Exception e) { | 
			
		
	
		
		
			
				
					
					|  |  |  |             e.printStackTrace(); |  |  |  |             e.printStackTrace(); | 
			
		
	
		
		
			
				
					
					|  |  |  |             return ResultVOUtils.error(500, "解除绑定失败!"); |  |  |  |             return ResultVOUtils.error(500, "解除绑定失败!"); | 
			
		
	
	
		
		
			
				
					|  |  | @ -367,7 +374,9 @@ public class UdiContrastController { | 
			
		
	
		
		
			
				
					
					|  |  |  |         String time = DateUtil.getDateTime(); |  |  |  |         String time = DateUtil.getDateTime(); | 
			
		
	
		
		
			
				
					
					|  |  |  |         udiRelevanceEntity.setUpdateTime(time); |  |  |  |         udiRelevanceEntity.setUpdateTime(time); | 
			
		
	
		
		
			
				
					
					|  |  |  |         udiRelevanceEntity.setModifyTime(time); |  |  |  |         udiRelevanceEntity.setModifyTime(time); | 
			
		
	
		
		
			
				
					
					|  |  |  |         udiRelevanceService.updateUdiRelevance(udiRelevanceEntity); |  |  |  |         UdiRelevanceRequest udiRelevanceRequest=new UdiRelevanceRequest(); | 
			
				
				
			
		
	
		
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |         BeanUtils.copyProperties(udiRelevanceEntity,udiRelevanceRequest); | 
			
		
	
		
		
			
				
					
					|  |  |  |  |  |  |  |         udiRelevanceService.updateUdiRelevance(udiRelevanceRequest); | 
			
		
	
		
		
			
				
					
					|  |  |  |         insertUdiInfos(udiInfoEntities); |  |  |  |         insertUdiInfos(udiInfoEntities); | 
			
		
	
		
		
			
				
					
					|  |  |  |     } |  |  |  |     } | 
			
		
	
		
		
			
				
					
					|  |  |  | 
 |  |  |  | 
 | 
			
		
	
	
		
		
			
				
					|  |  | 
 |