| | |
| | | if (staProtocol.isAutoing() |
| | | && staProtocol.isLoading() |
| | | && staProtocol.isInEnable() |
| | | && (staProtocol.getWorkNo() > 0) |
| | | // && (staProtocol.getWorkNo() > 0) |
| | | && staProtocol.isPakMk()){ |
| | | |
| | | WrkMast wrkMast = wrkMastMapper.selectByWorkNo(staProtocol.getWorkNo().intValue()); |
| | | WrkMast wrkMast = null; |
| | | if (staProtocol.getWorkNo() > 0) {//存在工作号,利用工作号搜索任务 |
| | | wrkMast = wrkMastMapper.selectByWorkNo(staProtocol.getWorkNo().intValue()); |
| | | }else { |
| | | //不存在工作号,依靠托盘条码搜索 |
| | | // 获取条码扫描仪信息 |
| | | BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, pickSta.getBarcode()); |
| | | if (barcodeThread == null) { |
| | | continue; |
| | | } |
| | | String barcode = barcodeThread.getBarcode(); |
| | | if(Cools.isEmpty(barcode)) { |
| | | continue; |
| | | } |
| | | if("NG".endsWith(barcode) || "NoRead".equals(barcode) || "empty".equals(barcode)) { |
| | | continue; |
| | | } |
| | | wrkMast = wrkMastMapper.selectPickStepByBarcode(barcode); |
| | | } |
| | | |
| | | if (wrkMast == null) {//找不到工作档 |
| | | continue; |
| | | } |