diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/InspectRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/InspectRequestMainController.java index 5c80e5ce..e4c31e23 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/InspectRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/InspectRequestMainController.java @@ -10,9 +10,12 @@ import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.inspectRequest.vo.*; +import com.win.module.wms.convert.inspectRequest.InspectRequestDetailConvert; import com.win.module.wms.convert.inspectRequest.InspectRequestMainConvert; +import com.win.module.wms.dal.dataobject.inspectRequest.InspectRequestDetailDO; import com.win.module.wms.dal.dataobject.inspectRequest.InspectRequestMainDO; import com.win.module.wms.enums.DictTypeConstants; +import com.win.module.wms.service.inspectRequest.InspectRequestDetailService; import com.win.module.wms.service.inspectRequest.InspectRequestMainService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; @@ -42,6 +45,9 @@ public class InspectRequestMainController { @Resource private InspectRequestMainService inspectRequestMainService; + + @Resource + private InspectRequestDetailService inspectRequestDetailService; @Resource private AdminUserApi userApi; @@ -163,4 +169,22 @@ public class InspectRequestMainController { } return success(returnMap); } + + @GetMapping("/getInspectRequestById") + @Operation(summary = "APP获得检验申请主子表明细列表") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('wms:inspect-request-main:query')") + public CommonResult getInspectRequestById(@RequestParam("id") Long id) { + InspectRequestMainDO inspectRequestMain = inspectRequestMainService.getInspectRequestMain(id); + InspectRequestMainRespVO result = InspectRequestMainConvert.INSTANCE.convert(inspectRequestMain); + if(result==null) { + return success(result); + }; + InspectRequestDetailExportReqVO reqVO = new InspectRequestDetailExportReqVO(); + reqVO.setMasterId(result.getId()); + List list = inspectRequestDetailService.getInspectRequestDetailList(reqVO); + List vos = InspectRequestDetailConvert.INSTANCE.convertList02(list); + result.setSubList(vos); + return success(result); + } }