|
|
|
|
@ -3,7 +3,9 @@ package com.glxp.api.admin.thread;
|
|
|
|
|
import cn.hutool.core.collection.CollUtil;
|
|
|
|
|
import com.glxp.api.admin.constant.ConstantStatus;
|
|
|
|
|
import com.glxp.api.admin.dao.basic.UdiInfoDao;
|
|
|
|
|
import com.glxp.api.admin.dao.info.SyncDataSetDao;
|
|
|
|
|
import com.glxp.api.admin.entity.basic.*;
|
|
|
|
|
import com.glxp.api.admin.entity.info.SyncDataSetEntity;
|
|
|
|
|
import com.glxp.api.admin.entity.inout.ErpOrderEntity;
|
|
|
|
|
import com.glxp.api.admin.entity.inout.OrderEntity;
|
|
|
|
|
import com.glxp.api.admin.entity.inout.WarehouseEntity;
|
|
|
|
|
@ -58,9 +60,14 @@ public class UpBasicService {
|
|
|
|
|
private CompanyProductRelevanceService companyProductRelevanceService;
|
|
|
|
|
@Resource
|
|
|
|
|
private BasicExportTimeService basicExportTimeService;
|
|
|
|
|
@Resource
|
|
|
|
|
private SyncDataSetDao syncDataSetDao;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public SpsSyncDataResponse upAllData() {
|
|
|
|
|
SpsSyncDataResponse syncDataResponse = new SpsSyncDataResponse();
|
|
|
|
|
SyncDataSetEntity syncDataSetEntity = syncDataSetDao.selectSet();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
BasicExportStatusTimeEntity basicExportStatusTimeEntity = basicExportTimeService.findByKey("AutoUploadAllData");
|
|
|
|
|
if (basicExportStatusTimeEntity == null) {
|
|
|
|
|
@ -70,11 +77,15 @@ public class UpBasicService {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//仓库字典
|
|
|
|
|
if (syncDataSetEntity.isBasicInv()) {
|
|
|
|
|
FilterInvWarehouseRequest filterInvWarehouseRequest = new FilterInvWarehouseRequest();
|
|
|
|
|
filterInvWarehouseRequest.setLastUpdateTime(basicExportStatusTimeEntity.getLastUpdateTime());
|
|
|
|
|
List<InvWarehouseEntity> invWarehouseEntities = invWarehouseService.filterInvWarehouse(filterInvWarehouseRequest);
|
|
|
|
|
syncDataResponse.setInvWarehouseEntities(invWarehouseEntities);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//耗材字典
|
|
|
|
|
if (syncDataSetEntity.isBasicProducts()) {
|
|
|
|
|
FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest();
|
|
|
|
|
filterUdiInfoRequest.setLastUpdateTime(basicExportStatusTimeEntity.getLastUpdateTime());
|
|
|
|
|
List<UdiRelevanceEntity> udiRelevanceEntities = udiRelevanceService.filterUdiEntity(filterUdiInfoRequest);
|
|
|
|
|
@ -88,30 +99,44 @@ public class UpBasicService {
|
|
|
|
|
if (results.size() > 0)
|
|
|
|
|
udiInfoEntities = udiInfoDao.batchSelectByUuid(results);
|
|
|
|
|
|
|
|
|
|
syncDataResponse.setUdiInfoEntities(udiInfoEntities);
|
|
|
|
|
syncDataResponse.setUdiRelevanceEntities(udiRelevanceEntities);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//往来单位字典
|
|
|
|
|
if (syncDataSetEntity.isBasicCorp()) {
|
|
|
|
|
BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest = new BasicUnitMaintainFilterRequest();
|
|
|
|
|
basicUnitMaintainFilterRequest.setLastUpdateTime(basicExportStatusTimeEntity.getLastUpdateTime());
|
|
|
|
|
List<BasicUnitMaintainEntity> basicUnitMaintainEntities = basicUnitMaintainService.filterList(basicUnitMaintainFilterRequest);
|
|
|
|
|
|
|
|
|
|
syncDataResponse.setBasicUnitMaintainEntities(basicUnitMaintainEntities);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//第三方仓库信息
|
|
|
|
|
if (syncDataSetEntity.isBasicInv()) {
|
|
|
|
|
FilterThrInvWarehouseRequest filterThrInvWarehouseRequest = new FilterThrInvWarehouseRequest();
|
|
|
|
|
filterThrInvWarehouseRequest.setLastUpdateTime(basicExportStatusTimeEntity.getLastUpdateTime());
|
|
|
|
|
List<ThrInvWarehouseEntity> thrInvWarehouseEntities = thrInvWarehouseService.filterThrInvWarehouse(filterThrInvWarehouseRequest);
|
|
|
|
|
|
|
|
|
|
syncDataResponse.setThrInvWarehouseEntities(thrInvWarehouseEntities);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//第三方往来单位
|
|
|
|
|
if (syncDataSetEntity.isBasicThirdCorp()) {
|
|
|
|
|
FilterThrCorpRequest filterThrCorpRequest = new FilterThrCorpRequest();
|
|
|
|
|
BeanUtils.copyProperties(basicExportStatusTimeEntity, filterThrCorpRequest);
|
|
|
|
|
List<ThrCorpEntity> thrCorpEntities = thrCorpService.filterThrCorps(filterThrCorpRequest);
|
|
|
|
|
syncDataResponse.setThrCorpEntities(thrCorpEntities);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//第三方产品信息
|
|
|
|
|
if (syncDataSetEntity.isBasicThirdProducts()) {
|
|
|
|
|
FilterThrProductsRequest filterThrProductsRequest = new FilterThrProductsRequest();
|
|
|
|
|
BeanUtils.copyProperties(basicExportStatusTimeEntity, filterThrProductsRequest);
|
|
|
|
|
List<ThrProductsEntity> thrProductsEntities = thrProductsService.filterThrProductsRequest(filterThrProductsRequest);
|
|
|
|
|
syncDataResponse.setThrProductsEntities(thrProductsEntities);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//第三方业务单据
|
|
|
|
|
if (syncDataSetEntity.isBasicThirdBusOrder()) {
|
|
|
|
|
FilterThrOrderRequest filterThrOrderRequest = new FilterThrOrderRequest();
|
|
|
|
|
BeanUtils.copyProperties(basicExportStatusTimeEntity, filterThrOrderRequest);
|
|
|
|
|
List<ThrOrderDetailEntity> allOrderDetailEntities = new ArrayList<>();
|
|
|
|
|
@ -125,25 +150,17 @@ public class UpBasicService {
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
syncDataResponse.setThrOrderDetailEntities(allOrderDetailEntities);
|
|
|
|
|
syncDataResponse.setThrOrderEntities(thrOrderEntities);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//供应商产品信息关联表
|
|
|
|
|
FilterCompanyProductRelevanceRequest filterCompanyProductRelevanceRequest = new FilterCompanyProductRelevanceRequest();
|
|
|
|
|
BeanUtils.copyProperties(basicExportStatusTimeEntity, filterCompanyProductRelevanceRequest);
|
|
|
|
|
List<CompanyProductRelevanceEntity> companyProductRelevanceEntities = companyProductRelevanceService.filterCompanyProductRelevance(filterCompanyProductRelevanceRequest);
|
|
|
|
|
|
|
|
|
|
SpsSyncDataResponse syncDataResponse = new SpsSyncDataResponse();
|
|
|
|
|
syncDataResponse.setCompanyProductRelevanceEntities(companyProductRelevanceEntities);
|
|
|
|
|
syncDataResponse.setInvWarehouseEntities(invWarehouseEntities);
|
|
|
|
|
syncDataResponse.setBasicUnitMaintainEntities(basicUnitMaintainEntities);
|
|
|
|
|
syncDataResponse.setThrCorpEntities(thrCorpEntities);
|
|
|
|
|
syncDataResponse.setThrInvWarehouseEntities(thrInvWarehouseEntities);
|
|
|
|
|
syncDataResponse.setThrOrderDetailEntities(allOrderDetailEntities);
|
|
|
|
|
syncDataResponse.setThrOrderEntities(thrOrderEntities);
|
|
|
|
|
syncDataResponse.setUdiInfoEntities(udiInfoEntities);
|
|
|
|
|
syncDataResponse.setThrProductsEntities(thrProductsEntities);
|
|
|
|
|
syncDataResponse.setUdiRelevanceEntities(udiRelevanceEntities);
|
|
|
|
|
|
|
|
|
|
return syncDataResponse;
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//单据类型
|
|
|
|
|
@ -155,25 +172,38 @@ public class UpBasicService {
|
|
|
|
|
BussinessOriginTypeService bussinessOriginTypeService;
|
|
|
|
|
|
|
|
|
|
public SpsSyncBusResponse upAllBus() {
|
|
|
|
|
SpsSyncBusResponse spsSyncBusResponse = new SpsSyncBusResponse();
|
|
|
|
|
SyncDataSetEntity syncDataSetEntity = syncDataSetDao.selectSet();
|
|
|
|
|
|
|
|
|
|
BasicExportStatusTimeEntity basicExportStatusTimeEntity = basicExportTimeService.findByKey("AutoUploadBusType");
|
|
|
|
|
if (basicExportStatusTimeEntity == null) {
|
|
|
|
|
basicExportStatusTimeEntity = new BasicExportStatusTimeEntity();
|
|
|
|
|
basicExportStatusTimeEntity.setLastUpdateTime("1949-10-01 09:00:00");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//业务单据类型
|
|
|
|
|
if (syncDataSetEntity.isTypeBus()) {
|
|
|
|
|
BussinessTypeFilterRequest bussinessTypeFilterRequest = new BussinessTypeFilterRequest();
|
|
|
|
|
BeanUtils.copyProperties(basicExportStatusTimeEntity, bussinessTypeFilterRequest);
|
|
|
|
|
List<BussinessTypeEntity> bussinessTypeEntities = bussinessTypeService.filterAllList(bussinessTypeFilterRequest);
|
|
|
|
|
spsSyncBusResponse.setBussinessTypeEntities(bussinessTypeEntities);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//扫码单据类型
|
|
|
|
|
if (syncDataSetEntity.isTypeScan()) {
|
|
|
|
|
BussinessLocalTypeFilterRequest bussinessLocalTypeFilterRequest = new BussinessLocalTypeFilterRequest();
|
|
|
|
|
BeanUtils.copyProperties(basicExportStatusTimeEntity, bussinessLocalTypeFilterRequest);
|
|
|
|
|
List<BussinessLocalTypeEntity> bussinessLocalTypeEntities = bussinessLocalTypeService.filterAllList(bussinessLocalTypeFilterRequest);
|
|
|
|
|
spsSyncBusResponse.setBussinessLocalTypeEntities(bussinessLocalTypeEntities);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//第三方单据类型
|
|
|
|
|
if (syncDataSetEntity.isTypeThird()) {
|
|
|
|
|
BussinessOriginTypeFilterRequest bussinessOriginTypeFilterRequest = new BussinessOriginTypeFilterRequest();
|
|
|
|
|
BeanUtils.copyProperties(basicExportStatusTimeEntity, bussinessOriginTypeFilterRequest);
|
|
|
|
|
List<BussinessOriginTypeEntity> bussinessOriginTypeEntities = bussinessOriginTypeService.filterList(bussinessOriginTypeFilterRequest);
|
|
|
|
|
SpsSyncBusResponse spsSyncBusResponse = new SpsSyncBusResponse();
|
|
|
|
|
spsSyncBusResponse.setBussinessTypeEntities(bussinessTypeEntities);
|
|
|
|
|
spsSyncBusResponse.setBussinessLocalTypeEntities(bussinessLocalTypeEntities);
|
|
|
|
|
spsSyncBusResponse.setBussinessOriginTypeEntities(bussinessOriginTypeEntities);
|
|
|
|
|
}
|
|
|
|
|
return spsSyncBusResponse;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@ -187,7 +217,11 @@ public class UpBasicService {
|
|
|
|
|
OrderDetailService orderDetailService;
|
|
|
|
|
|
|
|
|
|
public SpsSyncOrderResponse upAllOrder() {
|
|
|
|
|
|
|
|
|
|
SpsSyncOrderResponse syncOrderResponse = new SpsSyncOrderResponse();
|
|
|
|
|
//查询数据同步设置
|
|
|
|
|
SyncDataSetEntity syncDataSetEntity = syncDataSetDao.selectSet();
|
|
|
|
|
//已完成单据
|
|
|
|
|
if (syncDataSetEntity.isOrderScanFinish()) {
|
|
|
|
|
BasicExportStatusTimeEntity basicExportStatusTimeEntity = basicExportTimeService.findByKey("AutoUploadOrder");
|
|
|
|
|
if (basicExportStatusTimeEntity == null) {
|
|
|
|
|
basicExportStatusTimeEntity = new BasicExportStatusTimeEntity();
|
|
|
|
|
@ -211,12 +245,12 @@ public class UpBasicService {
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
SpsSyncOrderResponse syncOrderResponse = new SpsSyncOrderResponse();
|
|
|
|
|
|
|
|
|
|
syncOrderResponse.setOrderEntities(orderEntities);
|
|
|
|
|
syncOrderResponse.setOrderDetailEntityList(allOrderDetailEntityList);
|
|
|
|
|
syncOrderResponse.setWarehouseEntityList(warehouseEntityList);
|
|
|
|
|
}
|
|
|
|
|
return syncOrderResponse;
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
x_z
3 years ago