Browse Source

首页接口。

master
刘忱 2 years ago
parent
commit
5160c35fb6
  1. 15
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/index/IndexController.java
  2. 6
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverPlan/DeliverPlanMainService.java
  3. 10
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverPlan/DeliverPlanMainServiceImpl.java
  4. 5
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestMainService.java
  5. 12
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestMainServiceImpl.java

15
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; package com.win.module.wms.controller.index;
import com.win.framework.common.pojo.CommonResult; 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.issueRequest.IssueRequestMainService;
import com.win.module.wms.service.location.LocationService; import com.win.module.wms.service.location.LocationService;
import com.win.module.wms.service.preparetoissue.PreparetoissueMainService; 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.purchase.PurchaseMainService;
import com.win.module.wms.service.purchasePlan.PurchasePlanMainService; import com.win.module.wms.service.purchasePlan.PurchasePlanMainService;
import com.win.module.wms.service.purchaseclaimRecord.PurchaseclaimRecordDetailService; 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.purchasereturnRecord.PurchasereturnRecordDetailService;
import com.win.module.wms.service.supplierdeliverRecord.SupplierdeliverRecordDetailService; import com.win.module.wms.service.supplierdeliverRecord.SupplierdeliverRecordDetailService;
import com.win.module.wms.service.supplierdeliverRecord.SupplierdeliverRecordMainService; import com.win.module.wms.service.supplierdeliverRecord.SupplierdeliverRecordMainService;
@ -42,6 +44,8 @@ public class IndexController {
@Resource @Resource
private PurchasereturnRecordDetailService purchasereturnRecordDetailService; private PurchasereturnRecordDetailService purchasereturnRecordDetailService;
@Resource @Resource
private PurchasereceiptRequestMainService purchasereceiptRequestMainService;
@Resource
private PurchaseclaimRecordDetailService purchaseclaimRecordDetailService; private PurchaseclaimRecordDetailService purchaseclaimRecordDetailService;
@Resource @Resource
private PreparetoissueMainService preparetoissueMainService; private PreparetoissueMainService preparetoissueMainService;
@ -53,6 +57,8 @@ public class IndexController {
private ProductionMainService productionMainService; private ProductionMainService productionMainService;
@Resource @Resource
private ProductputawayJobDetailService productputawayJobDetailService; private ProductputawayJobDetailService productputawayJobDetailService;
@Resource
private DeliverPlanMainService deliverPlanMainService;
@GetMapping("/indexSupplier") @GetMapping("/indexSupplier")
@Operation(summary = "供应商首页") @Operation(summary = "供应商首页")
@ -75,6 +81,7 @@ public class IndexController {
@Operation(summary = "原料管理员首页") @Operation(summary = "原料管理员首页")
public CommonResult<Map<String, Object>> indexMaterial() { public CommonResult<Map<String, Object>> indexMaterial() {
Map<String, Object> dataMap = new HashMap<>(); Map<String, Object> dataMap = new HashMap<>();
dataMap.put("purchasereceiptRequestTodayCount", purchasereceiptRequestMainService.getPurchasereceiptRequestToday());//今日到货计划(已发货)
dataMap.put("preparetoissueTodayCount", preparetoissueMainService.getPreparetoissueToday());//今日备料计划(已发料) dataMap.put("preparetoissueTodayCount", preparetoissueMainService.getPreparetoissueToday());//今日备料计划(已发料)
dataMap.put("issueRequestTodayCount", issueRequestMainService.getIssueRequestToday());//今日叫料请求(已发料) dataMap.put("issueRequestTodayCount", issueRequestMainService.getIssueRequestToday());//今日叫料请求(已发料)
dataMap.put("freeLocationCount", locationService.getFreeLocationCount());//空闲库位数 dataMap.put("freeLocationCount", locationService.getFreeLocationCount());//空闲库位数
@ -82,6 +89,14 @@ public class IndexController {
return success(dataMap); return success(dataMap);
} }
@GetMapping("/indexProduct")
@Operation(summary = "成品管理员首页")
public CommonResult<Map<String, Object>> indexProduct() {
Map<String, Object> dataMap = new HashMap<>();
dataMap.put("deliverPlanTodayCount", deliverPlanMainService.getDeliverPlanToday());//今日发货计划(未发货)
return success(dataMap);
}
@GetMapping("/indexProduce") @GetMapping("/indexProduce")
@Operation(summary = "生产管理员首页") @Operation(summary = "生产管理员首页")
public CommonResult<Map<String, Object>> indexProduce() { public CommonResult<Map<String, Object>> indexProduce() {

6
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 * @return
*/ */
DeliverPlanMainDO selectDeliverPlanExist(String code); DeliverPlanMainDO selectDeliverPlanExist(String code);
/**
* 今日发货计划(未发货)
* @return 今日发货计划(未发货)
*/
Long getDeliverPlanToday();
} }

10
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.annotation.Resource;
import javax.validation.Validator; import javax.validation.Validator;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.List; 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<DeliverPlanMainDO> queryWrapper = new QueryWrapper<>();
queryWrapper.between("begin_time", beginTime, endTime);
return deliverPlanMainMapper.selectCount(queryWrapper);
}
@Override @Override
public DeliverPlanMainDO getDeliverPlanMain(Long id) { public DeliverPlanMainDO getDeliverPlanMain(Long id) {
return deliverPlanMainMapper.selectById(id); return deliverPlanMainMapper.selectById(id);

5
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); Integer refusedPurchasereceiptRequestMain(Long id);
/**
* 今日到货计划(已发货)
* @return 今日到货计划(已发货)
*/
Long getPurchasereceiptRequestToday();
} }

12
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.JSONArray;
import cn.hutool.json.JSONObject; import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil; 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.exception.ServiceException;
import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.CustomConditions;
import com.win.framework.common.pojo.PageResult; import com.win.framework.common.pojo.PageResult;
@ -61,6 +62,7 @@ import org.springframework.validation.annotation.Validated;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.validation.Validator; import javax.validation.Validator;
import java.time.LocalDateTime;
import java.util.*; import java.util.*;
import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception;
@ -385,6 +387,16 @@ public class PurchasereceiptRequestMainServiceImpl implements PurchasereceiptReq
return purchasereceiptRequestMainMapper.updateById(mainDO); return purchasereceiptRequestMainMapper.updateById(mainDO);
} }
@Override
public Long getPurchasereceiptRequestToday() {
LocalDateTime endTime = LocalDateTime.now();
LocalDateTime beginTime = endTime.withHour(0).withMinute(0).withSecond(0).withNano(0);
QueryWrapper<PurchasereceiptRequestMainDO> 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 * @param mainDo

Loading…
Cancel
Save