| | |
| | | && staProtocol.isPakMk()){ |
| | | |
| | | // 获取条码扫描仪信息 |
| | | // BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, pickSta.getBarcode()); |
| | | // if (barcodeThread == null) { |
| | | // continue; |
| | | // } |
| | | BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, pickSta.getBarcode()); |
| | | if (barcodeThread == null) { |
| | | continue; |
| | | } |
| | | String barcode = barcodeThread.getBarcode(); |
| | | |
| | | WrkMast wrkMast = null; |
| | | if (staProtocol.getWorkNo() > 0 && staProtocol.getWorkNo() < 9999) { |
| | | wrkMast = wrkMastMapper.selectPickStep(staProtocol.getWorkNo()); |
| | | if (null == wrkMast) { |
| | | continue; |
| | | } |
| | | } else { |
| | | wrkMast = wrkMastMapper.selectPickStepByBarcode(barcode); |
| | | if (null != wrkMast) { |
| | | continue; |
| | | } |
| | | // if (staProtocol.getWorkNo() == 9996) { |