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 de0700ae..4b73ecd2 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 @@ -3,6 +3,8 @@ package com.win.module.wms.controller.index; import com.win.framework.common.pojo.CommonResult; 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.purchasereturnRecord.PurchasereturnRecordDetailService; import com.win.module.wms.service.supplierdeliverRecord.SupplierdeliverRecordDetailService; import com.win.module.wms.service.supplierdeliverRecord.SupplierdeliverRecordMainService; import io.swagger.v3.oas.annotations.Operation; @@ -32,6 +34,10 @@ public class IndexController { private SupplierdeliverRecordMainService supplierdeliverRecordMainService; @Resource private SupplierdeliverRecordDetailService supplierdeliverRecordDetailService; + @Resource + private PurchasereturnRecordDetailService purchasereturnRecordDetailService; + @Resource + private PurchaseclaimRecordDetailService purchaseclaimRecordDetailService; @GetMapping("/index") @Operation(summary = "开放订单数") @@ -45,6 +51,8 @@ public class IndexController { dataMap.put("notTakeSupplierdeliverCount", supplierdeliverRecordMainService.getSupplierdeliverCount(false));//未收货订单数 dataMap.put("supplierdeliverMonthCount", supplierdeliverRecordMainService.getSupplierdeliverMonthCount());//本月发货单趋势 dataMap.put("supplierdeliverItemMonthTop", supplierdeliverRecordDetailService.getSupplierdeliverItemMonthTop());//本月发货零件TOP10 + dataMap.put("purchasereturnRecordDetailMonth", purchasereturnRecordDetailService.getPurchasereturnRecordDetailMonth());//本月退货明细 + dataMap.put("purchaseclaimRecordDetailMonth", purchaseclaimRecordDetailService.getPurchaseclaimRecordDetailMonth());//本月索赔明细 return success(dataMap); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchaseclaimRecord/PurchaseclaimRecordDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchaseclaimRecord/PurchaseclaimRecordDetailService.java index bed74860..1e93014e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchaseclaimRecord/PurchaseclaimRecordDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchaseclaimRecord/PurchaseclaimRecordDetailService.java @@ -1,15 +1,13 @@ package com.win.module.wms.service.purchaseclaimRecord; -import java.util.*; -import javax.validation.*; - import com.win.framework.common.pojo.CustomConditions; -import com.win.module.wms.controller.purchaseclaimRecord.vo.PurchaseclaimRecordDetailCreateReqVO; -import com.win.module.wms.controller.purchaseclaimRecord.vo.PurchaseclaimRecordDetailExportReqVO; -import com.win.module.wms.controller.purchaseclaimRecord.vo.PurchaseclaimRecordDetailPageReqVO; -import com.win.module.wms.controller.purchaseclaimRecord.vo.PurchaseclaimRecordDetailUpdateReqVO; -import com.win.module.wms.dal.dataobject.purchaseclaimRecord.PurchaseclaimRecordDetailDO; import com.win.framework.common.pojo.PageResult; +import com.win.module.wms.controller.purchaseclaimRecord.vo.*; +import com.win.module.wms.dal.dataobject.purchaseclaimRecord.PurchaseclaimRecordDetailDO; + +import javax.validation.Valid; +import java.util.Collection; +import java.util.List; /** * 采购索赔记录子 Service 接口 @@ -80,4 +78,9 @@ public interface PurchaseclaimRecordDetailService { */ List getPurchaseclaimRecordDetailList(PurchaseclaimRecordDetailExportReqVO exportReqVO); + /** + * 本月退货明细 + * @return 退货明细 + */ + List getPurchaseclaimRecordDetailMonth(); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchaseclaimRecord/PurchaseclaimRecordDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchaseclaimRecord/PurchaseclaimRecordDetailServiceImpl.java index 63637c37..0f2d40fa 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchaseclaimRecord/PurchaseclaimRecordDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchaseclaimRecord/PurchaseclaimRecordDetailServiceImpl.java @@ -1,24 +1,22 @@ package com.win.module.wms.service.purchaseclaimRecord; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.win.framework.common.pojo.CustomConditions; -import com.win.module.wms.controller.purchaseclaimRecord.vo.PurchaseclaimRecordDetailCreateReqVO; -import com.win.module.wms.controller.purchaseclaimRecord.vo.PurchaseclaimRecordDetailExportReqVO; -import com.win.module.wms.controller.purchaseclaimRecord.vo.PurchaseclaimRecordDetailPageReqVO; -import com.win.module.wms.controller.purchaseclaimRecord.vo.PurchaseclaimRecordDetailUpdateReqVO; -import org.springframework.stereotype.Service; -import javax.annotation.Resource; -import org.springframework.validation.annotation.Validated; - -import java.util.*; - -import com.win.module.wms.dal.dataobject.purchaseclaimRecord.PurchaseclaimRecordDetailDO; import com.win.framework.common.pojo.PageResult; - +import com.win.module.wms.controller.purchaseclaimRecord.vo.*; import com.win.module.wms.convert.purchaseclaimRecord.PurchaseclaimRecordDetailConvert; +import com.win.module.wms.dal.dataobject.purchaseclaimRecord.PurchaseclaimRecordDetailDO; import com.win.module.wms.dal.mysql.purchaseclaimRecord.PurchaseclaimRecordDetailMapper; +import org.springframework.stereotype.Service; +import org.springframework.validation.annotation.Validated; + +import javax.annotation.Resource; +import java.time.LocalDateTime; +import java.util.Collection; +import java.util.List; import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.win.module.wms.enums.ErrorCodeConstants.*; +import static com.win.module.wms.enums.ErrorCodeConstants.PURCHASECLAIM_RECORD_DETAIL_NOT_EXISTS; /** * 采购索赔记录子 Service 实现类 @@ -88,4 +86,16 @@ public class PurchaseclaimRecordDetailServiceImpl implements PurchaseclaimRecord return purchaseclaimRecordDetailMapper.selectList(exportReqVO); } + @Override + public List getPurchaseclaimRecordDetailMonth() { + LocalDateTime endTime = LocalDateTime.now(); + LocalDateTime beginTime = endTime.withDayOfMonth(1).withHour(0).withMinute(0).withSecond(0).withNano(0); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.between("create_time", beginTime, endTime); + queryWrapper.orderByDesc("create_time"); + queryWrapper.last("LIMIT 10"); + List purchasereturnRecordDetailDOList = purchaseclaimRecordDetailMapper.selectList(queryWrapper); + return PurchaseclaimRecordDetailConvert.INSTANCE.convertList(purchasereturnRecordDetailDOList); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRecord/PurchasereturnRecordDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRecord/PurchasereturnRecordDetailService.java index 2cfcd00f..84d33d4b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRecord/PurchasereturnRecordDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRecord/PurchasereturnRecordDetailService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.purchasereturnRecord; import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.purchasereturnRecord.vo.PurchasereturnRecordDetailPageReqVO; +import com.win.module.wms.controller.purchasereturnRecord.vo.PurchasereturnRecordDetailRespVO; import com.win.module.wms.dal.dataobject.purchasereturnRecord.PurchasereturnRecordDetailDO; import java.util.List; @@ -37,4 +38,10 @@ public interface PurchasereturnRecordDetailService { */ List selectList(Long masterId); + /** + * 本月退货明细 + * @return 退货明细 + */ + List getPurchasereturnRecordDetailMonth(); + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRecord/PurchasereturnRecordDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRecord/PurchasereturnRecordDetailServiceImpl.java index d32286a5..6546b136 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRecord/PurchasereturnRecordDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRecord/PurchasereturnRecordDetailServiceImpl.java @@ -1,14 +1,18 @@ package com.win.module.wms.service.purchasereturnRecord; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.purchasereturnRecord.vo.PurchasereturnRecordDetailPageReqVO; +import com.win.module.wms.controller.purchasereturnRecord.vo.PurchasereturnRecordDetailRespVO; +import com.win.module.wms.convert.purchasereturnRecord.PurchasereturnRecordDetailConvert; import com.win.module.wms.dal.dataobject.purchasereturnRecord.PurchasereturnRecordDetailDO; import com.win.module.wms.dal.mysql.purchasereturnRecord.PurchasereturnRecordDetailMapper; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; import javax.annotation.Resource; +import java.time.LocalDateTime; import java.util.List; /** @@ -38,4 +42,16 @@ public class PurchasereturnRecordDetailServiceImpl implements PurchasereturnReco return purchasereturnRecordDetailMapper.selectList(masterId); } + @Override + public List getPurchasereturnRecordDetailMonth() { + LocalDateTime endTime = LocalDateTime.now(); + LocalDateTime beginTime = endTime.withDayOfMonth(1).withHour(0).withMinute(0).withSecond(0).withNano(0); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.between("create_time", beginTime, endTime); + queryWrapper.orderByDesc("create_time"); + queryWrapper.last("LIMIT 10"); + List purchasereturnRecordDetailDOList = purchasereturnRecordDetailMapper.selectList(queryWrapper); + return PurchasereturnRecordDetailConvert.INSTANCE.convertList(purchasereturnRecordDetailDOList); + } + }