From bffff62e2be2addcfcdb32813bc0f1eb3558780c Mon Sep 17 00:00:00 2001 From: songguoqiang Date: Fri, 10 Nov 2023 14:02:33 +0800 Subject: [PATCH 1/4] =?UTF-8?q?APP=E6=8B=A3=E6=96=99=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E7=B1=BB=E5=9E=8B=E6=9F=A5=E8=AF=A2=E6=95=B0?= =?UTF-8?q?=E9=87=8F=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pickJob/PickJobMainController.java | 17 +++++++++++++++++ .../RepleinshJobMainController.java | 2 +- .../dal/mysql/pickJob/PickJobMainMapper.java | 12 ++++++++++++ .../wms/service/pickJob/PickJobMainService.java | 9 +++++++++ .../service/pickJob/PickJobMainServiceImpl.java | 11 +++++++++++ 5 files changed, 50 insertions(+), 1 deletion(-) 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; + } } From 8f7f424dde9e40e89a0c73a5ed1ffe8e095ab226 Mon Sep 17 00:00:00 2001 From: songguoqiang Date: Fri, 10 Nov 2023 14:19:24 +0800 Subject: [PATCH 2/4] =?UTF-8?q?APP=E5=8F=91=E6=96=99=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E7=B1=BB=E5=9E=8B=E6=9F=A5=E8=AF=A2=E6=95=B0?= =?UTF-8?q?=E9=87=8F=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../issueJob/IssueJobMainController.java | 16 ++++++++++++++++ .../dal/mysql/issueJob/IssueJobMainMapper.java | 11 +++++++++++ .../service/issueJob/IssueJobMainService.java | 8 ++++++++ .../issueJob/IssueJobMainServiceImpl.java | 9 +++++++++ 4 files changed, 44 insertions(+) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/IssueJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/IssueJobMainController.java index af7cb02d..3c6c7d8f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/IssueJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/IssueJobMainController.java @@ -6,6 +6,7 @@ import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.convert.issueJob.IssueJobDetailConvert; import com.win.module.wms.dal.dataobject.issueJob.IssueJobDetailDO; import com.win.module.wms.service.issueJob.IssueJobDetailService; +import jodd.util.StringUtil; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -145,4 +146,19 @@ public class IssueJobMainController { return success(result); } + @PostMapping("/getCountByStatus") + @Operation(summary = "APP获得拣料任务数量根据任务状态") + @Parameter(name = "types", description = "类型数组", required = false, example = "\"types\":[\"1\",\"2\"]") + @PreAuthorize("@ss.hasPermission('wms:issue-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 = issueJobMainService.getCountByStatus(list); + return success(countByStatus); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/issueJob/IssueJobMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/issueJob/IssueJobMainMapper.java index 297aacfa..9563004a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/issueJob/IssueJobMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/issueJob/IssueJobMainMapper.java @@ -10,6 +10,7 @@ import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.issueJob.vo.IssueJobMainExportReqVO; import com.win.module.wms.controller.issueJob.vo.IssueJobMainPageReqVO; import com.win.module.wms.dal.dataobject.issueJob.IssueJobMainDO; +import com.win.module.wms.dal.dataobject.repleinshJob.RepleinshJobMainDO; import org.apache.ibatis.annotations.Mapper; /** @@ -108,4 +109,14 @@ public interface IssueJobMainMapper extends BaseMapperX { .orderByDesc(IssueJobMainDO::getId)); } + /** + *根据类型数组查询任务数量 + * @param types 类型组合 + */ + default Long selectListCount(Collection types) { + return selectCount(new LambdaQueryWrapperX() + .inIfPresent(IssueJobMainDO::getStatus, types)); + + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobMainService.java index 34291fc9..c27260d5 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobMainService.java @@ -10,6 +10,7 @@ import com.win.module.wms.controller.issueJob.vo.IssueJobMainPageReqVO; import com.win.module.wms.controller.issueJob.vo.IssueJobMainUpdateReqVO; import com.win.module.wms.dal.dataobject.issueJob.IssueJobMainDO; import com.win.framework.common.pojo.PageResult; +import org.springframework.lang.Nullable; /** * 发料任务主 Service 接口 @@ -87,4 +88,11 @@ public interface IssueJobMainService { * @return 采购订单主列表 */ public IssueJobMainDO issueJobMainDoStatusRight(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/issueJob/IssueJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobMainServiceImpl.java index b6416a46..b3a6adaf 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobMainServiceImpl.java @@ -100,4 +100,13 @@ public class IssueJobMainServiceImpl implements IssueJobMainService { throw exception(ISSUE_JOB_MAIN_STATUS_ERROR); } } + + @Override + public Map getCountByStatus(Collection types) { + Long l = issueJobMainMapper.selectListCount(types); + Map map = new HashMap<>(); + map.put("jobType", 7); + map.put("count", l.intValue()); + return map; + } } From 2a6ec12b4da407f8c7c40ce90bc2a4561736ebdb Mon Sep 17 00:00:00 2001 From: songguoqiang Date: Fri, 10 Nov 2023 14:27:37 +0800 Subject: [PATCH 3/4] =?UTF-8?q?AP=E7=94=9F=E4=BA=A7=E6=94=B6=E6=96=99?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=A0=B9=E6=8D=AE=E7=B1=BB=E5=9E=8B=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=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 --- .../ProductionreceiptJobMainController.java | 20 ++++++++++++++++++- .../ProductionreceiptJobMainMapper.java | 12 +++++++++++ .../ProductionreceiptJobMainService.java | 9 +++++++++ .../ProductionreceiptJobMainServiceImpl.java | 11 ++++++++++ 4 files changed, 51 insertions(+), 1 deletion(-) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptJob/ProductionreceiptJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptJob/ProductionreceiptJobMainController.java index 965931f7..4474eab6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptJob/ProductionreceiptJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptJob/ProductionreceiptJobMainController.java @@ -17,6 +17,7 @@ import com.win.module.wms.service.productionreceiptJob.ProductionreceiptJobMainS 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; @@ -127,7 +130,7 @@ public class ProductionreceiptJobMainController { } @GetMapping("/getProductionreceiptJobById") - @Operation(summary = "APP获得生产发料主子表明细列表") + @Operation(summary = "APP获得生产收料主子表明细列表") @Parameter(name = "id", description = "编号", required = true, example = "1024") @PreAuthorize("@ss.hasPermission('wms:productionreceipt-job-main:query')") public CommonResult getProductionreceiptJobById(@RequestParam("id") Long id) { @@ -144,4 +147,19 @@ public class ProductionreceiptJobMainController { return success(result); } + @PostMapping("/getCountByStatus") + @Operation(summary = "APP获得生产收料任务数量根据任务状态") + @Parameter(name = "types", description = "类型数组", required = false, example = "\"types\":[\"1\",\"2\"]") + @PreAuthorize("@ss.hasPermission('wms:productionreceipt-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 = productionreceiptJobMainService.getCountByStatus(list); + return success(countByStatus); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreceiptJob/ProductionreceiptJobMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreceiptJob/ProductionreceiptJobMainMapper.java index 15c1d0da..0637d8d3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreceiptJob/ProductionreceiptJobMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreceiptJob/ProductionreceiptJobMainMapper.java @@ -8,8 +8,10 @@ import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.productionreceiptJob.vo.ProductionreceiptJobMainExportReqVO; import com.win.module.wms.controller.productionreceiptJob.vo.ProductionreceiptJobMainPageReqVO; import com.win.module.wms.dal.dataobject.productionreceiptJob.ProductionreceiptJobMainDO; +import com.win.module.wms.dal.dataobject.repleinshJob.RepleinshJobMainDO; import org.apache.ibatis.annotations.Mapper; +import java.util.Collection; import java.util.List; /** @@ -110,4 +112,14 @@ public interface ProductionreceiptJobMainMapper extends BaseMapperX types) { + return selectCount(new LambdaQueryWrapperX() + .inIfPresent(ProductionreceiptJobMainDO::getStatus, types)); + + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptJob/ProductionreceiptJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptJob/ProductionreceiptJobMainService.java index b5235f52..dc01ec2e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptJob/ProductionreceiptJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptJob/ProductionreceiptJobMainService.java @@ -7,10 +7,12 @@ import com.win.module.wms.controller.productionreceiptJob.vo.ProductionreceiptJo import com.win.module.wms.controller.productionreceiptJob.vo.ProductionreceiptJobMainPageReqVO; import com.win.module.wms.controller.productionreceiptJob.vo.ProductionreceiptJobMainUpdateReqVO; import com.win.module.wms.dal.dataobject.productionreceiptJob.ProductionreceiptJobMainDO; +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 ProductionreceiptJobMainService { * @return 分页列表 */ PageResult getProductionreceiptJobMainSenior(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/productionreceiptJob/ProductionreceiptJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptJob/ProductionreceiptJobMainServiceImpl.java index f4c1964d..24b6e54e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptJob/ProductionreceiptJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptJob/ProductionreceiptJobMainServiceImpl.java @@ -18,7 +18,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.*; @@ -116,4 +118,13 @@ public class ProductionreceiptJobMainServiceImpl implements ProductionreceiptJob public PageResult getProductionreceiptJobMainSenior(CustomConditions conditions) { return productionreceiptJobMainMapper.selectSenior(conditions); } + + @Override + public Map getCountByStatus(Collection types) { + Long l = productionreceiptJobMainMapper.selectListCount(types); + Map map = new HashMap<>(); + map.put("jobType", 8); + map.put("count", l.intValue()); + return map; + } } From 57411458e193c3e02deb9e810a8e7966eeb6791d Mon Sep 17 00:00:00 2001 From: songguoqiang Date: Fri, 10 Nov 2023 14:34:47 +0800 Subject: [PATCH 4/4] =?UTF-8?q?AP=E7=94=9F=E4=BA=A7=E9=80=80=E6=96=99?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=A0=B9=E6=8D=AE=E7=B1=BB=E5=9E=8B=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=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; + } }