1

zhang

2025-08-02 8687f74a7e45949d6fc451e151a00b18f9dd0ca7

 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() == 53 || wrkMast1.getIoType()==107 || wrkMast1.getIoType()==104){
                        if (wrkMast1.getIoType()==103 || wrkMast1.getIoType() == 53 || wrkMast1.getIoType()==107 || wrkMast1.getIoType()== 57 || wrkMast1.getIoType()==104){
                            continue;
                        }
                    }
@@ -445,6 +445,8 @@
                            stnNo =204;
                        }else if(wrkMast.getCrnNo() == 3) {
                            stnNo = 304;
                        }else if(wrkMast.getCrnNo() == 4) {
                            stnNo = 311;
                        }
                    } else if(wrkMast.getIoType() == 107){ //盘点出库
                        if(wrkMast.getCrnNo() == 1) {
@@ -453,6 +455,8 @@
                            stnNo =201;
                        }else if(wrkMast.getCrnNo() == 3) {
                            stnNo = 301;
                        }else if(wrkMast.getCrnNo() == 4) {
                            stnNo = 314;
                        }
                    }
                    if (stnNo == 0) {
@@ -1558,7 +1562,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);