camera_merge
qiushui 4 years ago
parent f0ea64a0f4
commit ff2fa9d01f

@ -341,11 +341,8 @@ public class PlcService {
if(street == null){ if(street == null){
return; return;
} }
//拍照,转动 需要知道是哪个货架
//1 判断是左右货架 1:左货架 2右货架
//判断左右 行列号 //判断左右 行列号
Integer leftRight = plcOrderInfo.getLeftRight2(); Integer leftRight = plcOrderInfo.getLeftRight2();
String shelveId; String shelveId;
if(leftRight == 1){ if(leftRight == 1){
shelveId = street.getLeftShelveId(); shelveId = street.getLeftShelveId();
@ -353,18 +350,14 @@ public class PlcService {
shelveId = street.getRightShelveId(); shelveId = street.getRightShelveId();
} }
Stock stock = stockMapper.getByShelveIdAndRowColumn(shelveId,plcOrderInfo.getRow2(),plcOrderInfo.getColumn2()); Stock stock = stockMapper.getByShelveIdAndRowColumn(shelveId,plcOrderInfo.getRow2(),plcOrderInfo.getColumn2());
if(stock != null) if(stock != null) {
{
stock.setCategory(barCodeSys); stock.setCategory(barCodeSys);
stock.setCount(boxNumSys); stock.setCount(boxNumSys);
if(boxNumSys == boxNumAlgo) if(boxNumSys == boxNumAlgo) {
{
stock.setStatus(StockStatus.SUCCESS.getStatus()); stock.setStatus(StockStatus.SUCCESS.getStatus());
log.info("核对正确"); log.info("核对正确");
stockMapper.updateById(stock); stockMapper.updateById(stock);
} }else {
else
{
log.info("核对失败"); log.info("核对失败");
stock.setStatus(StockStatus.ERROR.getStatus()); stock.setStatus(StockStatus.ERROR.getStatus());
stockMapper.updateById(stock); stockMapper.updateById(stock);

Loading…
Cancel
Save