Merge remote-tracking branch 'origin/master'

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

@@ -609,6 +609,12 @@ public class BaseDeviceHandler implements IDeviceHandler {
     protected void finishedOutPos(String cid, String posName,String barcode,int executeTime,OP_STATUS outBoxStatus) throws ValidateException {
     protected void finishedOutPos(String cid, String posName,String barcode,int executeTime,OP_STATUS outBoxStatus) throws ValidateException {
         DataLog task = taskService.findExecutingTask(cid, posName,barcode);
         DataLog task = taskService.findExecutingTask(cid, posName,barcode);
         if (task != null && task.isCheckOutTask()) {
         if (task != null && task.isCheckOutTask()) {
+            //判断状态是否重复推送
+            log.info(task.getBarcode()+"状态为:"+task.getStatus()+",重新更改状态:"+outBoxStatus.name());
+            if (outBoxStatus.name().equals(task.getStatus())){
+                log.info("状态一致,不处理,返回");
+                return;
+            }
             if (executeTime > 0) {
             if (executeTime > 0) {
                 task.setExecuteTime(executeTime);
                 task.setExecuteTime(executeTime);
             }
             }
@@ -625,6 +631,12 @@ public class BaseDeviceHandler implements IDeviceHandler {
             //从已完成列表中找,如果还找不到就忽略
             //从已完成列表中找,如果还找不到就忽略
             task = taskService.findFinishedOutTask(cid, posName,barcode);
             task = taskService.findFinishedOutTask(cid, posName,barcode);
             if (task != null && task.isCheckOutTask()) {
             if (task != null && task.isCheckOutTask()) {
+                //判断状态是否重复推送
+                log.info(task.getBarcode()+"状态为:"+task.getStatus()+",重新更改状态:"+outBoxStatus.name());
+                if (outBoxStatus.name().equals(task.getStatus())){
+                    log.info("状态一致,不处理,返回");
+                    return;
+                }
                 if (task.isCancel()) {//被取消的任务,客户端发完成信号过来,修改取消状态为已完成
                 if (task.isCancel()) {//被取消的任务,客户端发完成信号过来,修改取消状态为已完成
                     if (executeTime > 0) {
                     if (executeTime > 0) {
                         task.setExecuteTime(executeTime);
                         task.setExecuteTime(executeTime);

src/main/java/com/neotel/smfcore/custom/sungya20456/SungyaApi.java

@@ -259,6 +259,7 @@ public class SungyaApi extends BaseSmfApiListener {
      */
      */
     @Override
     @Override
     public void outTaskStatusChange(String outNotifyUrl, DataLog task) {
     public void outTaskStatusChange(String outNotifyUrl, DataLog task) {
+        if (task.isOutBox() || task.isFinished()) {
             try {
             try {
                 Map<String, Object> paramMap = new HashMap<>();
                 Map<String, Object> paramMap = new HashMap<>();
                 paramMap.put("funcname", "OUTWHDONE");
                 paramMap.put("funcname", "OUTWHDONE");
@@ -302,4 +303,5 @@ public class SungyaApi extends BaseSmfApiListener {
                 e.printStackTrace();
                 e.printStackTrace();
             }
             }
         }
         }
+    }
 }
 }