pang.jiabao
2024-09-23 e21af5e638d3a13129be1d4762a1f3900b237515
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -205,7 +205,7 @@
                    //过滤判断,防止拣料再入库货物,经过入库站再入库时,被退回到退库站
                    WrkMast wrkMast1 = wrkMastMapper.selectPakInStepBarcode(barcode);
                    if (wrkMast1 !=null){
                        if (wrkMast1.getIoType()==103 || wrkMast1.getIoType()==107 || wrkMast1.getIoType()==104){
                        if (wrkMast1.getIoType()==103 || wrkMast1.getIoType() == 53 || wrkMast1.getIoType()==107 || wrkMast1.getIoType()==104){
                            continue;
                        }
                    }
@@ -1558,7 +1558,13 @@
                        && staProtocol.isLoading()
                ) {
                    News.warnNoLog(""+mark+" - 0"+" - 开始执行:空栈板初始化入库,叉车入库站放货");
                    // 判断上一个空托入库写入后,线程还读取到,造成重复请求
                    List<WrkMast> wrkMastList = wrkMastMapper.selectList(new EntityWrapper<WrkMast>().eq("wrk_sts",2)
                            .eq("io_type",10).eq("source_sta_no",emptyInSta.getStaNo()));
                    if(!wrkMastList.isEmpty()) {
                        log.warn("查询到一个在设备上走任务:{}",wrkMastList.get(0).getWrkNo());
                        continue;
                    }
                    try {
                        LocTypeDto locTypeDto = new LocTypeDto(staProtocol);
@@ -1585,7 +1591,6 @@
                                News.errorNoLog(""+mark+" - 1"+" - 更新plc站点信息失败");
                                throw new CoolException("更新plc站点信息失败");
                            }
                            if (ledThread != null) {
                                // 命令集合
                                List<LedCommand> commands = new ArrayList<>();
@@ -1610,7 +1615,7 @@
                                }
//                                ledThread.errorReset();
                            }
                            Thread.sleep(500);
                            Thread.sleep(1000);
                        } else {
                            staProtocol.setWorkNo((short)9991);
                            staProtocol.setStaNo(emptyInSta.getBackSta().shortValue());