|  |  |  | @ -14,10 +14,7 @@ import com.glxp.api.admin.entity.inout.*; | 
			
		
	
		
			
				
					|  |  |  |  | import com.glxp.api.admin.entity.inventory.InvBusUserEntity; | 
			
		
	
		
			
				
					|  |  |  |  | import com.glxp.api.admin.entity.inventory.InvSubWarehouseEntity; | 
			
		
	
		
			
				
					|  |  |  |  | import com.glxp.api.admin.entity.inventory.InvWarehouseEntity; | 
			
		
	
		
			
				
					|  |  |  |  | import com.glxp.api.admin.entity.purchase.SupCertEntity; | 
			
		
	
		
			
				
					|  |  |  |  | import com.glxp.api.admin.entity.purchase.SupCompanyEntity; | 
			
		
	
		
			
				
					|  |  |  |  | import com.glxp.api.admin.entity.purchase.SupManufacturerEntity; | 
			
		
	
		
			
				
					|  |  |  |  | import com.glxp.api.admin.entity.purchase.SupProductEntity; | 
			
		
	
		
			
				
					|  |  |  |  | import com.glxp.api.admin.entity.purchase.*; | 
			
		
	
		
			
				
					|  |  |  |  | import com.glxp.api.admin.entity.thrsys.*; | 
			
		
	
		
			
				
					|  |  |  |  | import com.glxp.api.admin.req.auth.AuthAdminQueryRequest; | 
			
		
	
		
			
				
					|  |  |  |  | import com.glxp.api.admin.req.auth.FilterDeptRequest; | 
			
		
	
	
		
			
				
					|  |  |  | @ -26,6 +23,7 @@ import com.glxp.api.admin.req.inout.OrderFilterRequest; | 
			
		
	
		
			
				
					|  |  |  |  | import com.glxp.api.admin.req.inout.OrderQueryRequest; | 
			
		
	
		
			
				
					|  |  |  |  | import com.glxp.api.admin.req.inventory.FilterInvUserRequest; | 
			
		
	
		
			
				
					|  |  |  |  | import com.glxp.api.admin.req.inventory.FilterInvWarehouseRequest; | 
			
		
	
		
			
				
					|  |  |  |  | import com.glxp.api.admin.req.purchase.FilterCertSetsRequest; | 
			
		
	
		
			
				
					|  |  |  |  | import com.glxp.api.admin.req.purchase.FilterPoductRequest; | 
			
		
	
		
			
				
					|  |  |  |  | import com.glxp.api.admin.req.purchase.FilterSupCompanyRequest; | 
			
		
	
		
			
				
					|  |  |  |  | import com.glxp.api.admin.req.purchase.FilterSupManufacturerRequest; | 
			
		
	
	
		
			
				
					|  |  |  | @ -34,6 +32,7 @@ import com.glxp.api.admin.req.thrsys.*; | 
			
		
	
		
			
				
					|  |  |  |  | import com.glxp.api.admin.res.basic.SpsSyncBusResponse; | 
			
		
	
		
			
				
					|  |  |  |  | import com.glxp.api.admin.res.basic.SpsSyncDataResponse; | 
			
		
	
		
			
				
					|  |  |  |  | import com.glxp.api.admin.res.basic.SpsSyncOrderResponse; | 
			
		
	
		
			
				
					|  |  |  |  | import com.glxp.api.admin.res.basic.SupCertSetResponse; | 
			
		
	
		
			
				
					|  |  |  |  | import com.glxp.api.admin.res.info.SyncDataSetResponse; | 
			
		
	
		
			
				
					|  |  |  |  | import com.glxp.api.admin.service.auth.AuthAdminService; | 
			
		
	
		
			
				
					|  |  |  |  | import com.glxp.api.admin.service.auth.DeptService; | 
			
		
	
	
		
			
				
					|  |  |  | @ -44,17 +43,16 @@ import com.glxp.api.admin.service.inout.*; | 
			
		
	
		
			
				
					|  |  |  |  | import com.glxp.api.admin.service.inventory.InvBusUserService; | 
			
		
	
		
			
				
					|  |  |  |  | import com.glxp.api.admin.service.inventory.InvSubWarehouseService; | 
			
		
	
		
			
				
					|  |  |  |  | import com.glxp.api.admin.service.inventory.InvWarehouseService; | 
			
		
	
		
			
				
					|  |  |  |  | import com.glxp.api.admin.service.purchase.SupCertService; | 
			
		
	
		
			
				
					|  |  |  |  | import com.glxp.api.admin.service.purchase.SupCompanyService; | 
			
		
	
		
			
				
					|  |  |  |  | import com.glxp.api.admin.service.purchase.SupManufacturerService; | 
			
		
	
		
			
				
					|  |  |  |  | import com.glxp.api.admin.service.purchase.SupProductService; | 
			
		
	
		
			
				
					|  |  |  |  | import com.glxp.api.admin.service.purchase.*; | 
			
		
	
		
			
				
					|  |  |  |  | import com.glxp.api.admin.service.thrsys.*; | 
			
		
	
		
			
				
					|  |  |  |  | import groovy.transform.WithReadLock; | 
			
		
	
		
			
				
					|  |  |  |  | import org.springframework.beans.BeanUtils; | 
			
		
	
		
			
				
					|  |  |  |  | import org.springframework.stereotype.Service; | 
			
		
	
		
			
				
					|  |  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |  | import javax.annotation.Resource; | 
			
		
	
		
			
				
					|  |  |  |  | import java.util.ArrayList; | 
			
		
	
		
			
				
					|  |  |  |  | import java.util.List; | 
			
		
	
		
			
				
					|  |  |  |  | import java.util.stream.Collectors; | 
			
		
	
		
			
				
					|  |  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |  | @Service | 
			
		
	
		
			
				
					|  |  |  |  | public class UpBasicService { | 
			
		
	
	
		
			
				
					|  |  |  | @ -107,6 +105,8 @@ public class UpBasicService { | 
			
		
	
		
			
				
					|  |  |  |  |     SupProductService supProductService; | 
			
		
	
		
			
				
					|  |  |  |  |     @Resource | 
			
		
	
		
			
				
					|  |  |  |  |     SupCertService supCertService; | 
			
		
	
		
			
				
					|  |  |  |  |     @Resource | 
			
		
	
		
			
				
					|  |  |  |  |     SupCertSetService supCertSetService; | 
			
		
	
		
			
				
					|  |  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |  |     public SpsSyncDataResponse upAllData(SpsSyncDataRequest spsSyncDataRequest) { | 
			
		
	
		
			
				
					|  |  |  |  |         SpsSyncDataResponse syncDataResponse = new SpsSyncDataResponse(); | 
			
		
	
	
		
			
				
					|  |  |  | @ -280,56 +280,78 @@ public class UpBasicService { | 
			
		
	
		
			
				
					|  |  |  |  |         //资质证书
 | 
			
		
	
		
			
				
					|  |  |  |  |         List<SupCertEntity> supCertEntityList = new ArrayList<>(); | 
			
		
	
		
			
				
					|  |  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |  |         //获取供应商资质证书
 | 
			
		
	
		
			
				
					|  |  |  |  |         FilterSupCompanyRequest filterSupCompanyRequest = new FilterSupCompanyRequest(); | 
			
		
	
		
			
				
					|  |  |  |  |         BeanUtils.copyProperties(spsSyncDataRequest, filterSupCompanyRequest); | 
			
		
	
		
			
				
					|  |  |  |  |         filterSupCompanyRequest.setAuditStatus(ConstantStatus.AUDIT_PASS); | 
			
		
	
		
			
				
					|  |  |  |  |         List<SupCompanyEntity> supCompanyEntities = supCompanyService.filterCompany(filterSupCompanyRequest); | 
			
		
	
		
			
				
					|  |  |  |  |         syncDataResponse.setSupCompanyEntities(supCompanyEntities); | 
			
		
	
		
			
				
					|  |  |  |  |         if (CollUtil.isNotEmpty(supCompanyEntities)) { | 
			
		
	
		
			
				
					|  |  |  |  |             for (SupCompanyEntity supCompanyEntity : supCompanyEntities) { | 
			
		
	
		
			
				
					|  |  |  |  |                 List<SupCertEntity> tempsList = supCertService.findAll(supCompanyEntity.getCustomerId()); | 
			
		
	
		
			
				
					|  |  |  |  |                 if (CollUtil.isNotEmpty(tempsList)) { | 
			
		
	
		
			
				
					|  |  |  |  |                     supCertEntityList.addAll(tempsList); | 
			
		
	
		
			
				
					|  |  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |  |         if (syncDataSetEntity.isCompanyCert()) { | 
			
		
	
		
			
				
					|  |  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |  |             //获取供应商资质证书
 | 
			
		
	
		
			
				
					|  |  |  |  |             FilterSupCompanyRequest filterSupCompanyRequest = new FilterSupCompanyRequest(); | 
			
		
	
		
			
				
					|  |  |  |  |             BeanUtils.copyProperties(spsSyncDataRequest, filterSupCompanyRequest); | 
			
		
	
		
			
				
					|  |  |  |  |             filterSupCompanyRequest.setAuditStatus(ConstantStatus.AUDIT_PASS); | 
			
		
	
		
			
				
					|  |  |  |  |             List<SupCompanyEntity> supCompanyEntities = supCompanyService.filterCompany(filterSupCompanyRequest); | 
			
		
	
		
			
				
					|  |  |  |  |             syncDataResponse.setSupCompanyEntities(supCompanyEntities); | 
			
		
	
		
			
				
					|  |  |  |  |             if (CollUtil.isNotEmpty(supCompanyEntities)) { | 
			
		
	
		
			
				
					|  |  |  |  |                 for (SupCompanyEntity supCompanyEntity : supCompanyEntities) { | 
			
		
	
		
			
				
					|  |  |  |  |                     List<SupCertEntity> tempsList = supCertService.findAll(supCompanyEntity.getCustomerId()); | 
			
		
	
		
			
				
					|  |  |  |  |                     if (CollUtil.isNotEmpty(tempsList)) { | 
			
		
	
		
			
				
					|  |  |  |  |                         supCertEntityList.addAll(tempsList); | 
			
		
	
		
			
				
					|  |  |  |  |                     } | 
			
		
	
		
			
				
					|  |  |  |  |                 } | 
			
		
	
		
			
				
					|  |  |  |  |             } | 
			
		
	
		
			
				
					|  |  |  |  |         } | 
			
		
	
		
			
				
					|  |  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |  |         //获取生产企业资质证书
 | 
			
		
	
		
			
				
					|  |  |  |  |         FilterSupManufacturerRequest filterSupManufacturerRequest = new FilterSupManufacturerRequest(); | 
			
		
	
		
			
				
					|  |  |  |  |         BeanUtils.copyProperties(spsSyncDataRequest, filterSupManufacturerRequest); | 
			
		
	
		
			
				
					|  |  |  |  |         filterSupManufacturerRequest.setAuditStatus(ConstantStatus.AUDIT_PASS); | 
			
		
	
		
			
				
					|  |  |  |  |         List<SupManufacturerEntity> supManufacturerEntities = supManufacturerService.getCompany(filterSupManufacturerRequest); | 
			
		
	
		
			
				
					|  |  |  |  |         syncDataResponse.setSupManufacturerEntities(supManufacturerEntities); | 
			
		
	
		
			
				
					|  |  |  |  |         if (CollUtil.isNotEmpty(supManufacturerEntities)) { | 
			
		
	
		
			
				
					|  |  |  |  |             for (SupManufacturerEntity supManufacturerEntity : supManufacturerEntities) { | 
			
		
	
		
			
				
					|  |  |  |  |                 List<SupCertEntity> tempsList = supCertService.findAll(supManufacturerEntity.getCustomerId(), supManufacturerEntity.getManufacturerId()); | 
			
		
	
		
			
				
					|  |  |  |  |                 if (CollUtil.isNotEmpty(tempsList)) { | 
			
		
	
		
			
				
					|  |  |  |  |                     supCertEntityList.addAll(tempsList); | 
			
		
	
		
			
				
					|  |  |  |  |         if (syncDataSetEntity.isManufacturerCert()) { | 
			
		
	
		
			
				
					|  |  |  |  |             //获取生产企业资质证书
 | 
			
		
	
		
			
				
					|  |  |  |  |             FilterSupManufacturerRequest filterSupManufacturerRequest = new FilterSupManufacturerRequest(); | 
			
		
	
		
			
				
					|  |  |  |  |             BeanUtils.copyProperties(spsSyncDataRequest, filterSupManufacturerRequest); | 
			
		
	
		
			
				
					|  |  |  |  |             filterSupManufacturerRequest.setAuditStatus(ConstantStatus.AUDIT_PASS); | 
			
		
	
		
			
				
					|  |  |  |  |             List<SupManufacturerEntity> supManufacturerEntities = supManufacturerService.getCompany(filterSupManufacturerRequest); | 
			
		
	
		
			
				
					|  |  |  |  |             syncDataResponse.setSupManufacturerEntities(supManufacturerEntities); | 
			
		
	
		
			
				
					|  |  |  |  |             if (CollUtil.isNotEmpty(supManufacturerEntities)) { | 
			
		
	
		
			
				
					|  |  |  |  |                 for (SupManufacturerEntity supManufacturerEntity : supManufacturerEntities) { | 
			
		
	
		
			
				
					|  |  |  |  |                     List<SupCertEntity> tempsList = supCertService.findAll(supManufacturerEntity.getCustomerId(), supManufacturerEntity.getManufacturerId()); | 
			
		
	
		
			
				
					|  |  |  |  |                     if (CollUtil.isNotEmpty(tempsList)) { | 
			
		
	
		
			
				
					|  |  |  |  |                         supCertEntityList.addAll(tempsList); | 
			
		
	
		
			
				
					|  |  |  |  |                     } | 
			
		
	
		
			
				
					|  |  |  |  |                 } | 
			
		
	
		
			
				
					|  |  |  |  |             } | 
			
		
	
		
			
				
					|  |  |  |  |         } | 
			
		
	
		
			
				
					|  |  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |  |         //获取产品资质证书
 | 
			
		
	
		
			
				
					|  |  |  |  |         FilterPoductRequest filterPoductRequest = new FilterPoductRequest(); | 
			
		
	
		
			
				
					|  |  |  |  |         BeanUtils.copyProperties(spsSyncDataRequest, filterPoductRequest); | 
			
		
	
		
			
				
					|  |  |  |  |         filterPoductRequest.setAuditStatus(ConstantStatus.AUDIT_PASS); | 
			
		
	
		
			
				
					|  |  |  |  |         List<SupProductEntity> supProductEntities = supProductService.filterProducts(filterPoductRequest); | 
			
		
	
		
			
				
					|  |  |  |  |         syncDataResponse.setSupProductEntities(supProductEntities); | 
			
		
	
		
			
				
					|  |  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |  |         if (CollUtil.isNotEmpty(supProductEntities)) { | 
			
		
	
		
			
				
					|  |  |  |  |             for (SupProductEntity supProductEntity : supProductEntities) { | 
			
		
	
		
			
				
					|  |  |  |  |                 List<SupCertEntity> tempsList = supCertService.findAll(supProductEntity.getCustomerId(), supProductEntity.getManufacturerIdFk(), supProductEntity.getProductId()); | 
			
		
	
		
			
				
					|  |  |  |  |                 if (CollUtil.isNotEmpty(tempsList)) { | 
			
		
	
		
			
				
					|  |  |  |  |                     supCertEntityList.addAll(tempsList); | 
			
		
	
		
			
				
					|  |  |  |  |         if (syncDataSetEntity.isProductCert()) { | 
			
		
	
		
			
				
					|  |  |  |  |             //获取产品资质证书
 | 
			
		
	
		
			
				
					|  |  |  |  |             FilterPoductRequest filterPoductRequest = new FilterPoductRequest(); | 
			
		
	
		
			
				
					|  |  |  |  |             BeanUtils.copyProperties(spsSyncDataRequest, filterPoductRequest); | 
			
		
	
		
			
				
					|  |  |  |  |             filterPoductRequest.setAuditStatus(ConstantStatus.AUDIT_PASS); | 
			
		
	
		
			
				
					|  |  |  |  |             List<SupProductEntity> supProductEntities = supProductService.filterProducts(filterPoductRequest); | 
			
		
	
		
			
				
					|  |  |  |  |             syncDataResponse.setSupProductEntities(supProductEntities); | 
			
		
	
		
			
				
					|  |  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |  |             if (CollUtil.isNotEmpty(supProductEntities)) { | 
			
		
	
		
			
				
					|  |  |  |  |                 for (SupProductEntity supProductEntity : supProductEntities) { | 
			
		
	
		
			
				
					|  |  |  |  |                     List<SupCertEntity> tempsList = supCertService.findAll(supProductEntity.getCustomerId(), supProductEntity.getManufacturerIdFk(), supProductEntity.getProductId()); | 
			
		
	
		
			
				
					|  |  |  |  |                     if (CollUtil.isNotEmpty(tempsList)) { | 
			
		
	
		
			
				
					|  |  |  |  |                         supCertEntityList.addAll(tempsList); | 
			
		
	
		
			
				
					|  |  |  |  |                     } | 
			
		
	
		
			
				
					|  |  |  |  |                 } | 
			
		
	
		
			
				
					|  |  |  |  |             } | 
			
		
	
		
			
				
					|  |  |  |  |             syncDataResponse.setSupCertEntities(supCertEntityList); | 
			
		
	
		
			
				
					|  |  |  |  |         } | 
			
		
	
		
			
				
					|  |  |  |  |         syncDataResponse.setSupCertEntities(supCertEntityList); | 
			
		
	
		
			
				
					|  |  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |  |         //企业证书设置
 | 
			
		
	
		
			
				
					|  |  |  |  |         FilterCertSetsRequest filterCertSetsRequest = new FilterCertSetsRequest(); | 
			
		
	
		
			
				
					|  |  |  |  |         BeanUtils.copyProperties(spsSyncDataRequest, filterCertSetsRequest); | 
			
		
	
		
			
				
					|  |  |  |  |         List<SupCertSetEntity> supCertSetEntities = supCertSetService.filterCertSets(filterCertSetsRequest); | 
			
		
	
		
			
				
					|  |  |  |  |         if (CollUtil.isNotEmpty(supCertSetEntities)) { | 
			
		
	
		
			
				
					|  |  |  |  |             List<SupCertSetEntity> temps = supCertSetService.filterCertSets(new FilterCertSetsRequest()); | 
			
		
	
		
			
				
					|  |  |  |  |             List<SupCertSetResponse> supCertSetResponses = temps.stream().map(item -> | 
			
		
	
		
			
				
					|  |  |  |  |             { | 
			
		
	
		
			
				
					|  |  |  |  |                 SupCertSetResponse supCertSetResponse = new SupCertSetResponse(); | 
			
		
	
		
			
				
					|  |  |  |  |                 BeanUtils.copyProperties(item, supCertSetResponse); | 
			
		
	
		
			
				
					|  |  |  |  |                 return supCertSetResponse; | 
			
		
	
		
			
				
					|  |  |  |  |             }).collect(Collectors.toList()); | 
			
		
	
		
			
				
					|  |  |  |  |             syncDataResponse.setSupCertSetEntities(supCertSetResponses); | 
			
		
	
		
			
				
					|  |  |  |  |         } | 
			
		
	
		
			
				
					|  |  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |  |         return syncDataResponse; | 
			
		
	
		
			
				
					|  |  |  |  |     } | 
			
		
	
		
			
				
					|  |  |  |  | 
 | 
			
		
	
	
		
			
				
					|  |  |  | 
 |