计划外出库任务

根据id查询主任务及子任务信息以及整理createtime

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueJob/UnplannedissueJobMainController.java

@@ -4,6 +4,9 @@ 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.controller.unplannedissueJob.vo.*;
+import com.win.module.wms.convert.unplannedissueJob.UnplannedissueJobDetailConvert;
+import com.win.module.wms.dal.dataobject.unplannedissueJob.UnplannedissueJobDetailDO;
+import com.win.module.wms.service.unplannedissueJob.UnplannedissueJobDetailService;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -40,6 +43,9 @@ public class UnplannedissueJobMainController {
     @Resource
     private UnplannedissueJobMainService unplannedissueJobMainService;
 
+    @Resource
+    private UnplannedissueJobDetailService unplannedissueJobDetailService;
+
     @Resource
     private AdminUserApi userApi;
 
@@ -122,4 +128,22 @@ public class UnplannedissueJobMainController {
         ExcelUtils.write(response, "计划外出库任务主.xls", "数据", UnplannedissueJobMainExcelVO.class, datas);
     }
 
+    @GetMapping("/getUnplannedissueJobById")
+    @Operation(summary = "APP获得计划外出库任务主子表明细列表")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('wms:unplannedissue-job-main:query')")
+    public CommonResult<UnplannedissueJobMainRespVO> getUnplannedissueJobById(@RequestParam("id") Long id) {
+        UnplannedissueJobMainDO unplannedissueJobMain = unplannedissueJobMainService.getUnplannedissueJobMain(id);
+        UnplannedissueJobMainRespVO result = UnplannedissueJobMainConvert.INSTANCE.convert(unplannedissueJobMain);
+        if(result==null) {
+            return success(result);
+        };
+        UnplannedissueJobDetailExportReqVO reqVO = new UnplannedissueJobDetailExportReqVO();
+        reqVO.setMasterId(result.getId());
+        List<UnplannedissueJobDetailDO> list = unplannedissueJobDetailService.getUnplannedissueJobDetailList(reqVO);
+        List<UnplannedissueJobDetailExcelVO> vos = UnplannedissueJobDetailConvert.INSTANCE.convertList02(list);
+        result.setSubList(vos);
+        return success(result);
+    }
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueJob/vo/UnplannedissueJobDetailExportReqVO.java

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

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueJob/vo/UnplannedissueJobMainRespVO.java

@@ -3,10 +3,15 @@ package com.win.module.wms.controller.unplannedissueJob.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 UnplannedissueJobMainRespVO extends UnplannedissueJobMainBaseVO {
 
+    @Schema(description = "计划外出库任务子表job_unplannedissue_detail", requiredMode = Schema.RequiredMode.REQUIRED)
+    private List subList;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptJob/UnplannedreceiptJobMainController.java

@@ -3,6 +3,9 @@ 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.controller.unplannedreceiptJob.vo.*;
+import com.win.module.wms.convert.unplannedreceiptJob.UnplannedreceiptJobDetailConvert;
+import com.win.module.wms.dal.dataobject.unplannedreceiptJob.UnplannedreceiptJobDetailDO;
+import com.win.module.wms.service.unplannedreceiptJob.UnplannedreceiptJobDetailService;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -33,6 +36,9 @@ public class UnplannedreceiptJobMainController {
     @Resource
     private UnplannedreceiptJobMainService unplannedreceiptJobMainService;
 
+    @Resource
+    private UnplannedreceiptJobDetailService unplannedreceiptJobDetailService;
+
     @Resource
     private AdminUserApi userApi;
 
@@ -115,4 +121,22 @@ public class UnplannedreceiptJobMainController {
         ExcelUtils.write(response, "计划外入库任务主.xls", "数据", UnplannedreceiptJobMainExcelVO.class, datas);
     }
 
+    @GetMapping("/getUnplannedreceiptJobById")
+    @Operation(summary = "APP获得计划外入库任务主子表明细列表")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('wms:unplannedreceipt-job-main:query')")
+    public CommonResult<UnplannedreceiptJobMainRespVO> getUnplannedreceiptJobById(@RequestParam("id") Long id) {
+        UnplannedreceiptJobMainDO unplannedreceiptJobMain = unplannedreceiptJobMainService.getUnplannedreceiptJobMain(id);
+        UnplannedreceiptJobMainRespVO result = UnplannedreceiptJobMainConvert.INSTANCE.convert(unplannedreceiptJobMain);
+        if(result==null) {
+            return success(result);
+        };
+        UnplannedreceiptJobDetailExportReqVO exportReqVO = new UnplannedreceiptJobDetailExportReqVO();
+        exportReqVO.setMasterId(result.getId());
+        List<UnplannedreceiptJobDetailDO> unplannedreceiptJobDetailList = unplannedreceiptJobDetailService.getUnplannedreceiptJobDetailList(exportReqVO);
+        List<UnplannedreceiptJobDetailExcelVO> vos = UnplannedreceiptJobDetailConvert.INSTANCE.convertList02(unplannedreceiptJobDetailList);
+        result.setSubList(vos);
+        return success(result);
+    }
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptJob/vo/UnplannedreceiptJobDetailExportReqVO.java

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

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptJob/vo/UnplannedreceiptJobMainRespVO.java

@@ -3,10 +3,14 @@ package com.win.module.wms.controller.unplannedreceiptJob.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 UnplannedreceiptJobMainRespVO extends UnplannedreceiptJobMainBaseVO {
 
+    @Schema(description = "计划外入库任务主子表job_unplannedreceipt_detail", requiredMode = Schema.RequiredMode.REQUIRED)
+    private List subList;
 }