Merge branch '泸州-视觉+扫码-昆船' of https://gitlab.hzleaper.com:81/duoji/backend-duoji-monitor into 泸州-视觉+扫码-昆船

web/src/main/java/com/zhehekeji/web/service/PlcService.java

@@ -469,8 +469,8 @@ public class PlcService {
         kuKouService.save(kuKou);
         return true;
     }
-    public boolean checkVision(KsecDataInfo dataInfo,Boolean flag){
+    public Integer checkVision(KsecDataInfo dataInfo,Boolean flag){
-
+        int i = 2;
         IndustrialCameraVO scTransmission = new IndustrialCameraVO();
         scTransmission.setTypeMacth(dataInfo.getTypeNum());
         scTransmission.setCount(dataInfo.getQuantity());
@@ -503,7 +503,7 @@ public class PlcService {
                 scTransmission.setTypeMacth(response.getBody().getData().getCategoryName());
                 scTransmission.setFlag(response.getBody().getData().getFlag());
                 kuKouService.setHttp(scTransmission,flag);
-                return true;
+                return i;
             }else {
 
                 scTransmission.setWmsTrayCode(dataInfo.getTrayCode());
@@ -515,7 +515,7 @@ public class PlcService {
                 scTransmission.setCount(0);
                 scTransmission.setFlag(response.getBody().getData().getFlag());
                 kuKouService.setHttp(scTransmission,flag);
-                return false;
+                return i;
             }
         } catch (Exception e) {
             log.error("3D get pcd error", e);
@@ -525,7 +525,7 @@ public class PlcService {
             scTransmission.setTrayCode("");
             scTransmission.setCount(0);
             kuKouService.setHttp(scTransmission,flag);
-            return false;
+            return i;
         }
     }
 

web/src/main/java/com/zhehekeji/web/service/ksec/KsecDecoder.java

@@ -222,10 +222,10 @@ public class KsecDecoder extends DelimiterBasedFrameDecoder {
                     log.info("盘点结束："+ksecInfo.getData().toString());
 
                 }else if (Cmd.SC.name().equals(ksecInfo.getType())) {
-                   boolean flag =  plcService.checkVision(dataInfo,true);
+                   int flag =  plcService.checkVision(dataInfo,true);
 
                     ksecInfo.getData().setCmdName("SC02");
-                    ksecInfo.getData().setCheckRlt(flag?1:0);
+                    ksecInfo.getData().setCheckRlt(flag);
                     try {
                         Thread.sleep(2000);
                     } catch (InterruptedException e) {