From 5160c35fb6ac4cffeacca7ae9fb4bdcab71c3a27 Mon Sep 17 00:00:00 2001 From: liuchen864 <23082234@qq.com> Date: Wed, 20 Dec 2023 19:37:24 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=8E=A5=E5=8F=A3=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/controller/index/IndexController.java | 15 +++++++++++++++ .../deliverPlan/DeliverPlanMainService.java | 6 ++++++ .../deliverPlan/DeliverPlanMainServiceImpl.java | 10 ++++++++++ .../PurchasereceiptRequestMainService.java | 5 +++++ .../PurchasereceiptRequestMainServiceImpl.java | 12 ++++++++++++ 5 files changed, 48 insertions(+) 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 f6737f62..1d221d20 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,7 @@ package com.win.module.wms.controller.index; import com.win.framework.common.pojo.CommonResult; +import com.win.module.wms.service.deliverPlan.DeliverPlanMainService; import com.win.module.wms.service.issueRequest.IssueRequestMainService; import com.win.module.wms.service.location.LocationService; import com.win.module.wms.service.preparetoissue.PreparetoissueMainService; @@ -9,6 +10,7 @@ import com.win.module.wms.service.productputawayJob.ProductputawayJobDetailServi import com.win.module.wms.service.purchase.PurchaseMainService; import com.win.module.wms.service.purchasePlan.PurchasePlanMainService; import com.win.module.wms.service.purchaseclaimRecord.PurchaseclaimRecordDetailService; +import com.win.module.wms.service.purchasereceiptRequest.PurchasereceiptRequestMainService; import com.win.module.wms.service.purchasereturnRecord.PurchasereturnRecordDetailService; import com.win.module.wms.service.supplierdeliverRecord.SupplierdeliverRecordDetailService; import com.win.module.wms.service.supplierdeliverRecord.SupplierdeliverRecordMainService; @@ -42,6 +44,8 @@ public class IndexController { @Resource private PurchasereturnRecordDetailService purchasereturnRecordDetailService; @Resource + private PurchasereceiptRequestMainService purchasereceiptRequestMainService; + @Resource private PurchaseclaimRecordDetailService purchaseclaimRecordDetailService; @Resource private PreparetoissueMainService preparetoissueMainService; @@ -53,6 +57,8 @@ public class IndexController { private ProductionMainService productionMainService; @Resource private ProductputawayJobDetailService productputawayJobDetailService; + @Resource + private DeliverPlanMainService deliverPlanMainService; @GetMapping("/indexSupplier") @Operation(summary = "供应商首页") @@ -75,6 +81,7 @@ public class IndexController { @Operation(summary = "原料管理员首页") public CommonResult> indexMaterial() { Map dataMap = new HashMap<>(); + dataMap.put("purchasereceiptRequestTodayCount", purchasereceiptRequestMainService.getPurchasereceiptRequestToday());//今日到货计划(已发货) dataMap.put("preparetoissueTodayCount", preparetoissueMainService.getPreparetoissueToday());//今日备料计划(已发料) dataMap.put("issueRequestTodayCount", issueRequestMainService.getIssueRequestToday());//今日叫料请求(已发料) dataMap.put("freeLocationCount", locationService.getFreeLocationCount());//空闲库位数 @@ -82,6 +89,14 @@ public class IndexController { return success(dataMap); } + @GetMapping("/indexProduct") + @Operation(summary = "成品管理员首页") + public CommonResult> indexProduct() { + Map dataMap = new HashMap<>(); + dataMap.put("deliverPlanTodayCount", deliverPlanMainService.getDeliverPlanToday());//今日发货计划(未发货) + return success(dataMap); + } + @GetMapping("/indexProduce") @Operation(summary = "生产管理员首页") public CommonResult> indexProduce() { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverPlan/DeliverPlanMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverPlan/DeliverPlanMainService.java index bec3c10e..65620399 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverPlan/DeliverPlanMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverPlan/DeliverPlanMainService.java @@ -158,4 +158,10 @@ public interface DeliverPlanMainService { * @return */ DeliverPlanMainDO selectDeliverPlanExist(String code); + + /** + * 今日发货计划(未发货) + * @return 今日发货计划(未发货) + */ + Long getDeliverPlanToday(); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverPlan/DeliverPlanMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverPlan/DeliverPlanMainServiceImpl.java index 8496f1df..0de896fd 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverPlan/DeliverPlanMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverPlan/DeliverPlanMainServiceImpl.java @@ -41,6 +41,7 @@ import org.springframework.validation.annotation.Validated; import javax.annotation.Resource; import javax.validation.Validator; import java.math.BigDecimal; +import java.time.LocalDateTime; import java.util.ArrayList; import java.util.Collection; import java.util.List; @@ -314,6 +315,15 @@ public class DeliverPlanMainServiceImpl implements DeliverPlanMainService { } } + @Override + public Long getDeliverPlanToday() { + LocalDateTime endTime = LocalDateTime.now(); + LocalDateTime beginTime = endTime.withHour(0).withMinute(0).withSecond(0).withNano(0); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.between("begin_time", beginTime, endTime); + return deliverPlanMainMapper.selectCount(queryWrapper); + } + @Override public DeliverPlanMainDO getDeliverPlanMain(Long id) { return deliverPlanMainMapper.selectById(id); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestMainService.java index 0c406c5d..d5a0f0e7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestMainService.java @@ -134,4 +134,9 @@ public interface PurchasereceiptRequestMainService { */ Integer refusedPurchasereceiptRequestMain(Long id); + /** + * 今日到货计划(已发货) + * @return 今日到货计划(已发货) + */ + Long getPurchasereceiptRequestToday(); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestMainServiceImpl.java index 38c0b7cb..212a867a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestMainServiceImpl.java @@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.json.JSONArray; 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; @@ -61,6 +62,7 @@ import org.springframework.validation.annotation.Validated; import javax.annotation.Resource; import javax.validation.Validator; +import java.time.LocalDateTime; import java.util.*; import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; @@ -385,6 +387,16 @@ public class PurchasereceiptRequestMainServiceImpl implements PurchasereceiptReq return purchasereceiptRequestMainMapper.updateById(mainDO); } + @Override + public Long getPurchasereceiptRequestToday() { + LocalDateTime endTime = LocalDateTime.now(); + LocalDateTime beginTime = endTime.withHour(0).withMinute(0).withSecond(0).withNano(0); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.between("due_time", beginTime, endTime); + queryWrapper.in("`status`", Arrays.asList(RequestStatusEnum.NEW.getCode(), RequestStatusEnum.REVIEWING.getCode(), RequestStatusEnum.AGREED.getCode())); + return purchasereceiptRequestMainMapper.selectCount(queryWrapper); + } + /** * 校验导入，并赋值一些参数，未完全实现 * @param mainDo