|
|
|
|
@ -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();
|
|
|
|
|
@ -134,10 +142,67 @@ public class ThrOrderExportLogController {
|
|
|
|
|
udiInfoExportLogEntity.setUpdateTime(new Date());
|
|
|
|
|
udiInfoExportLogEntity.setDlCount(0);
|
|
|
|
|
thrOrderExportLogService.insertThrOrderExportLog(udiInfoExportLogEntity);
|
|
|
|
|
thrOrdersDlService.genExcel(genKey,thrOrderExportRequest);
|
|
|
|
|
thrOrdersDlService.genExcel(genKey, thrOrderExportRequest);
|
|
|
|
|
return ResultVOUtils.success("后台正在导出生成excel文件，请稍后刷新查看!");
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//第三方业务单据接口下载（第三方使用）
|
|
|
|
|
@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);
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
anthonywj
4 years ago