#

pang.jiabao

2024-09-18 daab1a328f30acd8c906568a5c532252c1e974ed

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

@@ -198,15 +198,15 @@
                        continue;
                    }
                    // 判断重复工作档
                    WrkMast wrkMast = wrkMastMapper.selectPakInStep1(inSta.getStaNo(), barcode);
                    if (wrkMast != null) {
                        News.error(methodName + ":工作档中已存在该站状态为（ 2.设备上走 ）的数据,工作号={}", wrkMast.getWrkNo());
                        if (ledThread != null) {
                            News.error(methodName + ":扫码失败，请重试");
                            MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, "工作档中已存在该站状态为（ 2.设备上走 ）的数据,工作号={" + wrkMast.getWrkNo() + "}, 请手动取消已存在工作档"));
                        }
                        continue;
                    }
//                    WrkMast wrkMast = wrkMastMapper.selectPakInStep1(inSta.getStaNo(), barcode);
//                    if (wrkMast != null) {
//                        News.error(methodName + ":工作档中已存在该站状态为（ 2.设备上走 ）的数据,工作号={}", wrkMast.getWrkNo());
//                        if (ledThread != null) {
//                            News.error(methodName + ":扫码失败，请重试");
//                            MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, "工作档中已存在该站状态为（ 2.设备上走 ）的数据,工作号={" + wrkMast.getWrkNo() + "}, 请手动取消已存在工作档"));
//                        }
//                        continue;
//                    }
                    WrkMast checkPick = wrkMastService.selectOne(new EntityWrapper<WrkMast>()
                            .eq("barcode", barcode)
                            .in("io_type", 107,103,57));