上架任务

根据id查询主任务及子任务信息
根据类型list以及时间查询主任务分页数据方法

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayJob/PutawayJobMainController.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.putawayJob.vo.*;
+import com.win.module.wms.convert.putawayJob.PutawayJobDetailConvert;
+import com.win.module.wms.dal.dataobject.putawayJob.PutawayJobDetailDO;
+import com.win.module.wms.service.putawayJob.PutawayJobDetailService;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -39,6 +42,9 @@ public class PutawayJobMainController {
     @Resource
     private PutawayJobMainService putawayJobMainService;
 
+    @Resource
+    private PutawayJobDetailService putawayJobDetailService;
+
     @Resource
     private AdminUserApi userApi;
 
@@ -121,4 +127,33 @@ public class PutawayJobMainController {
         ExcelUtils.write(response, "上架任务主.xls", "数据", PutawayJobMainExcelVO.class, datas);
     }
 
+    @GetMapping("/getPutawayJobById")
+    @Operation(summary = "APP获得上架任务主子表明细列表")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('wms:putaway-job-main:query')")
+    public CommonResult<PutawayJobMainRespVO> getPutawayJobById(@RequestParam("id") Long id) {
+        PutawayJobMainDO putawayJobMain = putawayJobMainService.getPutawayJobMain(id);
+        PutawayJobMainRespVO result = PutawayJobMainConvert.INSTANCE.convert(putawayJobMain);
+        if(result==null) {
+            return success(result);
+        };
+        PutawayJobDetailExportReqVO putawayJobDetailExportReqVO = new PutawayJobDetailExportReqVO();
+        PutawayJobDetailExportReqVO putawayJobDetailExportReqVO1 = putawayJobDetailExportReqVO.setMasterid(result.getId());
+        List<PutawayJobDetailDO> putawayJobDetailList = putawayJobDetailService.getPutawayJobDetailList(putawayJobDetailExportReqVO1);
+        List<PutawayJobDetailExcelVO> putawayJobDetailExcelVOS = PutawayJobDetailConvert.INSTANCE.convertList02(putawayJobDetailList);
+        result.setSubList(putawayJobDetailExcelVOS);
+        return success(result);
+    }
+
+    @PostMapping("/getPutawayJobPageByStatusAndTime")
+    @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:putaway-job-main:query')")
+    public CommonResult<PageResult<PutawayJobMainRespVO>> getPutawayJobPageByStatusAndTime(@RequestBody PutawayJobMainPageReqVO putawayJobMainPageReqVO) {
+        PageResult<PutawayJobMainDO> putawayJobMainPage = putawayJobMainService.getPutawayJobMainPage(putawayJobMainPageReqVO);
+        PutawayJobMainConvert.INSTANCE.convertPage(putawayJobMainPage);
+        return success(PutawayJobMainConvert.INSTANCE.convertPage(putawayJobMainPage));
+    }
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayJob/vo/PutawayJobDetailExportReqVO.java

@@ -79,4 +79,6 @@ public class PutawayJobDetailExportReqVO {
     @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/putawayJob/vo/PutawayJobMainPageReqVO.java

@@ -136,4 +136,7 @@ public class PutawayJobMainPageReqVO extends PageParam {
     @Schema(description = "允许修改箱码")
     private String allowModifyPackingNumber;
 
+    @Schema(description = "任务状态list可以为空", requiredMode = Schema.RequiredMode.REQUIRED)
+    private List types;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayJob/vo/PutawayJobMainRespVO.java

@@ -3,10 +3,14 @@ package com.win.module.wms.controller.putawayJob.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 PutawayJobMainRespVO extends PutawayJobMainBaseVO {
 
+    @Schema(description = "上架任务子表job_putaway_detail列表数据", requiredMode = Schema.RequiredMode.REQUIRED)
+    private List subList;
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/putawayJob/PutawayJobDetailDO.java

@@ -75,7 +75,7 @@ public class PutawayJobDetailDO extends BaseDO {
     /**
      * 物品描述2
      */
-    private String itemdesc2;
+    private String itemDesc2;
     /**
      * 项目代码
      */

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/putawayJob/PutawayJobDetailMapper.java

@@ -33,7 +33,7 @@ public interface PutawayJobDetailMapper extends BaseMapperX<PutawayJobDetailDO>
                 .eqIfPresent(PutawayJobDetailDO::getItemCode, reqVO.getItemCode())
                 .likeIfPresent(PutawayJobDetailDO::getItemName, reqVO.getItemName())
                 .eqIfPresent(PutawayJobDetailDO::getItemDesc1, reqVO.getItemDesc1())
-                .eqIfPresent(PutawayJobDetailDO::getItemdesc2, reqVO.getItemdesc2())
+                .eqIfPresent(PutawayJobDetailDO::getItemDesc2, reqVO.getItemdesc2())
                 .eqIfPresent(PutawayJobDetailDO::getProjectCode, reqVO.getProjectCode())
                 .eqIfPresent(PutawayJobDetailDO::getQty, reqVO.getQty())
                 .eqIfPresent(PutawayJobDetailDO::getUom, reqVO.getUom())
@@ -61,7 +61,7 @@ public interface PutawayJobDetailMapper extends BaseMapperX<PutawayJobDetailDO>
                 .eqIfPresent(PutawayJobDetailDO::getItemCode, reqVO.getItemCode())
                 .likeIfPresent(PutawayJobDetailDO::getItemName, reqVO.getItemName())
                 .eqIfPresent(PutawayJobDetailDO::getItemDesc1, reqVO.getItemDesc1())
-                .eqIfPresent(PutawayJobDetailDO::getItemdesc2, reqVO.getItemdesc2())
+                .eqIfPresent(PutawayJobDetailDO::getItemDesc2, reqVO.getItemdesc2())
                 .eqIfPresent(PutawayJobDetailDO::getProjectCode, reqVO.getProjectCode())
                 .eqIfPresent(PutawayJobDetailDO::getQty, reqVO.getQty())
                 .eqIfPresent(PutawayJobDetailDO::getUom, reqVO.getUom())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/putawayJob/PutawayJobMainMapper.java

@@ -22,6 +22,7 @@ public interface PutawayJobMainMapper extends BaseMapperX<PutawayJobMainDO> {
 
     default PageResult<PutawayJobMainDO> selectPage(PutawayJobMainPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<PutawayJobMainDO>()
+                .inIfPresent(PutawayJobMainDO::getStatus, reqVO.getTypes())
                 .eqIfPresent(PutawayJobMainDO::getRequestNumber, reqVO.getRequestNumber())
                 .eqIfPresent(PutawayJobMainDO::getSupplierCode, reqVO.getSupplierCode())
                 .eqIfPresent(PutawayJobMainDO::getFromWarehouseCode, reqVO.getFromWarehouseCode())