diff --git a/libs/code_scan/TestJNI-bak.dll b/libs/code_scan/TestJNI-bak.dll new file mode 100644 index 0000000..ab9e6a6 Binary files /dev/null and b/libs/code_scan/TestJNI-bak.dll differ diff --git a/libs/code_scan/TestJNI.dll b/libs/code_scan/TestJNI.dll index ab9e6a6..659a180 100644 Binary files a/libs/code_scan/TestJNI.dll and b/libs/code_scan/TestJNI.dll differ 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 f7ac0aa..28624f9 100644 --- a/web/src/main/java/com/zhehekeji/web/service/PlcService.java +++ b/web/src/main/java/com/zhehekeji/web/service/PlcService.java @@ -437,7 +437,24 @@ public class PlcService { } } + public void kescTest6(PlcCmdInfo plcCmdInfo,String code,String wmsCode){ + long startTime = System.currentTimeMillis(); + log.info("test startTime",startTime); + check(plcCmdInfo,"C2-L",wmsCode); + plcCmdInfo.setColumn1(plcCmdInfo.getColumn1()+1); + check(plcCmdInfo,"C3-L",wmsCode); + plcCmdInfo.setColumn1(plcCmdInfo.getColumn1()+1); + check(plcCmdInfo,"C4-L",wmsCode); + plcCmdInfo.setColumn1(plcCmdInfo.getColumn1()+1); + check(plcCmdInfo,"C5",wmsCode); + plcCmdInfo.setColumn1(plcCmdInfo.getColumn1()+1); + check(plcCmdInfo,"E1",wmsCode); + long endTime = System.currentTimeMillis(); + log.info("test endTime,time:{}millisecond",endTime,(endTime - startTime)); + } + public void check(PlcCmdInfo plcCmdInfo,String cmdCode,String wmsCode){ + long startTime = System.currentTimeMillis(); Street street = streetService.getStreetByPlcId(plcCmdInfo.getPlcId()); Integer cameraId = getCameraByPlcCmd(plcCmdInfo,plcCmdInfo.getLeftRight1()); @@ -452,8 +469,9 @@ public class PlcService { e.printStackTrace(); } String scanCode = barCodeScan.detectBestBarCode(configProperties.getSavePath().getMediaPath()+path); - if(StringUtils.isEmpty(scanCode)){ + if(StringUtils.isEmpty(scanCode) || scanCode.equals("Empty")){ scanCode = "识别异常"; + log.warn("detectBestBarCode:{}",scanCode); } log.info("code:{}",scanCode); //核对正确 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 8cb715c..74e63c7 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 @@ -100,7 +100,12 @@ public class KsecDecoder extends DelimiterBasedFrameDecoder { tcpLogger.info("info:{}",body); //盘点 //转球机到盘点位 然后拍照 - plcService.check(plcCmdInfo,ksecInfo.getData().getCmdName(), dataInfo.getCode()); + + if(ksecInfo.getData().getCmdName().equals("test")){ + plcService.kescTest6(plcCmdInfo,ksecInfo.getData().getCmdName(), dataInfo.getCode()); + }else { + plcService.check(plcCmdInfo,ksecInfo.getData().getCmdName(), dataInfo.getCode()); + } //找到该货位的最后一张照片与现在的照片比照 //plcService.recordStock(plcCmdInfo, dataInfo.getCode(), 0, 0); }