From 7eec858b040bd5b8def5a054e4af004da39044c3 Mon Sep 17 00:00:00 2001 From: songguoqiang Date: Fri, 10 Nov 2023 13:14:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=B6=E5=93=81=E4=B8=8A=E6=9E=B6=E4=BB=BB?= =?UTF-8?q?=E5=8A=A13=E6=9F=A5=E8=AF=A2=E6=95=B0=E9=87=8F=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProductputawayJobMainController.java | 18 ++++++++++++++++++ .../ProductputawayJobMainMapper.java | 12 ++++++++++++ .../ProductputawayJobMainService.java | 11 +++++++++++ .../ProductputawayJobMainServiceImpl.java | 11 +++++++++++ 4 files changed, 52 insertions(+) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayJob/ProductputawayJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayJob/ProductputawayJobMainController.java index 3f3adf91..f6480e6d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayJob/ProductputawayJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayJob/ProductputawayJobMainController.java @@ -17,6 +17,7 @@ import com.win.module.wms.service.productputawayJob.ProductputawayJobMainService 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,19 @@ public class ProductputawayJobMainController { return success(result); } + @PostMapping("/getCountByStatus") + @Operation(summary = "APP获得制品上架任务数量根据任务状态") + @Parameter(name = "types", description = "类型数组", required = false, example = "\"types\":[\"1\",\"2\"]") + @PreAuthorize("@ss.hasPermission('wms:productputaway-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 = productputawayJobMainService.getCountByStatus(list); + return success(countByStatus); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productputawayJob/ProductputawayJobMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productputawayJob/ProductputawayJobMainMapper.java index 6f26c12c..63cdc3e1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productputawayJob/ProductputawayJobMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productputawayJob/ProductputawayJobMainMapper.java @@ -8,8 +8,10 @@ import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.productputawayJob.vo.ProductputawayJobMainExportReqVO; import com.win.module.wms.controller.productputawayJob.vo.ProductputawayJobMainPageReqVO; import com.win.module.wms.dal.dataobject.productputawayJob.ProductputawayJobMainDO; +import com.win.module.wms.dal.dataobject.purchasereturnJob.PurchasereturnJobMainDO; import org.apache.ibatis.annotations.Mapper; +import java.util.Collection; import java.util.List; /** @@ -108,4 +110,14 @@ public interface ProductputawayJobMainMapper extends BaseMapperX types) { + return selectCount(new LambdaQueryWrapperX() + .inIfPresent(ProductputawayJobMainDO::getStatus, types)); + + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayJob/ProductputawayJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayJob/ProductputawayJobMainService.java index 414ee511..fd96f8d5 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayJob/ProductputawayJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayJob/ProductputawayJobMainService.java @@ -7,10 +7,12 @@ import com.win.module.wms.controller.productputawayJob.vo.ProductputawayJobMainE import com.win.module.wms.controller.productputawayJob.vo.ProductputawayJobMainPageReqVO; import com.win.module.wms.controller.productputawayJob.vo.ProductputawayJobMainUpdateReqVO; import com.win.module.wms.dal.dataobject.productputawayJob.ProductputawayJobMainDO; +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,13 @@ public interface ProductputawayJobMainService { * @return 分页列表 */ PageResult getProductputawayJobMainSenior(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/productputawayJob/ProductputawayJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayJob/ProductputawayJobMainServiceImpl.java index 822e7609..a46e8f17 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayJob/ProductputawayJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayJob/ProductputawayJobMainServiceImpl.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.PRODUCTPUTAWAY_JOB_MAIN_NOT_EXISTS; @@ -101,4 +103,13 @@ public class ProductputawayJobMainServiceImpl implements ProductputawayJobMainSe public PageResult getProductputawayJobMainSenior(CustomConditions conditions) { return productputawayJobMainMapper.selectSenior(conditions); } + + @Override + public Map getCountByStatus(Collection types) { + Long l = productputawayJobMainMapper.selectListCount(types); + Map map = new HashMap<>(); + map.put("jobType", 4); + map.put("count", l.intValue()); + return map; + } }