From 6f827a8429d020b7b07835c9fcf4aa161c6a0567 Mon Sep 17 00:00:00 2001 From: liuchen864 <23082234@qq.com> Date: Tue, 19 Dec 2023 19:28:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=9F=E6=96=99=E7=AE=A1=E7=90=86=E5=91=98?= =?UTF-8?q?=E9=A6=96=E9=A1=B5=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/controller/index/IndexController.java | 24 +++++++++++++++++-- .../issueRequest/IssueRequestMainService.java | 18 +++++++++----- .../IssueRequestMainServiceImpl.java | 13 ++++++++-- .../wms/service/location/LocationService.java | 12 ++++++++++ .../service/location/LocationServiceImpl.java | 17 +++++++++++++ .../PreparetoissueMainService.java | 5 ++++ .../PreparetoissueMainServiceImpl.java | 22 ++++++++++++----- 7 files changed, 95 insertions(+), 16 deletions(-) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/index/IndexController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/index/IndexController.java index 2733cf5d..e68cc9fc 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/index/IndexController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/index/IndexController.java @@ -1,6 +1,9 @@ package com.win.module.wms.controller.index; import com.win.framework.common.pojo.CommonResult; +import com.win.module.wms.service.issueRequest.IssueRequestMainService; +import com.win.module.wms.service.location.LocationService; +import com.win.module.wms.service.preparetoissue.PreparetoissueMainService; import com.win.module.wms.service.purchase.PurchaseMainService; import com.win.module.wms.service.purchasePlan.PurchasePlanMainService; import com.win.module.wms.service.purchaseclaimRecord.PurchaseclaimRecordDetailService; @@ -38,10 +41,16 @@ public class IndexController { private PurchasereturnRecordDetailService purchasereturnRecordDetailService; @Resource private PurchaseclaimRecordDetailService purchaseclaimRecordDetailService; + @Resource + private PreparetoissueMainService preparetoissueMainService; + @Resource + private IssueRequestMainService issueRequestMainService; + @Resource + private LocationService locationService; - @GetMapping("/indexSupplierde") + @GetMapping("/indexSupplier") @Operation(summary = "供应商首页") - public CommonResult> indexSupplierde() { + public CommonResult> indexSupplier() { Map dataMap = new HashMap<>(); dataMap.put("openPurchaseCount", purchaseMainService.getPurchaseCount(true));//开放订单数 dataMap.put("allPurchaseCount", purchaseMainService.getPurchaseCount(false));//全部订单数 @@ -56,4 +65,15 @@ public class IndexController { return success(dataMap); } + @GetMapping("/indexMaterial") + @Operation(summary = "原料管理员首页") + public CommonResult> indexMaterial() { + Map dataMap = new HashMap<>(); + dataMap.put("preparetoissueTodayCount", preparetoissueMainService.getPreparetoissueToday());//今日备料计划(已发料) + dataMap.put("issueRequestTodayCount", issueRequestMainService.getIssueRequestToday());//今日叫料请求(已发料) + dataMap.put("freeLocationCount", locationService.getFreeLocationCount());//空闲库位数 + dataMap.put("totalLocationCount", locationService.getTotalLocationCount());//总库位数 + return success(dataMap); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueRequest/IssueRequestMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueRequest/IssueRequestMainService.java index 87bfbf5b..fe6421b9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueRequest/IssueRequestMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueRequest/IssueRequestMainService.java @@ -1,15 +1,15 @@ package com.win.module.wms.service.issueRequest; -import java.math.BigDecimal; -import java.util.*; -import javax.validation.*; - import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.issueRequest.vo.*; import com.win.module.wms.dal.dataobject.issueJob.IssueJobDetailDO; import com.win.module.wms.dal.dataobject.issueRequest.IssueRequestMainDO; -import com.win.framework.common.pojo.PageResult; -import com.win.module.wms.dal.dataobject.production.ProductionMainDO; + +import javax.validation.Valid; +import java.math.BigDecimal; +import java.util.Collection; +import java.util.List; /** * 发料申请主 Service 接口 @@ -103,4 +103,10 @@ public interface IssueRequestMainService { Integer handleIssueRequestMain(Long id); List getBalanceByBatchOffShelf(String itemCode, BigDecimal qty); + + /** + * 今日叫料请求(已发料) + * @return 退货明细 + */ + Long getIssueRequestToday(); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueRequest/IssueRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueRequest/IssueRequestMainServiceImpl.java index eadd9da7..e40e1406 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueRequest/IssueRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueRequest/IssueRequestMainServiceImpl.java @@ -4,11 +4,11 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.exceptions.UtilException; import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.win.framework.common.exception.ServiceException; import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.common.util.validation.ValidationUtils; -import com.win.framework.dict.core.util.DictFrameworkUtils; import com.win.module.infra.api.trends.TrendsApi; import com.win.module.infra.enums.TrendsTypeEnum; import com.win.module.system.api.dict.DictDataApi; @@ -39,7 +39,6 @@ import com.win.module.wms.dal.mysql.issueJob.IssueJobDetailMapper; import com.win.module.wms.dal.mysql.issueJob.IssueJobMainMapper; import com.win.module.wms.dal.mysql.issueRequest.IssueRequestDetailMapper; import com.win.module.wms.dal.mysql.issueRequest.IssueRequestMainMapper; -import com.win.module.wms.enums.DictTypeConstants; import com.win.module.wms.enums.job.JobStatusEnum; import com.win.module.wms.enums.request.RequestStatusEnum; import com.win.module.wms.enums.request.RequestStatusState; @@ -775,4 +774,14 @@ public class IssueRequestMainServiceImpl implements IssueRequestMainService { }); return issueJobDetailDOList; } + + @Override + public Long getIssueRequestToday() { + LocalDateTime endTime = LocalDateTime.now(); + LocalDateTime beginTime = endTime.withHour(0).withMinute(0).withSecond(0).withNano(0); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.between("create_time", beginTime, endTime); + queryWrapper.inSql("number", "SELECT DISTINCT request_number FROM record_issue_main WHERE request_number=request_issue_main.number"); + return issueRequestMainMapper.selectCount(queryWrapper); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/location/LocationService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/location/LocationService.java index e9869d55..40c5c770 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/location/LocationService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/location/LocationService.java @@ -98,4 +98,16 @@ public interface LocationService { * @return */ LocationDO inspectLocation(RuleRespVO ruleRespVO, String itemCode, String batch, String inventoryStatus); + + /** + * 获取总库位数 + * @return 总库位数 + */ + Long getTotalLocationCount(); + + /** + * 获取空闲库位数 + * @return 空闲库位数 + */ + Long getFreeLocationCount(); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/location/LocationServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/location/LocationServiceImpl.java index 9298cb37..29dc0bc6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/location/LocationServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/location/LocationServiceImpl.java @@ -380,6 +380,23 @@ public class LocationServiceImpl implements LocationService { return locationDOList.get(0); } + @Override + public Long getTotalLocationCount() { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("available", "TRUE"); + queryWrapper.eq("`type`", "RAW"); + return locationMapper.selectCount(queryWrapper); + } + + @Override + public Long getFreeLocationCount() { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("available", "TRUE"); + queryWrapper.eq("`type`", "RAW"); + queryWrapper.inSql("`code`", "SELECT location_code FROM (SELECT location_code,SUM(qty) qty FROM transaction_balance GROUP BY location_code HAVING qty>0) t1"); + return locationMapper.selectCount(queryWrapper); + } + /** * 判断优先空库位和非空库位 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/preparetoissue/PreparetoissueMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/preparetoissue/PreparetoissueMainService.java index 47904795..df406b3d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/preparetoissue/PreparetoissueMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/preparetoissue/PreparetoissueMainService.java @@ -105,4 +105,9 @@ public interface PreparetoissueMainService { Integer resettingProductionMain(Long id); + /** + * 今日备料计划(已发料) + * @return 退货明细 + */ + Long getPreparetoissueToday(); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/preparetoissue/PreparetoissueMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/preparetoissue/PreparetoissueMainServiceImpl.java index 1088d1b4..199222dc 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/preparetoissue/PreparetoissueMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/preparetoissue/PreparetoissueMainServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.preparetoissue; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.win.framework.common.exception.ServiceException; import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; @@ -9,15 +10,11 @@ import com.win.module.system.api.dict.DictDataApi; import com.win.module.system.api.serialnumber.SerialNumberApi; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.enums.serialNumber.RuleCodeEnum; -import com.win.module.wms.controller.bom.vo.BomExportReqVO; import com.win.module.wms.controller.issueRequest.vo.IssueRequestDetailCreateReqVO; import com.win.module.wms.controller.issueRequest.vo.IssueRequestMainCreateReqVO; import com.win.module.wms.controller.preparetoissue.vo.*; import com.win.module.wms.convert.preparetoissue.PreparetoissueDetailConvert; import com.win.module.wms.convert.preparetoissue.PreparetoissueMainConvert; -import com.win.module.wms.convert.production.ProductionDetailConvert; -import com.win.module.wms.convert.production.ProductionMainConvert; -import com.win.module.wms.dal.dataobject.bom.BomDO; import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO; import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import com.win.module.wms.dal.dataobject.preparetoissue.PreparetoissueDetailDO; @@ -26,7 +23,6 @@ import com.win.module.wms.dal.dataobject.production.ProductionDetailDO; import com.win.module.wms.dal.dataobject.production.ProductionMainDO; import com.win.module.wms.dal.mysql.preparetoissue.PreparetoissueDetailMapper; import com.win.module.wms.dal.mysql.preparetoissue.PreparetoissueMainMapper; -import com.win.module.wms.enums.plan.PlanStatusEnum; import com.win.module.wms.enums.plan.PlanStatusState; import com.win.module.wms.enums.request.RequestStatusEnum; import com.win.module.wms.service.bom.BomService; @@ -45,7 +41,11 @@ import org.springframework.validation.annotation.Validated; import javax.annotation.Resource; import java.math.BigDecimal; -import java.util.*; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.Map; import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; import static com.win.framework.web.core.util.WebFrameworkUtils.getLoginUserId; @@ -285,6 +285,16 @@ public class PreparetoissueMainServiceImpl implements PreparetoissueMainService return preparetoissueMainMapper.updateById(mainDO); } + @Override + public Long getPreparetoissueToday() { + LocalDateTime endTime = LocalDateTime.now(); + LocalDateTime beginTime = endTime.withHour(0).withMinute(0).withSecond(0).withNano(0); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.between("create_time", beginTime, endTime); + queryWrapper.inSql("number", "SELECT DISTINCT preparetoissue_plan_number FROM record_issue_main WHERE preparetoissue_plan_number=plan_preparetoissue_main.number"); + return preparetoissueMainMapper.selectCount(queryWrapper); + } + /** * 新增校验 * @param detailDo