From 390fc081d92f52e177646f138638a6e134b90a33 Mon Sep 17 00:00:00 2001 From: songguoqiang Date: Fri, 10 Nov 2023 16:24:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=AD=98=E8=BD=AC=E7=A7=BB=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E6=9F=A5=E8=AF=A2=E6=95=B0=E6=8D=AE=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../InventorymoveJobMainController.java | 16 ++++++++++++++++ .../InventorymoveJobMainMapper.java | 12 ++++++++++++ .../InventorymoveJobMainService.java | 8 ++++++++ .../InventorymoveJobMainServiceImpl.java | 9 +++++++++ 4 files changed, 45 insertions(+) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/InventorymoveJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/InventorymoveJobMainController.java index c9f1135f..34817557 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/InventorymoveJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/InventorymoveJobMainController.java @@ -6,6 +6,7 @@ import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.convert.inventorymoveJob.InventorymoveJobDetailConvert; import com.win.module.wms.dal.dataobject.inventorymoveJob.InventorymoveJobDetailDO; import com.win.module.wms.service.inventorymoveJob.InventorymoveJobDetailService; +import jodd.util.StringUtil; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -147,4 +148,19 @@ public class InventorymoveJobMainController { return success(result); } + @PostMapping("/getCountByStatus") + @Operation(summary = "APP获得库存转移任务数量根据任务状态") + @Parameter(name = "types", description = "类型数组", required = false, example = "\"types\":[\"1\",\"2\"]") + @PreAuthorize("@ss.hasPermission('wms:inventorymove-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 = inventorymoveJobMainService.getCountByStatus(list); + return success(countByStatus); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorymoveJob/InventorymoveJobMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorymoveJob/InventorymoveJobMainMapper.java index 17988377..b24e0421 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorymoveJob/InventorymoveJobMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/inventorymoveJob/InventorymoveJobMainMapper.java @@ -10,6 +10,7 @@ import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.inventorymoveJob.vo.InventorymoveJobMainExportReqVO; import com.win.module.wms.controller.inventorymoveJob.vo.InventorymoveJobMainPageReqVO; import com.win.module.wms.dal.dataobject.inventorymoveJob.InventorymoveJobMainDO; +import com.win.module.wms.dal.dataobject.productdismantleJob.ProductdismantleJobMainDO; import org.apache.ibatis.annotations.Mapper; /** @@ -108,4 +109,15 @@ public interface InventorymoveJobMainMapper extends BaseMapperX types) { + return selectCount(new LambdaQueryWrapperX() + .inIfPresent(InventorymoveJobMainDO::getStatus, types)); + + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveJob/InventorymoveJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveJob/InventorymoveJobMainService.java index af2fbd4b..5d668068 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveJob/InventorymoveJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveJob/InventorymoveJobMainService.java @@ -10,6 +10,7 @@ import com.win.module.wms.controller.inventorymoveJob.vo.InventorymoveJobMainPag import com.win.module.wms.controller.inventorymoveJob.vo.InventorymoveJobMainUpdateReqVO; import com.win.module.wms.dal.dataobject.inventorymoveJob.InventorymoveJobMainDO; import com.win.framework.common.pojo.PageResult; +import org.springframework.lang.Nullable; /** * 库存转移任务主 Service 接口 @@ -87,4 +88,11 @@ public interface InventorymoveJobMainService { * @return 采购订单主列表 */ public InventorymoveJobMainDO inventorymoveJobMainDoStatusRight(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/inventorymoveJob/InventorymoveJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveJob/InventorymoveJobMainServiceImpl.java index d54340bb..efd03050 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveJob/InventorymoveJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveJob/InventorymoveJobMainServiceImpl.java @@ -100,4 +100,13 @@ public class InventorymoveJobMainServiceImpl implements InventorymoveJobMainServ throw exception(INVENTORYMOVE_JOB_MAIN_STATUS_ERROR); } } + + @Override + public Map getCountByStatus(Collection types) { + Long l = inventorymoveJobMainMapper.selectListCount(types); + Map map = new HashMap<>(); + map.put("jobType", 14); + map.put("count", l.intValue()); + return map; + } }