调拨入库任务

根据id查询主任务及子任务信息

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptJob/TransferreceiptJobMainController.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.transferreceiptJob.vo.*;
+import com.win.module.wms.convert.transferreceiptJob.TransferreceiptJobDetailConvert;
+import com.win.module.wms.dal.dataobject.transferreceiptJob.TransferreceiptJobDetailDO;
+import com.win.module.wms.service.transferreceiptJob.TransferreceiptJobDetailService;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -34,6 +37,9 @@ public class TransferreceiptJobMainController {
     @Resource
     private TransferreceiptJobMainService transferreceiptJobMainService;
 
+    @Resource
+    private TransferreceiptJobDetailService transferreceiptJobDetailService;
+
     @Resource
     private AdminUserApi userApi;
 
@@ -118,4 +124,22 @@ public class TransferreceiptJobMainController {
         ExcelUtils.write(response, "调拨入库任务主.xls", "数据", TransferreceiptJobMainExcelVO.class, datas);
     }
 
+    @GetMapping("/getTransferreceiptJobById")
+    @Operation(summary = "APP获得调拨入库主子表明细列表")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('wms:transferreceipt-job-main:query')")
+    public CommonResult<TransferreceiptJobMainRespVO> getTransferreceiptJobById(@RequestParam("id") Long id) {
+        TransferreceiptJobMainDO transferreceiptJobMain = transferreceiptJobMainService.getTransferreceiptJobMain(id);
+        TransferreceiptJobMainRespVO result = TransferreceiptJobMainConvert.INSTANCE.convert(transferreceiptJobMain);
+        if(result==null) {
+            return success(result);
+        };
+        TransferreceiptJobDetailExportReqVO exportReqVO = new TransferreceiptJobDetailExportReqVO();
+        exportReqVO.setMasterId(result.getId());
+        List<TransferreceiptJobDetailDO> transferreceiptJobDetailList = transferreceiptJobDetailService.getTransferreceiptJobDetailList(exportReqVO);
+        List<TransferreceiptJobDetailExcelVO> transferreceiptJobDetailExcelVOS = TransferreceiptJobDetailConvert.INSTANCE.convertList02(transferreceiptJobDetailList);
+        result.setSubList(transferreceiptJobDetailExcelVOS);
+        return success(result);
+    }
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptJob/vo/TransferreceiptJobDetailExportReqVO.java

@@ -46,7 +46,7 @@ public class TransferreceiptJobDetailExportReqVO {
     private String itemDesc2;
 
     @Schema(description = "项目代码")
-    private String projectCode;
+    private Long projectCode;
 
     @Schema(description = "数量")
     private BigDecimal qty;
@@ -73,4 +73,7 @@ public class TransferreceiptJobDetailExportReqVO {
     @Schema(description = "到货主代码")
     private String toOwnerCode;
 
+    @Schema(description = "主表id")
+    private Long masterId;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptJob/vo/TransferreceiptJobMainRespVO.java

@@ -3,10 +3,15 @@ package com.win.module.wms.controller.transferreceiptJob.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 TransferreceiptJobMainRespVO extends TransferreceiptJobMainBaseVO {
 
+    @Schema(description = "调拨入库任务子表job_transferreceipt_detail", requiredMode = Schema.RequiredMode.REQUIRED)
+    private List subList;
+
 }