diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/PurchasereceiptJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/PurchasereceiptJobMainController.java index b3deccd8..9314a267 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/PurchasereceiptJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/PurchasereceiptJobMainController.java @@ -6,6 +6,7 @@ import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.convert.purchasereceiptJob.PurchasereceiptJobDetailConvert; import com.win.module.wms.dal.dataobject.purchasereceiptJob.PurchasereceiptJobDetailDO; import com.win.module.wms.service.purchasereceiptJob.PurchasereceiptJobDetailService; +import jodd.util.StringUtil; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -140,27 +141,21 @@ public class PurchasereceiptJobMainController { return success(result); } - @PostMapping("/getPageByStatusAndTime") - @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:purchasereceipt-job-main:query')") - public CommonResult> getPageByStatusAndTime(@RequestBody PurchasereceiptJobMainPageReqVO purchasereceiptJobMainPageReqVO) { - PageResult purchasereceiptJobMainByStatusPage = purchasereceiptJobMainService.getPurchasereceiptJobMainPage(purchasereceiptJobMainPageReqVO); - PageResult result = PurchasereceiptJobMainConvert.INSTANCE.convertPage(purchasereceiptJobMainByStatusPage); - 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 = purchasereceiptJobMainService.getCountByStatus(list); + return success(countByStatus); } - @PostMapping("/getPurchasereceiptJobMainSenior") - @Operation(summary = "APP根据发货单号和单据号查询采购收货任务主任务列表") - @Parameter(name = "asnNumber", description = "发货单号", required = false, example = "100") - @Parameter(name = "number", description = "单据号", required = false, example = "100") - @PreAuthorize("@ss.hasPermission('wms:purchasereceipt-job-main:query')") - public CommonResult> getPurchasereceiptJobMainSenior(@RequestBody PurchasereceiptJobMainRespVO respVO) { - List purchasereceiptJobMainSenior = purchasereceiptJobMainService.getPurchasereceiptJobMainSenior(respVO); - List result = PurchasereceiptJobMainConvert.INSTANCE.convertList(purchasereceiptJobMainSenior); - return success(result); - } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereceiptJob/PurchasereceiptJobMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereceiptJob/PurchasereceiptJobMainMapper.java index 2ba7151b..dc64bff6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereceiptJob/PurchasereceiptJobMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasereceiptJob/PurchasereceiptJobMainMapper.java @@ -12,6 +12,7 @@ import com.win.module.wms.dal.dataobject.purchasereceiptJob.PurchasereceiptJobMa import com.win.module.wms.enums.order.OrderStatusEnum; import org.apache.ibatis.annotations.Mapper; +import java.util.Collection; import java.util.List; /** @@ -130,46 +131,15 @@ public interface PurchasereceiptJobMainMapper extends BaseMapperX getPurchasereceiptJobMainSenior(PurchasereceiptJobMainRespVO reqVO) { - return selectList(new LambdaQueryWrapperX() - .eqIfPresent(PurchasereceiptJobMainDO::getRequestNumber, reqVO.getRequestNumber()) - .eqIfPresent(PurchasereceiptJobMainDO::getAsnNumber, reqVO.getAsnNumber()) - .eqIfPresent(PurchasereceiptJobMainDO::getPpNumber, reqVO.getPpNumber()) - .eqIfPresent(PurchasereceiptJobMainDO::getSupplierCode, reqVO.getSupplierCode()) - .eqIfPresent(PurchasereceiptJobMainDO::getToDockCode, reqVO.getToDockCode()) - .eqIfPresent(PurchasereceiptJobMainDO::getCarrierCode, reqVO.getCarrierCode()) - .eqIfPresent(PurchasereceiptJobMainDO::getTransferMode, reqVO.getTransferMode()) - .eqIfPresent(PurchasereceiptJobMainDO::getVehiclePlateNumber, reqVO.getVehiclePlateNumber()) - .eqIfPresent(PurchasereceiptJobMainDO::getFromWarehouseCode, reqVO.getFromWarehouseCode()) - .eqIfPresent(PurchasereceiptJobMainDO::getToWarehouseCode, reqVO.getToWarehouseCode()) - .eqIfPresent(PurchasereceiptJobMainDO::getStatus, reqVO.getStatus()) - .eqIfPresent(PurchasereceiptJobMainDO::getUpdater, reqVO.getUpdater()) - .eqIfPresent(PurchasereceiptJobMainDO::getJobStageStatus, reqVO.getJobStageStatus()) - .eqIfPresent(PurchasereceiptJobMainDO::getPriority, reqVO.getPriority()) - .eqIfPresent(PurchasereceiptJobMainDO::getPriorityIncrement, reqVO.getPriorityIncrement()) - .eqIfPresent(PurchasereceiptJobMainDO::getDepartmentCode, reqVO.getDepartmentCode()) - .eqIfPresent(PurchasereceiptJobMainDO::getUserPositionCode, reqVO.getUserPositionCode()) - .eqIfPresent(PurchasereceiptJobMainDO::getAcceptUserId, reqVO.getAcceptUserId()) - .eqIfPresent(PurchasereceiptJobMainDO::getCompleteUserId, reqVO.getCompleteUserId()) - .eqIfPresent(PurchasereceiptJobMainDO::getFromLocationTypes, reqVO.getFromLocationTypes()) - .eqIfPresent(PurchasereceiptJobMainDO::getToLocationTypes, reqVO.getToLocationTypes()) - .eqIfPresent(PurchasereceiptJobMainDO::getNumber, reqVO.getNumber()) - .eqIfPresent(PurchasereceiptJobMainDO::getBusinessType, reqVO.getBusinessType()) - .eqIfPresent(PurchasereceiptJobMainDO::getRemark, reqVO.getRemark()) - .eqIfPresent(PurchasereceiptJobMainDO::getCreator, reqVO.getCreator()) - .eqIfPresent(PurchasereceiptJobMainDO::getAllowModifyBatch, reqVO.getAllowModifyBatch()) - .eqIfPresent(PurchasereceiptJobMainDO::getFromAreaCodes, reqVO.getFromAreaCodes()) - .eqIfPresent(PurchasereceiptJobMainDO::getToAreaCodes, reqVO.getToAreaCodes()) - .eqIfPresent(PurchasereceiptJobMainDO::getAutoComplete, reqVO.getAutoComplete()) - .eqIfPresent(PurchasereceiptJobMainDO::getAllowModifyLocation, reqVO.getAllowModifyLocation()) - .eqIfPresent(PurchasereceiptJobMainDO::getAllowModifyQty, reqVO.getAllowModifyQty()) - .eqIfPresent(PurchasereceiptJobMainDO::getAllowBiggerQty, reqVO.getAllowBiggerQty()) - .eqIfPresent(PurchasereceiptJobMainDO::getAllowSmallerQty, reqVO.getAllowSmallerQty()) - .eqIfPresent(PurchasereceiptJobMainDO::getAllowModifyInventoryStatus, reqVO.getAllowModifyInventoryStatus()) - .eqIfPresent(PurchasereceiptJobMainDO::getAllowContinuousScanning, reqVO.getAllowContinuousScanning()) - .eqIfPresent(PurchasereceiptJobMainDO::getAllowPartialComplete, reqVO.getAllowPartialComplete()) - .eqIfPresent(PurchasereceiptJobMainDO::getAllowModifyPackingNumber, reqVO.getAllowModifyPackingNumber()) - .orderByDesc(PurchasereceiptJobMainDO::getId)); + /** + *根据类型数组查询任务数量 + * @param types + * @return + */ + default Long selectListCount(Collection types) { + return selectCount(new LambdaQueryWrapperX() + .inIfPresent(PurchasereceiptJobMainDO::getStatus, types)); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainService.java index 270729b9..8a4bf415 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainService.java @@ -7,6 +7,7 @@ import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.purchasereceiptJob.vo.*; import com.win.module.wms.dal.dataobject.purchasereceiptJob.PurchasereceiptJobMainDO; import com.win.framework.common.pojo.PageResult; +import org.springframework.lang.Nullable; /** * 采购收货任务主 Service 接口 @@ -83,5 +84,10 @@ public interface PurchasereceiptJobMainService { */ public PurchasereceiptJobMainDO purchasereceiptJobMainDoStatusRight(String pnumber, String pstatus); - List getPurchasereceiptJobMainSenior(PurchasereceiptJobMainRespVO 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/purchasereceiptJob/PurchasereceiptJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainServiceImpl.java index 3c071cde..1ce474ee 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainServiceImpl.java @@ -118,7 +118,11 @@ public class PurchasereceiptJobMainServiceImpl implements PurchasereceiptJobMain } @Override - public List getPurchasereceiptJobMainSenior(PurchasereceiptJobMainRespVO respVO) { - return purchasereceiptJobMainMapper.getPurchasereceiptJobMainSenior(respVO); + public Map getCountByStatus(Collection types) { + Long l = purchasereceiptJobMainMapper.selectListCount(types); + Map map = new HashMap<>(); + map.put("jobType", 1); + map.put("count", l.intValue()); + return map; } }