修复库位监控的问题

肖超群 · 李泰瑜 · 李泰瑜 · 肖超群 · 肖超群
1 parent 80eba915
Showing 5 changed files with 56 additions and 57 deletions
ant-design-vue-jeecg/src/views/system/monitor/locationStatus.vue
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/location/controller/LocationController.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/location/service/ILocationService.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/location/service/impl/LocationServiceImpl.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/locationMonitor/controller/LocationMonitorController.java
@@ -201,10 +201,10 @@
       loadFrom() {
         getLocationTypeList().then((res) => {
           if (res.success) {
-            this.locationTypeList = res.result
+            this.locationTypeList = res.result;
             this.zoneCode = this.locationTypeList[0].code;
             let _this=this;
-            this.resetAjax("L");
+            this.resetAjax(this.zoneCode);
           }
         })
       },
 package org.jeecg.modules.wms.config.location.controller;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
+import java.util.Arrays;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.utils.HuahengJwtUtil;
 import org.jeecg.modules.wms.config.location.entity.BatchLocation;
 import org.jeecg.modules.wms.config.location.entity.Location;
 import org.jeecg.modules.wms.config.location.service.ILocationService;
+import org.jeecg.utils.HuahengJwtUtil;
 import org.jeecg.utils.StringUtils;
 import org.jeecg.utils.constant.QuantityConstant;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.Arrays;
-import java.util.List;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 /**
  * @Description: 库位管理
@@ -175,11 +178,12 @@ public class LocationController extends JeecgController&lt;Location, ILocationServi
      */
     @ApiOperation(value = "库位监控-查询库位列表", notes = "库位监控-查询库位列表")
     @GetMapping(value = "/getAllLocation")
