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 e68cc9fc..9aacc0a3 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 @@ -4,6 +4,7 @@ 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.production.ProductionMainService; import com.win.module.wms.service.purchase.PurchaseMainService; import com.win.module.wms.service.purchasePlan.PurchasePlanMainService; import com.win.module.wms.service.purchaseclaimRecord.PurchaseclaimRecordDetailService; @@ -47,6 +48,8 @@ public class IndexController { private IssueRequestMainService issueRequestMainService; @Resource private LocationService locationService; + @Resource + private ProductionMainService productionMainService; @GetMapping("/indexSupplier") @Operation(summary = "供应商首页") @@ -60,8 +63,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());//本月索赔明细 + dataMap.put("purchasereturnRecordMonth", purchasereturnRecordDetailService.getPurchasereturnRecordDetailMonth());//本月退货明细 + dataMap.put("purchaseclaimRecordMonth", purchaseclaimRecordDetailService.getPurchaseclaimRecordDetailMonth());//本月索赔明细 return success(dataMap); } @@ -76,4 +79,12 @@ public class IndexController { return success(dataMap); } + @GetMapping("/indexProduce") + @Operation(summary = "生产管理员首页") + public CommonResult> indexProduce() { + Map dataMap = new HashMap<>(); + dataMap.put("productionTodayList", productionMainService.getProductionToday());//今日生产计划 + return success(dataMap); + } + } 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 df406b3d..446a9722 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 @@ -107,7 +107,7 @@ public interface PreparetoissueMainService { /** * 今日备料计划(已发料) - * @return 退货明细 + * @return 日备料计划(已发料) */ Long getPreparetoissueToday(); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/production/ProductionMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/production/ProductionMainService.java index 48fdd2ea..5ebd1f1d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/production/ProductionMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/production/ProductionMainService.java @@ -5,7 +5,6 @@ import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.production.vo.*; import com.win.module.wms.dal.dataobject.production.ProductionDetailDO; import com.win.module.wms.dal.dataobject.production.ProductionMainDO; -import com.win.module.wms.dal.dataobject.work.WorkMainDO; import javax.validation.Valid; import java.util.Collection; @@ -124,4 +123,10 @@ public interface ProductionMainService { Integer publishProductionMain(Long id); Integer resettingProductionMain(Long id); + + /** + * 今日生产计划 + * @return 今日生产计划 + */ + List getProductionToday(); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/production/ProductionMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/production/ProductionMainServiceImpl.java index c4425acf..a617c8a0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/production/ProductionMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/production/ProductionMainServiceImpl.java @@ -2,59 +2,34 @@ package com.win.module.wms.service.production; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.exceptions.UtilException; -import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.win.framework.common.exception.ServiceException; -import com.win.framework.common.pojo.CommonResult; 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; import com.win.module.system.api.serialnumber.SerialNumberApi; import com.win.module.system.enums.serialNumber.RuleCodeEnum; -import com.win.module.wms.controller.bom.vo.BomBaseVO; -import com.win.module.wms.controller.bom.vo.BomExportReqVO; import com.win.module.wms.controller.preparetoissue.vo.PreparetoissueDetailCreateReqVO; import com.win.module.wms.controller.preparetoissue.vo.PreparetoissueMainCreateReqVO; import com.win.module.wms.controller.production.vo.*; import com.win.module.wms.controller.productreceiptRequest.vo.ProductreceiptRequestDetailCreateReqVO; import com.win.module.wms.controller.productreceiptRequest.vo.ProductreceiptRequestMainCreateReqVO; -import com.win.module.wms.controller.work.vo.WorkDetailCreateReqVO; -import com.win.module.wms.controller.work.vo.WorkMainImportErrorVO; import com.win.module.wms.convert.production.ProductionDetailConvert; import com.win.module.wms.convert.production.ProductionMainConvert; -import com.win.module.wms.convert.purchasereceiptRequest.PurchasereceiptRequestDetailConvert; -import com.win.module.wms.convert.work.WorkDetailConvert; -import com.win.module.wms.convert.work.WorkMainConvert; -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.production.ProductionDetailDO; import com.win.module.wms.dal.dataobject.production.ProductionMainDO; -import com.win.module.wms.dal.dataobject.productionline.ProductionlineDO; -import com.win.module.wms.dal.dataobject.purchasereceiptRequest.PurchasereceiptRequestDetailDO; -import com.win.module.wms.dal.dataobject.purchasereceiptRequest.PurchasereceiptRequestMainDO; -import com.win.module.wms.dal.dataobject.requestsetting.RequestsettingDO; -import com.win.module.wms.dal.dataobject.team.TeamDO; -import com.win.module.wms.dal.dataobject.work.WorkDetailDO; -import com.win.module.wms.dal.dataobject.work.WorkMainDO; import com.win.module.wms.dal.dataobject.workstation.WorkstationDO; import com.win.module.wms.dal.mysql.documentSwitch.SwitchMapper; -import com.win.module.wms.dal.mysql.documentsetting.DocumentsettingMapper; -import com.win.module.wms.dal.mysql.preparetoissue.PreparetoissueMainMapper; import com.win.module.wms.dal.mysql.production.ProductionDetailMapper; import com.win.module.wms.dal.mysql.production.ProductionMainMapper; import com.win.module.wms.dal.mysql.productreceiptJob.ProductreceiptJobDetailMapper; -import com.win.module.wms.dal.mysql.productreceiptRequest.ProductreceiptRequestMainMapper; import com.win.module.wms.dal.mysql.workstation.WorkstationMapper; -import com.win.module.wms.enums.DictTypeConstants; 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.enums.request.RequestStatusState; import com.win.module.wms.service.bom.BomService; import com.win.module.wms.service.itembasic.ItembasicService; import com.win.module.wms.service.preparetoissue.PreparetoissueMainService; @@ -66,17 +41,11 @@ import com.win.module.wms.service.supplieritem.SupplieritemService; import com.win.module.wms.service.team.TeamService; import com.win.module.wms.service.work.WorkMainService; import com.win.module.wms.service.workshop.WorkshopService; -import com.win.module.wms.service.workstation.WorkstationService; import com.win.module.wms.util.JobUtils; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.interceptor.TransactionAspectSupport; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestParam; import javax.annotation.Resource; import javax.validation.Validator; @@ -84,10 +53,11 @@ import java.math.BigDecimal; import java.time.LocalDate; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.win.framework.common.pojo.CommonResult.success; import static com.win.module.wms.enums.ErrorCodeConstants.*; /** @@ -535,6 +505,17 @@ public class ProductionMainServiceImpl implements ProductionMainService { return productionMainMapper.updateById(mainDO); } + @Override + public List getProductionToday() { + LocalDateTime endTime = LocalDateTime.now(); + LocalDateTime beginTime = endTime.withHour(0).withMinute(0).withSecond(0).withNano(0); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.between("plan_date", beginTime, endTime); + queryWrapper.last("LIMIT 10"); + List productionMainDOList = productionMainMapper.selectList(queryWrapper); + return ProductionMainConvert.INSTANCE.convertList(productionMainDOList); + } + /** * 生成申请单据 * @param mainDO