|  |  | @ -79,14 +79,6 @@ public class UdiRelevanceService extends ServiceImpl<UdiRelevanceDao, UdiRelevan | 
			
		
	
		
		
			
				
					
					|  |  |  |         return data; |  |  |  |         return data; | 
			
		
	
		
		
			
				
					
					|  |  |  |     } |  |  |  |     } | 
			
		
	
		
		
			
				
					
					|  |  |  | 
 |  |  |  | 
 | 
			
		
	
		
		
			
				
					
					|  |  |  | 
 |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  |     public List<UdiRelevanceEntity> filterUdiEntity(FilterUdiRelRequest filterUdiRelRequest) { |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  | 
 |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  |         List<UdiRelevanceEntity> data = udiRelevanceDao.filterEntity(filterUdiRelRequest); |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  |         return data; |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  |     } |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  | 
 |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  | 
 |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  |     public List<UdiRelevanceResponse> selectAllByNameCode(String nameCode) { |  |  |  |     public List<UdiRelevanceResponse> selectAllByNameCode(String nameCode) { | 
			
		
	
		
		
			
				
					
					|  |  |  |         FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest(); |  |  |  |         FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest(); | 
			
		
	
		
		
			
				
					
					|  |  |  |         filterUdiRelRequest.setUniqueNameCode(nameCode); |  |  |  |         filterUdiRelRequest.setUniqueNameCode(nameCode); | 
			
		
	
	
		
		
			
				
					|  |  | @ -178,12 +170,6 @@ public class UdiRelevanceService extends ServiceImpl<UdiRelevanceDao, UdiRelevan | 
			
		
	
		
		
			
				
					
					|  |  |  |         if (CollUtil.isNotEmpty(udiRelevanceResponses)) { |  |  |  |         if (CollUtil.isNotEmpty(udiRelevanceResponses)) { | 
			
		
	
		
		
			
				
					
					|  |  |  |             return udiRelevanceResponses.get(0); |  |  |  |             return udiRelevanceResponses.get(0); | 
			
		
	
		
		
			
				
					
					|  |  |  |         } |  |  |  |         } | 
			
		
	
		
		
			
				
					
					|  |  |  | //        if (udiRelevanceResponses.size() == 1) {
 |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  | //            UdiRelevanceResponse udiRelevanceResponse = udiRelevanceResponses.get(0);
 |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  | //            if (udiRelevanceResponse == null || udiRelevanceResponse.getProductType() == ConstantStatus.PRODUCT_TYPE_THIRD) {
 |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  | //                return selectByMainId(nameCode);
 |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  | //            }
 |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  | //        }
 |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  |         return null; |  |  |  |         return null; | 
			
		
	
		
		
			
				
					
					|  |  |  | 
 |  |  |  | 
 | 
			
		
	
		
		
			
				
					
					|  |  |  | 
 |  |  |  | 
 | 
			
		
	
	
		
		
			
				
					|  |  | @ -216,15 +202,6 @@ public class UdiRelevanceService extends ServiceImpl<UdiRelevanceDao, UdiRelevan | 
			
		
	
		
		
			
				
					
					|  |  |  |     } |  |  |  |     } | 
			
		
	
		
		
			
				
					
					|  |  |  | 
 |  |  |  | 
 | 
			
		
	
		
		
			
				
					
					|  |  |  | 
 |  |  |  | 
 | 
			
		
	
		
		
			
				
					
					|  |  |  |     public boolean isExitByUuid(String uuid) { |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  |         List<UdiRelevanceEntity> udiRelevanceEntities = udiRelevanceDao.selectByUuid(uuid); |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  |         if (udiRelevanceEntities != null && !udiRelevanceEntities.isEmpty()) { |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  |             return true; |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  |         } |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  |         return false; |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  |     } |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  | 
 |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  | 
 |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  |     public List<UdiRelevanceEntity> batchSelectByUuid(List<String> uuids) { |  |  |  |     public List<UdiRelevanceEntity> batchSelectByUuid(List<String> uuids) { | 
			
		
	
		
		
			
				
					
					|  |  |  |         return udiRelevanceDao.batchSelectByUuid(uuids); |  |  |  |         return udiRelevanceDao.batchSelectByUuid(uuids); | 
			
		
	
		
		
			
				
					
					|  |  |  |     } |  |  |  |     } | 
			
		
	
	
		
		
			
				
					|  |  | @ -309,17 +286,6 @@ public class UdiRelevanceService extends ServiceImpl<UdiRelevanceDao, UdiRelevan | 
			
		
	
		
		
			
				
					
					|  |  |  |         return null; |  |  |  |         return null; | 
			
		
	
		
		
			
				
					
					|  |  |  |     } |  |  |  |     } | 
			
		
	
		
		
			
				
					
					|  |  |  | 
 |  |  |  | 
 | 
			
		
	
		
		
			
				
					
					|  |  |  | 
 |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  |     public UdiRelevanceEntity selectByMainIdLimitOne(String mainId) { |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  | 
 |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  |         if (mainId == null) |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  |             return null; |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  |         FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest(); |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  |         filterUdiRelRequest.setMainId(mainId); |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  |         return udiRelevanceDao.selectByThirdId(filterUdiRelRequest); |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  |     } |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  | 
 |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  | 
 |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  |     public List<UdiRelevanceResponse> selectByMainId(String mainId) { |  |  |  |     public List<UdiRelevanceResponse> selectByMainId(String mainId) { | 
			
		
	
		
		
			
				
					
					|  |  |  |         FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest(); |  |  |  |         FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest(); | 
			
		
	
		
		
			
				
					
					|  |  |  |         filterUdiRelRequest.setMainId(mainId); |  |  |  |         filterUdiRelRequest.setMainId(mainId); | 
			
		
	
	
		
		
			
				
					|  |  | @ -409,14 +375,7 @@ public class UdiRelevanceService extends ServiceImpl<UdiRelevanceDao, UdiRelevan | 
			
		
	
		
		
			
				
					
					|  |  |  |     public UdiRelevanceEntity insertDefaultLevel(UdiRelevanceEntity udiRelevanceEntity, UdiProductEntity udiProductEntity) { |  |  |  |     public UdiRelevanceEntity insertDefaultLevel(UdiRelevanceEntity udiRelevanceEntity, UdiProductEntity udiProductEntity) { | 
			
		
	
		
		
			
				
					
					|  |  |  |         if (udiProductEntity != null) { |  |  |  |         if (udiProductEntity != null) { | 
			
		
	
		
		
			
				
					
					|  |  |  |             udiRelevanceEntity.setDistributeLevel(1); |  |  |  |             udiRelevanceEntity.setDistributeLevel(1); | 
			
		
	
		
		
			
				
					
					|  |  |  | //            udiRelevanceEntity.setDistributeLevelDi(udiProductEntity.getNameCode());
 |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  | //            udiRelevanceEntity.setDistributeLevelUnit(udiProductEntity.getPackUnit());
 |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  | //            udiRelevanceEntity.setDistributeLevelCount(IntUtil.value(udiProductEntity.getBhxjsl()));
 |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  | 
 |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  |             udiRelevanceEntity.setUseLevel(0); |  |  |  |             udiRelevanceEntity.setUseLevel(0); | 
			
		
	
		
		
			
				
					
					|  |  |  | //            udiRelevanceEntity.setUseLevelDi(udiProductEntity.getNameCode());
 |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  | //            udiRelevanceEntity.setUseLevelUnit(udiProductEntity.getPackUnit());
 |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  | //            udiRelevanceEntity.setUseLeverCount(IntUtil.value(udiProductEntity.getBhxjsl()));
 |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  |         } |  |  |  |         } | 
			
		
	
		
		
			
				
					
					|  |  |  | 
 |  |  |  | 
 | 
			
		
	
		
		
			
				
					
					|  |  |  |         return udiRelevanceEntity; |  |  |  |         return udiRelevanceEntity; | 
			
		
	
	
		
		
			
				
					|  |  | @ -434,11 +393,6 @@ public class UdiRelevanceService extends ServiceImpl<UdiRelevanceDao, UdiRelevan | 
			
		
	
		
		
			
				
					
					|  |  |  |         return null; |  |  |  |         return null; | 
			
		
	
		
		
			
				
					
					|  |  |  |     } |  |  |  |     } | 
			
		
	
		
		
			
				
					
					|  |  |  | 
 |  |  |  | 
 | 
			
		
	
		
		
			
				
					
					|  |  |  |     public boolean insertUdiRelevanceignore(UdiRelevanceEntity udiRelevanceEntity) { |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  |         return udiRelevanceDao.insertUdiRelevanceignore(udiRelevanceEntity); |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  |     } |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  | 
 |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  | 
 |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  |     public boolean updateUdiRelevance(UdiRelevanceEntity udiRelevanceEntity) { |  |  |  |     public boolean updateUdiRelevance(UdiRelevanceEntity udiRelevanceEntity) { | 
			
		
	
		
		
			
				
					
					|  |  |  |         ThrSystemEntity basicThirdSysEntity = basicThirdSysService.selectMainThrSys(); |  |  |  |         ThrSystemEntity basicThirdSysEntity = basicThirdSysService.selectMainThrSys(); | 
			
		
	
		
		
			
				
					
					|  |  |  |         String mainSys = basicThirdSysEntity.getThirdId(); |  |  |  |         String mainSys = basicThirdSysEntity.getThirdId(); | 
			
		
	
	
		
		
			
				
					|  |  | @ -467,30 +421,10 @@ public class UdiRelevanceService extends ServiceImpl<UdiRelevanceDao, UdiRelevan | 
			
		
	
		
		
			
				
					
					|  |  |  |     } |  |  |  |     } | 
			
		
	
		
		
			
				
					
					|  |  |  | 
 |  |  |  | 
 | 
			
		
	
		
		
			
				
					
					|  |  |  | 
 |  |  |  | 
 | 
			
		
	
		
		
			
				
					
					|  |  |  |     public boolean deleteByUuid(String uuid) { |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  |         return udiRelevanceDao.deleteByUuid(uuid); |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  |     } |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  | 
 |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  | 
 |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  |     public String findUuidById(String relId) { |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  |         return udiRelevanceDao.selectUuidById(relId); |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  |     } |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  | 
 |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  | 
 |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  |     public List<UdiRelevanceResponse> selectGroupByNameCode(String nameCode, Boolean isDisable) { |  |  |  |     public List<UdiRelevanceResponse> selectGroupByNameCode(String nameCode, Boolean isDisable) { | 
			
		
	
		
		
			
				
					
					|  |  |  |         return udiRelevanceDao.selectGroupByNameCode(nameCode, isDisable); |  |  |  |         return udiRelevanceDao.selectGroupByNameCode(nameCode, isDisable); | 
			
		
	
		
		
			
				
					
					|  |  |  |     } |  |  |  |     } | 
			
		
	
		
		
			
				
					
					|  |  |  | 
 |  |  |  | 
 | 
			
		
	
		
		
			
				
					
					|  |  |  | 
 |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  |     public String getRelIdByUdiCode(String code) { |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  |         if (StrUtil.isBlank(code)) { |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  |             return null; |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  |         } |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  |         UdiEntity udi = FilterUdiUtils.getUdi(code); |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  |         return udiRelevanceDao.selectRelIdByNameCode(udi.getUdi()); |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  |     } |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  | 
 |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  | 
 |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  |     public UdiRelevanceResponse selectOneUdi(FilterUdiRelRequest filterUdiRelRequest) { |  |  |  |     public UdiRelevanceResponse selectOneUdi(FilterUdiRelRequest filterUdiRelRequest) { | 
			
		
	
		
		
			
				
					
					|  |  |  |         return udiRelevanceDao.selectOneUdi(filterUdiRelRequest); |  |  |  |         return udiRelevanceDao.selectOneUdi(filterUdiRelRequest); | 
			
		
	
		
		
			
				
					
					|  |  |  |     } |  |  |  |     } | 
			
		
	
	
		
		
			
				
					|  |  | @ -508,11 +442,6 @@ public class UdiRelevanceService extends ServiceImpl<UdiRelevanceDao, UdiRelevan | 
			
		
	
		
		
			
				
					
					|  |  |  |         List<UdiRelevanceEntity> udiRelevanceEntityList = udiRelevanceDao.selectList(qw); |  |  |  |         List<UdiRelevanceEntity> udiRelevanceEntityList = udiRelevanceDao.selectList(qw); | 
			
		
	
		
		
			
				
					
					|  |  |  |         if (CollectionUtil.isNotEmpty(udiRelevanceEntityList)) { |  |  |  |         if (CollectionUtil.isNotEmpty(udiRelevanceEntityList)) { | 
			
		
	
		
		
			
				
					
					|  |  |  |             mainIdRelIdMap = udiRelevanceEntityList.stream().collect(Collectors.toMap(UdiRelevanceEntity::getMainId, udiRelevanceEntity -> udiRelevanceEntity)); |  |  |  |             mainIdRelIdMap = udiRelevanceEntityList.stream().collect(Collectors.toMap(UdiRelevanceEntity::getMainId, udiRelevanceEntity -> udiRelevanceEntity)); | 
			
		
	
		
		
			
				
					
					|  |  |  | //            List<Long> relIds = udiRelevanceEntityList.stream().map(UdiRelevanceEntity::getId).collect(Collectors.toList());
 |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  | //            List<BasicProductsEntity> basicProductsEntities = udiRelevanceDao.selectProductByRelIds(relIds);
 |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  | //            if (CollectionUtil.isNotEmpty(basicProductsEntities)){
 |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  | //                relIdBasicProductsEntityMap = basicProductsEntities.stream().collect(Collectors.toMap(BasicProductsEntity::getId, x -> x));
 |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  | //            }
 |  |  |  |  | 
			
		
	
		
		
			
				
					
					|  |  |  |         } |  |  |  |         } | 
			
		
	
		
		
			
				
					
					|  |  |  | 
 |  |  |  | 
 | 
			
		
	
		
		
			
				
					
					|  |  |  |         mainIdRelIdAndProductResponse.setMainIdRelIdMap(mainIdRelIdMap); |  |  |  |         mainIdRelIdAndProductResponse.setMainIdRelIdMap(mainIdRelIdMap); | 
			
		
	
	
		
		
			
				
					|  |  | 
 |