|
|
|
@ -459,25 +459,27 @@ public class PlcService {
|
|
|
|
Street street = streetService.getStreetByPlcId(plcCmdInfo.getPlcId());
|
|
|
|
Street street = streetService.getStreetByPlcId(plcCmdInfo.getPlcId());
|
|
|
|
Integer cameraId = getCameraByPlcCmd(plcCmdInfo,plcCmdInfo.getLeftRight1());
|
|
|
|
Integer cameraId = getCameraByPlcCmd(plcCmdInfo,plcCmdInfo.getLeftRight1());
|
|
|
|
gyrateCameraByCode(cameraId, cmdCode);
|
|
|
|
gyrateCameraByCode(cameraId, cmdCode);
|
|
|
|
String path = cameraCapture(cameraId,true,configProperties.getCameraConfig().getDelayCaptureTime());
|
|
|
|
|
|
|
|
OrderInfo orderInfo = new OrderInfo(street,plcCmdInfo,1,cmdCode);
|
|
|
|
|
|
|
|
Stock stock = stockMapper.getByShelveIdAndRowColumn(orderInfo.getShelveId(),orderInfo.getRow(),orderInfo.getColumn());
|
|
|
|
|
|
|
|
log.info("pic path:{}",configProperties.getSavePath().getMediaPath()+path);
|
|
|
|
|
|
|
|
try {
|
|
|
|
try {
|
|
|
|
Thread.sleep(configProperties.getCameraConfig().getDelayScanTime());
|
|
|
|
Thread.sleep(configProperties.getCameraConfig().getDelayCaptureTime());
|
|
|
|
} catch (InterruptedException e) {
|
|
|
|
} catch (InterruptedException e) {
|
|
|
|
e.printStackTrace();
|
|
|
|
e.printStackTrace();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
String path = cameraCapture(cameraId,false,null);
|
|
|
|
|
|
|
|
OrderInfo orderInfo = new OrderInfo(street,plcCmdInfo,1,cmdCode);
|
|
|
|
|
|
|
|
Stock stock = stockMapper.getByShelveIdAndRowColumn(orderInfo.getShelveId(),orderInfo.getRow(),orderInfo.getColumn());
|
|
|
|
|
|
|
|
log.info("pic path:{}",configProperties.getSavePath().getMediaPath()+path);
|
|
|
|
|
|
|
|
|
|
|
|
String scanCode = null;
|
|
|
|
String scanCode = null;
|
|
|
|
String trayCode = null;
|
|
|
|
String trayCode = null;
|
|
|
|
Boolean codeCheck = Boolean.TRUE;
|
|
|
|
Boolean codeCheck = Boolean.TRUE;
|
|
|
|
//货物使用球机扫码
|
|
|
|
//货物使用球机扫码
|
|
|
|
if(configProperties.getScanCodeMode().getGoods() == 1){
|
|
|
|
if(configProperties.getScanCodeMode().getGoods() == 1){
|
|
|
|
scanCode = barCodeScan.detectBestBarCode(configProperties.getSavePath().getMediaPath()+path);
|
|
|
|
scanCode = JNIDemo.detectBestCodeUntilOK(configProperties.getSavePath().getMediaPath()+path);
|
|
|
|
if(StringUtils.isEmpty(scanCode) || scanCode.equals("Empty")){
|
|
|
|
if(StringUtils.isEmpty(scanCode)){
|
|
|
|
|
|
|
|
log.error("row:{},cloumn:{}",plcCmdInfo.getRow1(),plcCmdInfo.getColumn1());
|
|
|
|
|
|
|
|
log.error("detectBestBarCode:{}",scanCode);
|
|
|
|
scanCode = "识别异常";
|
|
|
|
scanCode = "识别异常";
|
|
|
|
codeCheck = Boolean.FALSE;
|
|
|
|
codeCheck = Boolean.FALSE;
|
|
|
|
log.warn("detectBestBarCode:{}",scanCode);
|
|
|
|
|
|
|
|
}else {
|
|
|
|
}else {
|
|
|
|
codeCheck = wmsCode.equals(scanCode);
|
|
|
|
codeCheck = wmsCode.equals(scanCode);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|