Commit 35900edf authored by liuzeheng's avatar liuzeheng

AWB文件上传

parent 2d7e0265
package cn.iocoder.yudao.module.shipment.dal.dataobject; package cn.iocoder.yudao.module.shipment.dal.dataobject;
import io.swagger.annotations.ApiModelProperty;
import lombok.*; import lombok.*;
import java.util.*; import java.util.*;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
...@@ -20,7 +21,7 @@ import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; ...@@ -20,7 +21,7 @@ import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
public class BoxClearanceDocDO extends BaseDO { public class BoxClearanceDocDO extends BaseDO {
/** /**
* *
*/ */
@TableId @TableId
private Long id; private Long id;
...@@ -77,4 +78,7 @@ public class BoxClearanceDocDO extends BaseDO { ...@@ -77,4 +78,7 @@ public class BoxClearanceDocDO extends BaseDO {
*/ */
private String docFiles; private String docFiles;
@ApiModelProperty(value = "awb文件路径")
private String cdAwbFile ;
} }
...@@ -82,4 +82,8 @@ public class BoxClearanceDocBackVO { ...@@ -82,4 +82,8 @@ public class BoxClearanceDocBackVO {
@ApiModelProperty(value = "空运清关文件列表") @ApiModelProperty(value = "空运清关文件列表")
private String docFiles; private String docFiles;
@ApiModelProperty(value = "awb文件路径")
private String cdAwbFile ;
} }
...@@ -58,4 +58,6 @@ public class BoxClearanceDocBaseVO { ...@@ -58,4 +58,6 @@ public class BoxClearanceDocBaseVO {
@ApiModelProperty(value = "空运清关文件列表") @ApiModelProperty(value = "空运清关文件列表")
private String docFiles; private String docFiles;
@ApiModelProperty(value = "awb文件路径")
private String cdAwbFile ;
} }
...@@ -223,6 +223,23 @@ public class BoxPreloadGoodsController { ...@@ -223,6 +223,23 @@ public class BoxPreloadGoodsController {
return error(FILE_NOT_EXISTS); return error(FILE_NOT_EXISTS);
} }
@GetMapping("/cdAwbFile")
@ApiOperation("下载AWB文件")
@ApiImplicitParam(name = "shipmentId", value = "出货单ID", required = true, example = "20", dataTypeClass = Long.class)
public CommonResult<String> cdAwbFile(@RequestParam("shipmentId") Long shipmentId, HttpServletResponse response) throws Exception {
BoxClearanceDocQueryVO queryVO = new BoxClearanceDocQueryVO();
queryVO.setShipmentId(shipmentId);
List<BoxClearanceDocDO> boxClearanceDocList = boxClearanceDocService.getBoxClearanceDocList(queryVO);
if (!CollectionUtil.isEmpty(boxClearanceDocList)) {
BoxClearanceDocDO boxClearanceDocDO = boxClearanceDocList.get(0);
String cdAwbFile = boxClearanceDocDO.getCdAwbFile();
if (StringUtils.isNotBlank(cdAwbFile)) {
return success(cdAwbFile);
}
}
return error(FILE_NOT_EXISTS);
}
// @NotNull // @NotNull
// private List<InputStream> getInputStreams(List<String> agentListFiles) { // private List<InputStream> getInputStreams(List<String> agentListFiles) {
// return agentListFiles.stream().map(item -> { // return agentListFiles.stream().map(item -> {
...@@ -371,6 +388,10 @@ public class BoxPreloadGoodsController { ...@@ -371,6 +388,10 @@ public class BoxPreloadGoodsController {
return success(""); return success("");
} }
@GetMapping("/loadGoodsList") @GetMapping("/loadGoodsList")
@ApiOperation("获得装柜订单列表,卸柜页面数据use this") @ApiOperation("获得装柜订单列表,卸柜页面数据use this")
@ApiImplicitParams({ @ApiImplicitParams({
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment