diff --git a/web/src/main/java/com/zhehekeji/web/service/PlcService.java b/web/src/main/java/com/zhehekeji/web/service/PlcService.java index 9f1dd12..14b3396 100644 --- a/web/src/main/java/com/zhehekeji/web/service/PlcService.java +++ b/web/src/main/java/com/zhehekeji/web/service/PlcService.java @@ -580,7 +580,6 @@ public class PlcService { } } - String path = PathUtil.createFileNameByRowColumn("jpg",cameraId,plcCmdInfo.getRow1(),plcCmdInfo.getColumn1()); cameraCapture(cameraId,false,null,path); //托盘码 @@ -588,10 +587,9 @@ public class PlcService { Boolean trayCheck = Boolean.TRUE; //如果是用扫码枪 扫 托盘码,就直接扫 //if(configProperties.getScanCodeMode().getTray() == 2){ - SensorGun sensorGun = sensorService.getSensorByPlc(street.getId(),plcCmdInfo.getLeftRight1()); if(plcCmdInfo.getSeparation1() == 1 && configProperties.getScanCodeMode().getTray() == 2){ //托盘使用sick扫码枪 - + SensorGun sensorGun = sensorService.getSensorByPlc(street.getId(),plcCmdInfo.getLeftRight1()); if(sensorGun == null){ trayCode = "识别异常"; trayCheck = Boolean.FALSE; diff --git a/web/src/main/java/com/zhehekeji/web/service/ksec/KsecDecoder.java b/web/src/main/java/com/zhehekeji/web/service/ksec/KsecDecoder.java index 5794ac0..7e7f299 100644 --- a/web/src/main/java/com/zhehekeji/web/service/ksec/KsecDecoder.java +++ b/web/src/main/java/com/zhehekeji/web/service/ksec/KsecDecoder.java @@ -201,7 +201,7 @@ public class KsecDecoder extends DelimiterBasedFrameDecoder { // ctx.channel().writeAndFlush(ksecInfo); //rfid的逻辑 String code = dataInfo.getCmdName(); - + log.info("盘点指令:{}", ksecInfo); plcService.check(plcCmdInfo,ksecInfo.getType(),dataInfo.getCode(),dataInfo.getTrayCode()); /* if("E1".equals(code)){ @@ -209,7 +209,8 @@ public class KsecDecoder extends DelimiterBasedFrameDecoder { }else { plcService.RFIDStop(plcCmdInfo); }*/ - + ctx.channel().writeAndFlush(ksecInfo); + log.info("盘点完成"); } //找到该货位的最后一张照片与现在的照片比照 //plcService.recordStock(plcCmdInfo, dataInfo.getCode(), 0, 0); @@ -218,3 +219,4 @@ public class KsecDecoder extends DelimiterBasedFrameDecoder { } } } +