#

tqs

2024-05-17 6dc8121c05bec103386cd85df1b1f7603ec52788

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

@@ -437,6 +437,10 @@
                }
                String barcode = barcodeThread.getBarcode();

                WrkMast wrkMast1 = wrkMastMapper.selectPickStep1(staProtocol.getWorkNo().intValue());

                //任务号如果在工作档中存在，就不用去判断条码
                if(Cools.isEmpty(wrkMast1)) {
                if (!Cools.isEmpty(barcode)) {
//                    log.info("{}号条码扫描器检测条码信息：{}", pickSta.getBarcode(), barcode);
                    if ("NG".endsWith(barcode) || "NoRead".equals(barcode) && staProtocol.isPakMk() ) {
@@ -449,6 +453,7 @@
                        if(staProtocol.getWorkNo() != 0) {
                            continue;
                        }

                        staProtocol.setWorkNo(wrkNo);
                        wrkNo++;
                        staProtocol.setStaNo(pickSta.getBackSta().shortValue());
@@ -465,6 +470,7 @@
                } else {
                    continue;
                }
                }


//                // 入出库模式判断
@@ -477,7 +483,12 @@
//                        && (staProtocol.getWorkNo() == 9999 || staProtocol.getWorkNo() == 9997 || staProtocol.getWorkNo() == 9995)
                        && staProtocol.isPakMk()) {

                    WrkMast wrkMast = wrkMastMapper.selectPickStep(barcode);
                    WrkMast wrkMast = null;
                    //优先查询任务号对应的工作档有没有，如果有的话就不用查条码号
                    wrkMast = wrkMastMapper.selectPickStep1(staProtocol.getWorkNo().intValue());
                    if(Cools.isEmpty(wrkMast)) {
                        wrkMast = wrkMastMapper.selectPickStep(barcode);
                    }
//                    WrkMast wrkMast = wrkMastMapper.selectPakInStep3(staProtocol.getWorkNo().intValue());
                    if (wrkMast == null) {
                        // 无拣料数据