908XLR 最后一盘料放上料串时,料串不离开问题修正

src/main/java/com/neotel/smfcore/core/device/handler/impl/XLRBoxHandler.java

@@ -65,10 +65,10 @@ public class XLRBoxHandler extends BaseDeviceHandler {
                         if (BOX_STATUS.IN_FINISHED == status) {//入仓完成
                             finishedPutIn(statusBean.getCid(),posName,executeTime);
                         } else if (BOX_STATUS.OUT_FINISHED == status) {//出仓完成
-                            reelOutBox(statusBean.getCid(),posName);
+                            finishedOutPos(statusBean.getCid(),posName,executeTime,OP_STATUS.OUT_BOX);
                         } else if (BOX_STATUS.OUT_END == status) {//出库完成(放到仓门口
                             log.info(statusBean.getCid() +"将物料从库位["+posName+"]出库到门口/料串完成");
-                            finishedOutPos(statusBean.getCid(),posName,executeTime);
+                            reelOnShelf(statusBean.getCid(),posName);
                         }
                     }
                 } catch (ValidateException e) {
@@ -79,12 +79,11 @@ public class XLRBoxHandler extends BaseDeviceHandler {
         return statusBean;
     }
 
-    protected void reelOutBox(String cid, String posName){
-        log.info(cid +"将物料从库位["+posName+"]中取出");
-        DataLog task = taskService.findExecutingTask(cid,posName);
+    protected void reelOnShelf(String cid, String posName){
+        DataLog task = taskService.findFinishedOutTask(cid,posName);
         if(task != null){
-            task.setStatus(OP_STATUS.OUT_BOX.name());
-            taskService.updateQueueTask(task);
+            task.setStatus(OP_STATUS.FINISHED.name());
+            taskService.updateFinishedTask(task);
         }
     }
 

src/main/java/com/neotel/smfcore/core/device/rest/DeviceController.java

@@ -514,10 +514,10 @@ public class DeviceController {
         String hSerial = request.getParameter("hSerial");
         int outTaskCount = 0;
         if(!Strings.isNullOrEmpty(cid)){
-            Collection<DataLog> queueTasks = taskService.getQueueTasks(cid);
+            Collection<DataLog> queueTasks = taskService.getAllTasksByCid(cid);
             if(!Strings.isNullOrEmpty(hSerial)){
                 for (DataLog queueTask : queueTasks) {
-                    if(queueTask.isCheckOutTask()){
+                    if(queueTask.isCheckOutTask() && !queueTask.isFinished()){
                         if(queueTask.getSourceName().equals(hSerial)){
                             //单号相同任务数量+1
                             outTaskCount = outTaskCount + 1;
@@ -526,7 +526,7 @@ public class DeviceController {
                 }
             }else{
                 for (DataLog queueTask : queueTasks) {
-                    if (queueTask.isCheckOutTask()) {
+                    if (queueTask.isCheckOutTask() && !queueTask.isFinished()) {
                         outTaskCount = outTaskCount + 1;
                     }
                 }