1.API007参数错误。

2.出库失败增加 提示

src/main/java/com/neotel/smfcore/core/order/LiteOrderCache.java

@@ -384,7 +384,7 @@ public class LiteOrderCache {
                             //先改为单盘上传
                             //先改为单盘上传
                             List<DataLog> dataLogList = dataLogManager.findByQuery(new Query(Criteria.where("subSourceId").in(itemIdList)));
                             List<DataLog> dataLogList = dataLogManager.findByQuery(new Query(Criteria.where("subSourceId").in(itemIdList)));
                             if (dataLogList != null && !dataLogList.isEmpty()) {
                             if (dataLogList != null && !dataLogList.isEmpty()) {
-                                String msg = MicronApi.Api007(order.getOrderNo(), task.getLocInfo(), dataLogList);
+                                String msg = MicronApi.Api007(order.getOperationId(), task.getLocInfo(), dataLogList);
                                 for (LiteOrderItem item : items) {
                                 for (LiteOrderItem item : items) {
                                     if (itemIdList.contains(item.getId())) {
                                     if (itemIdList.contains(item.getId())) {
                                         if (ObjectUtil.isEmpty(msg)) {
                                         if (ObjectUtil.isEmpty(msg)) {
@@ -1215,6 +1215,7 @@ public class LiteOrderCache {
     public synchronized String dispatchCheckOut(LiteOrder order, boolean isRetry,boolean isOver) {
     public synchronized String dispatchCheckOut(LiteOrder order, boolean isRetry,boolean isOver) {
 
 
 
 
+        String resultMsg="smfcore.label.noReel";
         log.info("dispatchCheckOut 出库单[" + order.getOrderNo() + "] operatetionId [" + order.getOperationId() + "]开始出库,isRetry="+isRetry+",isOver="+isOver);
         log.info("dispatchCheckOut 出库单[" + order.getOrderNo() + "] operatetionId [" + order.getOperationId() + "]开始出库,isRetry="+isRetry+",isOver="+isOver);
         int taskReelCount = 0;
         int taskReelCount = 0;
 
 
@@ -1243,7 +1244,7 @@ public class LiteOrderCache {
 
 
         if (needOutBarcode.size() < 0) {
         if (needOutBarcode.size() < 0) {
             log.info("dispatchCheckOut 出库单[" + order.getOrderNo() + "] 未找到可以retry的物料");
             log.info("dispatchCheckOut 出库单[" + order.getOrderNo() + "] 未找到可以retry的物料");
-            return "";
+            return resultMsg;
         }
         }
         order.setStatus(LITEORDER_STATUS.TAILS);
         order.setStatus(LITEORDER_STATUS.TAILS);
         order.setTaskReelCount(0);
         order.setTaskReelCount(0);
@@ -1345,14 +1346,17 @@ public class LiteOrderCache {
                 log.info("dispatchCheckOut 出库单[" + order.getOrderNo() + "] 还有 [" + currTask + "] 未完成的出库任务");
                 log.info("dispatchCheckOut 出库单[" + order.getOrderNo() + "] 还有 [" + currTask + "] 未完成的出库任务");
             }
             }
         }
         }
+
         if (taskReelCount <= 0 && currTask <= 0) {
         if (taskReelCount <= 0 && currTask <= 0) {
             if (order.isOutTails()) {
             if (order.isOutTails()) {
                 order.setStatus(LITEORDER_STATUS.TAILS_FINISHED);
                 order.setStatus(LITEORDER_STATUS.TAILS_FINISHED);
             }
             }
             //liteOrderCache.finishedOrderTasks(order);
             //liteOrderCache.finishedOrderTasks(order);
+        }else{
+            resultMsg="";
         }
         }
         liteOrderManager.save(order);
         liteOrderManager.save(order);
         addOrderToMap(order);
         addOrderToMap(order);
-        return "";
+        return resultMsg;
     }
     }
 }
 }

src/main/java/com/neotel/smfcore/custom/micron1053/task/MicronDispatchController.java

@@ -559,7 +559,10 @@ private IStoragePosManager storagePosManager;
         }
         }
 
 
         //调用API010扣除库存，扣除成功的才可以出库
         //调用API010扣除库存，扣除成功的才可以出库
-        liteOrderCache.dispatchCheckOut(order,false,isOver);
+       String msg= liteOrderCache.dispatchCheckOut(order,false,isOver);
+        if(ObjectUtil.isNotEmpty(msg)){
+            return ResultBean.newErrorResult(-1,msg,msg);
+        }
         //工单开始出库
         //工单开始出库
 
 
         return ResultBean.newOkResult("");
         return ResultBean.newOkResult("");
@@ -583,7 +586,10 @@ private IStoragePosManager storagePosManager;
             return ResultBean.newErrorResult(-1, "smfcore.micron.operationFailure", "操作失败");
             return ResultBean.newErrorResult(-1, "smfcore.micron.operationFailure", "操作失败");
         }
         }
 
 
-        liteOrderCache.dispatchCheckOut(order,true,isOver);
+      String msg=  liteOrderCache.dispatchCheckOut(order,true,isOver);
+        if(ObjectUtil.isNotEmpty(msg)){
+            return ResultBean.newErrorResult(-1,msg,msg);
+        }
         return ResultBean.newOkResult("");
         return ResultBean.newOkResult("");