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 238447e0..3faa81b8 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 @@ -7,6 +7,7 @@ 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 jodd.util.StringUtil; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -138,26 +139,19 @@ public class PurchasereturnJobMainController { 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\"]") + @PostMapping("/getCountByStatus") + @Operation(summary = "APP获得采购收货任务数量根据任务状态") + @Parameter(name = "types", description = "类型数组", required = false, example = "\"types\":[\"1\",\"2\"]") @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); + public CommonResult> getCountByStatus(@RequestBody Map> map) { + List list = new ArrayList<>(); + if(map==null||map.get("types")==null|| StringUtil.isEmpty(map.get("types").toString())){ + list.add("1");//默认不传为执行中的 + }else{ + list = map.get("types"); + } + Map countByStatus = purchasereturnJobMainService.getCountByStatus(list); + return success(countByStatus); } } 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 717730ef..8f421124 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,7 +9,6 @@ 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; @@ -123,48 +122,15 @@ public interface PurchasereturnJobMainMapper extends BaseMapperX types) { + return selectCount(new LambdaQueryWrapperX() + .inIfPresent(PurchasereturnJobMainDO::getStatus, types)); - default List 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 8940d9bc..98903de2 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 @@ -7,6 +7,7 @@ import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.purchasereturnJob.vo.*; import com.win.module.wms.dal.dataobject.purchasereturnJob.PurchasereturnJobMainDO; import com.win.framework.common.pojo.PageResult; +import org.springframework.lang.Nullable; /** * 采购退货任务主 Service 接口 @@ -92,5 +93,10 @@ public interface PurchasereturnJobMainService { */ PurchasereturnJobMainDO getPurchasereturnJobMain(Long id); - List getReturnJobMainSenior(PurchasereturnJobMainRespVO respVO); + /** + *根据任务状态获取任务数量 + * @param types 任务状态数组 + * @return + */ + Map getCountByStatus(@Nullable Collection types); } 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 00555ed6..5c31222d 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 @@ -3,7 +3,6 @@ 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.*; -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; @@ -124,7 +123,12 @@ public class PurchasereturnJobMainServiceImpl implements PurchasereturnJobMainSe } @Override - public List getReturnJobMainSenior(PurchasereturnJobMainRespVO respVO) { - return purchasereturnJobMainMapper.getReturnJobMainSenior(respVO); + public Map getCountByStatus(Collection types) { + Long l = purchasereturnJobMainMapper.selectListCount(types); + Map map = new HashMap<>(); + map.put("jobType", 2); + map.put("count", l.intValue()); + return map; } + }