增加空箱与非空箱展示

src/main/java/com/neotel/smfcore/core/device/handler/impl/XLCBoxHandler.java

@@ -34,10 +34,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.RestController;
 
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentHashMap;
 
 
 //北京方仓
 //北京方仓
@@ -96,7 +93,7 @@ public class XLCBoxHandler extends BaseDeviceHandler {
     @ApiOperation("XLC方仓容量详情")
     @ApiOperation("XLC方仓容量详情")
     @GetMapping("/api/boxkanban/xlcDetails")
     @GetMapping("/api/boxkanban/xlcDetails")
     @PreAuthorize("@el.check('boxkanban:info')")
     @PreAuthorize("@el.check('boxkanban:info')")
-    public List<XLCPosDetailDto> xlcDetails(StoragePosQueryCriteria criteria) {
+    public Map<String,Object> xlcDetails(StoragePosQueryCriteria criteria) {
 
 
         criteria.setUsed(true);
         criteria.setUsed(true);
 //        String storageId = mapValues.get("storageId");
 //        String storageId = mapValues.get("storageId");
@@ -111,6 +108,8 @@ public class XLCBoxHandler extends BaseDeviceHandler {
 //        }
 //        }
 
 
         List<XLCPosDetailDto> dtos = new ArrayList<>();
         List<XLCPosDetailDto> dtos = new ArrayList<>();
+        int emptyBoxNum = 0;
+        int noEmptyBoxNum = 0;
         for (StoragePos pos : enabledPosList) {
         for (StoragePos pos : enabledPosList) {
             boolean isEx=pos.isExpandPos();
             boolean isEx=pos.isExpandPos();
             if ((!pos.isExpandPos()) && (pos.getBarcode() != null)) {
             if ((!pos.isExpandPos()) && (pos.getBarcode() != null)) {
@@ -122,6 +121,9 @@ public class XLCBoxHandler extends BaseDeviceHandler {
 //                        Barcode barcode = pos.getBarcode().getSubCodeMap().get(key);
 //                        Barcode barcode = pos.getBarcode().getSubCodeMap().get(key);
                         list.add(  toPosBarcodeDto(barcode));
                         list.add(  toPosBarcodeDto(barcode));
                     }
                     }
+                    noEmptyBoxNum ++;
+                } else {
+                    emptyBoxNum ++;
                 }
                 }
 //                if(list.size()<=0) {
 //                if(list.size()<=0) {
 //                    Random r = new Random();
 //                    Random r = new Random();
@@ -141,9 +143,15 @@ public class XLCBoxHandler extends BaseDeviceHandler {
                 barcodeDto.setSubCodeList(list);
                 barcodeDto.setSubCodeList(list);
                 XLCPosDetailDto dto = new XLCPosDetailDto(pos.getId(), pos.getStorageId(), pos.getPosName(), barcodeDto);
                 XLCPosDetailDto dto = new XLCPosDetailDto(pos.getId(), pos.getStorageId(), pos.getPosName(), barcodeDto);
                 dtos.add(dto);
                 dtos.add(dto);
+            } else {
+                emptyBoxNum ++;
             }
             }
         }
         }
-        return dtos;
+        Map<String,Object> resultMap = new HashMap<>();
+        resultMap.put("dtos",dtos);
+        resultMap.put("emptyBoxNum",emptyBoxNum);
+        resultMap.put("noEmptyBoxNum",noEmptyBoxNum);
+        return resultMap;
     }
     }
     private XLCPosBarcodeDto toPosBarcodeDto(Barcode barcode){
     private XLCPosBarcodeDto toPosBarcodeDto(Barcode barcode){
         XLCPosBarcodeDto dto=new XLCPosBarcodeDto();
         XLCPosBarcodeDto dto=new XLCPosBarcodeDto();