增加override选项

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

@@ -1168,12 +1168,12 @@ public class LiteOrderCache {
     }
     }
 
 
 
 
-    public synchronized String dispatchCheckOut(LiteOrder order, boolean isRetry) {
+    public synchronized String dispatchCheckOut(LiteOrder order, boolean isRetry,boolean isOver) {
         order.setStatus(LITEORDER_STATUS.TAILS);
         order.setStatus(LITEORDER_STATUS.TAILS);
         order.setTaskReelCount(0);
         order.setTaskReelCount(0);
         order.setFinishedReelCount(0);
         order.setFinishedReelCount(0);
 
 
-        log.info("dispatchCheckOut 出库单[" + order.getOrderNo() + "] operatetionId [" + order.getOperationId() + "]开始出库,isRetry="+isRetry);
+        log.info("dispatchCheckOut 出库单[" + order.getOrderNo() + "] operatetionId [" + order.getOperationId() + "]开始出库,isRetry="+isRetry+",isOver="+isOver);
         int taskReelCount = 0;
         int taskReelCount = 0;
 
 
         List<String> needOutBarcode = new ArrayList<>();
         List<String> needOutBarcode = new ArrayList<>();
@@ -1192,6 +1192,9 @@ public class LiteOrderCache {
                         //只出checkOK的
                         //只出checkOK的
                         needOutBarcode.add(selItem.getRi());
                         needOutBarcode.add(selItem.getRi());
                     }
                     }
+                    if (selItem.getStatus().equals(OrderItemStatus.Reserved) && isOver) {
+                        needOutBarcode.add(selItem.getRi());
+                    }
                 }
                 }
             }
             }
         }
         }

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

@@ -545,7 +545,12 @@ private IStoragePosManager storagePosManager;
     public ResultBean checkOut(@RequestBody Map<String,Object> params) {
     public ResultBean checkOut(@RequestBody Map<String,Object> params) {
 
 
         String mode = params.get("mode").toString();
         String mode = params.get("mode").toString();
-        log.info(" checkOut :mode=" + mode + ",开始确认出库");
+        Object overrideOut=params.get("isOverride");
+        boolean isOver=false;
+        if(ObjectUtil.isNotEmpty(overrideOut)&&overrideOut.toString().equalsIgnoreCase("true")) {
+            isOver = true;
+        }
+        log.info(" checkOut :mode=" + mode + ",开始确认出库, isOver="+isOver);
 
 
         //判断有没有生成任务
         //判断有没有生成任务
         LiteOrder order = getOrderByMode(mode);
         LiteOrder order = getOrderByMode(mode);
@@ -554,9 +559,7 @@ private IStoragePosManager storagePosManager;
         }
         }
 
 
         //调用API010扣除库存，扣除成功的才可以出库
         //调用API010扣除库存，扣除成功的才可以出库
-        liteOrderCache.dispatchCheckOut(order,false);
-
-
+        liteOrderCache.dispatchCheckOut(order,false,isOver);
         //工单开始出库
         //工单开始出库
 
 
         return ResultBean.newOkResult("");
         return ResultBean.newOkResult("");
@@ -568,14 +571,19 @@ private IStoragePosManager storagePosManager;
     public ResultBean retry(@RequestBody Map<String,Object> params) {
     public ResultBean retry(@RequestBody Map<String,Object> params) {
 
 
         String mode = params.get("mode").toString();
         String mode = params.get("mode").toString();
-        log.info(" retry :mode=" + mode + ",重新出库");
+        Object overrideOut=params.get("isOverride");
+        boolean isOver=false;
+        if(ObjectUtil.isNotEmpty(overrideOut)&&overrideOut.toString().equalsIgnoreCase("true")) {
+            isOver = true;
+        }
+        log.info(" retry :mode=" + mode + ",重新出库, isOver="+isOver);
         //判断有没有生成任务
         //判断有没有生成任务
         LiteOrder order = getOrderByMode(mode);
         LiteOrder order = getOrderByMode(mode);
         if (order == null) {
         if (order == null) {
             return ResultBean.newErrorResult(-1, "smfcore.micron.operationFailure", "操作失败");
             return ResultBean.newErrorResult(-1, "smfcore.micron.operationFailure", "操作失败");
         }
         }
 
 
-        liteOrderCache.dispatchCheckOut(order,true);
+        liteOrderCache.dispatchCheckOut(order,true,isOver);
         return ResultBean.newOkResult("");
         return ResultBean.newOkResult("");