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 9aacc0a3..f6737f62 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 @@ -5,6 +5,7 @@ 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.productputawayJob.ProductputawayJobDetailService; import com.win.module.wms.service.purchase.PurchaseMainService; import com.win.module.wms.service.purchasePlan.PurchasePlanMainService; import com.win.module.wms.service.purchaseclaimRecord.PurchaseclaimRecordDetailService; @@ -50,6 +51,8 @@ public class IndexController { private LocationService locationService; @Resource private ProductionMainService productionMainService; + @Resource + private ProductputawayJobDetailService productputawayJobDetailService; @GetMapping("/indexSupplier") @Operation(summary = "供应商首页") @@ -84,6 +87,8 @@ public class IndexController { public CommonResult> indexProduce() { Map dataMap = new HashMap<>(); dataMap.put("productionTodayList", productionMainService.getProductionToday());//今日生产计划 + dataMap.put("safeLocationList", locationService.getSafeLocationList());//线边安全库存 + dataMap.put("productputawayJobDetailList", productputawayJobDetailService.getProductputawayJobDetailList());//待上架成品库存 return success(dataMap); } 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 40c5c770..b05dc158 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 @@ -110,4 +110,10 @@ public interface LocationService { * @return 空闲库位数 */ Long getFreeLocationCount(); + + /** + * 线边安全库存 + * @return 线边安全库存 + */ + List getSafeLocationList(); } 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 29dc0bc6..f0440da6 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 @@ -397,6 +397,17 @@ public class LocationServiceImpl implements LocationService { return locationMapper.selectCount(queryWrapper); } + @Override + public List getSafeLocationList() { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("available", "TRUE"); + queryWrapper.eq("`type`", "WIP");//线边库 + queryWrapper.inSql("`code`", "SELECT DISTINCT location_code FROM transaction_balance"); + queryWrapper.last("LIMIT 10"); + List locationDOList = locationMapper.selectList(queryWrapper); + return LocationConvert.INSTANCE.convertList(locationDOList); + } + /** * 判断优先空库位和非空库位 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayJob/ProductputawayJobDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayJob/ProductputawayJobDetailService.java index bb3bc7a0..342b0600 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayJob/ProductputawayJobDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayJob/ProductputawayJobDetailService.java @@ -2,10 +2,7 @@ package com.win.module.wms.service.productputawayJob; import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; -import com.win.module.wms.controller.productputawayJob.vo.ProductputawayJobDetailCreateReqVO; -import com.win.module.wms.controller.productputawayJob.vo.ProductputawayJobDetailExportReqVO; -import com.win.module.wms.controller.productputawayJob.vo.ProductputawayJobDetailPageReqVO; -import com.win.module.wms.controller.productputawayJob.vo.ProductputawayJobDetailUpdateReqVO; +import com.win.module.wms.controller.productputawayJob.vo.*; import com.win.module.wms.dal.dataobject.productputawayJob.ProductputawayJobDetailDO; import javax.validation.Valid; @@ -82,4 +79,10 @@ public interface ProductputawayJobDetailService { PageResult getProductputawayJobDetailSeniorList(CustomConditions conditions); List selectList(Long id); + + /** + * 待上架成品库存 + * @return 待上架成品库存列表 + */ + List getProductputawayJobDetailList(); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayJob/ProductputawayJobDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayJob/ProductputawayJobDetailServiceImpl.java index e7f8cc80..04b11cdb 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayJob/ProductputawayJobDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayJob/ProductputawayJobDetailServiceImpl.java @@ -1,11 +1,9 @@ package com.win.module.wms.service.productputawayJob; +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.productputawayJob.vo.ProductputawayJobDetailCreateReqVO; -import com.win.module.wms.controller.productputawayJob.vo.ProductputawayJobDetailExportReqVO; -import com.win.module.wms.controller.productputawayJob.vo.ProductputawayJobDetailPageReqVO; -import com.win.module.wms.controller.productputawayJob.vo.ProductputawayJobDetailUpdateReqVO; +import com.win.module.wms.controller.productputawayJob.vo.*; import com.win.module.wms.convert.productputawayJob.ProductputawayJobDetailConvert; import com.win.module.wms.dal.dataobject.productputawayJob.ProductputawayJobDetailDO; import com.win.module.wms.dal.mysql.productputawayJob.ProductputawayJobDetailMapper; @@ -92,4 +90,13 @@ public class ProductputawayJobDetailServiceImpl implements ProductputawayJobDeta public List selectList(Long masterId) { return productputawayJobDetailMapper.selectList(masterId); } + + @Override + public List getProductputawayJobDetailList() { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.inSql("number", "SELECT number FROM job_productputaway_main WHERE `status`=1 OR `status`=2"); + queryWrapper.last("LIMIT 10"); + List productputawayJobDetailDOList = productputawayJobDetailMapper.selectList(queryWrapper); + return ProductputawayJobDetailConvert.INSTANCE.convertList(productputawayJobDetailDOList); + } }