|
|
@ -3,6 +3,9 @@ package com.win.module.wms.controller.repleinshJob; |
|
|
|
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.repleinshJob.RepleinshJobDetailConvert; |
|
|
|
import com.win.module.wms.dal.dataobject.repleinshJob.RepleinshJobDetailDO; |
|
|
|
import com.win.module.wms.service.repleinshJob.RepleinshJobDetailService; |
|
|
|
import org.springframework.web.bind.annotation.*; |
|
|
|
import javax.annotation.Resource; |
|
|
|
import org.springframework.validation.annotation.Validated; |
|
|
@ -38,6 +41,9 @@ public class RepleinshJobMainController { |
|
|
|
@Resource |
|
|
|
private RepleinshJobMainService repleinshJobMainService; |
|
|
|
|
|
|
|
@Resource |
|
|
|
private RepleinshJobDetailService repleinshJobDetailService; |
|
|
|
|
|
|
|
@Resource |
|
|
|
private AdminUserApi userApi; |
|
|
|
|
|
|
@ -120,4 +126,33 @@ public class RepleinshJobMainController { |
|
|
|
ExcelUtils.write(response, "补料任务主.xls", "数据", RepleinshJobMainExcelVO.class, datas); |
|
|
|
} |
|
|
|
|
|
|
|
@GetMapping("/getRepleinshJobById") |
|
|
|
@Operation(summary = "APP获得补料任务主子表明细列表") |
|
|
|
@Parameter(name = "id", description = "编号", required = true, example = "1024") |
|
|
|
@PreAuthorize("@ss.hasPermission('wms:repleinsh-job-main:query')") |
|
|
|
public CommonResult<RepleinshJobMainRespVO> getRepleinshJobById(@RequestParam("id") Long id) { |
|
|
|
RepleinshJobMainDO repleinshJobMain = repleinshJobMainService.getRepleinshJobMain(id); |
|
|
|
RepleinshJobMainRespVO result = RepleinshJobMainConvert.INSTANCE.convert(repleinshJobMain); |
|
|
|
if(result==null) { |
|
|
|
return success(result); |
|
|
|
}; |
|
|
|
RepleinshJobDetailExportReqVO repleinshJobDetailExportReqVO = new RepleinshJobDetailExportReqVO(); |
|
|
|
repleinshJobDetailExportReqVO.setMasterId(result.getId()); |
|
|
|
List<RepleinshJobDetailDO> repleinshJobDetailList = repleinshJobDetailService.getRepleinshJobDetailList(repleinshJobDetailExportReqVO); |
|
|
|
List<RepleinshJobDetailExcelVO> repleinshJobDetailExcelVOS = RepleinshJobDetailConvert.INSTANCE.convertList02(repleinshJobDetailList); |
|
|
|
result.setSubList(repleinshJobDetailExcelVOS); |
|
|
|
return success(result); |
|
|
|
} |
|
|
|
|
|
|
|
@PostMapping("/getRepleinshJobbPageByStatusAndTime") |
|
|
|
@Operation(summary = "APP获得补料任务主任务分页列表") |
|
|
|
@Parameter(name = "createTime", description = "今日开始结束时间", required = false, example = "[\"1699200000000\",\"1701878400000\"]") |
|
|
|
@Parameter(name = "types", description = "字典类型数组", required = false, example = "\"types\":[\"JOB_PENDING\",\"JOB_COMPLETED\"]") |
|
|
|
@PreAuthorize("@ss.hasPermission('wms:repleinsh-job-mainn:query')") |
|
|
|
public CommonResult<PageResult<RepleinshJobMainRespVO>> getRepleinshJobbPageByStatusAndTime(@RequestBody RepleinshJobMainPageReqVO pageReqVO) { |
|
|
|
PageResult<RepleinshJobMainDO> repleinshJobMainPage = repleinshJobMainService.getRepleinshJobMainPage(pageReqVO); |
|
|
|
PageResult<RepleinshJobMainRespVO> result = RepleinshJobMainConvert.INSTANCE.convertPage(repleinshJobMainPage); |
|
|
|
return success(result); |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|