Browse Source

发货任务

根据id查询主任务及子任务信息
master
songguoqiang 2 years ago
parent
commit
df98ce0f4e
  1. 24
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverJob/DeliverJobMainController.java
  2. 5
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverJob/vo/DeliverJobDetailExportReqVO.java
  3. 4
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverJob/vo/DeliverJobMainRespVO.java

24
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverJob/DeliverJobMainController.java

@ -3,6 +3,9 @@ package com.win.module.wms.controller.deliverJob;
import com.win.framework.common.pojo.CustomConditions;
import com.win.module.system.api.user.AdminUserApi;
import com.win.module.system.api.user.dto.AdminUserRespDTO;
import com.win.module.wms.convert.deliverJob.DeliverJobDetailConvert;
import com.win.module.wms.dal.dataobject.deliverJob.DeliverJobDetailDO;
import com.win.module.wms.service.deliverJob.DeliverJobDetailService;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
@ -39,6 +42,9 @@ public class DeliverJobMainController {
@Resource
private DeliverJobMainService deliverJobMainService;
@Resource
private DeliverJobDetailService deliverJobDetailService;
@Resource
private AdminUserApi userApi;
@ -121,4 +127,22 @@ public class DeliverJobMainController {
ExcelUtils.write(response, "发货任务主.xls", "数据", DeliverJobMainExcelVO.class, datas);
}
@GetMapping("/getDeliverJobById")
@Operation(summary = "APP获得发货任务主子表明细列表")
@Parameter(name = "id", description = "编号", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('wms:deliver-job-main:query')")
public CommonResult<DeliverJobMainRespVO> getDeliverJobById(@RequestParam("id") Long id) {
DeliverJobMainDO deliverJobMain = deliverJobMainService.getDeliverJobMain(id);
DeliverJobMainRespVO result = DeliverJobMainConvert.INSTANCE.convert(deliverJobMain);
if(result==null) {
return success(result);
};
DeliverJobDetailExportReqVO exportReqVO = new DeliverJobDetailExportReqVO();
exportReqVO.setMasterId(result.getId());
List<DeliverJobDetailDO> deliverJobDetailList = deliverJobDetailService.getDeliverJobDetailList(exportReqVO);
List<DeliverJobDetailExcelVO> deliverJobDetailExcelVOS = DeliverJobDetailConvert.INSTANCE.convertList02(deliverJobDetailList);
result.setSubList(deliverJobDetailExcelVOS);
return success(result);
}
}

5
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverJob/vo/DeliverJobDetailExportReqVO.java

@ -74,4 +74,9 @@ public class DeliverJobDetailExportReqVO {
@Schema(description = "创建者Id")
private String creator;
@Schema(description = "主表id")
private Long masterId;
}

4
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverJob/vo/DeliverJobMainRespVO.java

@ -3,10 +3,14 @@ package com.win.module.wms.controller.deliverJob.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.util.List;
@Schema(description = "管理后台 - 发货任务主 Response VO")
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
public class DeliverJobMainRespVO extends DeliverJobMainBaseVO {
@Schema(description = "发货任务子表job_deliver_detail", requiredMode = Schema.RequiredMode.REQUIRED)
private List subList;
}

Loading…
Cancel
Save