Browse Source

APP拣料任务根据类型查询数量接口

master
songguoqiang 2 years ago
parent
commit
bffff62e2b
  1. 17
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickJob/PickJobMainController.java
  2. 2
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshJob/RepleinshJobMainController.java
  3. 12
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/pickJob/PickJobMainMapper.java
  4. 9
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickJob/PickJobMainService.java
  5. 11
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickJob/PickJobMainServiceImpl.java

17
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<Map<String,Integer>> getCountByStatus(@RequestBody Map<String, List<String>> map) {
List<String> 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<String, Integer> countByStatus = pickJobMainService.getCountByStatus(list);
return success(countByStatus);
}
}

2
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<Map<String,Integer>> getCountByStatus(@RequestBody Map<String, List<String>> map) {
List<String> list = new ArrayList<>();
if(map==null||map.get("types")==null|| StringUtil.isEmpty(map.get("types").toString())){

12
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<PickJobMainDO> {
.orderByDesc(PickJobMainDO::getId));
}
/**
*根据类型数组查询任务数量
* @param types 类型组合
*/
default Long selectListCount(Collection<String> types) {
return selectCount(new LambdaQueryWrapperX<PickJobMainDO>()
.inIfPresent(PickJobMainDO::getStatus, types));
}
}

9
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<PickJobMainDO> getPickJobMainSenior(CustomConditions conditions);
/**
*根据任务状态获取任务数量
* @param types 任务状态数组
* @return
*/
Map<String,Integer> getCountByStatus(@Nullable Collection<String> types);
}

11
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<PickJobMainDO> getPickJobMainSenior(CustomConditions conditions) {
return pickJobMainMapper.selectSenior(conditions);
}
@Override
public Map<String, Integer> getCountByStatus(Collection<String> types) {
Long l = pickJobMainMapper.selectListCount(types);
Map<String, Integer> map = new HashMap<>();
map.put("jobType", 6);
map.put("count", l.intValue());
return map;
}
}

Loading…
Cancel
Save