捡料

Junjie

2023-07-25 3a641d32f53e378e5cfa1bd4b1ae5590f4883bda

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

@@ -207,11 +207,11 @@
                    }

                    // 判断重复工作档
//                    WrkMast wrkMast = wrkMastMapper.selectPakInStep1(inSta.getStaNo(), barcode);
//                    if (wrkMast != null) {
//                        News.error("工作档中已存在该站状态为（ 2.设备上走 ）的数据,工作号={}", wrkMast.getWrkNo());
//                        continue;
//                    }
                    WrkMast wrkMast2 = wrkMastMapper.selectPakInStep1(inSta.getStaNo(), barcode);
                    if (wrkMast2 != null) {
                        News.error("工作档中已存在该站状态为（ 2.设备上走 ）的数据,工作号={}", wrkMast2.getWrkNo());
                        continue;
                    }

                    try {
                        LocTypeDto locTypeDto = new LocTypeDto(staProtocol);
@@ -399,8 +399,7 @@
                }
                if (staProtocol.isAutoing()
                        && staProtocol.isLoading()
                        // 0 - 9990 或者 9996
                        && (staProtocol.getWorkNo() > 0 && staProtocol.getWorkNo() < 9990)
                        && (staProtocol.getWorkNo() > 0 && staProtocol.getWorkNo() < 9999)
                        && staProtocol.getStaNo().equals(staProtocol.getSiteId().shortValue())
                        && staProtocol.isPakMk()){

@@ -411,7 +410,7 @@
//                    }

                    WrkMast wrkMast = null;
                    if (staProtocol.getWorkNo() > 0 && staProtocol.getWorkNo() < 9990) {
                    if (staProtocol.getWorkNo() > 0 && staProtocol.getWorkNo() < 9999) {
                        wrkMast = wrkMastMapper.selectPickStep(staProtocol.getWorkNo());
                        if (null == wrkMast) {
                            continue;