From 57411458e193c3e02deb9e810a8e7966eeb6791d Mon Sep 17 00:00:00 2001 From: songguoqiang Date: Fri, 10 Nov 2023 14:34:47 +0800 Subject: [PATCH] =?UTF-8?q?AP=E7=94=9F=E4=BA=A7=E9=80=80=E6=96=99=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E6=A0=B9=E6=8D=AE=E7=B1=BB=E5=9E=8B=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=95=B0=E9=87=8F=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProductionreturnJobMainController.java | 19 +++++++++++++++++++ .../ProductionreturnJobMainMapper.java | 12 ++++++++++++ .../ProductionreturnJobMainService.java | 9 +++++++++ .../ProductionreturnJobMainServiceImpl.java | 11 +++++++++++ 4 files changed, 51 insertions(+) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnJob/ProductionreturnJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnJob/ProductionreturnJobMainController.java index 88ef73fa..03f71b77 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnJob/ProductionreturnJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnJob/ProductionreturnJobMainController.java @@ -17,6 +17,7 @@ import com.win.module.wms.service.productionreturnJob.ProductionreturnJobMainSer 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; @@ -145,4 +148,20 @@ public class ProductionreturnJobMainController { return success(result); } + @PostMapping("/getCountByStatus") + @Operation(summary = "APP获得生产退料任务数量根据任务状态") + @Parameter(name = "types", description = "类型数组", required = false, example = "\"types\":[\"1\",\"2\"]") + @PreAuthorize("@ss.hasPermission('wms:productionreturn-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 = productionreturnJobMainService.getCountByStatus(list); + return success(countByStatus); + } + + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreturnJob/ProductionreturnJobMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreturnJob/ProductionreturnJobMainMapper.java index 43376371..2c6e26ff 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreturnJob/ProductionreturnJobMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreturnJob/ProductionreturnJobMainMapper.java @@ -7,9 +7,11 @@ import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.productionreturnJob.vo.ProductionreturnJobMainExportReqVO; import com.win.module.wms.controller.productionreturnJob.vo.ProductionreturnJobMainPageReqVO; +import com.win.module.wms.dal.dataobject.productionreceiptJob.ProductionreceiptJobMainDO; import com.win.module.wms.dal.dataobject.productionreturnJob.ProductionreturnJobMainDO; import org.apache.ibatis.annotations.Mapper; +import java.util.Collection; import java.util.List; /** @@ -110,4 +112,14 @@ public interface ProductionreturnJobMainMapper extends BaseMapperX types) { + return selectCount(new LambdaQueryWrapperX() + .inIfPresent(ProductionreturnJobMainDO::getStatus, types)); + + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnJob/ProductionreturnJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnJob/ProductionreturnJobMainService.java index b6c6239a..70b72188 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnJob/ProductionreturnJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnJob/ProductionreturnJobMainService.java @@ -7,10 +7,12 @@ import com.win.module.wms.controller.productionreturnJob.vo.ProductionreturnJobM import com.win.module.wms.controller.productionreturnJob.vo.ProductionreturnJobMainPageReqVO; import com.win.module.wms.controller.productionreturnJob.vo.ProductionreturnJobMainUpdateReqVO; import com.win.module.wms.dal.dataobject.productionreturnJob.ProductionreturnJobMainDO; +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 ProductionreturnJobMainService { * @return 分页列表 */ PageResult getProductionreturnJobMainSenior(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/productionreturnJob/ProductionreturnJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnJob/ProductionreturnJobMainServiceImpl.java index 71e462e6..55d448c2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnJob/ProductionreturnJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnJob/ProductionreturnJobMainServiceImpl.java @@ -16,7 +16,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.PRODUCTIONRETURN_JOB_MAIN_NOT_EXISTS; @@ -102,4 +104,13 @@ public class ProductionreturnJobMainServiceImpl implements ProductionreturnJobMa public PageResult getProductionreturnJobMainSenior(CustomConditions conditions) { return productionreturnJobMainMapper.selectSenior(conditions); } + + @Override + public Map getCountByStatus(Collection types) { + Long l = productionreturnJobMainMapper.selectListCount(types); + Map map = new HashMap<>(); + map.put("jobType", 9); + map.put("count", l.intValue()); + return map; + } }