#

Junjie

2023-12-12 3ee0ff0bd24d4df9b795146ece6da43a78bf8bd0

#

 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java

@@ -679,15 +679,6 @@
//                            && (staProtocol.getWorkNo() > 0)
                            && staProtocol.isPakMk()) {

                        WrkMast wrkMast = null;
                        if (pickSta.getStaNo() == 325 || pickSta.getStaNo() == 331 || pickSta.getStaNo() == 333 || pickSta.getStaNo() == 339) {
                            if (staProtocol.getWorkNo() == 0) {
                                continue;
                            }
                            //根据工作号搜索工作档
                            wrkMast = wrkMastMapper.selectByWorkNo(staProtocol.getWorkNo().intValue());
                        }else {
                            //根据托盘码搜索工作档
                            // 获取条码扫描仪信息
                            BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, pickSta.getBarcode());
                            if (barcodeThread == null) {
@@ -700,9 +691,7 @@
                            if ("NG".endsWith(barcode) || "NoRead".equals(barcode) || "empty".equals(barcode)) {
                                continue;
                            }
                            wrkMast = wrkMastMapper.selectByBarcode(barcode);
                        }

                        WrkMast wrkMast = wrkMastMapper.selectByBarcode(barcode);
                        if (wrkMast == null) {//找不到工作档
                            continue;
                        }