#

pang.jiabao

2024-10-12 42bb5e28a6d5bca11cb518da4a423ec95c69f5be

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

@@ -198,15 +198,15 @@
                        continue;
                    }
                    // 判断重复工作档
//                    WrkMast wrkMast = wrkMastMapper.selectPakInStep1(inSta.getStaNo(), barcode);
//                    if (wrkMast != null) {
                    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;
//                    }
                        continue;
                    }
                    WrkMast checkPick = wrkMastService.selectOne(new EntityWrapper<WrkMast>()
                            .eq("barcode", barcode)
                            .in("io_type", 107,103,57));
@@ -1901,7 +1901,7 @@
            if (null == loc) {
                for (Integer row : rows) {
                    if (Utils.isShallowLoc(slaveProperties, row)) {
                        loc = locMastService.queryFreeLocMast(row, shallowLoc.getLocType1());
                        loc = locMastService.queryFreeLocMast(row, shallowLoc.getLocType2());

                        if (null != loc) {//对应深库位非在库状态,不能移库
                            String deepLoc = Utils.getDeepLoc(slaveProperties, loc.getLocNo());
@@ -3127,6 +3127,12 @@
        WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_sts", 1L).eq("io_type", 1)
                .eq("source_sta_no", 305));
        if (wrkMast != null) {
            int count = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("wrk_sts", 2L).eq("io_type", 1)
                    .eq("source_sta_no", 305));
            if (count != 0) {
                log.warn("存在305入库任务，状态为设备上走");
                return;
            }
            SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, 1);
            StaProtocol staProtocol= devpThread.getStation().get(wrkMast.getStaNo());
            if (staProtocol == null) {