fix:修复

dev_2.5_optimize
chenhc 5 months ago
parent 2a31fcb349
commit 7a0c4b82b1

@ -1,5 +1,6 @@
package com.glxp.api.service.collect; package com.glxp.api.service.collect;
import cn.hutool.core.util.StrUtil;
import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.BusTypeConstant; import com.glxp.api.constant.BusTypeConstant;
@ -35,16 +36,21 @@ public class DownloadFactory {
*/ */
public BaseResponse downloadOrder(CollectOrderRequest collectOrderRequest) { public BaseResponse downloadOrder(CollectOrderRequest collectOrderRequest) {
String busType = collectOrderRequest.getBusType(); String busType = collectOrderRequest.getBusType();
if (busType == null) {
if (StrUtil.isBlank(busType)) {
return ResultVOUtils.error("下载失败,未配置业务类型"); return ResultVOUtils.error("下载失败,未配置业务类型");
} }
if (busType.startsWith("YPCF")) { if (busType.startsWith("YPCF")) {
return ypcf002Download.downloadOrder(collectOrderRequest); return ypcf002Download.downloadOrder(collectOrderRequest);
} else if (busType.equals(BusTypeConstant.QXCF001.getBusType())) { } else
if (busType.equals(BusTypeConstant.QXCF001.getBusType())) {
return qxcf001Download.downloadOrder(collectOrderRequest); return qxcf001Download.downloadOrder(collectOrderRequest);
} else if (busType.contains("SC")) { } else
if (busType.contains("SC")) {
return ioCollectOrderService.importUdi(collectOrderRequest); return ioCollectOrderService.importUdi(collectOrderRequest);
} else { } else
{
return thrOrderDownload.downloadOrder(collectOrderRequest); return thrOrderDownload.downloadOrder(collectOrderRequest);
} }
} }

@ -89,19 +89,17 @@ public class IoCollectOriginService {
//下载工位下的类型 //下载工位下的类型
List<SysWorkplaceDocumentEntity> list = sysWorkplaceDocumentService.list(); List<SysWorkplaceDocumentEntity> list = sysWorkplaceDocumentService.list();
if (list == null){ if (CollUtil.isEmpty(list)){
return ResultVOUtils.error(500, "未查到此业务单据"); return ResultVOUtils.error(500, "未查到此业务单据");
} }
if (CollUtil.isNotEmpty(list)) { BaseResponse response = new BaseResponse();
for (SysWorkplaceDocumentEntity item : list) { for (SysWorkplaceDocumentEntity item : list) {
collectOrderRequest.setBusType(item.getDocumentTypeCode()); collectOrderRequest.setBusType(item.getDocumentTypeCode());
downloadFactory.downloadOrder(collectOrderRequest); response = downloadFactory.downloadOrder(collectOrderRequest);
}
} else {
return ResultVOUtils.error("未配置业务类型");
} }
return ResultVOUtils.success("下载成功"); return response;
} else { } else {
return downloadFactory.downloadOrder(collectOrderRequest); return downloadFactory.downloadOrder(collectOrderRequest);
} }

Loading…
Cancel
Save