扫码后展示MES返回结果

在库物料不亮灯

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

@@ -97,18 +97,7 @@ public class NLPShelfHandler extends BaseDeviceHandler {
         try{
             CodeValidateParam params = new CodeValidateParam(loginUser, groupId, storageId, code, token);
             Barcode barcodeSave = smfApi.canPutInBeforeResolve(params);
-
-            if (barcodeSave == null) {
-                barcodeSave = codeResolve.resolveOneValideBarcode("=1x1=" + code);
-            }
-
-            //从API验证
-            Barcode verResult = smfApi.canPutInAfterResolve(barcodeSave);
-
-            if (verResult != null) {
-                barcodeSave = verResult;
-            }
-            return putIn(loginUser, groupId, storageId, barcodeSave, token);
+            return ResultBean.newOkResult("");
         }catch (ValidateException ve){
             return ResultBean.newErrorResult(-1,ve.getMsgKey(),ve.getDefaultMsg(),ve.getMsgParam());
         }
@@ -214,39 +203,26 @@ public class NLPShelfHandler extends BaseDeviceHandler {
         //亮灯
         Collection<DataLog> queueTasks = taskService.getQueueTasks(statusBean.getCid());
         for (DataLog queueTask : queueTasks) {
-            if (queueTask.isWait()) {
+            if (queueTask.isWait() && queueTask.isCheckOutTask()) {
                 queueTask.setStatus(OP_STATUS.EXECUTING.name());
                 taskService.updateQueueTask(queueTask);
                 String rgb = queueTask.getLightColor();
                 ORDER_COLOR color = ORDER_COLOR.fromRgb(rgb);
                 if (color == null) {
-                    if (queueTask.isPutInTask()) {
-                        color = ORDER_COLOR.DARKGREEN;
-                    } else {
-                        if (openZhiYin && ObjectUtil.isNotEmpty(queueTask.getSourceId())) {
-                            List<DataLog> dataLogList = outMap.get(queueTask.getSourceId());
-                            if (dataLogList == null) {
-                                dataLogList = new ArrayList<>();
-                            }
-                            dataLogList.add(queueTask);
-                            outMap.put(queueTask.getSourceId(), dataLogList);
-                        } else {
-                            color = ORDER_COLOR.BLUE;
+                    if (openZhiYin && ObjectUtil.isNotEmpty(queueTask.getSourceId())) {
+                        List<DataLog> dataLogList = outMap.get(queueTask.getSourceId());
+                        if (dataLogList == null) {
+                            dataLogList = new ArrayList<>();
                         }
+                        dataLogList.add(queueTask);
+                        outMap.put(queueTask.getSourceId(), dataLogList);
+                    } else {
+                        color = ORDER_COLOR.BLUE;
                     }
                 }
                 statusBean.addData("open", queueTask.getPosName() + "=" + color.name());
                 log.info("库位[" + queueTask.getPosName() + "]+亮灯:" + color.name());
             }
-//            else if(queueTask.isCancel()){
-//                if(queueTask.isCheckOutTask()){
-//
-//                    statusBean.addData("open",queueTask.getPosName()+"="+"orange" );
-//                    log.info("库位["+queueTask.getPosName()+"]+取消:open=orange" );
-//                    //从任务列表中删除
-//                    taskService.removeFinishedTask(queueTask);
-//                }
-//            }
         }
 
         List<DataLog> dataLogs = getLightGuideTask(outMap);
@@ -516,7 +492,7 @@ public class NLPShelfHandler extends BaseDeviceHandler {
         }
 
         String hasReelPosColor = "off";
-        hasReelPosColor = ORDER_COLOR.FORESTGREEN.name().toLowerCase();
+        //hasReelPosColor = ORDER_COLOR.FORESTGREEN.name().toLowerCase();
 //        if(lightPosCidList.contains(cid)){
 //            hasReelPosColor = ORDER_COLOR.LIGHTBLUE.name();
 //        }

src/main/java/com/neotel/smfcore/custom/hella/handler/HellaApiHandler.java

 package com.neotel.smfcore.custom.hella.handler;
 
+import com.neotel.smfcore.common.bean.ResultBean;
 import com.neotel.smfcore.common.exception.ValidateException;
 import com.neotel.smfcore.core.api.listener.BaseSmfApiListener;
 import com.neotel.smfcore.core.barcode.service.po.Barcode;
@@ -19,10 +20,11 @@ public class HellaApiHandler extends BaseSmfApiListener {
         if (!HellaTcpClient.isEnable()) {
             return null;
         }
-        hellaServiceHandler.checkMaterial(param);
-        Barcode barcode = new Barcode();
-        barcode.setFullCode(param.getCode());
-        return barcode;
+        ResultBean resultBean = hellaServiceHandler.checkMaterial(param);
+        if(!resultBean.isOkResult()){
+            throw new ValidateException(resultBean.getMsgKey(),resultBean.getMsg(), resultBean.getParams());
+        }
+        return null;
     }
 
     @Override

src/main/java/com/neotel/smfcore/custom/hella/handler/HellaServiceHandler.java

@@ -139,16 +139,17 @@ public class HellaServiceHandler extends BaseSmfApiListener implements IoHandler
 
         log.info("发送检查物料条码请求:" + command.toReqMsg());
         ResultBean resultBean = HellaTcpClient.sendMsg(command.toReqMsg());
-//        ResultBean resultBean = testCheckOK(command);
         resultBean.setMsg("Check Material result:"+resultBean.getMsg());
-        waitCheckMaterialResult(command);
+        if(resultBean.isOkResult()){
+            resultBean = waitCheckMaterialResult(command);
+        }
         return resultBean;
     }
 
     /**
      * 等待指令请求返回超时
      */
-    public void waitCheckMaterialResult(HellaReqCommand reqCommand){
+    public ResultBean waitCheckMaterialResult(HellaReqCommand reqCommand){
         try{
             long sleepTime = 10;
             long waitTime = 0;
@@ -164,11 +165,14 @@ public class HellaServiceHandler extends BaseSmfApiListener implements IoHandler
             }
             if(timeOut){
                 ResultBean ngResult = ResultBean.newErrorResult(408,"smfcore.checkMaterial.timeOut","checkMaterial timeout,event Id:{0}",new String[]{reqCommand.getEventId()} );
-                WebSocketServer.sendMsg(new SocketMsg(Lists.newArrayList(reqCommand.getLoginUser()),ngResult.getMsg(), MsgType.ERROR,ngResult.getMsgKey(),ngResult.getParams()));
+                //WebSocketServer.sendMsg(new SocketMsg(Lists.newArrayList(reqCommand.getLoginUser()),ngResult.getMsg(), MsgType.ERROR,ngResult.getMsgKey(),ngResult.getParams()));
+                return ngResult;
             }
         }catch (Exception e){
             log.error("waitCheckMaterialResult Error",e);
+            return ResultBean.newErrorResult(500, "smfcore.checkMaterial.error","Check Material Error:" + e.getMessage());
         }
+        return ResultBean.newOkResult("");
     }
 
 

src/main/resources/log4j2-spring.xml

@@ -6,10 +6,10 @@
     </Properties>
     <appenders>
         <Console name="Console" target="SYSTEM_OUT">
-            <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss} %-5level [%file:%line] - %msg%n"/>
+            <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level [%file:%line] - %msg%n"/>
         </Console>
         <RollingFile name="log" fileName="${LOG_HOME}/${LOG_NAME}" filePattern="${LOG_HOME}/%d{yyyy-MM-dd}.${LOG_NAME}" append="true">
-            <PatternLayout charset="GB18030" pattern="%d{yyyy-MM-dd HH:mm:ss} %-5level [%file:%line] - %msg%n" />
+            <PatternLayout charset="GB18030" pattern="%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level [%file:%line] - %msg%n" />
             <Policies>
                 <TimeBasedTriggeringPolicy modulate="true" interval="1" />
             </Policies>