From ab88e66caa43e327efe2a069f64a9ece9adee64e Mon Sep 17 00:00:00 2001 From: songguoqiang Date: Tue, 7 Nov 2023 18:12:29 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E9=80=80=E8=B4=A7=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=20=E6=A0=B9=E6=8D=AEid=E6=9F=A5=E8=AF=A2=E4=B8=BB?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=8F=8A=E5=AD=90=E4=BB=BB=E5=8A=A1=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=20=E6=A0=B9=E6=8D=AE=E7=B1=BB=E5=9E=8Blist=E4=BB=A5?= =?UTF-8?q?=E5=8F=8A=E6=97=B6=E9=97=B4=E6=9F=A5=E8=AF=A2=E4=B8=BB=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E5=88=86=E9=A1=B5=E6=95=B0=E6=8D=AE=E6=96=B9=E6=B3=95?= =?UTF-8?q?=20=E6=A0=B9=E6=8D=AE=E5=8F=82=E6=95=B0=E9=AB=98=E7=BA=A7?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=B8=8D=E5=88=86=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PurchasereturnJobMainController.java | 46 +++++++++++++++++++ .../PurchasereturnJobDetailExportReqVO.java | 3 ++ .../vo/PurchasereturnJobMainPageReqVO.java | 3 ++ .../vo/PurchasereturnJobMainRespVO.java | 6 +++ .../PurchasereturnJobMainMapper.java | 45 ++++++++++++++++++ .../PurchasereturnJobMainService.java | 15 ++++-- .../PurchasereturnJobMainServiceImpl.java | 16 +++++-- 7 files changed, 126 insertions(+), 8 deletions(-) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/PurchasereturnJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/PurchasereturnJobMainController.java index 74ca1e1f..238447e0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/PurchasereturnJobMainController.java +++ b/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 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 purchasereturnJobDetailList = purchasereturnJobDetailService.getPurchasereturnJobDetailList(purchasereturnJobDetailExportReqVO); + List 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> getReturnJobPageByStatusAndTime(@RequestBody PurchasereturnJobMainPageReqVO purchasereturnJobMainPageReqVO) { + PageResult purchasereturnJobMainByStatusPage = purchasereturnJobMainService.getPurchasereturnJobMainPage(purchasereturnJobMainPageReqVO); + PageResult 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> getReturnJobMainSenior(@RequestBody PurchasereturnJobMainRespVO respVO) { + List returnJobMainSenior = purchasereturnJobMainService.getReturnJobMainSenior(respVO); + List result = PurchasereturnJobMainConvert.INSTANCE.convertList(returnJobMainSenior); + return success(result); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/vo/PurchasereturnJobDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/vo/PurchasereturnJobDetailExportReqVO.java index 7204fc2b..e25cd5df 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/vo/PurchasereturnJobDetailExportReqVO.java +++ b/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; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/vo/PurchasereturnJobMainPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/vo/PurchasereturnJobMainPageReqVO.java index bf7683d6..9b1ff852 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/vo/PurchasereturnJobMainPageReqVO.java +++ b/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; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/vo/PurchasereturnJobMainRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/vo/PurchasereturnJobMainRespVO.java index 1248d46b..8ddfb1f3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/vo/PurchasereturnJobMainRespVO.java +++ b/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; + + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereturnJob/PurchasereturnJobMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereturnJob/PurchasereturnJobMainMapper.java index 6e0d78d8..717730ef 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereturnJob/PurchasereturnJobMainMapper.java +++ b/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 selectPage(PurchasereturnJobMainPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() + .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 getReturnJobMainSenior(PurchasereturnJobMainRespVO reqVO) { + return selectList(new LambdaQueryWrapperX() + .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)); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobMainService.java index 89d2d170..8940d9bc 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobMainService.java +++ b/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 getReturnJobMainSenior(PurchasereturnJobMainRespVO respVO); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobMainServiceImpl.java index 961fdbe1..00555ed6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobMainServiceImpl.java +++ b/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 getReturnJobMainSenior(PurchasereturnJobMainRespVO respVO) { + return purchasereturnJobMainMapper.getReturnJobMainSenior(respVO); + } }