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 2ec6bc9..2193f05 100644 --- a/web/src/main/java/com/zhehekeji/web/service/PlcService.java +++ b/web/src/main/java/com/zhehekeji/web/service/PlcService.java @@ -593,21 +593,41 @@ public class PlcService { HikControlSocket.openLight(lightSource.getIp(),lightSource.getPort(),configProperties.getLightSource().getIndex(),1); }); Integer cameraId = getCameraByPlcCmd(plcCmdInfo,plcCmdInfo.getLeftRight1()); - log.info("1"); - gyrateCameraByCode(cameraId, cmdCode); + + //重庆亚士创能盘点时先用同侧相机拍摄货物顶部 + Integer leftRightTop = plcCmdInfo.getLeftRight1() == 1 ? 2 : 1; + Integer cameraIdTop = getCameraByPlcCmd(plcCmdInfo, leftRightTop); + String cameraCmdCode = cmdCode; + if(plcCmdInfo.getSeparation1() == 1 && configProperties.getScanCodeMode().getTray() == 2){ + //内测 + cameraCmdCode = cmdCode + "-" + plcCmdInfo.getLeftRightStr(1) + "-IN"; + } + + log.info("1 camera ptz:"+cameraCmdCode); + gyrateCameraByCode(cameraIdTop, cameraCmdCode); try { Thread.sleep(configProperties.getCameraConfig().getDelayCaptureTime()); } catch (InterruptedException e) { e.printStackTrace(); } String path = PathUtil.createFileNameByRowColumn("jpg",cameraId,plcCmdInfo.getRow1(),plcCmdInfo.getColumn1()); - log.info("2"); - cameraCapture(cameraId,false,null,path); + cameraCapture(cameraIdTop,false,null,path); + + //重庆亚士创能盘点时再用对侧球机拍侧面层数 + String cameraCmdCode2 = "E2-" + plcCmdInfo.getLeftRightStr(1) + "-IN"; + log.info("2 camera ptz:"+cameraCmdCode2); + try { + Thread.sleep(1500l); + } catch (InterruptedException e) { + e.printStackTrace(); + } + cameraCapture(cameraId,false,null,path+".jpg"); + //托盘码 String trayCode = null; Boolean trayCheck = Boolean.TRUE; log.info("3"); - //重庆项目 单身,只用扫码枪 + //重庆项目 单伸,只用扫码枪 SensorGun sensorGun = sensorService.getSensorByPlc(street.getId(),plcCmdInfo.getLeftRight1());