Compare commits

..

No commits in common. '3cf128adad6e614c62ed4ad8a26bb5ba2d65013e' and '09e1aa7025d212a2a13723da728350f3996de515' have entirely different histories.

@ -469,8 +469,8 @@ public class PlcService {
kuKouService.save(kuKou);
return true;
}
public Integer checkVision(KsecDataInfo dataInfo,Boolean flag){
int i = 2;
public boolean checkVision(KsecDataInfo dataInfo,Boolean flag){
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 i;
return true;
}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 i;
return false;
}
} 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 i;
return false;
}
}

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

Loading…
Cancel
Save