#

Junjie

2023-11-09 c1eda835c6b10edb23b810da1fd6fb71aa5e5e6b

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

@@ -108,11 +108,11 @@
                String barcode = barcodeThread.getBarcode();

                ////判断101和104是否是拣料、并板、盘点再入库
                //WrkMast wrkMast1=wrkMastMapper.selectpj(inSta.getStaNo(),barcode);
                //if((inSta.getStaNo().equals(101) || inSta.getStaNo().equals(104)) &&!Cools.isEmpty(barcode)&&!Cools.isEmpty(wrkMast1)){
                //    log.error("101或104拣料、并板、盘点再入库", wrkMast1.getWrkNo());
                //    continue;
                //}
                WrkMast wrkMast1=wrkMastMapper.selectpj(inSta.getStaNo(),barcode);
                if((inSta.getStaNo().equals(101) || inSta.getStaNo().equals(104)) &&!Cools.isEmpty(barcode)&&!Cools.isEmpty(wrkMast1)){
                    log.error("101或104拣料、并板、盘点再入库", wrkMast1.getWrkNo());
                    continue;
                }

                if (!Cools.isEmpty(barcode)) {
                    log.info("{}号条码扫描器检测条码信息：{}", inSta.getBarcode(), barcode);
@@ -181,7 +181,7 @@
                            continue;
                        }
                    }
                    // 获取入库通知档
//                     获取入库通知档
//                    List<WaitPakin> waitPakins = waitPakinMapper.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", barcode).eq("io_status", "N"));
//                    if (waitPakins.isEmpty()) {
//                        log.error("无此入库条码数据。条码号={}", barcode);