Merge remote-tracking branch 'origin/master'

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayJob/ProductputawayJobMainController.java

@@ -8,8 +8,11 @@ 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.productputawayJob.vo.*;
+import com.win.module.wms.convert.productputawayJob.ProductputawayJobDetailConvert;
 import com.win.module.wms.convert.productputawayJob.ProductputawayJobMainConvert;
+import com.win.module.wms.dal.dataobject.productputawayJob.ProductputawayJobDetailDO;
 import com.win.module.wms.dal.dataobject.productputawayJob.ProductputawayJobMainDO;
+import com.win.module.wms.service.productputawayJob.ProductputawayJobDetailService;
 import com.win.module.wms.service.productputawayJob.ProductputawayJobMainService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
@@ -37,6 +40,9 @@ public class ProductputawayJobMainController {
     @Resource
     private ProductputawayJobMainService productputawayJobMainService;
 
+    @Resource
+    private ProductputawayJobDetailService productputawayJobDetailService;
+
     @Resource
     private AdminUserApi userApi;
 
@@ -121,4 +127,22 @@ public class ProductputawayJobMainController {
         return success(result);
     }
 
+    @GetMapping("/getProductputawayJobById")
+    @Operation(summary = "APP获得制品上架任务主子表明细列表")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('wms:productputaway-job-main:query')")
+    public CommonResult<ProductputawayJobMainRespVO> getProductputawayJobById(@RequestParam("id") Long id) {
+        ProductputawayJobMainDO productputawayJobMain = productputawayJobMainService.getProductputawayJobMain(id);
+        ProductputawayJobMainRespVO result = ProductputawayJobMainConvert.INSTANCE.convert(productputawayJobMain);
+        if(result==null) {
+            return success(result);
+        };
+        ProductputawayJobDetailExportReqVO reqVO = new ProductputawayJobDetailExportReqVO();
+        reqVO.setMasterId(result.getId());
+        List<ProductputawayJobDetailDO> list = productputawayJobDetailService.getProductputawayJobDetailList(reqVO);
+        List<ProductputawayJobDetailExcelVO> vos = ProductputawayJobDetailConvert.INSTANCE.convertList02(list);
+        result.setSubList(vos);
+        return success(result);
+    }
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayJob/vo/ProductputawayJobDetailExportReqVO.java

@@ -79,4 +79,7 @@ public class ProductputawayJobDetailExportReqVO {
     @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/productputawayJob/vo/ProductputawayJobMainRespVO.java

@@ -3,10 +3,14 @@ package com.win.module.wms.controller.productputawayJob.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 ProductputawayJobMainRespVO extends ProductputawayJobMainBaseVO {
 
+    @Schema(description = "制品上架子表job_productputaway_detail列表数据", requiredMode = Schema.RequiredMode.REQUIRED)
+    private List subList;
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productputawayJob/ProductputawayJobDetailMapper.java

@@ -52,6 +52,7 @@ public interface ProductputawayJobDetailMapper extends BaseMapperX<Productputawa
 
     default List<ProductputawayJobDetailDO> selectList(ProductputawayJobDetailExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<ProductputawayJobDetailDO>()
+                .eqIfPresent(ProductputawayJobDetailDO::getMasterId, reqVO.getMasterId())
                 .eqIfPresent(ProductputawayJobDetailDO::getPackingNumber, reqVO.getPackingNumber())
                 .eqIfPresent(ProductputawayJobDetailDO::getContainerNumber, reqVO.getContainerNumber())
                 .eqIfPresent(ProductputawayJobDetailDO::getBatch, reqVO.getBatch())