From 536652ec18ab70f8b83f02daaaba36fba9316707 Mon Sep 17 00:00:00 2001 From: anthonyywj2 <353682448@qq.com> Date: Sat, 21 May 2022 11:59:41 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E8=AE=BE=E7=BD=AE=EF=BC=8C?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=97=A5=E5=BF=97=E8=AE=B0=E5=BD=95=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/SpsSyncDownloadController.java | 295 +---------------- .../basic/SpsSyncDownloadService.java | 308 ++++++++++++++++++ .../controller/basic/UdiInfoController.java | 22 +- .../admin/req/basic/SpsSyncDataRequest.java | 3 +- .../service/basic/BasicExportTimeService.java | 3 + .../impl/BasicExportTimeServiceImpl.java | 15 + .../basic/impl/UdiRelevanceServiceImpl.java | 5 +- .../thread/BasicBackUpdateProductService.java | 132 +++++--- .../admin/thread/IoTransInoutService.java | 3 +- 9 files changed, 444 insertions(+), 342 deletions(-) create mode 100644 api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncDownloadService.java diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncDownloadController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncDownloadController.java index c9014d7..c01bcc1 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncDownloadController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncDownloadController.java @@ -1,319 +1,38 @@ package com.glxp.sale.admin.controller.basic; -import cn.hutool.core.collection.CollUtil; -import cn.hutool.db.sql.Order; -import com.glxp.sale.admin.constant.ConstantStatus; -import com.glxp.sale.admin.dao.basic.UdiInfoDao; -import com.glxp.sale.admin.entity.basic.*; -import com.glxp.sale.admin.entity.info.CompanyProductRelevanceEntity; -import com.glxp.sale.admin.entity.inout.ErpOrderEntity; -import com.glxp.sale.admin.entity.inout.OrderEntity; -import com.glxp.sale.admin.entity.inout.WarehouseEntity; -import com.glxp.sale.admin.entity.inventory.InvWarehouseEntity; -import com.glxp.sale.admin.entity.param.SyncDataSetEntity; -import com.glxp.sale.admin.entity.receipt.ProductInfoEntity; -import com.glxp.sale.admin.entity.thrsys.*; -import com.glxp.sale.admin.req.basic.*; -import com.glxp.sale.admin.req.info.FilterCompanyProductRelevanceRequest; -import com.glxp.sale.admin.req.inout.OrderFilterRequest; -import com.glxp.sale.admin.req.inventory.FilterInvWarehouseRequest; -import com.glxp.sale.admin.req.receipt.ProductInfoFilterRequest; -import com.glxp.sale.admin.req.thrsys.*; -import com.glxp.sale.admin.res.basic.SpSyncUdiResponse; -import com.glxp.sale.admin.res.basic.SpsSyncBusResponse; -import com.glxp.sale.admin.res.basic.SpsSyncDataResponse; -import com.glxp.sale.admin.res.basic.SpsSyncOrderResponse; -import com.glxp.sale.admin.res.inout.DlOrderResponse; -import com.glxp.sale.admin.res.inout.ErpOrderResponse; -import com.glxp.sale.admin.res.param.SyncDataSetResponse; -import com.glxp.sale.admin.service.basic.*; -import com.glxp.sale.admin.service.info.CompanyProductRelevanceService; -import com.glxp.sale.admin.service.inout.CodesService; -import com.glxp.sale.admin.service.inout.OrderDetailService; -import com.glxp.sale.admin.service.inout.OrderService; -import com.glxp.sale.admin.service.inventory.InvWarehouseService; -import com.glxp.sale.admin.service.param.SyncDataSetService; -import com.glxp.sale.admin.service.receipt.ProductInfoService; -import com.glxp.sale.admin.service.thrsys.*; -import com.glxp.sale.admin.util.BeanUtils; +import com.glxp.sale.admin.req.basic.SpsSyncDataRequest; import com.glxp.sale.common.res.BaseResponse; -import com.glxp.sale.common.util.ResultVOUtils; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.List; @RestController public class SpsSyncDownloadController { - - //基础信息 - @Resource - InvWarehouseService invWarehouseService; - @Resource - UdiRelevanceService udiRelevanceService; - @Resource - UdiInfoDao udiInfoDao; - @Resource - BasicUnitMaintainService basicUnitMaintainService; - @Resource - ThrInvWarehouseService thrInvWarehouseService; - @Resource - ThrCorpService thrCorpService; @Resource - ThrProductsService thrProductsService; - @Resource - ThrOrderService thrOrderService; - @Resource - ThrOrderDetailService thrOrderDetailService; - @Resource - private CompanyProductRelevanceService companyProductRelevanceService; - @Resource - private SyncDataSetService syncDataSetService; + SpsSyncDownloadService spsSyncDownloadService; @GetMapping("sps/sync/basic") public BaseResponse findProductInfo(SpsSyncDataRequest spsSyncDataRequest) { - - SpsSyncDataResponse syncDataResponse = new SpsSyncDataResponse(); - SyncDataSetResponse syncDataSetEntity = syncDataSetService.selectSet(); - if (syncDataSetEntity.isBasicInv()) { - //仓库字典 - FilterInvWarehouseRequest filterInvWarehouseRequest = new FilterInvWarehouseRequest(); - filterInvWarehouseRequest.setLastUpdateTime(spsSyncDataRequest.getLastUpdateTime()); - List invWarehouseEntities = invWarehouseService.filterGroupInvWarehouse(filterInvWarehouseRequest); - syncDataResponse.setInvWarehouseEntities(invWarehouseEntities); - } - - if (syncDataSetEntity.isBasicProducts()) { - //耗材字典 - FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest(); - filterUdiInfoRequest.setLastUpdateTime(spsSyncDataRequest.getLastUpdateTime()); - List udiRelevanceEntities = udiRelevanceService.filterUdiEntity(filterUdiInfoRequest); - List results = new ArrayList<>(); - udiRelevanceEntities.forEach( - item -> { - results.add(item.getUuid() + ""); - } - ); - List udiInfoEntities = new ArrayList<>(); - if (results.size() > 0) - udiInfoEntities = udiInfoDao.batchSelectByUuid(results); - //供应商产品信息关联表 - FilterCompanyProductRelevanceRequest filterCompanyProductRelevanceRequest = new FilterCompanyProductRelevanceRequest(); - BeanUtils.copyProperties(spsSyncDataRequest, filterCompanyProductRelevanceRequest); - List companyProductRelevanceEntities = companyProductRelevanceService.filterCompanyProductRelevance(filterCompanyProductRelevanceRequest); - - syncDataResponse.setCompanyProductRelevanceEntities(companyProductRelevanceEntities); - syncDataResponse.setUdiInfoEntities(udiInfoEntities); - syncDataResponse.setUdiRelevanceEntities(udiRelevanceEntities); - - if (!syncDataSetEntity.isBasicThirdProducts()) { - - } - - - } - - - if (syncDataSetEntity.isBasicCorp()) { - //往来单位字典 - BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest = new BasicUnitMaintainFilterRequest(); - basicUnitMaintainFilterRequest.setLastUpdateTime(spsSyncDataRequest.getLastUpdateTime()); - List basicUnitMaintainEntities = basicUnitMaintainService.filterList(basicUnitMaintainFilterRequest); - syncDataResponse.setBasicUnitMaintainEntities(basicUnitMaintainEntities); - } - - if (syncDataSetEntity.isBasicThirdInv()) { - //第三方仓库信息 - FilterThrInvWarehouseRequest filterThrInvWarehouseRequest = new FilterThrInvWarehouseRequest(); - filterThrInvWarehouseRequest.setLastUpdateTime(spsSyncDataRequest.getLastUpdateTime()); - List thrInvWarehouseEntities = thrInvWarehouseService.filterThrInvWarehouse(filterThrInvWarehouseRequest); - syncDataResponse.setThrInvWarehouseEntities(thrInvWarehouseEntities); - } - - - if (syncDataSetEntity.isBasicThirdCorp()) { - //第三方往来单位 - FilterThrCorpRequest filterThrCorpRequest = new FilterThrCorpRequest(); - BeanUtils.copyProperties(spsSyncDataRequest, filterThrCorpRequest); - List thrCorpEntities = thrCorpService.filterThrCorps(filterThrCorpRequest); - syncDataResponse.setThrCorpEntities(thrCorpEntities); - } - - if (syncDataSetEntity.isBasicThirdProducts()) { - //第三方产品信息 - FilterThrProductsRequest filterThrProductsRequest = new FilterThrProductsRequest(); - BeanUtils.copyProperties(spsSyncDataRequest, filterThrProductsRequest); - List thrProductsEntities = thrProductsService.filterThrProductsRequest(filterThrProductsRequest); - syncDataResponse.setThrProductsEntities(thrProductsEntities); - } - - if (syncDataSetEntity.isBasicThirdBusOrder()) { - //第三方业务单据 - FilterThrOrderRequest filterThrOrderRequest = new FilterThrOrderRequest(); - BeanUtils.copyProperties(spsSyncDataRequest, filterThrOrderRequest); - List allOrderDetailEntities = new ArrayList<>(); - List thrOrderEntities = thrOrderService.filterThrOrder(filterThrOrderRequest); - for (ThrOrderEntity thrOrderEntity : thrOrderEntities) { - FilterThrOrderDetailRequest filterThrOrderDetailRequest = new FilterThrOrderDetailRequest(); - filterThrOrderDetailRequest.setOrderIdFk(thrOrderEntity.getId() + ""); - List thrOrderDetailEntities = thrOrderDetailService.filterThrOrderDetailDetail(filterThrOrderDetailRequest); - if (!thrOrderDetailEntities.isEmpty()) { - allOrderDetailEntities.addAll(thrOrderDetailEntities); - } - } - syncDataResponse.setThrOrderDetailEntities(allOrderDetailEntities); - syncDataResponse.setThrOrderEntities(thrOrderEntities); - } - return ResultVOUtils.success(syncDataResponse); + return spsSyncDownloadService.findProductInfo(spsSyncDataRequest); } - //单据类型 - @Resource - BussinessTypeService bussinessTypeService; - @Resource - BussinessLocalTypeService bussinessLocalTypeService; - @Resource - BussinessOriginTypeService bussinessOriginTypeService; - - @GetMapping("sps/sync/busType") public BaseResponse findBusType(SpsSyncDataRequest spsSyncDataRequest) { - - SyncDataSetResponse syncDataSetEntity = syncDataSetService.selectSet(); - SpsSyncBusResponse spsSyncBusResponse = new SpsSyncBusResponse(); - if (syncDataSetEntity.isTypeScan()) { - BussinessTypeFilterRequest bussinessTypeFilterRequest = new BussinessTypeFilterRequest(); - BeanUtils.copyProperties(spsSyncDataRequest, bussinessTypeFilterRequest); - List bussinessTypeEntities = bussinessTypeService.filterAllList(bussinessTypeFilterRequest); - spsSyncBusResponse.setBussinessTypeEntities(bussinessTypeEntities); - } - if (syncDataSetEntity.isTypeBus()) { - BussinessLocalTypeFilterRequest bussinessLocalTypeFilterRequest = new BussinessLocalTypeFilterRequest(); - BeanUtils.copyProperties(spsSyncDataRequest, bussinessLocalTypeFilterRequest); - List bussinessLocalTypeEntities = bussinessLocalTypeService.filterAllList(bussinessLocalTypeFilterRequest); - spsSyncBusResponse.setBussinessLocalTypeEntities(bussinessLocalTypeEntities); - } - if (syncDataSetEntity.isTypeThird()) { - BussinessOriginTypeFilterRequest bussinessOriginTypeFilterRequest = new BussinessOriginTypeFilterRequest(); - BeanUtils.copyProperties(spsSyncDataRequest, bussinessOriginTypeFilterRequest); - List bussinessOriginTypeEntities = bussinessOriginTypeService.filterList(bussinessOriginTypeFilterRequest); - spsSyncBusResponse.setBussinessOriginTypeEntities(bussinessOriginTypeEntities); - } - return ResultVOUtils.success(spsSyncBusResponse); + return spsSyncDownloadService.findBusType(spsSyncDataRequest); } - - //已完成扫码单据 - @Resource - OrderService orderService; - @Resource - CodesService codesService; - @Resource - OrderDetailService orderDetailService; - - @GetMapping("sps/sync/order") public BaseResponse findOrder(SpsSyncDataRequest spsSyncDataRequest) { - SpsSyncOrderResponse syncOrderResponse = new SpsSyncOrderResponse(); - SyncDataSetResponse syncDataSetEntity = syncDataSetService.selectSet(); - if (syncDataSetEntity.isOrderScanFinish()) { - List orderEntities = new ArrayList<>(); - - if (syncDataSetEntity.isOrderScanFinish()) { - OrderFilterRequest orderFilterRequest = new OrderFilterRequest(); - BeanUtils.copyProperties(spsSyncDataRequest, orderFilterRequest); - orderFilterRequest.setFilterActions(syncDataSetEntity.getBusTypes()); - orderFilterRequest.setStatus(ConstantStatus.ORDER_STATUS_SUCCESS); - orderFilterRequest.setReceiveStatus(ConstantStatus.RECEIVE_ED); - List temps = orderService.findAllByTime(orderFilterRequest); - if (CollUtil.isNotEmpty(temps)) { - orderEntities.addAll(temps); - } - } - - if (syncDataSetEntity.isOrderUnReceive()) { - OrderFilterRequest orderFilterRequest = new OrderFilterRequest(); - BeanUtils.copyProperties(spsSyncDataRequest, orderFilterRequest); - orderFilterRequest.setFilterActions(syncDataSetEntity.getBusTypes()); - orderFilterRequest.setStatus(ConstantStatus.ORDER_STATUS_SUCCESS); - orderFilterRequest.setReceiveStatus(ConstantStatus.RECEIVE_UN); - List temps = orderService.findAllByTime(orderFilterRequest); - if (CollUtil.isNotEmpty(temps)) { - orderEntities.addAll(temps); - } - } - - if (syncDataSetEntity.isOrderUnCheck()) { - OrderFilterRequest orderFilterRequest = new OrderFilterRequest(); - BeanUtils.copyProperties(spsSyncDataRequest, orderFilterRequest); - orderFilterRequest.setFilterActions(syncDataSetEntity.getBusTypes()); - orderFilterRequest.setStatus(ConstantStatus.ORDER_STATUS_CHECK); - List temps = orderService.findAllByTime(orderFilterRequest); - if (CollUtil.isNotEmpty(temps)) { - orderEntities.addAll(temps); - } - } - - if (syncDataSetEntity.isOrderScanFinish()) { - OrderFilterRequest orderFilterRequest = new OrderFilterRequest(); - BeanUtils.copyProperties(spsSyncDataRequest, orderFilterRequest); - orderFilterRequest.setFilterActions(syncDataSetEntity.getBusTypes()); - orderFilterRequest.setStatus(ConstantStatus.ORDER_STATUS_SUCCESS); - orderFilterRequest.setReceiveStatus(ConstantStatus.RECEIVE_ED); - List temps = orderService.findAllByTime(orderFilterRequest); - if (CollUtil.isNotEmpty(temps)) { - orderEntities.addAll(temps); - } - } - - - List allOrderDetailEntityList = new ArrayList<>(); - List warehouseEntityList = new ArrayList<>(); - if (CollUtil.isNotEmpty(orderEntities)) { - for (OrderEntity orderEntity : orderEntities) { - List orderDetailEntityList = orderDetailService.filterAllByOrderIdFk(orderEntity.getId()); - if (CollUtil.isNotEmpty(orderDetailEntityList)) { - allOrderDetailEntityList.addAll(orderDetailEntityList); - } - List codes = codesService.findByReceiptId(orderEntity.getId()); - if (CollUtil.isNotEmpty(codes)) { - warehouseEntityList.addAll(codes); - } - } - } - syncOrderResponse.setOrderEntities(orderEntities); - syncOrderResponse.setOrderDetailEntityList(allOrderDetailEntityList); - syncOrderResponse.setWarehouseEntityList(warehouseEntityList); - } - - return ResultVOUtils.success(syncOrderResponse); + return spsSyncDownloadService.findOrder(spsSyncDataRequest); } - - @Resource - ProductInfoService productInfoService; - @Resource - UdiCompanyService udiCompanyService; - //udi同步数据 @GetMapping("sps/sync/syncUdis") public BaseResponse syncUdi(SpsSyncDataRequest spsSyncDataRequest) { - SpSyncUdiResponse spSyncUdiResponse = new SpSyncUdiResponse(); - SyncDataSetResponse syncDataSetEntity = syncDataSetService.selectSet(); - if (syncDataSetEntity.isDbDiProducts()) { - ProductInfoFilterRequest productInfoFilterRequest = new ProductInfoFilterRequest(); - productInfoFilterRequest.setUpdateTime(spsSyncDataRequest.getLastUpdateTime()); - List productInfoEntityList = productInfoService.syncDlUdi(productInfoFilterRequest); - UdiCompanyRequest udiCompanyRequest = new UdiCompanyRequest(); - udiCompanyRequest.setUpdateTime(spsSyncDataRequest.getLastUpdateTime()); - List udiCompanyEntities = udiCompanyService.syncDlCompany(udiCompanyRequest); - spSyncUdiResponse.setUdiCompanyEntities(udiCompanyEntities); - spSyncUdiResponse.setProductInfoEntityList(productInfoEntityList); - } - return ResultVOUtils.success(spSyncUdiResponse); + + return spsSyncDownloadService.syncUdi(spsSyncDataRequest); } } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncDownloadService.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncDownloadService.java new file mode 100644 index 0000000..719a6e1 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncDownloadService.java @@ -0,0 +1,308 @@ +package com.glxp.sale.admin.controller.basic; + +import cn.hutool.core.collection.CollUtil; +import com.glxp.sale.admin.constant.ConstantStatus; +import com.glxp.sale.admin.dao.basic.UdiInfoDao; +import com.glxp.sale.admin.entity.basic.*; +import com.glxp.sale.admin.entity.info.CompanyProductRelevanceEntity; +import com.glxp.sale.admin.entity.inout.ErpOrderEntity; +import com.glxp.sale.admin.entity.inout.OrderEntity; +import com.glxp.sale.admin.entity.inout.WarehouseEntity; +import com.glxp.sale.admin.entity.inventory.InvWarehouseEntity; +import com.glxp.sale.admin.entity.receipt.ProductInfoEntity; +import com.glxp.sale.admin.entity.thrsys.*; +import com.glxp.sale.admin.req.basic.*; +import com.glxp.sale.admin.req.info.FilterCompanyProductRelevanceRequest; +import com.glxp.sale.admin.req.inout.OrderFilterRequest; +import com.glxp.sale.admin.req.inventory.FilterInvWarehouseRequest; +import com.glxp.sale.admin.req.receipt.ProductInfoFilterRequest; +import com.glxp.sale.admin.req.thrsys.*; +import com.glxp.sale.admin.res.basic.SpSyncUdiResponse; +import com.glxp.sale.admin.res.basic.SpsSyncBusResponse; +import com.glxp.sale.admin.res.basic.SpsSyncDataResponse; +import com.glxp.sale.admin.res.basic.SpsSyncOrderResponse; +import com.glxp.sale.admin.res.param.SyncDataSetResponse; +import com.glxp.sale.admin.service.basic.*; +import com.glxp.sale.admin.service.info.CompanyProductRelevanceService; +import com.glxp.sale.admin.service.inout.CodesService; +import com.glxp.sale.admin.service.inout.OrderDetailService; +import com.glxp.sale.admin.service.inout.OrderService; +import com.glxp.sale.admin.service.inventory.InvWarehouseService; +import com.glxp.sale.admin.service.param.SyncDataSetService; +import com.glxp.sale.admin.service.receipt.ProductInfoService; +import com.glxp.sale.admin.service.thrsys.*; +import com.glxp.sale.admin.util.BeanUtils; +import com.glxp.sale.common.res.BaseResponse; +import com.glxp.sale.common.util.ResultVOUtils; +import org.springframework.stereotype.Service; +import org.springframework.web.bind.annotation.GetMapping; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; + +@Service +public class SpsSyncDownloadService { + + //基础信息 + @Resource + InvWarehouseService invWarehouseService; + @Resource + UdiRelevanceService udiRelevanceService; + @Resource + UdiInfoDao udiInfoDao; + @Resource + BasicUnitMaintainService basicUnitMaintainService; + @Resource + ThrInvWarehouseService thrInvWarehouseService; + @Resource + ThrCorpService thrCorpService; + @Resource + ThrProductsService thrProductsService; + @Resource + ThrOrderService thrOrderService; + @Resource + ThrOrderDetailService thrOrderDetailService; + @Resource + private CompanyProductRelevanceService companyProductRelevanceService; + @Resource + private SyncDataSetService syncDataSetService; + + public BaseResponse findProductInfo(SpsSyncDataRequest spsSyncDataRequest) { + + SpsSyncDataResponse syncDataResponse = new SpsSyncDataResponse(); + SyncDataSetResponse syncDataSetEntity = syncDataSetService.selectSet(); + if (syncDataSetEntity.isBasicInv()) { + //仓库字典 + FilterInvWarehouseRequest filterInvWarehouseRequest = new FilterInvWarehouseRequest(); + filterInvWarehouseRequest.setLastUpdateTime(spsSyncDataRequest.getLastUpdateTime()); + List invWarehouseEntities = invWarehouseService.filterGroupInvWarehouse(filterInvWarehouseRequest); + syncDataResponse.setInvWarehouseEntities(invWarehouseEntities); + } + + if (syncDataSetEntity.isBasicProducts()) { + //耗材字典 + FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest(); + filterUdiInfoRequest.setLastUpdateTime(spsSyncDataRequest.getLastUpdateTime()); + List udiRelevanceEntities = udiRelevanceService.filterUdiEntity(filterUdiInfoRequest); + List results = new ArrayList<>(); + udiRelevanceEntities.forEach( + item -> { + results.add(item.getUuid() + ""); + } + ); + List udiInfoEntities = new ArrayList<>(); + if (results.size() > 0) + udiInfoEntities = udiInfoDao.batchSelectByUuid(results); + //供应商产品信息关联表 + FilterCompanyProductRelevanceRequest filterCompanyProductRelevanceRequest = new FilterCompanyProductRelevanceRequest(); + BeanUtils.copyProperties(spsSyncDataRequest, filterCompanyProductRelevanceRequest); + List companyProductRelevanceEntities = companyProductRelevanceService.filterCompanyProductRelevance(filterCompanyProductRelevanceRequest); + + syncDataResponse.setCompanyProductRelevanceEntities(companyProductRelevanceEntities); + syncDataResponse.setUdiInfoEntities(udiInfoEntities); + syncDataResponse.setUdiRelevanceEntities(udiRelevanceEntities); + } + + + if (syncDataSetEntity.isBasicCorp()) { + //往来单位字典 + BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest = new BasicUnitMaintainFilterRequest(); + basicUnitMaintainFilterRequest.setLastUpdateTime(spsSyncDataRequest.getLastUpdateTime()); + List basicUnitMaintainEntities = basicUnitMaintainService.filterList(basicUnitMaintainFilterRequest); + syncDataResponse.setBasicUnitMaintainEntities(basicUnitMaintainEntities); + } + + if (syncDataSetEntity.isBasicThirdInv()) { + //第三方仓库信息 + FilterThrInvWarehouseRequest filterThrInvWarehouseRequest = new FilterThrInvWarehouseRequest(); + filterThrInvWarehouseRequest.setLastUpdateTime(spsSyncDataRequest.getLastUpdateTime()); + List thrInvWarehouseEntities = thrInvWarehouseService.filterThrInvWarehouse(filterThrInvWarehouseRequest); + syncDataResponse.setThrInvWarehouseEntities(thrInvWarehouseEntities); + } + + + if (syncDataSetEntity.isBasicThirdCorp()) { + //第三方往来单位 + FilterThrCorpRequest filterThrCorpRequest = new FilterThrCorpRequest(); + BeanUtils.copyProperties(spsSyncDataRequest, filterThrCorpRequest); + List thrCorpEntities = thrCorpService.filterThrCorps(filterThrCorpRequest); + syncDataResponse.setThrCorpEntities(thrCorpEntities); + } + + if (syncDataSetEntity.isBasicThirdProducts()) { + //第三方产品信息 + FilterThrProductsRequest filterThrProductsRequest = new FilterThrProductsRequest(); + BeanUtils.copyProperties(spsSyncDataRequest, filterThrProductsRequest); + List thrProductsEntities = thrProductsService.filterThrProductsRequest(filterThrProductsRequest); + syncDataResponse.setThrProductsEntities(thrProductsEntities); + } + + if (syncDataSetEntity.isBasicThirdBusOrder()) { + //第三方业务单据 + FilterThrOrderRequest filterThrOrderRequest = new FilterThrOrderRequest(); + BeanUtils.copyProperties(spsSyncDataRequest, filterThrOrderRequest); + List allOrderDetailEntities = new ArrayList<>(); + List thrOrderEntities = thrOrderService.filterThrOrder(filterThrOrderRequest); + for (ThrOrderEntity thrOrderEntity : thrOrderEntities) { + FilterThrOrderDetailRequest filterThrOrderDetailRequest = new FilterThrOrderDetailRequest(); + filterThrOrderDetailRequest.setOrderIdFk(thrOrderEntity.getId() + ""); + List thrOrderDetailEntities = thrOrderDetailService.filterThrOrderDetailDetail(filterThrOrderDetailRequest); + if (!thrOrderDetailEntities.isEmpty()) { + allOrderDetailEntities.addAll(thrOrderDetailEntities); + } + } + syncDataResponse.setThrOrderDetailEntities(allOrderDetailEntities); + syncDataResponse.setThrOrderEntities(thrOrderEntities); + } + return ResultVOUtils.success(syncDataResponse); + } + + //单据类型 + @Resource + BussinessTypeService bussinessTypeService; + @Resource + BussinessLocalTypeService bussinessLocalTypeService; + @Resource + BussinessOriginTypeService bussinessOriginTypeService; + + + @GetMapping("sps/sync/busType") + public BaseResponse findBusType(SpsSyncDataRequest spsSyncDataRequest) { + + SyncDataSetResponse syncDataSetEntity = syncDataSetService.selectSet(); + SpsSyncBusResponse spsSyncBusResponse = new SpsSyncBusResponse(); + if (syncDataSetEntity.isTypeScan()) { + BussinessTypeFilterRequest bussinessTypeFilterRequest = new BussinessTypeFilterRequest(); + BeanUtils.copyProperties(spsSyncDataRequest, bussinessTypeFilterRequest); + List bussinessTypeEntities = bussinessTypeService.filterAllList(bussinessTypeFilterRequest); + spsSyncBusResponse.setBussinessTypeEntities(bussinessTypeEntities); + } + if (syncDataSetEntity.isTypeBus()) { + BussinessLocalTypeFilterRequest bussinessLocalTypeFilterRequest = new BussinessLocalTypeFilterRequest(); + BeanUtils.copyProperties(spsSyncDataRequest, bussinessLocalTypeFilterRequest); + List bussinessLocalTypeEntities = bussinessLocalTypeService.filterAllList(bussinessLocalTypeFilterRequest); + spsSyncBusResponse.setBussinessLocalTypeEntities(bussinessLocalTypeEntities); + } + if (syncDataSetEntity.isTypeThird()) { + BussinessOriginTypeFilterRequest bussinessOriginTypeFilterRequest = new BussinessOriginTypeFilterRequest(); + BeanUtils.copyProperties(spsSyncDataRequest, bussinessOriginTypeFilterRequest); + List bussinessOriginTypeEntities = bussinessOriginTypeService.filterList(bussinessOriginTypeFilterRequest); + spsSyncBusResponse.setBussinessOriginTypeEntities(bussinessOriginTypeEntities); + } + return ResultVOUtils.success(spsSyncBusResponse); + } + + + //已完成扫码单据 + @Resource + OrderService orderService; + @Resource + CodesService codesService; + @Resource + OrderDetailService orderDetailService; + + + @GetMapping("sps/sync/order") + public BaseResponse findOrder(SpsSyncDataRequest spsSyncDataRequest) { + SpsSyncOrderResponse syncOrderResponse = new SpsSyncOrderResponse(); + SyncDataSetResponse syncDataSetEntity = syncDataSetService.selectSet(); + if (syncDataSetEntity.isOrderScanFinish()) { + List orderEntities = new ArrayList<>(); + + if (syncDataSetEntity.isOrderScanFinish()) { + OrderFilterRequest orderFilterRequest = new OrderFilterRequest(); + BeanUtils.copyProperties(spsSyncDataRequest, orderFilterRequest); + orderFilterRequest.setFilterActions(syncDataSetEntity.getBusTypes()); + orderFilterRequest.setStatus(ConstantStatus.ORDER_STATUS_SUCCESS); + orderFilterRequest.setReceiveStatus(ConstantStatus.RECEIVE_ED); + List temps = orderService.findAllByTime(orderFilterRequest); + if (CollUtil.isNotEmpty(temps)) { + orderEntities.addAll(temps); + } + } + + if (syncDataSetEntity.isOrderUnReceive()) { + OrderFilterRequest orderFilterRequest = new OrderFilterRequest(); + BeanUtils.copyProperties(spsSyncDataRequest, orderFilterRequest); + orderFilterRequest.setFilterActions(syncDataSetEntity.getBusTypes()); + orderFilterRequest.setStatus(ConstantStatus.ORDER_STATUS_SUCCESS); + orderFilterRequest.setReceiveStatus(ConstantStatus.RECEIVE_UN); + List temps = orderService.findAllByTime(orderFilterRequest); + if (CollUtil.isNotEmpty(temps)) { + orderEntities.addAll(temps); + } + } + + if (syncDataSetEntity.isOrderUnCheck()) { + OrderFilterRequest orderFilterRequest = new OrderFilterRequest(); + BeanUtils.copyProperties(spsSyncDataRequest, orderFilterRequest); + orderFilterRequest.setFilterActions(syncDataSetEntity.getBusTypes()); + orderFilterRequest.setStatus(ConstantStatus.ORDER_STATUS_CHECK); + List temps = orderService.findAllByTime(orderFilterRequest); + if (CollUtil.isNotEmpty(temps)) { + orderEntities.addAll(temps); + } + } + + if (syncDataSetEntity.isOrderScanFinish()) { + OrderFilterRequest orderFilterRequest = new OrderFilterRequest(); + BeanUtils.copyProperties(spsSyncDataRequest, orderFilterRequest); + orderFilterRequest.setFilterActions(syncDataSetEntity.getBusTypes()); + orderFilterRequest.setStatus(ConstantStatus.ORDER_STATUS_SUCCESS); + orderFilterRequest.setReceiveStatus(ConstantStatus.RECEIVE_ED); + List temps = orderService.findAllByTime(orderFilterRequest); + if (CollUtil.isNotEmpty(temps)) { + orderEntities.addAll(temps); + } + } + + + List allOrderDetailEntityList = new ArrayList<>(); + List warehouseEntityList = new ArrayList<>(); + if (CollUtil.isNotEmpty(orderEntities)) { + for (OrderEntity orderEntity : orderEntities) { + List orderDetailEntityList = orderDetailService.filterAllByOrderIdFk(orderEntity.getId()); + if (CollUtil.isNotEmpty(orderDetailEntityList)) { + allOrderDetailEntityList.addAll(orderDetailEntityList); + } + List codes = codesService.findByReceiptId(orderEntity.getId()); + if (CollUtil.isNotEmpty(codes)) { + warehouseEntityList.addAll(codes); + } + } + } + syncOrderResponse.setOrderEntities(orderEntities); + syncOrderResponse.setOrderDetailEntityList(allOrderDetailEntityList); + syncOrderResponse.setWarehouseEntityList(warehouseEntityList); + } + + return ResultVOUtils.success(syncOrderResponse); + } + + + @Resource + ProductInfoService productInfoService; + @Resource + UdiCompanyService udiCompanyService; + + //udi同步数据 + @GetMapping("sps/sync/syncUdis") + public BaseResponse syncUdi(SpsSyncDataRequest spsSyncDataRequest) { + SpSyncUdiResponse spSyncUdiResponse = new SpSyncUdiResponse(); + SyncDataSetResponse syncDataSetEntity = syncDataSetService.selectSet(); + if (syncDataSetEntity.isDbDiProducts()) { + ProductInfoFilterRequest productInfoFilterRequest = new ProductInfoFilterRequest(); + productInfoFilterRequest.setUpdateTime(spsSyncDataRequest.getLastUpdateTime()); + List productInfoEntityList = productInfoService.syncDlUdi(productInfoFilterRequest); + UdiCompanyRequest udiCompanyRequest = new UdiCompanyRequest(); + udiCompanyRequest.setUpdateTime(spsSyncDataRequest.getLastUpdateTime()); + List udiCompanyEntities = udiCompanyService.syncDlCompany(udiCompanyRequest); + spSyncUdiResponse.setUdiCompanyEntities(udiCompanyEntities); + spSyncUdiResponse.setProductInfoEntityList(productInfoEntityList); + } + return ResultVOUtils.success(spSyncUdiResponse); + + } + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiInfoController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiInfoController.java index d2ee621..12dbd9b 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiInfoController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiInfoController.java @@ -88,7 +88,10 @@ public class UdiInfoController { productInfoFilterRequest.setNameCode(nameCode); try { BaseResponse> udiDlDeviceResponse = syncUdiService.filterUdi(productInfoFilterRequest); - if (filterUdiInfoRequest.getIsCheck() != null && filterUdiInfoRequest.getIsCheck()) { + + if (udiDlDeviceResponse.getCode() != 20000) { + return udiDlDeviceResponse; + } else if (filterUdiInfoRequest.getIsCheck() != null && filterUdiInfoRequest.getIsCheck()) { List productInfoEntities = udiDlDeviceResponse.getData().getList(); List udiInfoEntities = new ArrayList<>(); if (productInfoEntities != null && productInfoEntities.size() > 0) { @@ -136,10 +139,16 @@ public class UdiInfoController { productInfoFilterRequest.setNameCode(filterUdiInfoRequest.getNameCode()); try { BaseResponse> udiDlDeviceResponse = syncUdiService.filterUdi(productInfoFilterRequest); + + if (udiDlDeviceResponse.getCode() != 20000) { + return udiDlDeviceResponse; + } + + if (CollUtil.isEmpty(udiDlDeviceResponse.getData().getList())) { BaseResponse> listBaseResponse = asyncDiDlHelper.dlByDiRes(filterUdiInfoRequest.getNameCode()); - if(listBaseResponse.getCode() == 20000){ + if (listBaseResponse.getCode() == 20000) { List productInfoEntityList = listBaseResponse.getData(); if (CollUtil.isNotEmpty(productInfoEntityList)) { productInfoService.insertProductInfos(productInfoEntityList); @@ -147,8 +156,8 @@ public class UdiInfoController { } else { ResultVOUtils.error(500, "未查询到该产品DI"); } - }else { - return listBaseResponse; + } else { + return listBaseResponse; } } if (filterUdiInfoRequest.getIsCheck() != null && filterUdiInfoRequest.getIsCheck()) { @@ -193,6 +202,11 @@ public class UdiInfoController { try { BaseResponse> udiDlDeviceResponse = syncUdiService.filterCompany(udiCompanyRequest); + if (udiDlDeviceResponse.getCode() != 20000) { + return udiDlDeviceResponse; + } + + return udiDlDeviceResponse; } catch (Exception e) { e.printStackTrace(); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/basic/SpsSyncDataRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/basic/SpsSyncDataRequest.java index 1fcd9a7..7e9f9d3 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/req/basic/SpsSyncDataRequest.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/basic/SpsSyncDataRequest.java @@ -1,9 +1,10 @@ package com.glxp.sale.admin.req.basic; +import com.glxp.sale.admin.req.ListPageRequest; import lombok.Data; @Data -public class SpsSyncDataRequest { +public class SpsSyncDataRequest extends ListPageRequest { private String lastUpdateTime; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/basic/BasicExportTimeService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/BasicExportTimeService.java index 8457b57..9d4e075 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/basic/BasicExportTimeService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/BasicExportTimeService.java @@ -7,6 +7,9 @@ import java.util.List; public interface BasicExportTimeService { + + BasicExportStatusTimeEntity findByType(String type); + List filterExportStatus(BasicExportTimeRequest basicExportStatusRequest); boolean insertExportStatus(BasicExportStatusTimeEntity basicExportStatusTimeEntity); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/BasicExportTimeServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/BasicExportTimeServiceImpl.java index 7be01b0..2d4bf61 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/BasicExportTimeServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/BasicExportTimeServiceImpl.java @@ -21,6 +21,21 @@ public class BasicExportTimeServiceImpl implements BasicExportTimeService { @Resource BasicExportTimeDao basicExportTimeDao; + @Override + public BasicExportStatusTimeEntity findByType(String type) { + BasicExportTimeRequest basicExportTimeRequest = new BasicExportTimeRequest(); + basicExportTimeRequest.setKey(type); + List basicExportStatusTimeEntities = basicExportTimeDao.filterExportStatus(basicExportTimeRequest); + if (CollUtil.isNotEmpty(basicExportStatusTimeEntities)) { + return basicExportStatusTimeEntities.get(0); + } + + BasicExportStatusTimeEntity basicExportStatusTimeEntity = new BasicExportStatusTimeEntity(); + basicExportStatusTimeEntity.setKey(type); + basicExportStatusTimeEntity.setLastUpdateTime("1949-01-01 00:00:00"); + return basicExportStatusTimeEntity; + } + @Override public List filterExportStatus(BasicExportTimeRequest basicExportStatusRequest) { if (basicExportStatusRequest == null) { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/UdiRelevanceServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/UdiRelevanceServiceImpl.java index 2ced31c..f22ffff 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/UdiRelevanceServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/UdiRelevanceServiceImpl.java @@ -56,7 +56,10 @@ public class UdiRelevanceServiceImpl implements UdiRelevanceService { @Override public List filterUdiEntity(FilterUdiInfoRequest filterUdiInfoRequest) { - + if (filterUdiInfoRequest.getPage() != null) { + int offset = (filterUdiInfoRequest.getPage() - 1) * filterUdiInfoRequest.getLimit(); + PageHelper.offsetPage(offset, filterUdiInfoRequest.getLimit()); + } List data = udiRelevanceDao.filterEntity(filterUdiInfoRequest); return data; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/thread/BasicBackUpdateProductService.java b/api-admin/src/main/java/com/glxp/sale/admin/thread/BasicBackUpdateProductService.java index 30212e3..015462c 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/thread/BasicBackUpdateProductService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/thread/BasicBackUpdateProductService.java @@ -1,22 +1,19 @@ package com.glxp.sale.admin.thread; +import cn.hutool.core.collection.CollUtil; import com.glxp.sale.admin.constant.BasicProcessStatus; import com.glxp.sale.admin.constant.ConstantStatus; -import com.glxp.sale.admin.entity.basic.BasicExportStatusEntity; -import com.glxp.sale.admin.entity.basic.BasicThirdSysEntity; -import com.glxp.sale.admin.entity.basic.UdiInfoEntity; -import com.glxp.sale.admin.entity.basic.UdiRelevanceEntity; +import com.glxp.sale.admin.controller.basic.SpsSyncDownloadService; +import com.glxp.sale.admin.entity.basic.*; import com.glxp.sale.admin.entity.param.SystemParamConfigEntity; import com.glxp.sale.admin.entity.thrsys.ThrProductsEntity; import com.glxp.sale.admin.httpclient.ErpBasicClient; import com.glxp.sale.admin.req.basic.FilterErpGoodsRequest; +import com.glxp.sale.admin.req.basic.SpsSyncDataRequest; import com.glxp.sale.admin.req.thrsys.FilterThrProductsRequest; import com.glxp.sale.admin.res.PageSimpleResponse; -import com.glxp.sale.admin.res.basic.ErpProductsResponse; -import com.glxp.sale.admin.service.basic.BasicExportService; -import com.glxp.sale.admin.service.basic.BasicThirdSysService; -import com.glxp.sale.admin.service.basic.UdiInfoService; -import com.glxp.sale.admin.service.basic.UdiRelevanceService; +import com.glxp.sale.admin.res.basic.*; +import com.glxp.sale.admin.service.basic.*; import com.glxp.sale.admin.service.param.SystemParamConfigService; import com.glxp.sale.admin.service.thrsys.ThrProductsService; import com.glxp.sale.admin.util.CustomUtil; @@ -47,6 +44,8 @@ public class BasicBackUpdateProductService { @Resource BasicExportService basicExportService; @Resource + BasicExportTimeService basicExportTimeService; + @Resource RedisUtil redisUtil; //定时或一键下载更新全部线上产品信息 @@ -243,72 +242,111 @@ public class BasicBackUpdateProductService { udiRelevanceService.insertUdiRelevanceignore(udiRelevanceEntity1); } } - } } redisUtil.set("load_thrid_basic", "finish", 15 * 60); } + @Resource + SpsSyncDownloadService spsSyncDownloadService; public void syncUpdatetTime() { //自动创建要求被下载已完成单据任务 BasicExportStatusEntity basicExportStatusEntity1 = basicExportService.findByData("AutoDownloadOrder", 0); if (basicExportStatusEntity1 == null) { - BasicExportStatusEntity orderStatusEntity = new BasicExportStatusEntity(); - orderStatusEntity.setId(CustomUtil.getId()); - orderStatusEntity.setIdDatas("AutoDownloadOrder"); - orderStatusEntity.setType(BasicProcessStatus.NEW_ALL_ORDER); - orderStatusEntity.setUpdateTime(new Date()); - orderStatusEntity.setStatus(0); - orderStatusEntity.setStartTime(new Date()); - orderStatusEntity.setScheduleType(BasicProcessStatus.SCHEDULE_NORMAL); - basicExportService.insertExportStatus(orderStatusEntity); + BaseResponse baseResponse = spsSyncDownloadService.findOrder(getRequest("AutoDownloadOrder")); + SpsSyncOrderResponse syncOrderResponse = baseResponse.getData(); + if (CollUtil.isNotEmpty(syncOrderResponse.getOrderEntities())) { + BasicExportStatusEntity orderStatusEntity = new BasicExportStatusEntity(); + orderStatusEntity.setId(CustomUtil.getId()); + orderStatusEntity.setIdDatas("AutoDownloadOrder"); + orderStatusEntity.setType(BasicProcessStatus.NEW_ALL_ORDER); + orderStatusEntity.setUpdateTime(new Date()); + orderStatusEntity.setStatus(0); + orderStatusEntity.setStartTime(new Date()); + orderStatusEntity.setScheduleType(BasicProcessStatus.SCHEDULE_NORMAL); + basicExportService.insertExportStatus(orderStatusEntity); + } } //自动创建要求被下载单据类型任务 BasicExportStatusEntity basicExportStatusEntity2 = basicExportService.findByData("AutoDownloadBusType", 0); if (basicExportStatusEntity2 == null) { - BasicExportStatusEntity busTypetatusEntity = new BasicExportStatusEntity(); - busTypetatusEntity.setId(CustomUtil.getId()); - busTypetatusEntity.setIdDatas("AutoDownloadBusType"); - busTypetatusEntity.setType(BasicProcessStatus.NEW_ALL_BUS); - busTypetatusEntity.setUpdateTime(new Date()); - busTypetatusEntity.setStatus(0); - busTypetatusEntity.setStartTime(new Date()); - busTypetatusEntity.setScheduleType(BasicProcessStatus.SCHEDULE_NORMAL); - basicExportService.insertExportStatus(busTypetatusEntity); + + BaseResponse baseResponse = spsSyncDownloadService.findBusType(getRequest("AutoDownloadBusType")); + SpsSyncBusResponse spsSyncBusResponse = baseResponse.getData(); + if (CollUtil.isNotEmpty(spsSyncBusResponse.getBussinessLocalTypeEntities()) + || CollUtil.isNotEmpty(spsSyncBusResponse.getBussinessOriginTypeEntities()) + || CollUtil.isNotEmpty(spsSyncBusResponse.getBussinessTypeEntities())) { + BasicExportStatusEntity busTypetatusEntity = new BasicExportStatusEntity(); + busTypetatusEntity.setId(CustomUtil.getId()); + busTypetatusEntity.setIdDatas("AutoDownloadBusType"); + busTypetatusEntity.setType(BasicProcessStatus.NEW_ALL_BUS); + busTypetatusEntity.setUpdateTime(new Date()); + busTypetatusEntity.setStatus(0); + busTypetatusEntity.setStartTime(new Date()); + busTypetatusEntity.setScheduleType(BasicProcessStatus.SCHEDULE_NORMAL); + basicExportService.insertExportStatus(busTypetatusEntity); + } } //自动创建要求被下载基础信息任务 BasicExportStatusEntity basicExportStatusEntity3 = basicExportService.findByData("AutoDownloadAllData", 0); if (basicExportStatusEntity3 == null) { - BasicExportStatusEntity basicExportStatusEntity = new BasicExportStatusEntity(); - basicExportStatusEntity.setId(CustomUtil.getId()); - basicExportStatusEntity.setIdDatas("AutoDownloadAllData"); - basicExportStatusEntity.setType(BasicProcessStatus.NEW_ALL_DATA); - basicExportStatusEntity.setUpdateTime(new Date()); - basicExportStatusEntity.setStatus(0); - basicExportStatusEntity.setStartTime(new Date()); - basicExportStatusEntity.setScheduleType(BasicProcessStatus.SCHEDULE_NORMAL); - basicExportService.insertExportStatus(basicExportStatusEntity); + BaseResponse baseResponse = spsSyncDownloadService.findProductInfo(getRequest("AutoDownloadAllData")); + SpsSyncDataResponse spsSyncDataResponse = baseResponse.getData(); + + if (CollUtil.isNotEmpty(spsSyncDataResponse.getThrOrderDetailEntities()) + || CollUtil.isNotEmpty(spsSyncDataResponse.getThrOrderEntities()) + || CollUtil.isNotEmpty(spsSyncDataResponse.getInvWarehouseEntities()) + || CollUtil.isNotEmpty(spsSyncDataResponse.getBasicUnitMaintainEntities()) + || CollUtil.isNotEmpty(spsSyncDataResponse.getCompanyProductRelevanceEntities()) + || CollUtil.isNotEmpty(spsSyncDataResponse.getThrCorpEntities()) + || CollUtil.isNotEmpty(spsSyncDataResponse.getUdiInfoEntities()) + || CollUtil.isNotEmpty(spsSyncDataResponse.getUdiRelevanceEntities()) + || CollUtil.isNotEmpty(spsSyncDataResponse.getThrProductsEntities()) + || CollUtil.isNotEmpty(spsSyncDataResponse.getThrInvWarehouseEntities()) + ) { + BasicExportStatusEntity basicExportStatusEntity = new BasicExportStatusEntity(); + basicExportStatusEntity.setId(CustomUtil.getId()); + basicExportStatusEntity.setIdDatas("AutoDownloadAllData"); + basicExportStatusEntity.setType(BasicProcessStatus.NEW_ALL_DATA); + basicExportStatusEntity.setUpdateTime(new Date()); + basicExportStatusEntity.setStatus(0); + basicExportStatusEntity.setStartTime(new Date()); + basicExportStatusEntity.setScheduleType(BasicProcessStatus.SCHEDULE_NORMAL); + basicExportService.insertExportStatus(basicExportStatusEntity); + } } //自动创建要求被下载同步库DI信息 BasicExportStatusEntity basicExportStatusEntity4 = basicExportService.findByData("AutoDownloadDiProducts", 0); if (basicExportStatusEntity4 == null) { - BasicExportStatusEntity basicExportStatusEntity = new BasicExportStatusEntity(); - basicExportStatusEntity.setId(CustomUtil.getId()); - basicExportStatusEntity.setIdDatas("AutoDownloadDiProducts"); - basicExportStatusEntity.setType(BasicProcessStatus.NEW_ALL_DI); - basicExportStatusEntity.setUpdateTime(new Date()); - basicExportStatusEntity.setStatus(0); - basicExportStatusEntity.setStartTime(new Date()); - basicExportStatusEntity.setScheduleType(BasicProcessStatus.SCHEDULE_NORMAL); - basicExportService.insertExportStatus(basicExportStatusEntity); + BaseResponse baseResponse = spsSyncDownloadService.syncUdi(getRequest("AutoDownloadDiProducts")); + SpSyncUdiResponse spSyncUdiResponse = baseResponse.getData(); + if (CollUtil.isNotEmpty(spSyncUdiResponse.getProductInfoEntityList()) + || CollUtil.isNotEmpty(spSyncUdiResponse.getUdiCompanyEntities())) { + BasicExportStatusEntity basicExportStatusEntity = new BasicExportStatusEntity(); + basicExportStatusEntity.setId(CustomUtil.getId()); + basicExportStatusEntity.setIdDatas("AutoDownloadDiProducts"); + basicExportStatusEntity.setType(BasicProcessStatus.NEW_ALL_DI); + basicExportStatusEntity.setUpdateTime(new Date()); + basicExportStatusEntity.setStatus(0); + basicExportStatusEntity.setStartTime(new Date()); + basicExportStatusEntity.setScheduleType(BasicProcessStatus.SCHEDULE_NORMAL); + basicExportService.insertExportStatus(basicExportStatusEntity); + } } } - + public SpsSyncDataRequest getRequest(String type) { + SpsSyncDataRequest spsSyncDataRequest = new SpsSyncDataRequest(); + spsSyncDataRequest.setPage(1); + spsSyncDataRequest.setLimit(1); + BasicExportStatusTimeEntity basicExportStatusTimeEntity = basicExportTimeService.findByType(type); + spsSyncDataRequest.setLastUpdateTime(basicExportStatusTimeEntity.getLastUpdateTime()); + return spsSyncDataRequest; + } } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/thread/IoTransInoutService.java b/api-admin/src/main/java/com/glxp/sale/admin/thread/IoTransInoutService.java index 86aada2..b5d640e 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/thread/IoTransInoutService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/thread/IoTransInoutService.java @@ -584,7 +584,7 @@ public class IoTransInoutService { unCheckFinish(orderEntity, warehouseEntityList); return; } - }else if (orderEntity.getFromType().intValue() == ConstantStatus.FROM_UDIWMS) { + } else if (orderEntity.getFromType().intValue() == ConstantStatus.FROM_UDIWMS) { if (!bussinessTypeEntity.isSecCheckUdiwms()) { unCheckFinish(orderEntity, warehouseEntityList); return; @@ -819,6 +819,7 @@ public class IoTransInoutService { } stockOrderDetailService.insertStockOrderDetails(stockOrderDetailEntities); orderEntity.setRemark(""); + orderEntity.setErpFk(stockOrderEntity.getBillNo()); orderEntity.setContrastStatus(ConstantStatus.ORDER_CHECK_UN); orderEntity.setUpdateTime(new Date()); orderService.updateOrder(orderEntity);