diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueJob/TransferissueJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueJob/TransferissueJobMainController.java index d91669d3..1eb11012 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueJob/TransferissueJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueJob/TransferissueJobMainController.java @@ -7,6 +7,7 @@ import com.win.module.wms.controller.transferissueJob.vo.*; import com.win.module.wms.convert.transferissueJob.TransferissueJobDetailConvert; import com.win.module.wms.dal.dataobject.transferissueJob.TransferissueJobDetailDO; import com.win.module.wms.service.transferissueJob.TransferissueJobDetailService; +import jodd.util.StringUtil; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -145,4 +146,20 @@ public class TransferissueJobMainController { return success(result); } + @PostMapping("/getCountByStatus") + @Operation(summary = "APP获得调拨出库任务数量根据任务状态") + @Parameter(name = "types", description = "类型数组", required = false, example = "\"types\":[\"1\",\"2\"]") + @PreAuthorize("@ss.hasPermission('wms:transferissue-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 = transferissueJobMainService.getCountByStatus(list); + return success(countByStatus); + } + + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptJob/TransferreceiptJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptJob/TransferreceiptJobMainController.java index ebfa6558..8ae3df13 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptJob/TransferreceiptJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptJob/TransferreceiptJobMainController.java @@ -7,6 +7,7 @@ import com.win.module.wms.controller.transferreceiptJob.vo.*; import com.win.module.wms.convert.transferreceiptJob.TransferreceiptJobDetailConvert; import com.win.module.wms.dal.dataobject.transferreceiptJob.TransferreceiptJobDetailDO; import com.win.module.wms.service.transferreceiptJob.TransferreceiptJobDetailService; +import jodd.util.StringUtil; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -142,4 +143,19 @@ public class TransferreceiptJobMainController { return success(result); } + @PostMapping("/getCountByStatus") + @Operation(summary = "APP获得调拨入库任务数量根据任务状态") + @Parameter(name = "types", description = "类型数组", required = false, example = "\"types\":[\"1\",\"2\"]") + @PreAuthorize("@ss.hasPermission('wms:transferreceipt-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 = transferreceiptJobMainService.getCountByStatus(list); + return success(countByStatus); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferissueJob/TransferissueJobMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferissueJob/TransferissueJobMainMapper.java index bb895a1d..e814951b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferissueJob/TransferissueJobMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferissueJob/TransferissueJobMainMapper.java @@ -9,6 +9,7 @@ import com.win.framework.mybatis.core.mapper.BaseMapperX; import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.transferissueJob.vo.TransferissueJobMainExportReqVO; import com.win.module.wms.controller.transferissueJob.vo.TransferissueJobMainPageReqVO; +import com.win.module.wms.dal.dataobject.inventorymoveJob.InventorymoveJobMainDO; import com.win.module.wms.dal.dataobject.transferissueJob.TransferissueJobMainDO; import org.apache.ibatis.annotations.Mapper; @@ -116,4 +117,15 @@ public interface TransferissueJobMainMapper extends BaseMapperX types) { + return selectCount(new LambdaQueryWrapperX() + .inIfPresent(TransferissueJobMainDO::getStatus, types)); + + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferreceiptJob/TransferreceiptJobMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferreceiptJob/TransferreceiptJobMainMapper.java index 2c97c859..ff0539e2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferreceiptJob/TransferreceiptJobMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/transferreceiptJob/TransferreceiptJobMainMapper.java @@ -9,6 +9,7 @@ import com.win.framework.mybatis.core.mapper.BaseMapperX; import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.transferreceiptJob.vo.TransferreceiptJobMainExportReqVO; import com.win.module.wms.controller.transferreceiptJob.vo.TransferreceiptJobMainPageReqVO; +import com.win.module.wms.dal.dataobject.transferissueJob.TransferissueJobMainDO; import com.win.module.wms.dal.dataobject.transferreceiptJob.TransferreceiptJobMainDO; import org.apache.ibatis.annotations.Mapper; @@ -114,4 +115,15 @@ public interface TransferreceiptJobMainMapper extends BaseMapperX types) { + return selectCount(new LambdaQueryWrapperX() + .inIfPresent(TransferreceiptJobMainDO::getStatus, types)); + + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueJob/TransferissueJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueJob/TransferissueJobMainService.java index 0d0817c0..f0b6913d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueJob/TransferissueJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueJob/TransferissueJobMainService.java @@ -10,6 +10,7 @@ import com.win.module.wms.controller.transferissueJob.vo.TransferissueJobMainPag import com.win.module.wms.controller.transferissueJob.vo.TransferissueJobMainUpdateReqVO; import com.win.module.wms.dal.dataobject.transferissueJob.TransferissueJobMainDO; import com.win.framework.common.pojo.PageResult; +import org.springframework.lang.Nullable; /** * 调拨出库任务主 Service 接口 @@ -86,4 +87,11 @@ public interface TransferissueJobMainService { * @return 采购订单主列表 */ public TransferissueJobMainDO transferissueJobMainDoStatusRight(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/transferissueJob/TransferissueJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueJob/TransferissueJobMainServiceImpl.java index 5ead2f1a..6df83816 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueJob/TransferissueJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueJob/TransferissueJobMainServiceImpl.java @@ -99,4 +99,13 @@ public class TransferissueJobMainServiceImpl implements TransferissueJobMainServ throw exception(TRANSFERISSUE_JOB_MAIN_STATUS_ERROR); } } + + @Override + public Map getCountByStatus(Collection types) { + Long l = transferissueJobMainMapper.selectListCount(types); + Map map = new HashMap<>(); + map.put("jobType", 15); + map.put("count", l.intValue()); + return map; + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptJob/TransferreceiptJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptJob/TransferreceiptJobMainService.java index c1fe948f..a8847833 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptJob/TransferreceiptJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptJob/TransferreceiptJobMainService.java @@ -10,6 +10,7 @@ import com.win.module.wms.controller.transferreceiptJob.vo.TransferreceiptJobMai import com.win.module.wms.controller.transferreceiptJob.vo.TransferreceiptJobMainUpdateReqVO; import com.win.module.wms.dal.dataobject.transferreceiptJob.TransferreceiptJobMainDO; import com.win.framework.common.pojo.PageResult; +import org.springframework.lang.Nullable; /** * 调拨入库任务主 Service 接口 @@ -86,4 +87,11 @@ public interface TransferreceiptJobMainService { * @return 采购订单主列表 */ public TransferreceiptJobMainDO transferreceiptJobMainDoStatusRight(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/transferreceiptJob/TransferreceiptJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptJob/TransferreceiptJobMainServiceImpl.java index 4ee21b13..4d39cc3f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptJob/TransferreceiptJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptJob/TransferreceiptJobMainServiceImpl.java @@ -99,4 +99,13 @@ public class TransferreceiptJobMainServiceImpl implements TransferreceiptJobMain throw exception(TRANSFERRECEIPT_JOB_MAIN_STATUS_ERROR); } } + + @Override + public Map getCountByStatus(Collection types) { + Long l = transferreceiptJobMainMapper.selectListCount(types); + Map map = new HashMap<>(); + map.put("jobType", 16); + map.put("count", l.intValue()); + return map; + } }