Merge remote-tracking branch 'origin/master'

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/InspectJobMainController.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.inspectJob.vo.*;
+import com.win.module.wms.convert.inspectJob.InspectJobDetailConvert;
+import com.win.module.wms.dal.dataobject.inspectJob.InspectJobDetailDO;
+import com.win.module.wms.service.inspectJob.InspectJobDetailService;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -39,6 +42,9 @@ public class InspectJobMainController {
     @Resource
     private InspectJobMainService inspectJobMainService;
 
+    @Resource
+    private InspectJobDetailService inspectJobDetailService;
+
     @Resource
     private AdminUserApi userApi;
 
@@ -122,4 +128,44 @@ public class InspectJobMainController {
         ExcelUtils.write(response, "检验任务主.xls", "数据", InspectJobMainExcelVO.class, datas);
     }
 
+    @GetMapping("/getInspectJobById")
+    @Operation(summary = "APP获得检验任务主子表明细列表")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('wms:inspect-job-main:query')")
+    public CommonResult<InspectJobMainRespVO> getInspectJobById(@RequestParam("id") Long id) {
+        InspectJobMainDO inspectJobMain = inspectJobMainService.getInspectJobMain(id);
+        InspectJobMainRespVO result = InspectJobMainConvert.INSTANCE.convert(inspectJobMain);
+        if(result==null) {
+            return success(result);
+        };
+        InspectJobDetailExportReqVO inspectJobDetailExportReqVO = new InspectJobDetailExportReqVO();
+        inspectJobDetailExportReqVO.setMasterId(result.getId());
+        List<InspectJobDetailDO> inspectJobDetailList = inspectJobDetailService.getInspectJobDetailList(inspectJobDetailExportReqVO);
+        List<InspectJobDetailExcelVO> inspectJobDetailExcelVOS = InspectJobDetailConvert.INSTANCE.convertList02(inspectJobDetailList);
+        result.setSubList(inspectJobDetailExcelVOS);
+        return success(result);
+    }
+
+    @PostMapping("/getInspectJobPageByStatusAndTime")
+    @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:inspect-job-main:query')")
+    public CommonResult<PageResult<InspectJobMainRespVO>> getInspectJobPageByStatusAndTime(@RequestBody InspectJobMainPageReqVO inspectJobMainPageReqVO) {
+        PageResult<InspectJobMainDO> inspectJobMainByStatusPage = inspectJobMainService.getInspectJobMainPage(inspectJobMainPageReqVO);
+        PageResult<InspectJobMainRespVO> result = InspectJobMainConvert.INSTANCE.convertPage(inspectJobMainByStatusPage);
+        return success(result);
+    }
+
+    @PostMapping("/getInspectJobMainSenior")
+    @Operation(summary = "APP根据发货单号和单据号查询检验任务主任务列表")
+    @Parameter(name = "asnNumber", description = "发货单号", required = false, example = "100")
+    @Parameter(name = "number", description = "单据号", required = false, example = "100")
+    @PreAuthorize("@ss.hasPermission('wms:inspect-job-main:query')")
+    public CommonResult<List<InspectJobMainRespVO>> getInspectJobMainSenior(@RequestBody InspectJobMainRespVO respVO) {
+        List<InspectJobMainDO> inspectJobMainSenior = inspectJobMainService.getInspectJobMainSenior(respVO);
+        List<InspectJobMainRespVO> result = InspectJobMainConvert.INSTANCE.convertList(inspectJobMainSenior);
+        return success(result);
+    }
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/vo/InspectJobDetailExportReqVO.java

@@ -61,4 +61,7 @@ public class InspectJobDetailExportReqVO {
     @Schema(description = "计量单位")
     private String uom;
 
+    @Schema(description = "主表ID", example = "6060")
+    private Long masterId;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/vo/InspectJobMainPageReqVO.java

@@ -162,4 +162,6 @@ public class InspectJobMainPageReqVO 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/inspectJob/vo/InspectJobMainRespVO.java

@@ -3,10 +3,14 @@ package com.win.module.wms.controller.inspectJob.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 InspectJobMainRespVO extends InspectJobMainBaseVO {
 
+    @Schema(description = "检验任务任务子表job_inspect_detail 列表数据", requiredMode = Schema.RequiredMode.REQUIRED)
+    private List subList;
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/PurchasereturnJobMainController.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.purchasereturnJob.vo.*;
+import com.win.module.wms.convert.purchasereturnJob.PurchasereturnJobDetailConvert;
+import com.win.module.wms.dal.dataobject.purchasereturnJob.PurchasereturnJobDetailDO;
+import com.win.module.wms.service.purchasereturnJob.PurchasereturnJobDetailService;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -40,6 +43,9 @@ public class PurchasereturnJobMainController {
     @Resource
     private PurchasereturnJobMainService purchasereturnJobMainService;
 
+    @Resource
+    private PurchasereturnJobDetailService purchasereturnJobDetailService;
+
     @PostMapping("/create")
     @Operation(summary = "创建采购退货任务主")
     @PreAuthorize("@ss.hasPermission('wms:purchasereturn-job-main:create')")
@@ -114,4 +120,44 @@ public class PurchasereturnJobMainController {
         ExcelUtils.write(response, "采购退货任务主.xls", "数据", PurchasereturnJobMainExcelVO.class, datas);
     }
 
+    @GetMapping("/getReturnJobById")
+    @Operation(summary = "APP获得采购退货任务主子表明细列表")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('wms:purchasereturn-job-main:query')")
+    public CommonResult<PurchasereturnJobMainRespVO> getReturnJobById(@RequestParam("id") Long id) {
+        PurchasereturnJobMainDO purchasereturnJobMain = purchasereturnJobMainService.getPurchasereturnJobMain(id);
+        PurchasereturnJobMainRespVO result = PurchasereturnJobMainConvert.INSTANCE.convert(purchasereturnJobMain);
+        if(result==null) {
+            return success(result);
+        };
+        PurchasereturnJobDetailExportReqVO purchasereturnJobDetailExportReqVO = new PurchasereturnJobDetailExportReqVO();
+        purchasereturnJobDetailExportReqVO.setMasterId(result.getId());
+        List<PurchasereturnJobDetailDO> purchasereturnJobDetailList = purchasereturnJobDetailService.getPurchasereturnJobDetailList(purchasereturnJobDetailExportReqVO);
+        List<PurchasereturnJobDetailExcelVO> purchasereturnJobDetailExcelVOS = PurchasereturnJobDetailConvert.INSTANCE.convertList02(purchasereturnJobDetailList);
+        result.setSubList(purchasereturnJobDetailExcelVOS);
+        return success(result);
+    }
+
+    @PostMapping("/getReturnJobPageByStatusAndTime")
+    @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:purchasereturn-job-main:query')")
+    public CommonResult<PageResult<PurchasereturnJobMainRespVO>> getReturnJobPageByStatusAndTime(@RequestBody PurchasereturnJobMainPageReqVO purchasereturnJobMainPageReqVO) {
+        PageResult<PurchasereturnJobMainDO> purchasereturnJobMainByStatusPage = purchasereturnJobMainService.getPurchasereturnJobMainPage(purchasereturnJobMainPageReqVO);
+        PageResult<PurchasereturnJobMainRespVO> result = PurchasereturnJobMainConvert.INSTANCE.convertPage(purchasereturnJobMainByStatusPage);
+        return success(result);
+    }
+
+    @PostMapping("/getReturnJobMainSenior")
+    @Operation(summary = "APP根据发货单号和单据号查询采购退货任务主任务列表暂无用")
+    @Parameter(name = "asnNumber", description = "发货单号", required = false, example = "100")
+    @Parameter(name = "number", description = "单据号", required = false, example = "100")
+    @PreAuthorize("@ss.hasPermission('wms:purchasereturn-job-main:query')")
+    public CommonResult<List<PurchasereturnJobMainRespVO>> getReturnJobMainSenior(@RequestBody PurchasereturnJobMainRespVO respVO) {
+        List<PurchasereturnJobMainDO> returnJobMainSenior = purchasereturnJobMainService.getReturnJobMainSenior(respVO);
+        List<PurchasereturnJobMainRespVO> result = PurchasereturnJobMainConvert.INSTANCE.convertList(returnJobMainSenior);
+        return success(result);
+    }
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/vo/PurchasereturnJobDetailExportReqVO.java

@@ -85,4 +85,7 @@ public class PurchasereturnJobDetailExportReqVO {
     @Schema(description = "到货主代码")
     private String toOwnerCode;
 
+    @Schema(description = "主表ID", example = "6060")
+    private Long masterId;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/vo/PurchasereturnJobMainPageReqVO.java

@@ -157,4 +157,7 @@ public class PurchasereturnJobMainPageReqVO 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/purchasereturnJob/vo/PurchasereturnJobMainRespVO.java

@@ -3,10 +3,16 @@ package com.win.module.wms.controller.purchasereturnJob.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 PurchasereturnJobMainRespVO extends PurchasereturnJobMainBaseVO {
 
+    @Schema(description = "退货任务子表job_purchasereceipt_detail 列表数据", requiredMode = Schema.RequiredMode.REQUIRED)
+    private List subList;
+
+
 }

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/controller/repleinshJob/RepleinshJobMainController.java

@@ -3,6 +3,9 @@ package com.win.module.wms.controller.repleinshJob;
 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.convert.repleinshJob.RepleinshJobDetailConvert;
+import com.win.module.wms.dal.dataobject.repleinshJob.RepleinshJobDetailDO;
+import com.win.module.wms.service.repleinshJob.RepleinshJobDetailService;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -38,6 +41,9 @@ public class RepleinshJobMainController {
     @Resource
     private RepleinshJobMainService repleinshJobMainService;
 
+    @Resource
+    private RepleinshJobDetailService repleinshJobDetailService;
+
     @Resource
     private AdminUserApi userApi;
 
@@ -120,4 +126,33 @@ public class RepleinshJobMainController {
         ExcelUtils.write(response, "补料任务主.xls", "数据", RepleinshJobMainExcelVO.class, datas);
     }
 
+    @GetMapping("/getRepleinshJobById")
+    @Operation(summary = "APP获得补料任务主子表明细列表")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('wms:repleinsh-job-main:query')")
+    public CommonResult<RepleinshJobMainRespVO> getRepleinshJobById(@RequestParam("id") Long id) {
+        RepleinshJobMainDO repleinshJobMain = repleinshJobMainService.getRepleinshJobMain(id);
+        RepleinshJobMainRespVO result = RepleinshJobMainConvert.INSTANCE.convert(repleinshJobMain);
+        if(result==null) {
+            return success(result);
+        };
+        RepleinshJobDetailExportReqVO repleinshJobDetailExportReqVO = new RepleinshJobDetailExportReqVO();
+        repleinshJobDetailExportReqVO.setMasterId(result.getId());
+        List<RepleinshJobDetailDO> repleinshJobDetailList = repleinshJobDetailService.getRepleinshJobDetailList(repleinshJobDetailExportReqVO);
+        List<RepleinshJobDetailExcelVO> repleinshJobDetailExcelVOS = RepleinshJobDetailConvert.INSTANCE.convertList02(repleinshJobDetailList);
+        result.setSubList(repleinshJobDetailExcelVOS);
+        return success(result);
+    }
+
+    @PostMapping("/getRepleinshJobbPageByStatusAndTime")
+    @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:repleinsh-job-mainn:query')")
+    public CommonResult<PageResult<RepleinshJobMainRespVO>> getRepleinshJobbPageByStatusAndTime(@RequestBody RepleinshJobMainPageReqVO pageReqVO) {
+        PageResult<RepleinshJobMainDO> repleinshJobMainPage = repleinshJobMainService.getRepleinshJobMainPage(pageReqVO);
+        PageResult<RepleinshJobMainRespVO> result = RepleinshJobMainConvert.INSTANCE.convertPage(repleinshJobMainPage);
+        return success(result);
+    }
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshJob/vo/RepleinshJobDetailExportReqVO.java

@@ -73,4 +73,7 @@ public class RepleinshJobDetailExportReqVO {
     @Schema(description = "到货主代码")
     private String toOwnerCode;
 
+    @Schema(description = "主表ID", example = "6060")
+    private Long masterId;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshJob/vo/RepleinshJobMainPageReqVO.java

@@ -130,4 +130,7 @@ public class RepleinshJobMainPageReqVO extends PageParam {
     @Schema(description = "允许修改箱码")
     private String allowModifyPackingNumber;
 
+    @Schema(description = "任务状态数组列表")
+    private List Types;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshJob/vo/RepleinshJobMainRespVO.java

@@ -3,10 +3,15 @@ package com.win.module.wms.controller.repleinshJob.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 RepleinshJobMainRespVO extends RepleinshJobMainBaseVO {
 
+    @Schema(description = "补料任务子表job_repleinsh_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/inspectJob/InspectJobMainMapper.java

@@ -9,6 +9,7 @@ import com.win.framework.mybatis.core.mapper.BaseMapperX;
 import com.win.framework.mybatis.core.util.QueryWrapperUtils;
 import com.win.module.wms.controller.inspectJob.vo.InspectJobMainExportReqVO;
 import com.win.module.wms.controller.inspectJob.vo.InspectJobMainPageReqVO;
+import com.win.module.wms.controller.inspectJob.vo.InspectJobMainRespVO;
 import com.win.module.wms.dal.dataobject.inspectJob.InspectJobMainDO;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -22,6 +23,7 @@ public interface InspectJobMainMapper extends BaseMapperX<InspectJobMainDO> {
 
     default PageResult<InspectJobMainDO> selectPage(InspectJobMainPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<InspectJobMainDO>()
+                .inIfPresent(InspectJobMainDO::getStatus, reqVO.getStatus())
                 .eqIfPresent(InspectJobMainDO::getRequestNumber, reqVO.getRequestNumber())
                 .eqIfPresent(InspectJobMainDO::getPurchaseReceiptRecordNumber, reqVO.getPurchaseReceiptRecordNumber())
                 .eqIfPresent(InspectJobMainDO::getSupplierCode, reqVO.getSupplierCode())
@@ -126,4 +128,48 @@ public interface InspectJobMainMapper extends BaseMapperX<InspectJobMainDO> {
                 .orderByDesc(InspectJobMainDO::getId));
     }
 
+    default List<InspectJobMainDO> getReturnJobMainSenior(InspectJobMainRespVO reqVO) {
+        return selectList(new LambdaQueryWrapperX<InspectJobMainDO>()
+                .eqIfPresent(InspectJobMainDO::getRequestNumber, reqVO.getRequestNumber())
+                .eqIfPresent(InspectJobMainDO::getPurchaseReceiptRecordNumber, reqVO.getPurchaseReceiptRecordNumber())
+                .eqIfPresent(InspectJobMainDO::getSupplierCode, reqVO.getSupplierCode())
+                .eqIfPresent(InspectJobMainDO::getWarehouseCode, reqVO.getWarehouseCode())
+                .eqIfPresent(InspectJobMainDO::getStatus, reqVO.getStatus())
+                .eqIfPresent(InspectJobMainDO::getUpdater, reqVO.getUpdater())
+                .eqIfPresent(InspectJobMainDO::getJobStageStatus, reqVO.getJobStageStatus())
+                .eqIfPresent(InspectJobMainDO::getPriority, reqVO.getPriority())
+                .eqIfPresent(InspectJobMainDO::getPriorityIncrement, reqVO.getPriorityIncrement())
+                .eqIfPresent(InspectJobMainDO::getDepartmentCode, reqVO.getDepartmentCode())
+                .eqIfPresent(InspectJobMainDO::getAcceptUserId, reqVO.getAcceptUserId())
+                .eqIfPresent(InspectJobMainDO::getCompleteUserId, reqVO.getCompleteUserId())
+                .eqIfPresent(InspectJobMainDO::getFromLocationTypes, reqVO.getFromLocationTypes())
+                .eqIfPresent(InspectJobMainDO::getToLocationTypes, reqVO.getToLocationTypes())
+                .eqIfPresent(InspectJobMainDO::getNumber, reqVO.getNumber())
+                .eqIfPresent(InspectJobMainDO::getBusinessType, reqVO.getBusinessType())
+                .eqIfPresent(InspectJobMainDO::getRemark, reqVO.getRemark())
+                .eqIfPresent(InspectJobMainDO::getCreator, reqVO.getCreator())
+                .eqIfPresent(InspectJobMainDO::getPoUmber, reqVO.getPoUmber())
+                .eqIfPresent(InspectJobMainDO::getPoLine, reqVO.getPoLine())
+                .eqIfPresent(InspectJobMainDO::getBatch, reqVO.getBatch())
+                .eqIfPresent(InspectJobMainDO::getItemCode, reqVO.getItemCode())
+                .eqIfPresent(InspectJobMainDO::getInspectType, reqVO.getInspectType())
+                .eqIfPresent(InspectJobMainDO::getNextAction, reqVO.getNextAction())
+                .eqIfPresent(InspectJobMainDO::getSampleMethod, reqVO.getSampleMethod())
+                .eqIfPresent(InspectJobMainDO::getUom, reqVO.getUom())
+                .eqIfPresent(InspectJobMainDO::getReceiveQty, reqVO.getReceiveQty())
+                .eqIfPresent(InspectJobMainDO::getSampleQty, reqVO.getSampleQty())
+                .eqIfPresent(InspectJobMainDO::getOwner, reqVO.getOwner())
+                .eqIfPresent(InspectJobMainDO::getAutoComplete, reqVO.getAutoComplete())
+                .eqIfPresent(InspectJobMainDO::getAllowModifyLocation, reqVO.getAllowModifyLocation())
+                .eqIfPresent(InspectJobMainDO::getAllowModifyQty, reqVO.getAllowModifyQty())
+                .eqIfPresent(InspectJobMainDO::getAllowBiggerQty, reqVO.getAllowBiggerQty())
+                .eqIfPresent(InspectJobMainDO::getAllowSmallerQty, reqVO.getAllowSmallerQty())
+                .eqIfPresent(InspectJobMainDO::getAllowModifyInventoryStatus, reqVO.getAllowModifyInventoryStatus())
+                .eqIfPresent(InspectJobMainDO::getAllowContinuousScanning, reqVO.getAllowContinuousScanning())
+                .eqIfPresent(InspectJobMainDO::getAllowPartialComplete, reqVO.getAllowPartialComplete())
+                .eqIfPresent(InspectJobMainDO::getAllowModifyBatch, reqVO.getAllowModifyBatch())
+                .eqIfPresent(InspectJobMainDO::getAllowModifyPackingNumber, reqVO.getAllowModifyPackingNumber())
+                .orderByDesc(InspectJobMainDO::getId));
+    }
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereturnJob/PurchasereturnJobMainMapper.java

@@ -9,6 +9,7 @@ import com.win.framework.mybatis.core.mapper.BaseMapperX;
 import com.win.framework.mybatis.core.util.QueryWrapperUtils;
 import com.win.module.wms.controller.purchasereturnJob.vo.PurchasereturnJobMainExportReqVO;
 import com.win.module.wms.controller.purchasereturnJob.vo.PurchasereturnJobMainPageReqVO;
+import com.win.module.wms.controller.purchasereturnJob.vo.PurchasereturnJobMainRespVO;
 import com.win.module.wms.dal.dataobject.purchasereturnJob.PurchasereturnJobMainDO;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -22,6 +23,7 @@ public interface PurchasereturnJobMainMapper extends BaseMapperX<PurchasereturnJ
 
     default PageResult<PurchasereturnJobMainDO> selectPage(PurchasereturnJobMainPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<PurchasereturnJobMainDO>()
+                .inIfPresent(PurchasereturnJobMainDO::getStatus, reqVO.getTypes())
                 .eqIfPresent(PurchasereturnJobMainDO::getRequestNumber, reqVO.getRequestNumber())
                 .eqIfPresent(PurchasereturnJobMainDO::getPurchaseReceiptRecordNumber, reqVO.getPurchaseReceiptRecordNumber())
                 .eqIfPresent(PurchasereturnJobMainDO::getAsnNumber, reqVO.getAsnNumber())
@@ -122,4 +124,47 @@ public interface PurchasereturnJobMainMapper extends BaseMapperX<PurchasereturnJ
                 .orderByDesc(PurchasereturnJobMainDO::getId));
     }
 
+    default List<PurchasereturnJobMainDO> getReturnJobMainSenior(PurchasereturnJobMainRespVO reqVO) {
+        return selectList(new LambdaQueryWrapperX<PurchasereturnJobMainDO>()
+                .eqIfPresent(PurchasereturnJobMainDO::getRequestNumber, reqVO.getRequestNumber())
+                .eqIfPresent(PurchasereturnJobMainDO::getPurchaseReceiptRecordNumber, reqVO.getPurchaseReceiptRecordNumber())
+                .eqIfPresent(PurchasereturnJobMainDO::getAsnNumber, reqVO.getAsnNumber())
+                .eqIfPresent(PurchasereturnJobMainDO::getPpNumber, reqVO.getPpNumber())
+                .eqIfPresent(PurchasereturnJobMainDO::getSupplierCode, reqVO.getSupplierCode())
+                .eqIfPresent(PurchasereturnJobMainDO::getDeliverDock, reqVO.getDeliverDock())
+                .eqIfPresent(PurchasereturnJobMainDO::getCarrierCode, reqVO.getCarrierCode())
+                .eqIfPresent(PurchasereturnJobMainDO::getTransferMode, reqVO.getTransferMode())
+                .eqIfPresent(PurchasereturnJobMainDO::getVehiclePlateNumber, reqVO.getVehiclePlateNumber())
+                .eqIfPresent(PurchasereturnJobMainDO::getFromWarehouseCode, reqVO.getFromWarehouseCode())
+                .eqIfPresent(PurchasereturnJobMainDO::getToWarehouseCode, reqVO.getToWarehouseCode())
+                .eqIfPresent(PurchasereturnJobMainDO::getStatus, reqVO.getStatus())
+                .eqIfPresent(PurchasereturnJobMainDO::getUpdater, reqVO.getUpdater())
+                .eqIfPresent(PurchasereturnJobMainDO::getJobStageStatus, reqVO.getJobStageStatus())
+                .eqIfPresent(PurchasereturnJobMainDO::getPriority, reqVO.getPriority())
+                .eqIfPresent(PurchasereturnJobMainDO::getPriorityIncrement, reqVO.getPriorityIncrement())
+                .eqIfPresent(PurchasereturnJobMainDO::getDepartmentCode, reqVO.getDepartmentCode())
+                .eqIfPresent(PurchasereturnJobMainDO::getAcceptUserId, reqVO.getAcceptUserId())
+                .eqIfPresent(PurchasereturnJobMainDO::getCompleteUserId, reqVO.getCompleteUserId())
+                .eqIfPresent(PurchasereturnJobMainDO::getFromLocationTypes, reqVO.getFromLocationTypes())
+                .eqIfPresent(PurchasereturnJobMainDO::getToLocationTypes, reqVO.getToLocationTypes())
+                .eqIfPresent(PurchasereturnJobMainDO::getNumber, reqVO.getNumber())
+                .eqIfPresent(PurchasereturnJobMainDO::getBusinessType, reqVO.getBusinessType())
+                .eqIfPresent(PurchasereturnJobMainDO::getRemark, reqVO.getRemark())
+                .eqIfPresent(PurchasereturnJobMainDO::getCreator, reqVO.getCreator())
+                .eqIfPresent(PurchasereturnJobMainDO::getFromAreaCodes, reqVO.getFromAreaCodes())
+                .eqIfPresent(PurchasereturnJobMainDO::getToAreaCodes, reqVO.getToAreaCodes())
+                .eqIfPresent(PurchasereturnJobMainDO::getFromDockCode, reqVO.getFromDockCode())
+                .eqIfPresent(PurchasereturnJobMainDO::getAutoComplete, reqVO.getAutoComplete())
+                .eqIfPresent(PurchasereturnJobMainDO::getAllowModifyLocation, reqVO.getAllowModifyLocation())
+                .eqIfPresent(PurchasereturnJobMainDO::getAllowModifyQty, reqVO.getAllowModifyQty())
+                .eqIfPresent(PurchasereturnJobMainDO::getAllowBiggerQty, reqVO.getAllowBiggerQty())
+                .eqIfPresent(PurchasereturnJobMainDO::getAllowSmallerQty, reqVO.getAllowSmallerQty())
+                .eqIfPresent(PurchasereturnJobMainDO::getAllowModifyInventoryStatus, reqVO.getAllowModifyInventoryStatus())
+                .eqIfPresent(PurchasereturnJobMainDO::getAllowContinuousScanning, reqVO.getAllowContinuousScanning())
+                .eqIfPresent(PurchasereturnJobMainDO::getAllowPartialComplete, reqVO.getAllowPartialComplete())
+                .eqIfPresent(PurchasereturnJobMainDO::getAllowModifyBatch, reqVO.getAllowModifyBatch())
+                .eqIfPresent(PurchasereturnJobMainDO::getAllowModifyPackingNumber, reqVO.getAllowModifyPackingNumber())
+                .orderByDesc(PurchasereturnJobMainDO::getId));
+    }
+
 }

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())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/repleinshJob/RepleinshJobMainMapper.java

@@ -22,6 +22,7 @@ public interface RepleinshJobMainMapper extends BaseMapperX<RepleinshJobMainDO>
 
     default PageResult<RepleinshJobMainDO> selectPage(RepleinshJobMainPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<RepleinshJobMainDO>()
+                .inIfPresent(RepleinshJobMainDO::getStatus, reqVO.getTypes())
                 .eqIfPresent(RepleinshJobMainDO::getRequestNumber, reqVO.getRequestNumber())
                 .betweenIfPresent(RepleinshJobMainDO::getRequestTime, reqVO.getRequestTime())
                 .betweenIfPresent(RepleinshJobMainDO::getRequestDueTime, reqVO.getRequestDueTime())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainService.java

@@ -4,10 +4,7 @@ import java.util.*;
 import javax.validation.*;
 
 import com.win.framework.common.pojo.CustomConditions;
-import com.win.module.wms.controller.inspectJob.vo.InspectJobMainCreateReqVO;
-import com.win.module.wms.controller.inspectJob.vo.InspectJobMainExportReqVO;
-import com.win.module.wms.controller.inspectJob.vo.InspectJobMainPageReqVO;
-import com.win.module.wms.controller.inspectJob.vo.InspectJobMainUpdateReqVO;
+import com.win.module.wms.controller.inspectJob.vo.*;
 import com.win.module.wms.dal.dataobject.inspectJob.InspectJobMainDO;
 import com.win.framework.common.pojo.PageResult;
 
@@ -88,4 +85,11 @@ public interface InspectJobMainService {
      * @return 采购订单主列表
      */
     public InspectJobMainDO inspectJobMainDoStatusRight(String pnumber, String pstatus);
+
+    /**
+     * 高级搜索不分页
+     * @param respVO
+     * @return
+     */
+    List<InspectJobMainDO> getInspectJobMainSenior(InspectJobMainRespVO respVO);
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainServiceImpl.java

@@ -2,10 +2,8 @@ package com.win.module.wms.service.inspectJob;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.win.framework.common.pojo.CustomConditions;
-import com.win.module.wms.controller.inspectJob.vo.InspectJobMainCreateReqVO;
-import com.win.module.wms.controller.inspectJob.vo.InspectJobMainExportReqVO;
-import com.win.module.wms.controller.inspectJob.vo.InspectJobMainPageReqVO;
-import com.win.module.wms.controller.inspectJob.vo.InspectJobMainUpdateReqVO;
+import com.win.module.wms.controller.inspectJob.vo.*;
+import com.win.module.wms.dal.dataobject.purchasereturnJob.PurchasereturnJobMainDO;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -100,4 +98,9 @@ public class InspectJobMainServiceImpl implements InspectJobMainService {
             throw exception(INSPECT_JOB_MAIN_STATUS_ERROR);
         }
     }
+
+    @Override
+    public List<InspectJobMainDO> getInspectJobMainSenior(InspectJobMainRespVO respVO) {
+        return inspectJobMainMapper.getReturnJobMainSenior(respVO);
+    }
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobMainService.java

@@ -4,10 +4,7 @@ import java.util.*;
 import javax.validation.*;
 
 import com.win.framework.common.pojo.CustomConditions;
-import com.win.module.wms.controller.purchasereturnJob.vo.PurchasereturnJobMainCreateReqVO;
-import com.win.module.wms.controller.purchasereturnJob.vo.PurchasereturnJobMainExportReqVO;
-import com.win.module.wms.controller.purchasereturnJob.vo.PurchasereturnJobMainPageReqVO;
-import com.win.module.wms.controller.purchasereturnJob.vo.PurchasereturnJobMainUpdateReqVO;
+import com.win.module.wms.controller.purchasereturnJob.vo.*;
 import com.win.module.wms.dal.dataobject.purchasereturnJob.PurchasereturnJobMainDO;
 import com.win.framework.common.pojo.PageResult;
 
@@ -86,4 +83,14 @@ public interface PurchasereturnJobMainService {
      * @return 采购订单主列表
      */
     public PurchasereturnJobMainDO purchasereturnJobMainDoStatusRight(String pnumber, String pstatus);
+
+    /**
+     * 获得采购退货任务主
+     *
+     * @param id 编号
+     * @return 采购退货任务主
+     */
+    PurchasereturnJobMainDO getPurchasereturnJobMain(Long id);
+
+    List<PurchasereturnJobMainDO> getReturnJobMainSenior(PurchasereturnJobMainRespVO respVO);
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobMainServiceImpl.java

@@ -2,10 +2,8 @@ package com.win.module.wms.service.purchasereturnJob;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.win.framework.common.pojo.CustomConditions;
-import com.win.module.wms.controller.purchasereturnJob.vo.PurchasereturnJobMainCreateReqVO;
-import com.win.module.wms.controller.purchasereturnJob.vo.PurchasereturnJobMainExportReqVO;
-import com.win.module.wms.controller.purchasereturnJob.vo.PurchasereturnJobMainPageReqVO;
-import com.win.module.wms.controller.purchasereturnJob.vo.PurchasereturnJobMainUpdateReqVO;
+import com.win.module.wms.controller.purchasereturnJob.vo.*;
+import com.win.module.wms.dal.dataobject.purchasereceiptJob.PurchasereceiptJobMainDO;
 import com.win.module.wms.dal.dataobject.supplierdeliverRecord.SupplierdeliverRecordDetailDO;
 import com.win.module.wms.service.supplierdeliverRecord.SupplierdeliverRecordMainService;
 import org.springframework.stereotype.Service;
@@ -119,4 +117,14 @@ public class PurchasereturnJobMainServiceImpl implements PurchasereturnJobMainSe
             throw exception(PURCHASERETURN_JOB_MAIN_STATUS_ERROR);
         }
     }
+
+    @Override
+    public PurchasereturnJobMainDO getPurchasereturnJobMain(Long id) {
+        return purchasereturnJobMainMapper.selectById(id);
+    }
+
+    @Override
+    public List<PurchasereturnJobMainDO> getReturnJobMainSenior(PurchasereturnJobMainRespVO respVO) {
+        return purchasereturnJobMainMapper.getReturnJobMainSenior(respVO);
+    }
 }