#

1

3 天以前 7c264be282c33feedbd4478f7e674ebac8fd55db

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

@@ -285,6 +285,9 @@
                            staProtocolNew.setSiteId(staProtocol.getSiteId());
                            devpThread.setPakMk(staProtocol.getSiteId(), false);
                            staProtocolNew.setBarcode(barcode);
                            if(!staProtocolNew.isLoading()){
                                continue;
                            }
                            MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocolNew));
                            if (ledThread != null) {
                                News.error(methodName + ":扫码失败，请重试");
@@ -1098,14 +1101,17 @@
                    }
                }
            }
            if(staProtocolIn.getWorkNo() != null && staProtocolIn.getStaNo() != 4001){
            WrkMast wrkMastIn= wrkMastMapper.selectByWrkNo(staProtocolIn.getWorkNo());
            if(wrkMastIn == null){
                continue;
            }
            if(staProtocolIn.getWorkNo() != null && wrkMastIn.getStaNo() != 4001){
                WrkMast wrkMastCrn = wrkMastMapper.selectByWrkNo(staProtocolIn.getWorkNo());
                if(wrkMastCrn!=null){
                    if(wrkMastCrn.getCrnNo() == 3 ){
                        continue;
                    }
                }
                WrkMast wrkMastIn = wrkMastMapper.selectByWrkNo(staProtocolIn.getWorkNo());
                WrkMast wrkMast = wrkMastMapper.selectByWrkNo(9996);
                if(wrkMastIn == null){
                    continue;
@@ -5122,7 +5128,10 @@
                    int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet",barcode));
                    int countwait = waitPakinMapper.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet",barcode));
                    if (countLoc > 0 || countWrk > 0 || countwait > 0) {
                        armTaskAssignmentCallApiLogSave(staProtocol, "条码数据已存在", staProtocol.getSiteId()+"码垛位置，组托档/工作档/库存条码数据已存在===>>" + barcode, true);
                        log.info("条码数据已存在, staProtocol={}, siteInfo={}, barcode={}",
                                staProtocol,
                                staProtocol.getSiteId() + "码垛位置，组托档/工作档/库存条码数据已存在===>>",
                                barcode);
                        continue;
                    }

@@ -5601,7 +5610,7 @@
                    }

                    // 判断重复工作档
                    List<BasAgvMast> basAgvMastList = basAgvMastService.selectList(new EntityWrapper<BasAgvMast>().eq("task_no", staProtocol.getWorkNo()));
                    List<BasAgvMast> basAgvMastList = basAgvMastService.selectList(new EntityWrapper<BasAgvMast>().eq("task_no", wrkMast.getWrkNo()));
                    if (!basAgvMastList.isEmpty()) {
                        wrkMast.setTakeNone("2");
                        wrkMastMapper.updateById(wrkMast);
@@ -5729,7 +5738,7 @@
                    }
                    List<LocMast> locMastList = locMastService.selectList(new EntityWrapper<LocMast>().eq("barcode", barcode));
                    if (!locMastList.isEmpty()) {
//                        News.info("{}号站点条码信息重复：{}", outStaAgv.getStaNo(), barcode);
                        News.info("{}号站点条码信息重复：{}", outStaAgv.getStaNo(), barcode);
                        continue;
                    }
                    // 任务生成区 --------------------------------------------------------------------------