原料管理员首页。

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<Map<String, Object>> indexProduce() {
         Map<String, Object> dataMap = new HashMap<>();
         dataMap.put("productionTodayList", productionMainService.getProductionToday());//今日生产计划
+        dataMap.put("safeLocationList", locationService.getSafeLocationList());//线边安全库存
+        dataMap.put("productputawayJobDetailList", productputawayJobDetailService.getProductputawayJobDetailList());//待上架成品库存
         return success(dataMap);
     }
 

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<LocationRespVO> getSafeLocationList();
 }

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<LocationRespVO> getSafeLocationList() {
+        QueryWrapper<LocationDO> 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<LocationDO> locationDOList = locationMapper.selectList(queryWrapper);
+        return LocationConvert.INSTANCE.convertList(locationDOList);
+    }
+
     /**
      * 判断优先空库位和非空库位
      *

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<ProductputawayJobDetailDO> getProductputawayJobDetailSeniorList(CustomConditions conditions);
 
     List<ProductputawayJobDetailDO> selectList(Long id);
+
+    /**
+     * 待上架成品库存
+     * @return 待上架成品库存列表
+     */
+    List<ProductputawayJobDetailRespVO> getProductputawayJobDetailList();
 }

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<ProductputawayJobDetailDO> selectList(Long masterId) {
         return productputawayJobDetailMapper.selectList(masterId);
     }
+
+    @Override
+    public List<ProductputawayJobDetailRespVO> getProductputawayJobDetailList() {
+        QueryWrapper<ProductputawayJobDetailDO> queryWrapper = new QueryWrapper<>();
+        queryWrapper.inSql("number", "SELECT number FROM job_productputaway_main WHERE `status`=1 OR `status`=2");
+        queryWrapper.last("LIMIT 10");
+        List<ProductputawayJobDetailDO> productputawayJobDetailDOList = productputawayJobDetailMapper.selectList(queryWrapper);
+        return ProductputawayJobDetailConvert.INSTANCE.convertList(productputawayJobDetailDOList);
+    }
 }