研华单盘入库修改

src/main/java/com/neotel/smfcore/core/device/bean/StatusBean.java

@@ -240,6 +240,14 @@ public class StatusBean {
         this.alarmList = alarmList;
         this.alarmList = alarmList;
     }
     }
 
 
+    public void putOp(Map<String, String> opMap) {
+        if (opMap != null && !opMap.isEmpty()) {
+            for (Map.Entry<String, String> op : opMap.entrySet()) {
+                data.put(op.getKey(), op.getValue());
+            }
+        }
+    }
+
     /**
     /**
      * 添加一些服务器的操作发送到客户端（批量入库）
      * 添加一些服务器的操作发送到客户端（批量入库）
      * @param opMap
      * @param opMap

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

 package com.neotel.smfcore.core.device.handler.impl;
 package com.neotel.smfcore.core.device.handler.impl;
 
 
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSON;
 import com.google.common.base.Strings;
 import com.google.common.base.Strings;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Lists;
 import com.neotel.smfcore.common.bean.ResultBean;
 import com.neotel.smfcore.common.bean.ResultBean;
 import com.neotel.smfcore.common.exception.ValidateException;
 import com.neotel.smfcore.common.exception.ValidateException;
 import com.neotel.smfcore.common.utils.Constants;
 import com.neotel.smfcore.common.utils.Constants;
+import com.neotel.smfcore.common.utils.JsonUtil;
 import com.neotel.smfcore.common.utils.SecurityUtils;
 import com.neotel.smfcore.common.utils.SecurityUtils;
 import com.neotel.smfcore.core.barcode.service.po.Barcode;
 import com.neotel.smfcore.core.barcode.service.po.Barcode;
 import com.neotel.smfcore.core.device.bean.StatusBean;
 import com.neotel.smfcore.core.device.bean.StatusBean;
@@ -74,8 +76,7 @@ public class MimoBoxHandler extends BaseDeviceHandler {
 
 
         //获取操作
         //获取操作
         Map<String, String> opMap = DevicesStatusUtil.getAndRemoveOp(cid);
         Map<String, String> opMap = DevicesStatusUtil.getAndRemoveOp(cid);
-        statusBean.addOp(opMap);
-
+        statusBean.putOp(opMap);
         return statusBean;
         return statusBean;
     }
     }
 
 

src/main/java/com/neotel/smfcore/custom/advantech/AdvantechApi.java

@@ -13,6 +13,7 @@ import com.neotel.smfcore.core.system.service.po.DataLog;
 import com.neotel.smfcore.core.system.util.TaskService;
 import com.neotel.smfcore.core.system.util.TaskService;
 import com.sun.org.apache.xpath.internal.operations.Bool;
 import com.sun.org.apache.xpath.internal.operations.Bool;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
@@ -230,7 +231,9 @@ public class AdvantechApi extends BaseSmfApiListener {
                     taskService.cancelTask(task.getId());
                     taskService.cancelTask(task.getId());
                 }else {
                 }else {
                     //如果返回成功,把singleOut改为true
                     //如果返回成功,把singleOut改为true
-                    task.setSingleOut(true);
+                    if (ObjectUtils.isNotEmpty(task.getSourceName())) {
+                        task.setSingleOut(true);
+                    }
                     taskService.updateQueueTask(task);
                     taskService.updateQueueTask(task);
                 }
                 }
                 log.info(task.getBarcode() + "出库通知返回" + result);
                 log.info(task.getBarcode() + "出库通知返回" + result);