拉到流水线上,任务不完成,等栈板扫到条码之后 才完成任务

src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/wipstor/controller/AgvDeviceController.java

@@ -129,7 +129,9 @@ public class AgvDeviceController {
                     //WipBoxHandleUtil.outFromPos(task);
                     //WipBoxHandleUtil.outFromPos(task);
                     task.setOutFromPos(true);
                     task.setOutFromPos(true);
                 }
                 }
-                taskService.updateFinishedTask(task);
+                if (!OP_STATUS.FINISHED.name().equals(statusStr)){
+                    taskService.updateFinishedTask(task);
+                }
             }
             }
         }
         }
         return ResultBean.newOkResult("");
         return ResultBean.newOkResult("");

src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/wipstor/controller/LineController.java

@@ -221,35 +221,65 @@ public class LineController {
     @AnonymousAccess
     @AnonymousAccess
     public ResultBean odnReCartonQty(@RequestBody Map<String, String> paramMap) {
     public ResultBean odnReCartonQty(@RequestBody Map<String, String> paramMap) {
         String boxId = paramMap.get("cartonId");
         String boxId = paramMap.get("cartonId");
-        DataLog dataLog = dataLogManager.findOne(new Query(Criteria.where("barcode").is(boxId).and("type").is(OP.CHECKOUT)));
+
+        //解析出来条码信息
+        Barcode barcode = codeResolve.resolveOneValideBarcode(boxId);
+        if (barcode == null) {
+            return ResultBean.newErrorResult(-1, "smfcore.error.barcode.noValidCode", "条码无效");
+        }
+
+        //获取正在出库的任务
+        String soureId = "";
+        String sourceName = "";
+        DataLog dataLog = null;
+
+        List<DataLog> allTasks = taskService.getAllTasks();
+        for (DataLog task : allTasks) {
+            if (task.isCheckOutTask()  && barcode.getBarcode().equals(task.getBarcode())) {
+                soureId = task.getSourceId();
+                sourceName = task.getSourceName();
+                if (!task.isFinished()){
+                    task.setStatus(OP_STATUS.FINISHED.name());
+                }
+                dataLog = task;
+                taskService.moveTaskToFinished(task);
+                taskService.updateFinishedTask(task);
+                break;
+            }
+        }
+
         if (dataLog != null) {
         if (dataLog != null) {
-            if (dataLog.isCheckOutTask() && dataLog.isFinished()) {
-                String sourceId = dataLog.getSourceId();
-                if (StringUtils.isNotEmpty(sourceId)) {
-
-                    int qty = 0;
-                    Map<String, Object> resultMap = new HashMap<>();
-
-                    List<DataLog> allTasks = taskService.getAllTasks();
-                    for (DataLog task : allTasks) {
-                        if (task.isCheckOutTask() && !task.isCancel() && !task.isFinished()) {
-                            if (sourceId.equals(task.getSourceId())) {
-                                qty++;
-                            }
-                        }
-                    }
 
 
-                    resultMap.put("odn", sourceId);
-                    resultMap.put("qty", qty);
-                    resultMap.put("palletId", "");
-                    Barcode barcode = barcodeManager.findByBarcode(boxId);
-                    if (barcode != null){
-                        resultMap.put("palletId", barcode.getPalletId());
+            int num = 0;
+
+            List<DataLog> dataLogList = taskService.getAllTasks();
+            for (DataLog task : dataLogList) {
+                if (task.isCheckOutTask() && !task.isFinished() && !task.isCancel()){
+                    if (StringUtils.isEmpty(soureId)){
+                        if (StringUtils.isEmpty(task.getSourceId())){
+                            num = num + 1;
+                        }
+                    } else {
+                        if (soureId.equals(task.getSourceId())){
+                            num = num + 1;
+                        }
                     }
                     }
-                    return ResultBean.newOkResult(resultMap);
                 }
                 }
             }
             }
+
+            Map<String,Object> resultMap = new HashMap<>();
+            resultMap.put("odn", sourceName);
+            resultMap.put("qty", num);
+            resultMap.put("palletId", barcode.getPalletId());
+            if (num == 0){
+                   return ResultBean.newOkResult(resultMap);
+            } else{
+                ResultBean resultBean = ResultBean.newErrorResult(-1, "", "剩余还有" + num + "箱");
+                resultBean.setData(resultMap);
+                return resultBean;
+            }
         }
         }
+
         return ResultBean.newErrorResult(-1, "", "未找到对应的信息");
         return ResultBean.newErrorResult(-1, "", "未找到对应的信息");
     }
     }