入库单未找到任务时返回失败

src/main/java/com/neotel/smfcore/custom/luxsan_sp/controller/SpSpareNoController.java

@@ -177,7 +177,7 @@ public class SpSpareNoController {
         }
 
         if (!spareNo.isExecuting()) {
-            return ResultBean.newErrorResult(-1, "", spareNoStr + "不是正在执行中,不允许放弃");
+            return ResultBean.newErrorResult(-1, "", spareNoStr + "入库单正在执行中,不允许放弃");
         }
 
         spareNo.setSpareStatus(SpareNostatus.ABANDON_STATUS);

src/main/java/com/neotel/smfcore/custom/luxsan_sp/util/SpareNoCache.java

@@ -315,14 +315,14 @@ public class SpareNoCache {
                     boxTypes.add("CM");
                     for (String type :
                             boxTypes) {
-                        if(type==""){
-                            emptyPos = storagePosManager.findEmptyBoxToPut(storageIdList, excludePosIds, dataCache.getCheckOutType(),baseNo.getWhCode().trim());
-                        }else{
+                        if (type == "") {
+                            emptyPos = storagePosManager.findEmptyBoxToPut(storageIdList, excludePosIds, dataCache.getCheckOutType(), baseNo.getWhCode().trim());
+                        } else {
                             int count = SpBoxUtil.GetBoxSubCount(type);
-                            emptyPos = storagePosManager.findEmptyBoxToPutIn(storageIdList, excludePosIds, dataCache.getCheckOutType(), type, count,baseNo.getWhCode().trim());
+                            emptyPos = storagePosManager.findEmptyBoxToPutIn(storageIdList, excludePosIds, dataCache.getCheckOutType(), type, count, baseNo.getWhCode().trim());
                         }
-                        emptyBox = emptyPos.getBarcode();
                         if (emptyPos != null) {
+                            emptyBox = emptyPos.getBarcode();
                             newPn.setBarcode(emptyBox.getBarcode() + "-" + (emptyBox.getSubCodeList() == null ? 1 : emptyBox.getSubCodeList().size()));
 //                            newPn = barcodeManager.save(newPn);
                             newPn = barcodeManager.saveBarcode(newPn);
@@ -335,7 +335,7 @@ public class SpareNoCache {
                             emptyBox.setOut(false);
                             emptyBox.setStatus(BARCODE_STATUS.IN_STORE);
                             emptyPos.setBarcode(emptyBox);
-                            needOutPos.put(emptyPos.getPosName(),emptyPos);
+                            needOutPos.put(emptyPos.getPosName(), emptyPos);
                             log.info("入库单" + orderNo + ", Pn=" + pn + "," + type + "查找到有空格口料箱=" + emptyPos.getPosName() + "，料箱号=" + emptyBox.getBarcode() + "，格口号=" + newPn.getBarcode() + "，需要入库数量=" + detail.getInQty());
 
                             break;
@@ -348,39 +348,45 @@ public class SpareNoCache {
 
             }
             //开始生成出库任务
-            int index = 1;
-            for (StoragePos pos : needOutPos.values()
-            ) {
-                Barcode barcode = pos.getBarcode();
-                log.info("入库单" + orderNo + ", 为库位=" + pos.getPosName() + "，料箱=" + barcode.getBarcode() + "生成出库任务：" + index);
-
-                pos.setBarcode(barcode);
-                barcodeManager.save(barcode);
-                barcodeManager.saveBarcode(barcode);
-                storagePosManager.save(pos);
-
-                Storage storage = dataCache.getStorageById(pos.getStorageId());
-                log.info(pos.getPosName() + "出库,料箱号为:" + barcode.getBarcode());
-                DataLog task = new DataLog(storage, barcode, pos);
-                task.setSourceId(baseNo.getId());
-                task.setSourceName(orderNo);
-                task.setSubSourceId(barcode.getLockName());
-                task.setSubSourceInfo(barcode.getLockName());
-                task.setType(OP.CHECKOUT);
-                task.setCreator(SecurityUtils.getLoginUsername());
-                task.setLoc("s1");
-                task.setStatus(OP_STATUS.WAIT.name());
-                try {
-                    taskService.addTaskToExecute(task);
-                } catch (Exception e) {
-                    e.getMessage();
+            int index = 0;
+            if(needOutPos.size()>0) {
+                for (StoragePos pos : needOutPos.values()
+                ) {
+                    Barcode barcode = pos.getBarcode();
+                    log.info("入库单" + orderNo + ", 为库位=" + pos.getPosName() + "，料箱=" + barcode.getBarcode() + "生成出库任务：" + index);
+
+                    pos.setBarcode(barcode);
+                    barcodeManager.save(barcode);
+                    barcodeManager.saveBarcode(barcode);
+                    storagePosManager.save(pos);
+
+                    Storage storage = dataCache.getStorageById(pos.getStorageId());
+                    log.info(pos.getPosName() + "出库,料箱号为:" + barcode.getBarcode());
+                    DataLog task = new DataLog(storage, barcode, pos);
+                    task.setSourceId(baseNo.getId());
+                    task.setSourceName(orderNo);
+                    task.setSubSourceId(barcode.getLockName());
+                    task.setSubSourceInfo(barcode.getLockName());
+                    task.setType(OP.CHECKOUT);
+                    task.setCreator(SecurityUtils.getLoginUsername());
+                    task.setLoc("s1");
+                    task.setStatus(OP_STATUS.WAIT.name());
+                    try {
+                        taskService.addTaskToExecute(task);
+                    } catch (Exception e) {
+                        e.getMessage();
+                    }
+                    index++;
                 }
-                index++;
+            }
+            //如果未找到任务，直接结束
+            else{
+                return "未找到可执行的任务";
             }
 
         } catch (Exception exception) {
 
-            log.error("执行ReturnInventoryNo 出错： " + exception.toString());
+            log.error("执行ReturnInventoryNo 出错： " ,exception);
             exception.printStackTrace();
         }
         return "";