1.盘点异常处理

2.库存报表增加隔口排序

src/main/java/com/neotel/smfcore/custom/lizhen/agvBox/rest/InventoryController.java

@@ -841,12 +841,18 @@ public class InventoryController {
 
 
         List<Map<String, String>> reelInfoList = getReelInfoList(boxBarcode, posName, inventoryBatch, data);
         List<Map<String, String>> reelInfoList = getReelInfoList(boxBarcode, posName, inventoryBatch, data);
         if (reelInfoList != null && !reelInfoList.isEmpty()) {
         if (reelInfoList != null && !reelInfoList.isEmpty()) {
+            //index+1 是因为最多从第2盘进行盘点
             int index = 0;
             int index = 0;
-            if (index != -1){
-                Map<String, String> map = reelInfoList.get(index);
+            for (Map<String, String> map : reelInfoList) {
+                String reel = map.get("reel");
+                if (StringUtils.isNotEmpty(reel)){
+                    continue;
+                }
                 String code = map.get("code");
                 String code = map.get("code");
                 if (!code.equals(barcode.getBarcode())){
                 if (!code.equals(barcode.getBarcode())){
                     return "当前扫的料盘信息为:"+barcode.getBarcode()+"与要盘点的料盘信息:"+code+"不一致";
                     return "当前扫的料盘信息为:"+barcode.getBarcode()+"与要盘点的料盘信息:"+code+"不一致";
+                } else {
+                    break;
                 }
                 }
             }
             }
         }
         }

src/main/java/com/neotel/smfcore/custom/lizhen/report/bean/dto/InventoryDto.java

@@ -118,5 +118,7 @@ public class InventoryDto {
      */
      */
     private String source;
     private String source;
 
 
+    private int seq;
+
     private long inStockDays = 0;
     private long inStockDays = 0;
 }
 }

src/main/java/com/neotel/smfcore/custom/lizhen/report/outer/OuterReportController.java

@@ -558,6 +558,7 @@ public class OuterReportController {
                 dto.setPutInDate(barcode.getPutInDate());
                 dto.setPutInDate(barcode.getPutInDate());
                 dto.setCreator(barcode.getCreator());
                 dto.setCreator(barcode.getCreator());
                 dto.setBarcode(barcode.getBarcode());
                 dto.setBarcode(barcode.getBarcode());
+                dto.setSeq(barcode.getSeq());
 
 
                 long putInTime = barcode.getPutInTime();
                 long putInTime = barcode.getPutInTime();
                 if (putInTime != -1){
                 if (putInTime != -1){