|
|
|
|
@ -14,6 +14,10 @@ import com.glxp.sale.admin.entity.inventory.InvBusUserEntity;
|
|
|
|
|
import com.glxp.sale.admin.entity.inventory.InvSubWarehouseEntity;
|
|
|
|
|
import com.glxp.sale.admin.entity.inventory.InvWarehouseEntity;
|
|
|
|
|
import com.glxp.sale.admin.entity.param.SyncDataBustypeEntity;
|
|
|
|
|
import com.glxp.sale.admin.entity.purchase.SupCertEntity;
|
|
|
|
|
import com.glxp.sale.admin.entity.purchase.SupCompanyEntity;
|
|
|
|
|
import com.glxp.sale.admin.entity.purchase.SupManufacturerEntity;
|
|
|
|
|
import com.glxp.sale.admin.entity.purchase.SupProductEntity;
|
|
|
|
|
import com.glxp.sale.admin.entity.receipt.ProductInfoEntity;
|
|
|
|
|
import com.glxp.sale.admin.entity.thrsys.*;
|
|
|
|
|
import com.glxp.sale.admin.req.auth.AuthAdminQueryRequest;
|
|
|
|
|
@ -23,6 +27,10 @@ import com.glxp.sale.admin.req.info.FilterCompanyProductRelevanceRequest;
|
|
|
|
|
import com.glxp.sale.admin.req.inout.OrderFilterRequest;
|
|
|
|
|
import com.glxp.sale.admin.req.inventory.FilterInvUserRequest;
|
|
|
|
|
import com.glxp.sale.admin.req.inventory.FilterInvWarehouseRequest;
|
|
|
|
|
import com.glxp.sale.admin.req.purchase.FilterPoductRequest;
|
|
|
|
|
import com.glxp.sale.admin.req.purchase.FilterSupCertRequest;
|
|
|
|
|
import com.glxp.sale.admin.req.purchase.FilterSupCompanyRequest;
|
|
|
|
|
import com.glxp.sale.admin.req.purchase.FilterSupManufacturerRequest;
|
|
|
|
|
import com.glxp.sale.admin.req.receipt.ProductInfoFilterRequest;
|
|
|
|
|
import com.glxp.sale.admin.req.thrsys.*;
|
|
|
|
|
import com.glxp.sale.admin.res.auth.AuthAdminRoleResponse;
|
|
|
|
|
@ -40,6 +48,10 @@ import com.glxp.sale.admin.service.inventory.InvBusUserService;
|
|
|
|
|
import com.glxp.sale.admin.service.inventory.InvSubWarehouseService;
|
|
|
|
|
import com.glxp.sale.admin.service.inventory.InvWarehouseService;
|
|
|
|
|
import com.glxp.sale.admin.service.param.SyncDataSetService;
|
|
|
|
|
import com.glxp.sale.admin.service.purchase.SupCertService;
|
|
|
|
|
import com.glxp.sale.admin.service.purchase.SupCompanyService;
|
|
|
|
|
import com.glxp.sale.admin.service.purchase.SupManufacturerService;
|
|
|
|
|
import com.glxp.sale.admin.service.purchase.SupProductService;
|
|
|
|
|
import com.glxp.sale.admin.service.receipt.ProductInfoService;
|
|
|
|
|
import com.glxp.sale.admin.service.thrsys.*;
|
|
|
|
|
import com.glxp.sale.admin.util.BeanUtils;
|
|
|
|
|
@ -99,6 +111,17 @@ public class SpsSyncDownloadService {
|
|
|
|
|
@Resource
|
|
|
|
|
NewUploadDiService newUploadDiService;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Resource
|
|
|
|
|
SupCompanyService supCompanyService;
|
|
|
|
|
@Resource
|
|
|
|
|
SupManufacturerService supManufacturerService;
|
|
|
|
|
@Resource
|
|
|
|
|
SupProductService supProductService;
|
|
|
|
|
@Resource
|
|
|
|
|
SupCertService supCertService;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public BaseResponse findProductInfo(SpsSyncDataRequest spsSyncDataRequest) {
|
|
|
|
|
|
|
|
|
|
SpsSyncDataResponse syncDataResponse = new SpsSyncDataResponse();
|
|
|
|
|
@ -269,9 +292,64 @@ public class SpsSyncDownloadService {
|
|
|
|
|
List<NewUploadDiEntity> newUploadDiEntities = newUploadDiService.filterNewUploads(filterNewUploadDiRequest);
|
|
|
|
|
syncDataResponse.setNewUploadDiEntities(newUploadDiEntities);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//资质证书
|
|
|
|
|
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);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//获取生产企业资质证书
|
|
|
|
|
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);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
syncDataResponse.setSupCertEntities(supCertEntityList);
|
|
|
|
|
|
|
|
|
|
return ResultVOUtils.success(syncDataResponse);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//单据类型
|
|
|
|
|
@Resource
|
|
|
|
|
BussinessTypeService bussinessTypeService;
|
|
|
|
|
@ -289,12 +367,16 @@ public class SpsSyncDownloadService {
|
|
|
|
|
|
|
|
|
|
SyncDataSetResponse syncDataSetEntity = syncDataSetService.selectSet();
|
|
|
|
|
SpsSyncBusResponse spsSyncBusResponse = new SpsSyncBusResponse();
|
|
|
|
|
|
|
|
|
|
//扫码单据类型
|
|
|
|
|
if (syncDataSetEntity.isTypeScan()) {
|
|
|
|
|
BussinessTypeFilterRequest bussinessTypeFilterRequest = new BussinessTypeFilterRequest();
|
|
|
|
|
BeanUtils.copyProperties(spsSyncDataRequest, bussinessTypeFilterRequest);
|
|
|
|
|
List<BussinessTypeEntity> bussinessTypeEntities = bussinessTypeService.filterAllList(bussinessTypeFilterRequest);
|
|
|
|
|
spsSyncBusResponse.setBussinessTypeEntities(bussinessTypeEntities);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//业务单据类型
|
|
|
|
|
if (syncDataSetEntity.isTypeBus()) {
|
|
|
|
|
BussinessLocalTypeFilterRequest bussinessLocalTypeFilterRequest = new BussinessLocalTypeFilterRequest();
|
|
|
|
|
BeanUtils.copyProperties(spsSyncDataRequest, bussinessLocalTypeFilterRequest);
|
|
|
|
|
@ -334,6 +416,8 @@ public class SpsSyncDownloadService {
|
|
|
|
|
spsSyncBusResponse.setEntrustReceEntities(dlEntrustReceEntities);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return ResultVOUtils.success(spsSyncBusResponse);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
