#

yxFwq

2025-02-11 2bf9814dc4e809987c6b700c4f0b191ef6765d6c

#

 src/main/java/com/zy/asrs/mapper/LocMastMapper.java

@@ -18,7 +18,7 @@
        "order by case row1 when 1 then 1 when 2 then 0 when 3 then 0 when 4 then 1 " +
        "when 5 then 1 when 6 then 0 when 7 then 0 when 8 then 1 when 9 then 1 when 10 then 0 " +
        "when 11 then 0 when 12 then 1 when 13 then 1 when 14 then 0 when 15 then 0 when 16 then 1 " +
            "when 17 then 1 when 18 then 0 when 19 then 0 when 20 then 1 when 21 then 1 when 22 then 0" +
            "when 17 then 1 when 18 then 0 when 19 then 0 when 20 then 1 when 21 then 1 when 22 then 0 " +
            "when 23 then 0 when 24 then 1 when 25 then 1 when 26 then 0 when 27 then 1 end desc,newid()")
    List<Integer> queryDistinctRow(@Param("crnNo")Integer crnNo);


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

@@ -2882,7 +2882,13 @@
                            wrkMast.setUpdMk("Y");
                            wrkMastMapper.updateById(wrkMast);
                            // 生成工作档,将浅库位移转到新的库位中
                            moveLocForDeepLoc(slave, shallowLoc);
                            try{
                                moveLocForDeepLoc(slave, shallowLoc);
                            } catch (Exception e){
                                log.error("{}任务出库失败，浅库位堵塞！异常", wrkMast.getWrkNo(), e);
                                log.error("{}任务出库失败，浅库位堵塞！浅库位号:{}", wrkMast.getWrkNo(), shallowLocNo);
                                continue;
                            }
                        }
                        log.error("{}任务出库失败，浅库位堵塞！浅库位号:{}", wrkMast.getWrkNo(), shallowLocNo);
                        continue;
@@ -5172,7 +5178,7 @@
                                break;
                            }
                            if (count>0){
                                if (jarOtherProtocol.getJarTemperature()<jarTemperature){
                                if (jarOtherProtocol.getJarTemperature()<jarTemperature && jarOtherProtocol.modeType == JarModeType.AUTO){
                                    break;
                                }
                            }
@@ -5183,7 +5189,7 @@
//                                    if (jarOtherProtocol == null) {
//                                        break;
//                                    }
                                    if (jarOtherProtocol.getJarTemperature()>jarTemperature){
                                    if (jarOtherProtocol.getJarTemperature()>jarTemperature || jarOtherProtocol.modeType != JarModeType.AUTO){
                                        log.info("{}号硫化罐查询设备温度过高，等待降温....先执行入罐任务！！！",jarOtherProtocol.getJarNo());
                                    } else {
                                        if (basJarMastService.getJarMastByJarIdCount(jarSlave.getId())>0){
@@ -8913,6 +8919,9 @@
    public synchronized void stackingCompletionDriveTray2() {
        SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, 2);
        StaProtocol staProtocol = devpThread.getStation().get(518);
        if (Cools.isEmpty(staProtocol)) {
            return;
        }
        String barcode = staProtocol.getBarcode();
        if (!Cools.isEmpty(barcode)) {
            if ("NG".endsWith(barcode) || "NoRead".equals(barcode) || "00000000".equals(barcode) || !CodeDetectionUtil.barcodeDetection(barcode)) {