diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickJob/PickJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickJob/PickJobMainController.java index c341b9ca..3ce97f54 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickJob/PickJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickJob/PickJobMainController.java @@ -17,6 +17,7 @@ import com.win.module.wms.service.pickJob.PickJobMainService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; +import jodd.util.StringUtil; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -25,8 +26,10 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.io.IOException; +import java.util.ArrayList; import java.util.Collection; import java.util.List; +import java.util.Map; import static com.win.framework.common.pojo.CommonResult.success; import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @@ -144,5 +147,19 @@ public class PickJobMainController { return success(result); } + @PostMapping("/getCountByStatus") + @Operation(summary = "APP获得拣料任务数量根据任务状态") + @Parameter(name = "types", description = "类型数组", required = false, example = "\"types\":[\"1\",\"2\"]") + @PreAuthorize("@ss.hasPermission('wms:pick-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 = pickJobMainService.getCountByStatus(list); + return success(countByStatus); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshJob/RepleinshJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshJob/RepleinshJobMainController.java index 799a23aa..9bcc88f2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshJob/RepleinshJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshJob/RepleinshJobMainController.java @@ -159,7 +159,7 @@ public class RepleinshJobMainController { @PostMapping("/getCountByStatus") @Operation(summary = "APP获得补料任务数量根据任务状态") @Parameter(name = "types", description = "类型数组", required = false, example = "\"types\":[\"1\",\"2\"]") - @PreAuthorize("@ss.hasPermission('wms:repleinsh-job-mainn:query')") + @PreAuthorize("@ss.hasPermission('wms:repleinsh-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())){ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/pickJob/PickJobMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/pickJob/PickJobMainMapper.java index 3f1be3c1..3dc1c88f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/pickJob/PickJobMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/pickJob/PickJobMainMapper.java @@ -8,8 +8,10 @@ import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.pickJob.vo.PickJobMainExportReqVO; import com.win.module.wms.controller.pickJob.vo.PickJobMainPageReqVO; import com.win.module.wms.dal.dataobject.pickJob.PickJobMainDO; +import com.win.module.wms.dal.dataobject.repleinshJob.RepleinshJobMainDO; import org.apache.ibatis.annotations.Mapper; +import java.util.Collection; import java.util.List; /** @@ -106,4 +108,14 @@ public interface PickJobMainMapper extends BaseMapperX { .orderByDesc(PickJobMainDO::getId)); } + /** + *根据类型数组查询任务数量 + * @param types 类型组合 + */ + default Long selectListCount(Collection types) { + return selectCount(new LambdaQueryWrapperX() + .inIfPresent(PickJobMainDO::getStatus, types)); + + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickJob/PickJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickJob/PickJobMainService.java index 49b7c471..41810ef6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickJob/PickJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickJob/PickJobMainService.java @@ -7,10 +7,12 @@ import com.win.module.wms.controller.pickJob.vo.PickJobMainExportReqVO; import com.win.module.wms.controller.pickJob.vo.PickJobMainPageReqVO; import com.win.module.wms.controller.pickJob.vo.PickJobMainUpdateReqVO; import com.win.module.wms.dal.dataobject.pickJob.PickJobMainDO; +import org.springframework.lang.Nullable; import javax.validation.Valid; import java.util.Collection; import java.util.List; +import java.util.Map; /** * 拣料任务主 Service 接口 @@ -88,4 +90,11 @@ public interface PickJobMainService { * @return 分页列表 */ PageResult getPickJobMainSenior(CustomConditions conditions); + + /** + *根据任务状态获取任务数量 + * @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/pickJob/PickJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickJob/PickJobMainServiceImpl.java index 77d50961..1b685600 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickJob/PickJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickJob/PickJobMainServiceImpl.java @@ -15,7 +15,9 @@ import org.springframework.validation.annotation.Validated; import javax.annotation.Resource; import java.util.Collection; +import java.util.HashMap; import java.util.List; +import java.util.Map; import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; import static com.win.module.wms.enums.ErrorCodeConstants.PICK_JOB_MAIN_NOT_EXISTS; @@ -101,4 +103,13 @@ public class PickJobMainServiceImpl implements PickJobMainService { public PageResult getPickJobMainSenior(CustomConditions conditions) { return pickJobMainMapper.selectSenior(conditions); } + + @Override + public Map getCountByStatus(Collection types) { + Long l = pickJobMainMapper.selectListCount(types); + Map map = new HashMap<>(); + map.put("jobType", 6); + map.put("count", l.intValue()); + return map; + } }