库位监控增加库位统计

游杰
1 parent 6d2f82d4
Showing 3 changed files with 44 additions and 27 deletions
src/main/java/com/huaheng/pc/config/zone/controller/ZoneController.java
src/main/resources/templates/monitor/locationstatus/locationstatus.html
src/main/resources/templates/shipment/shipmentHeader/shipmentHeader.html
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huaheng.common.constant.QuantityConstant;
 import com.huaheng.common.support.Convert;
 import com.huaheng.common.utils.StringUtils;
 import com.huaheng.common.utils.security.ShiroUtils;
@@ -15,6 +16,7 @@ import com.huaheng.framework.web.page.PageDomain;
 import com.huaheng.framework.web.page.TableDataInfo;
 import com.huaheng.framework.web.page.TableSupport;
 import com.huaheng.pc.config.container.domain.Container;
+import com.huaheng.pc.config.container.service.ContainerService;
 import com.huaheng.pc.config.location.domain.Location;
 import com.huaheng.pc.config.location.service.LocationService;
 import com.huaheng.pc.config.station.domain.Station;
@@ -31,6 +33,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
  
 /**
  * 库区 信息操作处理
@@ -49,6 +52,8 @@ public class ZoneController extends BaseController {
     private ZoneService zoneService;
     @Resource
     private LocationService locationService;
+    @Resource
+    private ContainerService containerService;
  
     @RequiresPermissions("config:zone:view")
     @GetMapping()
@@ -180,28 +185,38 @@ public class ZoneController extends BaseController {
  
     @GetMapping("/getStatus")
     @ResponseBody
-    public AjaxResult getStatus(String zoneCode){
+    public AjaxResult getStatus(String zoneCode) {
         HashMap<String, Integer> map = new HashMap<>();
         LambdaQueryWrapper<Location> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.eq(Location::getZoneCode,zoneCode);
         List<Location> locationList = locationService.list(queryWrapper);
-        map.put("location",locationList.size());
+        map.put("location", locationList.size());
         queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.and(wrapper->wrapper.isNull(Location::getContainerCode).or().eq(Location::getContainerCode,""))
                 .eq(Location::getZoneCode,zoneCode);
         List<Location> emptyLocationList = locationService.list(queryWrapper);
-        map.put("emptyLocation",emptyLocationList.size());
-        queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.eq(Location::getZoneCode,zoneCode)
-                .eq(Location::getStatus,"empty")
-                .isNotNull(Location::getContainerCode)
-                .ne(Location::getContainerCode,"");
-        List<Location> haveContainLocation = locationService.list(queryWrapper);
-        map.put("haveContainLocation",haveContainLocation.size());
-        queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.eq(Location::getZoneCode,zoneCode)
-                .eq(Location::getStatus,"some");
-        map.put("haveInventoryLocation",locationService.list(queryWrapper).size());
+        map.put("emptyLocation", emptyLocationList.size());
+
+        LambdaQueryWrapper<Container> containerLambdaQueryWrapper2 = Wrappers.lambdaQuery();
+        containerLambdaQueryWrapper2.eq(Container::getStatus, QuantityConstant.STATUS_CONTAINER_EMPTY);
+        List<Container> containerList2 = containerService.list(containerLambdaQueryWrapper2);
+        List<String> containerCodeList2 = containerList2.stream().map(Container::getCode).collect(Collectors.toList());
+        LambdaQueryWrapper<Location> locationLambdaQueryWrapper2 = Wrappers.lambdaQuery();
+        locationLambdaQueryWrapper2.in(Location::getContainerCode, containerCodeList2);
+        locationLambdaQueryWrapper2.eq(Location::getZoneCode, zoneCode);
+        List<Location> haveEmptyContainLocation = locationService.list(locationLambdaQueryWrapper2);
+        map.put("haveContainLocation", haveEmptyContainLocation.size());
+
+        LambdaQueryWrapper<Container> containerLambdaQueryWrapper = Wrappers.lambdaQuery();
+        containerLambdaQueryWrapper.eq(Container::getStatus, QuantityConstant.STATUS_CONTAINER_SOME);
+        List<Container> containerList = containerService.list(containerLambdaQueryWrapper);
+        List<String> containerCodeList = containerList.stream().map(Container::getCode).collect(Collectors.toList());
+        LambdaQueryWrapper<Location> locationLambdaQueryWrapper = Wrappers.lambdaQuery();
+        locationLambdaQueryWrapper.in(Location::getContainerCode, containerCodeList);
+        locationLambdaQueryWrapper.eq(Location::getZoneCode, zoneCode);
+        List<Location> haveInventoryLocation = locationService.list(locationLambdaQueryWrapper);
+        map.put("haveInventoryLocation", haveInventoryLocation.size());
+
         return AjaxResult.success().setData(map);
     }
 }
@@ -67,9 +67,9 @@
                                 <option value="layer">层</option>
                             </select>
                         </li>
-                        <li>货主编码：
-                            <input type="text" name="receiptCompanyCode" id="receiptCompanyCode">
-                        </li>
+<!--                        <li>货主编码：-->
+<!--                            <input type="text" name="receiptCompanyCode" id="receiptCompanyCode">-->
+<!--                        </li>-->
                         <li>
                             <a class="btn btn-primary btn-rounded btn-sm" onclick="Search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
                         </li>
@@ -117,21 +117,22 @@
                         <li>
                             整盘禁用：<img src="../img/icon/整盘禁用.png">
                         </li>
+                        <li><span style="font-size: 12px">库位统计情况：</span>
+                            <input style="width: 400px;  font-size: 12px"  type="text" id="zone" disabled/>
+                        </li>
                     </ul><br><br>
                     <ul id="info_list">
-                        <li><span>库区：</span><input type="text" id="zone" style="width: 450px" disabled/></li>
                         <li><span>库位：</span><input type="text" id="code" disabled/></li>
                         <li><span>容器编码：</span><input type="text" id="containerCode" disabled/></li>
                         <li><span>物料信息：<select id="material" style="width: auto"><option>无</option></select></span></li>
-                        <li>&nbsp;&nbsp;&nbsp;&nbsp;</li>
                         <li>
                             <a class="btn btn-success btn-rounded btn-sm" onclick="checkLocationCode()" shiro:hasPermission="inventory:inventory:seeOut"><i class="fa fa-eye"></i>&nbsp;出库查看</a>
                         </li>
                     </ul>
-                    <ul>
-                        <li style="float:left;margin-left: 40px"><button type="button" class="btn btn-sm btn-success" onclick="searchLocation()">查看库位</button></li>
-                        <li style="float:left;margin-left: 20px"><button type="button" class="btn btn-sm btn-success" onclick="searchInventory()">查看库存</button></li>
-                    </ul>
+<!--                    <ul>-->
+<!--                        <li style="float:left;margin-left: 40px"><button type="button" class="btn btn-sm btn-success" onclick="searchLocation()">查看库位</button></li>-->
+<!--                        <li style="float:left;margin-left: 20px"><button type="button" class="btn btn-sm btn-success" onclick="searchInventory()">查看库存</button></li>-->
+<!--                    </ul>-->
                 </div>
             </form>
         </div>
@@ -625,8 +626,8 @@
             },
             success:function (response) {
                 if (response.code==200){
-                    $("#zone").val("库位数量："+response.data.location+", 空柜数量："+response.data.emptyLocation+
-                        ", 空盘数量："+response.data.haveContainLocation+", 半整盘库位数量："+response.data.haveInventoryLocation)
+                    $("#zone").val("库位总数："+response.data.location+", 空闲库位："+response.data.emptyLocation+
+                        ", 空托盘库位："+response.data.haveContainLocation+", 有货库位："+response.data.haveInventoryLocation)
                 }else {
                     $.modal.alertError(response.msg)
                 }
@@ -333,7 +333,7 @@
                 {
                     field: 'projectCode',
                     title: '项目号',
-                    sortable:true
+                    visible: false
                 },
                 {
                     field: 'shipmentType',
@@ -379,7 +379,8 @@
                 },
                 {
                     field: 'waveId',
-                    title: '波次号'
+                    title: '波次号',
+                    visible: false
                 },
                 {
                     field: 'totalQty',