-    public Result getAllLocation(String type) {
+    public Result getAllLocation(String type, HttpServletRequest req) {
         if (StringUtils.isEmpty(type)) {
             return Result.error("type不能为空");
         }
-        return Result.OK(locationService.getAllLocation(type));
+        String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
+        return Result.OK(locationService.getAllLocation(type, warehouseCode));
     }
     /**
@@ -45,7 +45,7 @@ public interface ILocationService extends IService&lt;Location&gt; {
     Result batchAdd(BatchLocation batchLocation);
-    LocationInfo getAllLocation(String type);
+    LocationInfo getAllLocation(String type, String warehouseCode);
     IPage<Location> listEmptyContainerInLocation(Page<Location> page, Location location);
@@ -9,6 +9,7 @@ import java.util.List;
 import javax.annotation.Resource;
 import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.exception.JeecgBootException;
 import org.jeecg.modules.wms.config.location.entity.BatchLocation;
 import org.jeecg.modules.wms.config.location.entity.Location;
 import org.jeecg.modules.wms.config.location.entity.LocationInfo;
@@ -24,7 +25,6 @@ import org.jeecg.utils.constant.QuantityConstant;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.jeecg.common.exception.JeecgBootException;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -336,15 +336,15 @@ public class LocationServiceImpl extends ServiceImpl&lt;LocationMapper, Location&gt; i
     }
     @Override
-    public LocationInfo getAllLocation(String type) {
+    public LocationInfo getAllLocation(String type, String warehouseCode) {
         if (StringUtils.isNotEmpty(type)) {
-            Location location = locationMapper.getAllLocation("CS0001", type);
+            Location location = locationMapper.getAllLocation(warehouseCode, type);
             LocationInfo locationInfo = new LocationInfo();
             locationInfo.setMaxRow(location.getRow());
             locationInfo.setMaxLine(location.getIcolumn());
             locationInfo.setMaxLayer(location.getLayer());
-            locationInfo.setMaxGrid(location.getGrid());
-            int minRow = locationMapper.getFirstRowOfZone("CS0001", type);
+//            locationInfo.setMaxGrid(location.getGrid());
+            int minRow = locationMapper.getFirstRowOfZone(warehouseCode, type);
             locationInfo.setMinRow(minRow);
             return locationInfo;
         }
@@ -5,33 +5,34 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
+
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.wms.config.container.entity.Container;
 import org.jeecg.modules.wms.config.container.service.IContainerService;
 import org.jeecg.modules.wms.config.location.entity.Location;
 import org.jeecg.modules.wms.config.location.service.ILocationService;
-import lombok.extern.slf4j.Slf4j;
-
+import org.jeecg.modules.wms.config.locationMonitor.entity.LocationStatus;
 import org.jeecg.modules.wms.inventory.inventoryHeader.entity.InventoryDetail;
 import org.jeecg.modules.wms.inventory.inventoryHeader.service.IInventoryDetailService;
-import org.jeecg.modules.wms.config.locationMonitor.entity.LocationStatus;
 import org.jeecg.utils.HuahengJwtUtil;
 import org.jeecg.utils.StringUtils;
 import org.jeecg.utils.constant.QuantityConstant;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+
 import io.swagger.annotations.Api;
+import lombok.extern.slf4j.Slf4j;
 /**
  * @Description: 库存监控
- * @Author: lty
- * @Date: 2023/1/29
+ * @Author:      lty
+ * @Date:        2023/1/29
  */
 @Api(tags = "库存监控")
 @RestController
@@ -45,7 +46,6 @@ public class LocationMonitorController {
     @Resource
     private IInventoryDetailService inventoryDetailService;
-
     /**
      * 库存概括
      */
@@ -54,25 +54,24 @@ public class LocationMonitorController {
     public Result getStatus(String zoneCode) {
         HashMap<String, Integer> map = new HashMap<>();
         LambdaQueryWrapper<Location> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.select(Location::getStatus,Location::getContainerCode).eq(Location::getZoneCode, zoneCode);
+        queryWrapper.select(Location::getStatus, Location::getContainerCode).eq(Location::getZoneCode, zoneCode);
         List<Location> locationList = locationService.list(queryWrapper);
         map.put("location", locationList.size());
-        //换stream进行数据拣选速度更快
-        List<Location> emptyLocationList = locationList.stream().filter(
-                t -> StringUtils.isEmpty(t.getContainerCode())).collect(Collectors.toList());
+        // 换stream进行数据拣选速度更快
+        List<Location> emptyLocationList = locationList.stream().filter(t -> StringUtils.isEmpty(t.getContainerCode())).collect(Collectors.toList());
         map.put("emptyLocation", emptyLocationList.size());
         LambdaQueryWrapper<Container> containerLambdaQueryWrapper = Wrappers.lambdaQuery();
         containerLambdaQueryWrapper.select(Container::getCode, Container::getStatus);
         List<Container> containerList = containerService.list();
-        List<String> containerCodeList = containerList.stream().filter(t -> t.getStatus().equals(QuantityConstant.STATUS_CONTAINER_EMPTY)).map(Container::getCode).collect(Collectors.toList());
-        List<Location> haveEmptyContainLocation = locationList.stream().filter(
-                t -> t.getStatus().equals(QuantityConstant.STATUS_CONTAINER_EMPTY) && StringUtils.isNotEmpty(t.getContainerCode())
-                        && containerCodeList.contains(t.getContainerCode())).collect(Collectors.toList());
+        List<String> containerCodeList =
+            containerList.stream().filter(t -> t.getStatus().equals(QuantityConstant.STATUS_CONTAINER_EMPTY)).map(Container::getCode).collect(Collectors.toList());
+        List<Location> haveEmptyContainLocation = locationList.stream().filter(t -> t.getStatus().equals(QuantityConstant.STATUS_CONTAINER_EMPTY)
+            && StringUtils.isNotEmpty(t.getContainerCode()) && containerCodeList.contains(t.getContainerCode())).collect(Collectors.toList());
         map.put("haveContainLocation", haveEmptyContainLocation.size());
-        List<String> containerCodeList1 = containerList.stream().filter(t -> t.getStatus().equals(QuantityConstant.STATUS_CONTAINER_SOME)).map(Container::getCode).collect(Collectors.toList());
-        List<Location> haveInventoryLocationList = locationList.stream().filter(
-                t -> t.getStatus().equals(QuantityConstant.STATUS_CONTAINER_EMPTY) && StringUtils.isNotEmpty(t.getContainerCode())
-                        && containerCodeList1.contains(t.getContainerCode())).collect(Collectors.toList());
+        List<String> containerCodeList1 =
+            containerList.stream().filter(t -> t.getStatus().equals(QuantityConstant.STATUS_CONTAINER_SOME)).map(Container::getCode).collect(Collectors.toList());
+        List<Location> haveInventoryLocationList = locationList.stream().filter(t -> t.getStatus().equals(QuantityConstant.STATUS_CONTAINER_EMPTY)
+            && StringUtils.isNotEmpty(t.getContainerCode()) && containerCodeList1.contains(t.getContainerCode())).collect(Collectors.toList());
         map.put("haveInventoryLocation", haveInventoryLocationList.size());
         return Result.ok(map);
     }
@@ -87,18 +86,15 @@ public class LocationMonitorController {
             return Result.error("type不能为空");
         }
         String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
-        /* 查询库位信息*/
+        /* 查询库位信息 */
         LambdaQueryWrapper<Location> locationLambdaQueryWrapper = Wrappers.lambdaQuery();
-        locationLambdaQueryWrapper.eq(StringUtils.isNotEmpty(row), Location::getRow, row)
-                .eq(StringUtils.isNotEmpty(line), Location::getIcolumn, line)
-                .eq(StringUtils.isNotEmpty(layer), Location::getLayer, layer)
-                .eq(StringUtils.isNotEmpty(grid), Location::getGrid, grid)
-                .eq(Location::getWarehouseCode, warehouseCode)
-                .eq(StringUtils.isNotEmpty(type), Location::getZoneCode, type);
+        locationLambdaQueryWrapper.eq(StringUtils.isNotEmpty(row), Location::getRow, row).eq(StringUtils.isNotEmpty(line), Location::getIcolumn, line)
+            .eq(StringUtils.isNotEmpty(layer), Location::getLayer, layer).eq(StringUtils.isNotEmpty(grid), Location::getGrid, grid)
+            .eq(Location::getWarehouseCode, warehouseCode).eq(StringUtils.isNotEmpty(type), Location::getZoneCode, type);
         List<Location> locations = locationService.list(locationLambdaQueryWrapper);
         List<Location> locationList = new ArrayList<>();
-        /* 查询库存明细*/
+        /* 查询库存明细 */
         LambdaQueryWrapper<InventoryDetail> inventoryDetailLambda = Wrappers.lambdaQuery();
         inventoryDetailLambda.eq(InventoryDetail::getWarehouseCode, warehouseCode);
         List<InventoryDetail> inventoryDetailList = inventoryDetailService.list(inventoryDetailLambda);
@@ -111,8 +107,8 @@ public class LocationMonitorController {
                     inventoryDetail = inventoryDetail2;
                 }
             }
-            List<InventoryDetail> inventoryDetails = inventoryDetailList.stream().filter(inventoryDetail1 ->
-                    inventoryDetail1.getLocationCode().equals(location1.getCode())).collect(Collectors.toList());
+            List<InventoryDetail> inventoryDetails =
+                inventoryDetailList.stream().filter(inventoryDetail1 -> inventoryDetail1.getLocationCode().equals(location1.getCode())).collect(Collectors.toList());
             int locationAttribute = 0;
             String status = location1.getStatus();
@@ -151,24 +147,23 @@ public class LocationMonitorController {
                 }
             }
-
             location1.setLocationAttribute(String.valueOf(locationAttribute));
             locationList.add(location1);
         }
         return Result.ok(locations);
     }
-
     /**
      * 查询库位列表
      */
     @PostMapping("/getAllLocation")
     @ResponseBody
-    public Result getAllLocation(@RequestParam(name = "type") String type) {
+    public Result getAllLocation(@RequestParam(name = "type") String type, HttpServletRequest req) {
         if (StringUtils.isEmpty(type)) {
             return Result.error("type不能为空");
         }
-        return Result.ok(locationService.getAllLocation(type));
+        String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
+        return Result.ok(locationService.getAllLocation(type, warehouseCode));
     }
 }