upright
/
backend-duoji-monitor
mirror of https://gitlab.hzleaper.com:81/duoji/backend-duoji-monitor.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

采用rfid和扫码枪一起扫

Browse Source
changchun-医药
LAPTOP-S9HJSOEB\昊天 2 years ago
parent 404655c7c6
commit 1335eed45a
2 changed files with 74 additions and 102 deletions
Show Stats Download Patch File Download Diff File

65
web/src/main/java/com/zhehekeji/web/service/PlcService.java
Unescape Escape View File

@ -400,6 +400,7 @@ public class PlcService {
log.error("ptz not found ,code：{},cameraId:{}", code, cameraId);
}
}
public void gyrateCameraByCode(Integer cameraId, String code, String taskId) {
Integer ptzId = cameraService.getPtzIdByCodeAndCameraId(code, cameraId);
if (ptzId != null && ptzId >= 0) {
@ -601,6 +602,7 @@ public class PlcService {
}
}
}
public Integer getCameraByPlcCmdE(PlcCmdInfo plcCmdInfo, Integer leftRight) {
Street street = streetService.getStreetByPlcId(plcCmdInfo.getPlcId());
Integer type;
@ -611,6 +613,7 @@ public class PlcService {
return street.getCamera2Id();
}
}
@Resource
private LightSourceMapper lightSourceMapper;
@ -665,11 +668,10 @@ public class PlcService {
//如果是用扫码枪 扫 托盘码,就直接扫
//if(configProperties.getScanCodeMode().getTray() == 2){
log.info("扫码类型：" + configProperties.getScanCodeMode().getTray());
if (plcCmdInfo.getSeparation1() == 1 && configProperties.getScanCodeMode().getTray() == 2) {
//托盘使用sick扫码枪
SensorGun sensorGun = sensorService.getSensorByPlc(street.getId(), plcCmdInfo.getLeftRight1());
if (sensorGun == null) {
trayCode = "识别异常";
trayCode = "扫码枪识别异常";
trayCheck = Boolean.FALSE;
log.error("no sensor gun config in database ,street id:{},direction:{}", street.getId(), plcCmdInfo.getLeftRight1());
} else {
@ -682,28 +684,26 @@ public class PlcService {
trayCode = "";
trayCheck = Boolean.TRUE;
} else {
trayCode = "识别异常";
trayCode = "扫码枪识别异常";
trayCheck = Boolean.FALSE;
log.warn("sick ocr error:{}", trayCode);
}
} else {
if (StringUtils.isEmpty(trayCode) || trayCode.equals("NoRead")) {
trayCode = "识别异常";
trayCode = "扫码枪识别异常";
trayCheck = Boolean.FALSE;
log.warn("sick ocr error:{}", trayCode);
} else {
trayCheck = wmsTrayCode.equals(trayCode);
}
}
}
} else if (configProperties.getScanCodeMode().getTray() == 3 ) {
// //RFID
// RFID
// RFID rfid = rfidService.getRFIDByPlc(street.getId(),plcCmdInfo.getLeftRight1());
trayCode = "识别异常";
trayCheck = Boolean.FALSE;
Boolean trayRFIDCheck = Boolean.FALSE;
Set<String> tags = new HashSet<>();
try {
RFIDCheck(plcCmdInfo, true);
@ -719,12 +719,13 @@ public class PlcService {
if (tags.containsAll(wmsTrayCodeMapByTask.get(plcCmdInfo.getOrderNum()))) {
trayCode = "盘点正常";
trayCheck = Boolean.TRUE;
trayRFIDCheck = Boolean.TRUE;
} else {
trayCode = "盘点失败";
trayCheck = Boolean.FALSE;
if(trayCheck){
trayCode = "RFID扫描失败";
}else
trayCode += ";RFID扫描失败";
trayRFIDCheck = Boolean.FALSE;
}
wmsTrayCodeMapByTask.remove(plcCmdInfo.getOrderNum());
RFID rfid = rfidMapper.selectOne(new QueryWrapper<RFID>().eq("street_id", street.getId()));
@ -734,45 +735,17 @@ public class PlcService {
rfidLiveService.rfidSave(plcCmdInfo, String.join(",", tags), street, rfid);
}
}
OrderInfo orderInfo = new OrderInfo(street, plcCmdInfo, 1, cmdCode);
Stock stock = stockMapper.getByStreetAndDirectionAndSideAndRowColumn(orderInfo.getStreetId(), plcCmdInfo.getFromDirection(), orderInfo.getSeparation(), orderInfo.getRow(), orderInfo.getColumn());
String scanCode = null;
Boolean codeCheck = Boolean.TRUE;
Boolean trayCodeCheck = Boolean.TRUE;
//货物使用球机扫码
if (configProperties.getScanCodeMode().getTray() == 2 && plcCmdInfo.getSeparation1() == 2) {
//托盘使用球机扫码
if ("".equals(wmsTrayCode)) {
//空货物的处理
//如果系统货物为空，则只要扫码识别未出结果，就认为无货物
trayCode = BarcodeDetector.detectBestCodeUntilOK(configProperties.getSavePath().getMediaPath() + path, configProperties.getScanCodeMode().getTrayCodeTypes());
log.info("tray code:{},sys trayCode:{}", trayCode, wmsTrayCode);
if (StringUtils.isEmpty(trayCode) || trayCode.equals("Unrecognized")) {
trayCheck = Boolean.TRUE;
trayCode = "";
} else {
trayCheck = wmsTrayCode.equals(trayCode);
}
} else {
trayCode = BarcodeDetector.detectBestCodeUntilOK(configProperties.getSavePath().getMediaPath() + path, configProperties.getScanCodeMode().getTrayCodeTypes());
if (StringUtils.isEmpty(trayCode)) {
log.error("row:{},cloumn:{}", plcCmdInfo.getRow1(), plcCmdInfo.getColumn1());
log.error("detectBestBarCode:{}", trayCode);
trayCode = "识别异常";
trayCheck = Boolean.FALSE;
} else {
trayCheck = wmsTrayCode.equals(trayCode);
}
}
//货物使用球机扫码
}
log.info("code:{}", scanCode);
//核对异常
Integer status = 1;
//托盘和货物都正确
if (trayCheck && codeCheck) {
if (trayCheck && trayRFIDCheck ) {
status = 2;
}
if (stock == null) {
@ -826,7 +799,6 @@ public class PlcService {
}
public void checkLog(Stock stock) {
CheckLog checkLog = new CheckLog();
checkLog.setCheckNum(stock.getCheckNum());
@ -852,6 +824,7 @@ public class PlcService {
/**
* 根据信息开启rfid链接
*
* @param plcCmdInfo 相关信息
* @param fromOrTo 确定方向
*/

1
web/src/main/java/com/zhehekeji/web/service/impl/RfidLiveServiceImpl.java
Unescape Escape View File

@ -71,7 +71,6 @@ public class RfidLiveServiceImpl extends ServiceImpl<RfidLiveMapper, RfidLive> i
public void rfidRemoveLive(PlcCmdInfo plcCmdInfo, Street street, RFID rfid) {
RfidLog rfidLog = new RfidLog();
remove(new QueryWrapper<RfidLive>()
.eq("street_Id", street.getId())
.eq("direction", plcCmdInfo.getFromDirection())

Write Preview
Loading…
Cancel
Save