盘点BUG修改

src/main/java/com/neotel/smfcore/core/selfAudit/rest/SelfAuditController.java

@@ -43,10 +43,8 @@ import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
+import java.util.*;
+import java.util.stream.Collectors;
 
 
 @Slf4j
 @Slf4j
 @Api(tags = "盘点")
 @Api(tags = "盘点")
@@ -270,7 +268,24 @@ public class SelfAuditController {
         SelfAuditDto dto = selfAuditMapper.toDto(selfAudit);
         SelfAuditDto dto = selfAuditMapper.toDto(selfAudit);
         List<SelfAuditItem> selfAuditItemDtos = selfAudit.getItems();
         List<SelfAuditItem> selfAuditItemDtos = selfAudit.getItems();
         List<SelfAuditItemDto> dtos = selfAuditItemMapper.toDto(selfAuditItemDtos);
         List<SelfAuditItemDto> dtos = selfAuditItemMapper.toDto(selfAuditItemDtos);
-        dto.setItems(dtos);
+
+        //待处理的放在最前面
+        List sortedList = dtos.stream().sorted(
+                Comparator.comparingInt(item -> {
+                    int status = item.getItemStatus();
+                    if (status == 3) {
+                        return 0;
+                    } else if (status == 4) {
+                        return 1;
+                    } else if (status == 2) {
+                        return 2;
+                    } else if (status == 1) {
+                        return 3;
+                    } else {
+                        return 4;
+                    }
+                })).collect(Collectors.toList());
+        dto.setItems(sortedList);
         return dto;
         return dto;
     }
     }
 
 

src/main/java/com/neotel/smfcore/core/selfAudit/rest/SelfAuditDeviceController.java

@@ -125,6 +125,7 @@ public class SelfAuditDeviceController {
         for (SelfAuditItem item :
         for (SelfAuditItem item :
                 items) {
                 items) {
             if (item.getPosName().equals(posName)) {
             if (item.getPosName().equals(posName)) {
+                findOk=true;
                 log.info(" 盘点["+selfAudit.getBatchNo()+"]库位出库成功：posName["+item.getPosName()+"]barcode["+item.getBarcode()+"]，自动生成出库任务，清空库位");
                 log.info(" 盘点["+selfAudit.getBatchNo()+"]库位出库成功：posName["+item.getPosName()+"]barcode["+item.getBarcode()+"]，自动生成出库任务，清空库位");
 
 
                 StoragePos storagePos = storagePosManager.getByPosName(posName);
                 StoragePos storagePos = storagePosManager.getByPosName(posName);
@@ -156,6 +157,10 @@ public class SelfAuditDeviceController {
         }
         }
         if(findOk){
         if(findOk){
             selfAudit.setItems(newItems);
             selfAudit.setItems(newItems);
+            //更改自检状态
+            if(selfAudit.getStatus().equals(SELFAUDIT_STATUS.NEW.name())){
+                selfAudit.setStatus(SELFAUDIT_STATUS.EXECUTING.name());
+            }
             selfAuditUtil.updateShelfAudit(selfAudit);
             selfAuditUtil.updateShelfAudit(selfAudit);
             return ResultBean.newOkResult("ok");
             return ResultBean.newOkResult("ok");
         }
         }
@@ -231,7 +236,9 @@ public class SelfAuditDeviceController {
                         //TODO 如果原来有料，默认增加一条入库任务
                         //TODO 如果原来有料，默认增加一条入库任务
 
 
                     } catch (Exception e) {
                     } catch (Exception e) {
-                        throw new ValidateException("smfcore.error", "出错{0}", new String[]{e.toString()});
+                        //只打印提示信息，还需要继续执行
+                        log.error("盘点[" + selfAudit.getBatchNo() + "]库位入库完成：posName[" + item.getPosName() + "]处理出错："+e.toString());
+//                        throw new ValidateException("smfcore.error", "出错{0}", new String[]{e.toString()});
                     }
                     }
                 }
                 }