基础信息上传供应商

master
anthonywj 4 years ago
parent fbc9a2a833
commit 7ebc1b6e11

@ -236,8 +236,8 @@ public class BasicUnitMaintainController {
BasicThirdSysDetailEntity basicThirdSysDetailEntity = basicThirdSysDetailService.selectByKey("corpUrl", unitMaintainFilterRequest.getThirdSys());
if (basicThirdSysDetailEntity == null || basicThirdSysDetailEntity.getValue() == null)
return ResultVOUtils.error(500, "往来单位接口地址未定义");
if (basicThirdSysDetailEntity.getEnabled() && !basicThirdSysDetailEntity.getItrCache()) {
if (basicThirdSysDetailEntity.getEnabled()) {
if (basicThirdSysDetailEntity.getFromType() == 0 && !basicThirdSysDetailEntity.getItrCache()) {
BaseResponse<PageSimpleResponse<ErpUnitsResponse>> udiDlDeviceResponse =
new ErpBasicClient().getErpCrop(unitMaintainFilterRequest, basicThirdSysDetailEntity.getValue());
return udiDlDeviceResponse;
@ -261,6 +261,9 @@ public class BasicUnitMaintainController {
pageSimpleResponse.setList(thrCorpEntityList);
return ResultVOUtils.success(pageSimpleResponse);
}
} else {
return ResultVOUtils.error(500, "第三方往来单位服务未启用");
}
}

@ -5,6 +5,7 @@ import com.glxp.api.admin.constant.UdiInfoImportStatus;
import com.glxp.api.admin.entity.basic.BasicUnitMaintainEntity;
import com.glxp.api.admin.entity.basic.CorpExportLogEntity;
import com.glxp.api.admin.entity.basic.UdiInfoExportLogEntity;
import com.glxp.api.admin.entity.info.SystemParamConfigEntity;
import com.glxp.api.admin.req.basic.*;
import com.glxp.api.admin.req.inout.DeleteRequest;
import com.glxp.api.admin.res.PageSimpleResponse;
@ -19,6 +20,7 @@ import com.glxp.api.admin.util.ExcelUtil;
import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.GetMapping;
@ -32,9 +34,7 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.OutputStream;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.*;
@RestController
public class CorpExportLogController {
@ -42,6 +42,8 @@ public class CorpExportLogController {
BasicGenExcelService basicGenExcelService;
@Resource
CorpExportLogService corpExportLogService;
@Resource
private BasicUnitMaintainService basicUnitMaintainService;
@GetMapping("/udiwms/corps/exportLog/filter")
public BaseResponse filter(FilterUdiEpLogRequest filterUdiEpLogReques,
@ -71,7 +73,7 @@ public class CorpExportLogController {
return ResultVOUtils.success("删除成功");
}
//产品信息excel文件下载
//往来单位excel文件下载
@GetMapping("/udiwms/corps/exportLog/download")
public void download(FilterUdiEpLogRequest filterUdiEpLogRequest, HttpServletResponse res) {
@ -107,7 +109,7 @@ public class CorpExportLogController {
}
//产品信息导出生成Excel并创建生成记录
//往来单位导出生成Excel并创建生成记录
@PostMapping("/udiwms/corps/importLog/export")
public BaseResponse excelDownload(@RequestBody CorpsExportRequest corpsExportRequest) {
String fileName = "D:\\udiwms\\exportFile\\" + "往来单位信息导出" + System.currentTimeMillis() + ".xls";
@ -123,5 +125,22 @@ public class CorpExportLogController {
return ResultVOUtils.success("后台正在导出生成excel文件请稍后刷新查看!");
}
//往来单位接口下载(第三方使用)
@GetMapping("/udiwms/basic/corps/download")
public BaseResponse filterBasicUnitMaintain(BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest,
BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
List<BasicUnitMaintainEntity> basicUnitMaintainEntities;
basicUnitMaintainEntities = basicUnitMaintainService.filterList(basicUnitMaintainFilterRequest);
PageInfo<BasicUnitMaintainEntity> pageInfo = new PageInfo<>(basicUnitMaintainEntities);
PageSimpleResponse<BasicUnitMaintainEntity> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal());
pageSimpleResponse.setList(basicUnitMaintainEntities);
return ResultVOUtils.success(pageSimpleResponse);
}
}

@ -102,7 +102,8 @@ public class UdiInfoController {
BasicThirdSysDetailEntity basicThirdSysDetailEntity = basicThirdSysDetailService.selectByKey("piQueryUrl", filterErpGoodsRequest.getThirdSys());
if (basicThirdSysDetailEntity == null || basicThirdSysDetailEntity.getValue() == null)
return ResultVOUtils.error(500, "ERP产品信息接口地址未定义");
if (basicThirdSysDetailEntity.getEnabled() &&!basicThirdSysDetailEntity.getItrCache()) {
if(basicThirdSysDetailEntity.getEnabled() ){
if ( basicThirdSysDetailEntity.getFromType() == 0 && !basicThirdSysDetailEntity.getItrCache()) {
ErpBasicClient erpBasicHttpClient = new ErpBasicClient();
BaseResponse<PageSimpleResponse<ErpProductsResponse>> udiDlDeviceResponse = erpBasicHttpClient.getErpProducts(filterErpGoodsRequest, basicThirdSysDetailEntity.getValue());
if (udiDlDeviceResponse.getCode() == 20000) {
@ -133,6 +134,11 @@ public class UdiInfoController {
pageSimpleResponse.setList(thrCorpEntities);
return ResultVOUtils.success(pageSimpleResponse);
}
}else {
return ResultVOUtils.error(500, "第三方产品信息服务未启用");
}
}

@ -130,4 +130,23 @@ public class UdiInfoExportLogController {
}
//产品信息接口下载(第三方使用)
@GetMapping("/udiwms/basic/products/download")
public BaseResponse downloadProducts(FilterUdiInfoRequest filterUdiInfoRequest,
BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
List<UdiRelevanceResponse> udiRelevanceResponses = null;
udiRelevanceResponses = udiRelevanceService.filterUdiRelevance(filterUdiInfoRequest);
PageInfo<UdiRelevanceResponse> pageInfo;
pageInfo = new PageInfo<>(udiRelevanceResponses);
PageSimpleResponse<UdiRelevanceResponse> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal());
pageSimpleResponse.setList(udiRelevanceResponses);
return ResultVOUtils.success(pageSimpleResponse);
}
}

@ -231,7 +231,6 @@ public class UdiInfoImportLogController {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
String genKey = postUdiInfoRequest.getGenKey();
if (genKey == null) {
genKey = CustomUtil.getId();

@ -203,12 +203,17 @@ public class OrderController {
if (basicThirdSysDetailEntity == null) {
return ResultVOUtils.error(500, "ERP出入库单据查询接口地址未定义");
}
List<ErpOrderEntity> erpOrderEntities;
List<ErpOrderEntity> erpOrderEntities = null;
if(basicThirdSysDetailEntity.getEnabled()){
if ( basicThirdSysDetailEntity.getFromType() == 0 ) {
erpOrderEntities = new ErpOrderClient(basicThirdSysDetailEntity.getValue()).getErpOrder(docids, mainOrderEntity.getAction());
} else {
erpOrderEntities = thrOrderService.filterAllOrders(docids, basicThirdSysDetailEntity.getThirdSysFk());
}
}else {
return ResultVOUtils.error(500, "第三方业务单据服务未启用!");
}
if (erpOrderEntities != null && erpOrderEntities.size() > 0) {
List<ErpOrderEntity> returnOrders = new ContrastErpUtil().transErp(erpOrderEntities, udiRelevanceService, mainOrder);

@ -81,10 +81,15 @@ public class OrderDetailController {
}
BasicThirdSysDetailEntity basicThirdSysDetailEntity = bussinessTypeService.findByActionKey(filterErpOrderRequest.getBillAction(), "orderQueryUrl");
if (basicThirdSysDetailEntity.getEnabled() && !basicThirdSysDetailEntity.getItrCache()) {
if (basicThirdSysDetailEntity.getValue() == null) {
return ResultVOUtils.error(500, "业务单据查询接口未定义");
}
if(!basicThirdSysDetailEntity.getEnabled()){
return ResultVOUtils.error(500, "第三方业务单据服务未启用");
}
if (basicThirdSysDetailEntity.getFromType() == 0 && !basicThirdSysDetailEntity.getItrCache()) {
return new ErpOrderClient(basicThirdSysDetailEntity.getValue()).getErpOrderResponse(filterErpOrderRequest);
} else {
//todo 订单查询,需加日期

@ -63,12 +63,16 @@ public class InvErpOnhandController {
}
}
BasicThirdSysDetailEntity basicThirdSysDetailEntity = basicThirdSysDetailService.selectByKey("invPiUrl", onhandQueryRequest.getThirdSys());
if (basicThirdSysDetailEntity.getEnabled()) {
String onHandUrl;
if (basicThirdSysDetailEntity == null || basicThirdSysDetailEntity.getValue() == null)
return ResultVOUtils.error(500, "ERP库存产品信息接口地址未定义");
else
onHandUrl = basicThirdSysDetailEntity.getValue();
if (!basicThirdSysDetailEntity.getEnabled()) {
return ResultVOUtils.error(500, "第三方库存信息服务未启用!");
}
if (basicThirdSysDetailEntity.getFromType() == 0 && !basicThirdSysDetailEntity.getItrCache()) {
BaseResponse<PageSimpleResponse<ErpInvProductResponse>> responseBaseResponse = new ErpInvClient().getInvPrdoductResponse(onhandQueryRequest, onHandUrl);
return responseBaseResponse;
} else {

@ -5,10 +5,13 @@ import com.glxp.api.admin.constant.UdiInfoImportStatus;
import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity;
import com.glxp.api.admin.entity.thrsys.*;
import com.glxp.api.admin.entity.thrsys.ThrCorpExportLogEntity;
import com.glxp.api.admin.httpclient.ErpBasicClient;
import com.glxp.api.admin.req.basic.BasicUnitMaintainFilterRequest;
import com.glxp.api.admin.req.basic.FilterUdiEpLogRequest;
import com.glxp.api.admin.req.inout.DeleteRequest;
import com.glxp.api.admin.req.thrsys.*;
import com.glxp.api.admin.res.PageSimpleResponse;
import com.glxp.api.admin.res.basic.ErpUnitsResponse;
import com.glxp.api.admin.res.basic.UdiRelevanceResponse;
import com.glxp.api.admin.service.basic.BasicThirdSysDetailService;
import com.glxp.api.admin.service.thrsys.ThrCorpExportLogService;
@ -36,6 +39,7 @@ import java.io.OutputStream;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
/**
*
@ -49,6 +53,9 @@ public class ThrCorpExportLogController {
ThrCorpService thrCorpService;
@Resource
ThrCorpsDlService thrCorpsDlService;
@Resource
BasicThirdSysDetailService basicThirdSysDetailService;
@GetMapping("/udiwms/thrCorp/exportLog/filter")
public BaseResponse filter(FilterUdiEpLogRequest filterUdiEpLogReques,
BindingResult bindingResult) {
@ -140,5 +147,46 @@ public class ThrCorpExportLogController {
}
//第三方往来单位接口下载(第三方使用)
@GetMapping("/udiwms/thrsys/thrCorp/download")
public BaseResponse downloadThrCorps(BasicUnitMaintainFilterRequest unitMaintainFilterRequest,
BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
BasicThirdSysDetailEntity basicThirdSysDetailEntity = basicThirdSysDetailService.selectByKey("corpUrl", unitMaintainFilterRequest.getThirdSys());
if (basicThirdSysDetailEntity == null || basicThirdSysDetailEntity.getValue() == null)
return ResultVOUtils.error(500, "往来单位接口地址未定义");
if (basicThirdSysDetailEntity.getEnabled()) {
if (basicThirdSysDetailEntity.getFromType() == 0 && !basicThirdSysDetailEntity.getItrCache()) {
BaseResponse<PageSimpleResponse<ErpUnitsResponse>> udiDlDeviceResponse =
new ErpBasicClient().getErpCrop(unitMaintainFilterRequest, basicThirdSysDetailEntity.getValue());
return udiDlDeviceResponse;
} else {
FilterThrCorpRequest filterThrCorpRequest = new FilterThrCorpRequest();
BeanUtils.copyProperties(unitMaintainFilterRequest, filterThrCorpRequest);
filterThrCorpRequest.setThirdSysFk(unitMaintainFilterRequest.getThirdSys());
List<ThrCorpEntity> thrCorpEntities
= thrCorpService.filterThrCorps(filterThrCorpRequest);
List<ThrCorpEntity> thrCorpEntityList = thrCorpEntities.stream().map(item ->
{
ThrCorpEntity thrCorpEntity = new ThrCorpEntity();
BeanUtils.copyProperties(item, thrCorpEntity);
thrCorpEntity.setId(item.getUnitId());
return thrCorpEntity;
}).collect(Collectors.toList());
PageInfo<ThrCorpEntity> pageInfo;
pageInfo = new PageInfo<>(thrCorpEntities);
PageSimpleResponse<ThrCorpEntity> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal());
pageSimpleResponse.setList(thrCorpEntityList);
return ResultVOUtils.success(pageSimpleResponse);
}
} else {
return ResultVOUtils.error(500, "第三方往来单位服务未启用");
}
}
}

@ -42,8 +42,6 @@ public class ThrCorpsController {
private ThrCorpsDlService thrCorpsDlService;
@Resource
private ThrCorpImportLogService thrCorpImportLogService;
@Resource
private ThrCorpImportDetailService thrCorpImportDetailService;
@GetMapping("/udiwms/thrsys/getCorps")

@ -2,17 +2,29 @@ package com.glxp.api.admin.controller.thrsys;
import com.github.pagehelper.PageInfo;
import com.glxp.api.admin.constant.UdiInfoImportStatus;
import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity;
import com.glxp.api.admin.entity.basic.UdiEntity;
import com.glxp.api.admin.entity.thrsys.ThrInvProductsEntity;
import com.glxp.api.admin.entity.thrsys.ThrInvProductsExportLogEntity;
import com.glxp.api.admin.httpclient.ErpInvClient;
import com.glxp.api.admin.req.basic.FilterUdiEpLogRequest;
import com.glxp.api.admin.req.inout.DeleteRequest;
import com.glxp.api.admin.req.inventory.ErpOnhandRequest;
import com.glxp.api.admin.req.thrsys.FilterThrInvProductsRequest;
import com.glxp.api.admin.req.thrsys.ThrInvProductsExportRequest;
import com.glxp.api.admin.res.PageSimpleResponse;
import com.glxp.api.admin.res.basic.UdiRelevanceResponse;
import com.glxp.api.admin.res.inventory.ErpInvProductResponse;
import com.glxp.api.admin.service.basic.BasicThirdSysDetailService;
import com.glxp.api.admin.service.thrsys.ThrInvProductsExportLogService;
import com.glxp.api.admin.service.thrsys.ThrInvProductsService;
import com.glxp.api.admin.thread.ThrInvProductsDlService;
import com.glxp.api.admin.util.CustomUtil;
import com.glxp.api.admin.util.FilterUdiUtils;
import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
@ -27,6 +39,7 @@ import java.io.IOException;
import java.io.OutputStream;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
@RestController
public class ThrInvProductsExportLogController {
@ -34,6 +47,10 @@ public class ThrInvProductsExportLogController {
ThrInvProductsExportLogService thrInvProductsExportLogService;
@Resource
ThrInvProductsDlService thrInvProductsDlService;
@Resource
BasicThirdSysDetailService basicThirdSysDetailService;
@Resource
private ThrInvProductsService thrInvProductsService;
@GetMapping("/udiwms/invProducts/exportLog/filter")
public BaseResponse filter(FilterUdiEpLogRequest filterUdiEpLogReques,
@ -103,7 +120,6 @@ public class ThrInvProductsExportLogController {
@PostMapping("/udiwms/invProducts/importLog/export")
public BaseResponse excelDownload(@RequestBody ThrInvProductsExportRequest thrInvProductsExportRequest) {
String fileName = "D:\\udiwms\\exportFile\\" + "库存产品信息导出" + System.currentTimeMillis() + ".xls";
File file = new File(fileName);
if (!file.exists()) {
@ -124,8 +140,52 @@ public class ThrInvProductsExportLogController {
thrInvProductsDlService.genExcel(genKey, thrInvProductsExportRequest);
return ResultVOUtils.success("后台正在导出生成excel文件请稍后刷新查看!");
}
//第三方库存产品信息接口下载(第三方使用)
@GetMapping("/udiwms/thirdSys/invProducts/download")
public BaseResponse getOnhand(ErpOnhandRequest onhandQueryRequest,
BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
BasicThirdSysDetailEntity basicThirdSysDetailEntity = basicThirdSysDetailService.selectByKey("invPiUrl", onhandQueryRequest.getThirdSys());
String onHandUrl;
if (basicThirdSysDetailEntity == null || basicThirdSysDetailEntity.getValue() == null)
return ResultVOUtils.error(500, "ERP库存产品信息接口地址未定义");
else
onHandUrl = basicThirdSysDetailEntity.getValue();
if (!basicThirdSysDetailEntity.getEnabled()) {
return ResultVOUtils.error(500, "第三方库存信息服务未启用!");
}
if (basicThirdSysDetailEntity.getFromType() == 0 && !basicThirdSysDetailEntity.getItrCache()) {
BaseResponse<PageSimpleResponse<ErpInvProductResponse>> responseBaseResponse = new ErpInvClient().getInvPrdoductResponse(onhandQueryRequest, onHandUrl);
return responseBaseResponse;
} else {
FilterThrInvProductsRequest filterThrInvProductsRequest = new FilterThrInvProductsRequest();
BeanUtils.copyProperties(onhandQueryRequest, filterThrInvProductsRequest);
filterThrInvProductsRequest.setThirdSysFk(onhandQueryRequest.getThirdSys());
List<ThrInvProductsEntity> thrInvProductsEntities
= thrInvProductsService.filterThrInvProductss(filterThrInvProductsRequest);
List<ErpInvProductResponse> erpInvProductResponseList = thrInvProductsEntities.stream().map(item ->
{
ErpInvProductResponse erpInvProductResponse = new ErpInvProductResponse();
BeanUtils.copyProperties(item, erpInvProductResponse);
erpInvProductResponse.setCode(item.getInventoryCode());
erpInvProductResponse.setName(item.getInventoryName());
return erpInvProductResponse;
}).collect(Collectors.toList());
PageInfo<ErpInvProductResponse> pageInfo;
pageInfo = new PageInfo<>(erpInvProductResponseList);
PageSimpleResponse<ErpInvProductResponse> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal());
pageSimpleResponse.setList(erpInvProductResponseList);
return ResultVOUtils.success(pageSimpleResponse);
}
}
}

@ -6,14 +6,17 @@ import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity;
import com.glxp.api.admin.entity.thrsys.ThrOrderDetailEntity;
import com.glxp.api.admin.entity.thrsys.ThrOrderEntity;
import com.glxp.api.admin.entity.thrsys.ThrOrderExportLogEntity;
import com.glxp.api.admin.httpclient.ErpOrderClient;
import com.glxp.api.admin.req.basic.FilterUdiEpLogRequest;
import com.glxp.api.admin.req.inout.DeleteRequest;
import com.glxp.api.admin.req.inout.FilterOrderRequest;
import com.glxp.api.admin.req.thrsys.FilterThrOrderDetailRequest;
import com.glxp.api.admin.req.thrsys.FilterThrOrderRequest;
import com.glxp.api.admin.req.thrsys.ThrOrderExportRequest;
import com.glxp.api.admin.res.PageSimpleResponse;
import com.glxp.api.admin.res.inout.ErpOrderResponse;
import com.glxp.api.admin.service.basic.BasicThirdSysDetailService;
import com.glxp.api.admin.service.basic.BussinessTypeService;
import com.glxp.api.admin.service.thrsys.ThrOrderDetailService;
import com.glxp.api.admin.service.thrsys.ThrOrderExportLogService;
import com.glxp.api.admin.service.thrsys.ThrOrderService;
@ -46,6 +49,12 @@ public class ThrOrderExportLogController {
ThrOrderExportLogService thrOrderExportLogService;
@Resource
ThrOrdersDlService thrOrdersDlService;
@Resource
private BussinessTypeService bussinessTypeService;
@Resource
private ThrOrderService thrOrderService;
@Resource
private ThrOrderDetailService thrOrderDetailService;
@GetMapping("/udiwms/thrOrder/exportLog/filter")
public BaseResponse filter(FilterUdiEpLogRequest filterUdiEpLogReques,
@ -75,7 +84,7 @@ public class ThrOrderExportLogController {
return ResultVOUtils.success("删除成功");
}
//产品信息excel文件下载
//业务单据excel文件下载
@GetMapping("/udiwms/thrOrder/exportLog/download")
public void download(FilterUdiEpLogRequest filterUdiEpLogRequest, HttpServletResponse res) {
@ -111,7 +120,7 @@ public class ThrOrderExportLogController {
}
//产品信息导出生成Excel并创建生成记录
//业务单据导出生成Excel并创建生成记录
@PostMapping("/udiwms/thrOrder/importLog/export")
public BaseResponse excelDownload(@RequestBody ThrOrderExportRequest thrOrderExportRequest) {
@ -125,7 +134,6 @@ public class ThrOrderExportLogController {
e.printStackTrace();
}
}
ThrOrderExportLogEntity udiInfoExportLogEntity = new ThrOrderExportLogEntity();
udiInfoExportLogEntity.setStatus(UdiInfoImportStatus.UDIINFO_IMPORT_PROCESS);
String genKey = CustomUtil.getId();
@ -139,5 +147,62 @@ public class ThrOrderExportLogController {
}
//第三方业务单据接口下载(第三方使用)
@GetMapping("/udiwms/thrsys/thrOrder/download")
public BaseResponse downloadThrOrders(FilterOrderRequest filterErpOrderRequest,
BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
BasicThirdSysDetailEntity basicThirdSysDetailEntity = bussinessTypeService.findByActionKey(filterErpOrderRequest.getBillAction(), "orderQueryUrl");
if (basicThirdSysDetailEntity.getValue() == null) {
return ResultVOUtils.error(500, "业务单据查询接口未定义");
}
if (!basicThirdSysDetailEntity.getEnabled()) {
return ResultVOUtils.error(500, "第三方业务单据服务未启用");
}
if (basicThirdSysDetailEntity.getFromType() == 0 && !basicThirdSysDetailEntity.getItrCache()) {
return new ErpOrderClient(basicThirdSysDetailEntity.getValue()).getErpOrderResponse(filterErpOrderRequest);
} else {
//todo 订单查询,需加日期
FilterThrOrderRequest filterThrOrderRequest = new FilterThrOrderRequest();
BeanUtils.copyProperties(filterErpOrderRequest, filterThrOrderRequest);
filterThrOrderRequest.setPage(filterErpOrderRequest.getPage());
filterThrOrderRequest.setLimit(filterErpOrderRequest.getLimit());
List<ErpOrderResponse> erpOrderResponses = new ArrayList<>();
List<ThrOrderEntity> data = thrOrderService.filterThrOrder(filterThrOrderRequest);
if (data != null && data.size() > 0) {
for (ThrOrderEntity thrOrderEntity : data) {
FilterThrOrderDetailRequest filterThrOrderDetailRequest = new FilterThrOrderDetailRequest();
filterThrOrderDetailRequest.setOrderIdFk(thrOrderEntity.getId() + "");
List<ThrOrderDetailEntity> thrOrderDetailEntities = thrOrderDetailService.filterThrOrderDetailDetail(filterThrOrderDetailRequest);
ErpOrderResponse erpOrderResponse = new ErpOrderResponse();
BeanUtils.copyProperties(thrOrderEntity, erpOrderResponse);
List<ErpOrderResponse.SubErpOrder> subErpOrders = new ArrayList<>();
if (thrOrderDetailEntities != null && thrOrderDetailEntities.size() > 0) {
for (ThrOrderDetailEntity thrOrderDetailEntity : thrOrderDetailEntities) {
ErpOrderResponse.SubErpOrder subErpOrder = new ErpOrderResponse.SubErpOrder();
BeanUtils.copyProperties(thrOrderDetailEntity, subErpOrder);
subErpOrders.add(subErpOrder);
}
}
erpOrderResponse.setSubErpOrders(subErpOrders);
erpOrderResponses.add(erpOrderResponse);
}
}
PageInfo<ThrOrderEntity> pageInfo;
pageInfo = new PageInfo<>(data);
PageSimpleResponse<ErpOrderResponse> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal());
pageSimpleResponse.setList(erpOrderResponses);
return ResultVOUtils.success(pageSimpleResponse);
}
}
}

@ -84,7 +84,6 @@ public class ThrProductsController {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
List<ThrProductsEntity> thrProductsEntities;
List<ErpProductsResponse> erpProductsResponses = postThrProductsRequest.getDatas();
String genKey = postThrProductsRequest.getGenKey();

@ -3,14 +3,18 @@ package com.glxp.api.admin.controller.thrsys;
import com.github.pagehelper.PageInfo;
import com.glxp.api.admin.constant.UdiInfoImportStatus;
import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity;
import com.glxp.api.admin.entity.basic.UdiRelevanceEntity;
import com.glxp.api.admin.entity.thrsys.ThrInvProductsEntity;
import com.glxp.api.admin.entity.thrsys.ThrProductsEntity;
import com.glxp.api.admin.entity.thrsys.ThrProductsExportLogEntity;
import com.glxp.api.admin.httpclient.ErpBasicClient;
import com.glxp.api.admin.req.basic.FilterErpGoodsRequest;
import com.glxp.api.admin.req.basic.FilterUdiEpLogRequest;
import com.glxp.api.admin.req.inout.DeleteRequest;
import com.glxp.api.admin.req.thrsys.FilterThrProductsRequest;
import com.glxp.api.admin.req.thrsys.ThrProductsExportRequest;
import com.glxp.api.admin.res.PageSimpleResponse;
import com.glxp.api.admin.res.basic.ErpProductsResponse;
import com.glxp.api.admin.service.basic.BasicThirdSysDetailService;
import com.glxp.api.admin.service.thrsys.ThrProductsExportLogService;
import com.glxp.api.admin.service.thrsys.ThrProductsService;
@ -140,4 +144,65 @@ public class ThrProductsExportLogController {
}
//产品信息导出生成Excel并创建生成记录
@PostMapping("/udiwms/thrProducts/importLog/uploadSmp")
public BaseResponse uploadSmp(@RequestBody ThrProductsExportRequest thrProductsExportRequest) {
String fileName = "D:\\udiwms\\exportFile\\" + "产品信息导出" + System.currentTimeMillis() + ".xls";
File file = new File(fileName);
if (!file.exists()) {
try {
file.createNewFile();
} catch (IOException e) {
e.printStackTrace();
}
}
ThrProductsExportLogEntity thrProductsExportLogEntity = new ThrProductsExportLogEntity();
thrProductsExportLogEntity.setStatus(UdiInfoImportStatus.UDIINFO_IMPORT_PROCESS);
String genKey = CustomUtil.getId();
thrProductsExportLogEntity.setGenKey(genKey);
thrProductsExportLogEntity.setFilePath(fileName);
thrProductsExportLogEntity.setUpdateTime(new Date());
thrProductsExportLogEntity.setDlCount(0);
thrProductsExportLogService.insertThrProductsExportLog(thrProductsExportLogEntity);
thrProductsDlService.genExcel(genKey, thrProductsExportRequest);
return ResultVOUtils.success("后台正在导出生成excel文件请稍后刷新查看!");
}
//第三方产品信息接口下载(第三方使用)
@GetMapping("/udiwms/thrsys/thrProducts/download")
public BaseResponse getErpProducts(FilterErpGoodsRequest filterErpGoodsRequest,
BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
BasicThirdSysDetailEntity basicThirdSysDetailEntity = basicThirdSysDetailService.selectByKey("piQueryUrl", filterErpGoodsRequest.getThirdSys());
if (basicThirdSysDetailEntity == null || basicThirdSysDetailEntity.getValue() == null)
return ResultVOUtils.error(500, "ERP产品信息接口地址未定义");
if (basicThirdSysDetailEntity.getEnabled()) {
if (basicThirdSysDetailEntity.getFromType() == 0 && !basicThirdSysDetailEntity.getItrCache()) {
ErpBasicClient erpBasicHttpClient = new ErpBasicClient();
BaseResponse<PageSimpleResponse<ErpProductsResponse>> udiDlDeviceResponse = erpBasicHttpClient.getErpProducts(filterErpGoodsRequest, basicThirdSysDetailEntity.getValue());
if (udiDlDeviceResponse.getCode() == 20000) {
return udiDlDeviceResponse;
}
return ResultVOUtils.error(500, "未查询到产品信息");
} else {
FilterThrProductsRequest filterThrProductsRequest = new FilterThrProductsRequest();
BeanUtils.copyProperties(filterErpGoodsRequest, filterThrProductsRequest);
List<ThrProductsEntity> thrCorpEntities
= thrProductsService.filterThrProductsRequest(filterThrProductsRequest);
PageInfo<ThrProductsEntity> pageInfo;
pageInfo = new PageInfo<>(thrCorpEntities);
PageSimpleResponse<ThrProductsEntity> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal());
pageSimpleResponse.setList(thrCorpEntities);
return ResultVOUtils.success(pageSimpleResponse);
}
} else {
return ResultVOUtils.error(500, "第三方产品信息服务未启用");
}
}
}

@ -14,6 +14,7 @@ public class BasicThirdSysDetailEntity {
private String remark;
private String thirdSysFk;
private String name;
private Integer fromType;
}

@ -9,6 +9,7 @@ public class FilterBasicThirdSysRequest extends ListPageRequest {
private String thirdId;
private String thirdName;
private Boolean enabled;
private Integer fromType;
private Boolean mainSys;
}

@ -7,4 +7,7 @@ import java.awt.*;
@Data
public class FilterSysApiRequest extends ListPageRequest {
private Integer type;
}

@ -10,7 +10,10 @@ import com.glxp.api.admin.res.PageSimpleResponse;
import com.glxp.api.admin.res.basic.ErpProductsResponse;
import com.glxp.api.admin.service.basic.BasicThirdSysDetailService;
import com.glxp.api.admin.service.basic.BasicThirdSysService;
import com.glxp.api.admin.thread.IoModifyErpTask;
import com.glxp.api.common.res.BaseResponse;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
@ -29,10 +32,18 @@ public class ThrDataService {
@Resource
private ThrProductsService thrProductsService;
final Logger logger = LoggerFactory.getLogger(ThrDataService.class);
public ThrProductsEntity getProducts(String code, String thirdSys) {
BasicThirdSysDetailEntity basicThirdSysDetailEntity = basicThirdSysDetailService.selectByKey("piQueryUrl", thirdSys);
if (basicThirdSysDetailEntity.getEnabled() && !basicThirdSysDetailEntity.getItrCache()) {
if(basicThirdSysDetailEntity==null || !basicThirdSysDetailEntity.getEnabled()){
logger.info("第三方产品信息服务未启用");
return null;
}
if ( basicThirdSysDetailEntity.getFromType() == 0 && !basicThirdSysDetailEntity.getItrCache()) {
FilterErpGoodsRequest filterErpGoodsRequest = new FilterErpGoodsRequest();
filterErpGoodsRequest.setCode(code);
filterErpGoodsRequest.setPage(1);
@ -58,9 +69,4 @@ public class ThrDataService {
return null;
}
public void getCorps(){
}
}

@ -89,7 +89,7 @@ public class IoModifyErpTask implements SchedulingConfigurer {
filterErpOrderRequest.setOrderId(orderEntity.getId());
List<ErpOrderEntity> erpOrderEntities = myErpOrderService.filterMyErpOrder(filterErpOrderRequest);
BasicThirdSysDetailEntity basicThirdSysDetailEntity = bussinessTypeService.findByActionKey(filterErpOrderRequest.getBillAction(), "orderQueryUrl");
if (basicThirdSysDetailEntity.getEnabled()) {
if (basicThirdSysDetailEntity.getEnabled() && basicThirdSysDetailEntity.getFromType() == 0 ) {
if (basicThirdSysDetailEntity.getValue() != null) {
String url = basicThirdSysDetailEntity.getValue();
if (erpOrderEntities != null && !erpOrderEntities.isEmpty()) {
@ -134,7 +134,7 @@ public class IoModifyErpTask implements SchedulingConfigurer {
for (OrderEntity orderEntity : signsOrderEntities) {
BasicThirdSysDetailEntity basicThirdSysDetailEntity = bussinessTypeService.findByActionKey(orderEntity.getAction(), "orderQueryUrl");
if (basicThirdSysDetailEntity.getEnabled()) {
if (basicThirdSysDetailEntity.getEnabled() && basicThirdSysDetailEntity.getFromType() == 0 ) {
if (basicThirdSysDetailEntity.getValue() != null) {
String url = basicThirdSysDetailEntity.getValue();
FilterErpOrderRequest filterErpOrderRequest = new FilterErpOrderRequest();

@ -188,7 +188,7 @@ public class IoTransInoutService {
if (erpIds != null && erpIds.size() > 0) {
BasicThirdSysDetailEntity basicThirdSysDetailEntity = bussinessTypeService.findByActionKey(orderEntity.getAction(), "orderQueryUrl");
if (basicThirdSysDetailEntity.getEnabled()) {
if (basicThirdSysDetailEntity.getEnabled() && basicThirdSysDetailEntity.getFromType() == 0 ) {
if (basicThirdSysDetailEntity.getValue() == null) {
orderEntity.setContrastStatus(ConstantStatus.ORDER_CHECK_FAIL);
orderEntity.setStatus(ConstantStatus.ORDER_STATUS_SUCCESS);

@ -116,7 +116,15 @@ public class ThrCorpsDlService {
thrCorpExportLogService.updateThrCorpExportLog(thrCorpExportLogEntity);
return;
}
if (basicThirdSysDetailEntity.getEnabled() && !basicThirdSysDetailEntity.getItrCache()) {
if(!basicThirdSysDetailEntity.getEnabled()){
thrCorpExportLogEntity.setStatus(UdiInfoImportStatus.UDIINFO_IMPORT_FAIL);
thrCorpExportLogEntity.setRemark("第三方往来单位服务未启用");
thrCorpExportLogService.updateThrCorpExportLog(thrCorpExportLogEntity);
return;
}
if ( basicThirdSysDetailEntity.getFromType() == 0 && !basicThirdSysDetailEntity.getItrCache()) {
//根据查询条件一键导出第三方系统往来单位
List<ThrCorpEntity> thrCorpEntities = exportCorps(thrCorpExportRequest);
excelData.addAll(getRows(thrCorpEntities));

@ -110,7 +110,13 @@ public class ThrInvProductsDlService {
thrInvProductsExportLogService.updateThrInvProductsExportLog(thrInvProductsExportLogEntity);
return;
}
if (basicThirdSysDetailEntity.getEnabled() && !basicThirdSysDetailEntity.getItrCache()) {
if (!basicThirdSysDetailEntity.getEnabled()) {
thrInvProductsExportLogEntity.setStatus(UdiInfoImportStatus.UDIINFO_IMPORT_FAIL);
thrInvProductsExportLogEntity.setRemark("第三方库存产品信息接口服务未启用");
thrInvProductsExportLogService.updateThrInvProductsExportLog(thrInvProductsExportLogEntity);
return;
}
if ( basicThirdSysDetailEntity.getFromType() == 0 && !basicThirdSysDetailEntity.getItrCache()) {
//从第三方服务实时一键导出
FilterThrInvProductsRequest filterThrInvProductsRequest = new FilterThrInvProductsRequest();
BeanUtils.copyProperties(thrInvProductsExportRequest, filterThrInvProductsRequest);

@ -131,7 +131,14 @@ public class ThrOrdersDlService {
thrOrderExportLogService.updateThrOrderExportLog(thrOrderExportLogEntity);
return;
}
if (basicThirdSysDetailEntity.getEnabled() && !basicThirdSysDetailEntity.getItrCache()) {
if (!basicThirdSysDetailEntity.getEnabled() ) {
thrOrderExportLogEntity.setStatus(UdiInfoImportStatus.UDIINFO_IMPORT_FAIL);
thrOrderExportLogEntity.setRemark("第三方往来单位服务未启用");
thrOrderExportLogService.updateThrOrderExportLog(thrOrderExportLogEntity);
return;
}
if (basicThirdSysDetailEntity.getFromType() == 0 && !basicThirdSysDetailEntity.getItrCache()) {
FilterThrOrderRequest filterThrOrderRequest = new FilterThrOrderRequest();
BeanUtils.copyProperties(thrOrderExportRequest, filterThrOrderRequest);
List<List<String>> datas = exportThrOrders(filterThrOrderRequest);

@ -8,6 +8,7 @@ import com.glxp.api.admin.httpclient.ErpBasicClient;
import com.glxp.api.admin.req.basic.FilterErpGoodsRequest;
import com.glxp.api.admin.req.basic.FilterUdiIpLogRequest;
import com.glxp.api.admin.req.thrsys.FilterThrProductsRequest;
import com.glxp.api.admin.req.thrsys.PostThrProductsRequest;
import com.glxp.api.admin.req.thrsys.ThrProductsExportRequest;
import com.glxp.api.admin.res.PageSimpleResponse;
import com.glxp.api.admin.res.basic.ErpProductsResponse;
@ -113,7 +114,15 @@ public class ThrProductsDlService {
thrProductsExportLogService.updateThrProductsExportLog(thrProductsExportLogEntity);
return;
}
if (basicThirdSysDetailEntity.getEnabled() && !basicThirdSysDetailEntity.getItrCache()) {
if (!basicThirdSysDetailEntity.getEnabled()) {
thrProductsExportLogEntity.setStatus(UdiInfoImportStatus.UDIINFO_IMPORT_FAIL);
thrProductsExportLogEntity.setRemark("第三方产品信息服务未启用!");
thrProductsExportLogService.updateThrProductsExportLog(thrProductsExportLogEntity);
return;
}
if (basicThirdSysDetailEntity.getFromType() == 0 && !basicThirdSysDetailEntity.getItrCache()) {
FilterThrProductsRequest filterThrProductsRequest = new FilterThrProductsRequest();
BeanUtils.copyProperties(thrProductsExportRequest, filterThrProductsRequest);
List<ThrProductsEntity> thrProductsEntities = exportThrProducts(filterThrProductsRequest);
@ -135,6 +144,79 @@ public class ThrProductsDlService {
}
//上传SMP
@Async
public void uploadSmp(String genKey, ThrProductsExportRequest thrProductsExportRequest) {
PostThrProductsRequest postThrProductsRequest = new PostThrProductsRequest();
List<ErpProductsResponse> datas = new ArrayList<>();
ThrProductsExportLogEntity thrProductsExportLogEntity = thrProductsExportLogService.selectByGenKey(genKey);
//选中导出
if (thrProductsExportRequest.getThrProductsEntities() != null && thrProductsExportRequest.getThrProductsEntities().size() > 0) {
List<ThrProductsEntity> thrProductsEntities = thrProductsExportRequest.getThrProductsEntities();
List<ErpProductsResponse> lists = thrProductsEntities.stream().map(
item -> {
ErpProductsResponse thrProductsEntity = new ErpProductsResponse();
BeanUtils.copyProperties(item, thrProductsEntity);
return thrProductsEntity;
}
).collect(Collectors.toList());
datas.addAll(lists);
postThrProductsRequest.setDatas(datas);
postThrProductsRequest.setGenKey(genKey);
postThrProductsRequest.setThirdSys(thrProductsExportRequest.getThirdSys());
postThrProductsRequest.setUploadType("接口上传");
//Todo 接口上传SMP
} else {//一键导出
BasicThirdSysDetailEntity basicThirdSysDetailEntity = basicThirdSysDetailService.selectByKey("piQueryUrl", thrProductsExportRequest.getThirdSys());
if (basicThirdSysDetailEntity == null || basicThirdSysDetailEntity.getValue() == null) {
thrProductsExportLogEntity.setStatus(UdiInfoImportStatus.UDIINFO_IMPORT_FAIL);
thrProductsExportLogEntity.setRemark("产品信息接口未定义!");
thrProductsExportLogService.updateThrProductsExportLog(thrProductsExportLogEntity);
return;
}
if (!basicThirdSysDetailEntity.getEnabled()) {
thrProductsExportLogEntity.setStatus(UdiInfoImportStatus.UDIINFO_IMPORT_FAIL);
thrProductsExportLogEntity.setRemark("第三方产品信息服务未启用!");
thrProductsExportLogService.updateThrProductsExportLog(thrProductsExportLogEntity);
return;
}
List<ThrProductsEntity> thrProductsEntities;
if (basicThirdSysDetailEntity.getFromType() == 0 && !basicThirdSysDetailEntity.getItrCache()) {
FilterThrProductsRequest filterThrProductsRequest = new FilterThrProductsRequest();
BeanUtils.copyProperties(thrProductsExportRequest, filterThrProductsRequest);
thrProductsEntities = exportThrProducts(filterThrProductsRequest);
} else {
FilterThrProductsRequest filterThrInvProductsRequest = new FilterThrProductsRequest();
thrProductsEntities = thrProductsService.filterThrProductsRequest(filterThrInvProductsRequest);
}
if(thrProductsEntities!=null){
List<ErpProductsResponse> lists = thrProductsEntities.stream().map(
item -> {
ErpProductsResponse thrProductsEntity = new ErpProductsResponse();
BeanUtils.copyProperties(item, thrProductsEntity);
return thrProductsEntity;
}
).collect(Collectors.toList());
datas.addAll(lists);
postThrProductsRequest.setDatas(datas);
postThrProductsRequest.setGenKey(genKey);
postThrProductsRequest.setThirdSys(thrProductsExportRequest.getThirdSys());
postThrProductsRequest.setUploadType("接口上传");
}
thrProductsExportLogEntity.setStatus(UdiInfoImportStatus.UDIINFO_IMPORT_SUCCESS);
thrProductsExportLogService.updateThrProductsExportLog(thrProductsExportLogEntity);
}
}
// //接收第三方上传或文件导入数据
@Async
public void insertData(String genKey, List<ErpProductsResponse> erpProductsResponses, String thirdSys) {

@ -12,6 +12,7 @@
<if test="guideUrl != null">guideUrl=#{guideUrl},</if>
<if test="remark != null">remark=#{remark},</if>
<if test="name != null">name=#{name},</if>
<if test="fromType != null">fromType=#{fromType},</if>
<if test="thirdSysFk != null">thirdSysFk=#{thirdSysFk},</if>
</trim>
WHERE id=#{id}

@ -4,9 +4,14 @@
<mapper namespace="com.glxp.api.admin.dao.info.ThirdSysApiDao">
<select id="findSysApi"
<select id="findSysApi" parameterType="com.glxp.api.admin.req.info.FilterSysApiRequest"
resultType="com.glxp.api.admin.entity.info.ThirdSysApiEntity">
SELECT * FROM sys_thirdsys_api
<where>
<if test="type != '' and type != null">
AND type = #{type}
</if>
</where>
</select>
<update id="modifySysApi" parameterType="com.glxp.api.admin.entity.info.ThirdSysApiEntity">

Loading…
Cancel
Save