From 2c5248e7b7852f9b53566c4cda1aef94b57f9966 Mon Sep 17 00:00:00 2001 From: songguoqiang Date: Tue, 7 Nov 2023 18:18:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E6=9E=B6=E4=BB=BB=E5=8A=A1=20?= =?UTF-8?q?=E6=A0=B9=E6=8D=AEid=E6=9F=A5=E8=AF=A2=E4=B8=BB=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E5=8F=8A=E5=AD=90=E4=BB=BB=E5=8A=A1=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=20=E6=A0=B9=E6=8D=AE=E7=B1=BB=E5=9E=8Blist=E4=BB=A5=E5=8F=8A?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=9F=A5=E8=AF=A2=E4=B8=BB=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=88=86=E9=A1=B5=E6=95=B0=E6=8D=AE=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../putawayJob/PutawayJobMainController.java | 35 +++++++++++++++++++ .../vo/PutawayJobDetailExportReqVO.java | 2 ++ .../vo/PutawayJobMainPageReqVO.java | 3 ++ .../putawayJob/vo/PutawayJobMainRespVO.java | 4 +++ .../putawayJob/PutawayJobDetailDO.java | 2 +- .../putawayJob/PutawayJobDetailMapper.java | 4 +-- .../putawayJob/PutawayJobMainMapper.java | 1 + 7 files changed, 48 insertions(+), 3 deletions(-) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayJob/PutawayJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayJob/PutawayJobMainController.java index 115c5288..0d361a6b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayJob/PutawayJobMainController.java +++ b/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 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 putawayJobDetailList = putawayJobDetailService.getPutawayJobDetailList(putawayJobDetailExportReqVO1); + List 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> getPutawayJobPageByStatusAndTime(@RequestBody PutawayJobMainPageReqVO putawayJobMainPageReqVO) { + PageResult putawayJobMainPage = putawayJobMainService.getPutawayJobMainPage(putawayJobMainPageReqVO); + PutawayJobMainConvert.INSTANCE.convertPage(putawayJobMainPage); + return success(PutawayJobMainConvert.INSTANCE.convertPage(putawayJobMainPage)); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayJob/vo/PutawayJobDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayJob/vo/PutawayJobDetailExportReqVO.java index 2412f2d2..fc596e66 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayJob/vo/PutawayJobDetailExportReqVO.java +++ b/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; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayJob/vo/PutawayJobMainPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayJob/vo/PutawayJobMainPageReqVO.java index 1a89cfa1..36a7ab8c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayJob/vo/PutawayJobMainPageReqVO.java +++ b/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; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayJob/vo/PutawayJobMainRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayJob/vo/PutawayJobMainRespVO.java index 65d0f287..cbfc0f7e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayJob/vo/PutawayJobMainRespVO.java +++ b/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; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/putawayJob/PutawayJobDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/putawayJob/PutawayJobDetailDO.java index 240283e5..1c36746d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/putawayJob/PutawayJobDetailDO.java +++ b/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; /** * 项目代码 */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/putawayJob/PutawayJobDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/putawayJob/PutawayJobDetailMapper.java index 6d090f70..fc66fe85 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/putawayJob/PutawayJobDetailMapper.java +++ b/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 .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 .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()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/putawayJob/PutawayJobMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/putawayJob/PutawayJobMainMapper.java index 391ecd49..279199eb 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/putawayJob/PutawayJobMainMapper.java +++ b/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 { default PageResult selectPage(PutawayJobMainPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() + .inIfPresent(PutawayJobMainDO::getStatus, reqVO.getTypes()) .eqIfPresent(PutawayJobMainDO::getRequestNumber, reqVO.getRequestNumber()) .eqIfPresent(PutawayJobMainDO::getSupplierCode, reqVO.getSupplierCode()) .eqIfPresent(PutawayJobMainDO::getFromWarehouseCode, reqVO.getFromWarehouseCode())