Merge remote-tracking branch 'origin/master'

src/main/java/com/neotel/smfcore/custom/keboda1335/KebodaApi.java

+package com.neotel.smfcore.custom.keboda1335;
+
+import com.neotel.smfcore.custom.neotel.NeotelApi;
+import org.springframework.stereotype.Component;
+import org.springframework.stereotype.Service;
+
+@Service
+public class KebodaApi extends NeotelApi {
+
+    @Override
+    public boolean isForThisApi(String apiName) {
+        return apiName != null && apiName.equalsIgnoreCase("kbd");
+    }
+}

src/main/java/com/neotel/smfcore/custom/keboda1335/KebodaController.java

@@ -135,12 +135,16 @@ public class KebodaController {
                         //已经在任务当中,返回对应的信息
                         //已经在任务当中,返回对应的信息
                         if (dataLog.getBarcode().equals(barcode.getBarcode())) {
                         if (dataLog.getBarcode().equals(barcode.getBarcode())) {
                             if (dataLog.isPutInTask()) {
                             if (dataLog.isPutInTask()) {
-                                //已有入库任务
-                                errorMsg = "物料[" + dataLog.getBarcode() + "]已有入库任务,需继续执行入库动作";
-                                resultMap.put("pos", dataLog.getPosName());
-                                resultMap.put("barcode", barcode.getBarcode());
-                                resultMap.put("cid", dataLog.getCid());
-                                return resultMap;
+                                if (cidList.contains(dataLog.getCid())) {
+                                    //已有入库任务
+                                    errorMsg = "物料[" + dataLog.getBarcode() + "]已有入库任务,需继续执行入库动作";
+                                    resultMap.put("pos", dataLog.getPosName());
+                                    resultMap.put("barcode", barcode.getBarcode());
+                                    resultMap.put("cid", dataLog.getCid());
+                                    return resultMap;
+                                } else {
+                                    throw new ValidateException("smfcore.error.barcode.taskNotEnd", "料盘[{0}}]的操作未完成,无法执行入库操作", new String[]{barcode.getBarcode()});
+                                }
                             } else {
                             } else {
                                 //已有出库任务
                                 //已有出库任务
                                 errorMsg = "物料[" + dataLog.getBarcode() + "]已有出库任务,需继续执行出库动作";
                                 errorMsg = "物料[" + dataLog.getBarcode() + "]已有出库任务,需继续执行出库动作";