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 0d361a6b..24be863a 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 @@ -7,6 +7,7 @@ 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 jodd.util.StringUtil; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -156,4 +157,19 @@ public class PutawayJobMainController { return success(PutawayJobMainConvert.INSTANCE.convertPage(putawayJobMainPage)); } + @PostMapping("/getCountByStatus") + @Operation(summary = "APP获得上架任务数量根据任务状态") + @Parameter(name = "types", description = "类型数组", required = false, example = "\"types\":[\"1\",\"2\"]") + @PreAuthorize("@ss.hasPermission('wms:putaway-job-main:query')") + 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 = putawayJobMainService.getCountByStatus(list); + return success(countByStatus); + } + } 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 279199eb..798547a8 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 @@ -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.putawayJob.vo.PutawayJobMainExportReqVO; import com.win.module.wms.controller.putawayJob.vo.PutawayJobMainPageReqVO; +import com.win.module.wms.dal.dataobject.purchasereturnJob.PurchasereturnJobMainDO; import com.win.module.wms.dal.dataobject.putawayJob.PutawayJobMainDO; import org.apache.ibatis.annotations.Mapper; @@ -109,4 +110,15 @@ public interface PutawayJobMainMapper extends BaseMapperX { .orderByDesc(PutawayJobMainDO::getId)); } + /** + *根据类型数组查询任务数量 + * @param types + * @return + */ + default Long selectListCount(Collection types) { + return selectCount(new LambdaQueryWrapperX() + .inIfPresent(PutawayJobMainDO::getStatus, types)); + + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobMainService.java index c9363131..0c058fbf 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobMainService.java @@ -10,6 +10,7 @@ import com.win.module.wms.controller.putawayJob.vo.PutawayJobMainPageReqVO; import com.win.module.wms.controller.putawayJob.vo.PutawayJobMainUpdateReqVO; import com.win.module.wms.dal.dataobject.putawayJob.PutawayJobMainDO; import com.win.framework.common.pojo.PageResult; +import org.springframework.lang.Nullable; /** * 上架任务主 Service 接口 @@ -87,4 +88,11 @@ public interface PutawayJobMainService { * @return 采购订单主列表 */ public PutawayJobMainDO putawayJobMainDoStatusRight(String pnumber, String pstatus); + + /** + *根据任务状态获取任务数量 + * @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/putawayJob/PutawayJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobMainServiceImpl.java index 3fc34132..9fdedcdb 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobMainServiceImpl.java @@ -99,4 +99,13 @@ public class PutawayJobMainServiceImpl implements PutawayJobMainService { throw exception(CUSTOMERRETURN_JOB_MAIN_STATUS_ERROR); } } + + @Override + public Map getCountByStatus(Collection types) { + Long l = putawayJobMainMapper.selectListCount(types); + Map map = new HashMap<>(); + map.put("jobType", 3); + map.put("count", l.intValue()); + return map; + } }