#

Junjie

11 小时以前 a19b1025890eb0f71b44a9d1bb948cb084d4106a

#

 src/main/java/com/zy/asrs/utils/Utils.java

@@ -13,10 +13,12 @@
import com.zy.asrs.service.BasCrnpService;
import com.zy.asrs.service.WrkMastService;
import com.zy.common.utils.RedisUtil;
import com.zy.core.News;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.CrnModeType;
import com.zy.core.enums.RedisKeyType;
import com.zy.core.enums.SlaveType;
import com.zy.core.enums.WrkIoType;
import com.zy.core.model.protocol.CrnProtocol;
import com.zy.core.thread.CrnThread;

@@ -189,6 +191,16 @@
                if (crnProtocol.getMode() != CrnModeType.AUTO.id) {
                    continue;
                }

                List<WrkMast> inWrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
                        .eq("crn_no", basCrnp.getCrnNo())
                        .eq("io_type", WrkIoType.IN.id)
                );
                // 检查是否超过最大入库任务数
                if(inWrkMasts.size() >= basCrnp.getMaxInTask()){
                    News.info("堆垛机:{} 已达最大入库任务数，当前任务数:{}", basCrnp.getCrnNo(), inWrkMasts.size());
                    continue;
                }
                enabledCrnps.add(basCrnp);
            }


 src/main/java/com/zy/common/service/CommonService.java

@@ -264,6 +264,20 @@
            throw new CoolException("未找到输送目标站点可走行路径");
        }

        BasCrnp basCrnp = basCrnpService.selectOne(new EntityWrapper<BasCrnp>().eq("crn_no", crnNo));
        if(basCrnp == null) {
            throw new CoolException("未找到对应堆垛机数据");
        }
        List<WrkMast> outWrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
                .eq("crn_no", crnNo)
                .eq("io_type", WrkIoType.OUT.id)
        );
        // 检查是否超过最大出库任务数
        if(outWrkMasts.size() >= basCrnp.getMaxOutTask()){
            News.info("堆垛机:{} 已达最大出库任务数，当前任务数:{}", basCrnp.getCrnNo(), outWrkMasts.size());
            throw new CoolException("堆垛机:" + basCrnp.getCrnNo() + "已达最大出库任务数，当前任务数:" + outWrkMasts.size());
        }

        // 获取工作号
        int workNo = getWorkNo(WrkIoType.OUT.id);
        // 保存工作档
@@ -290,7 +304,6 @@
        locMast.setLocSts("R");
        locMast.setModiTime(new Date());
        locMastService.updateById(locMast);

        return true;
    }


 src/main/java/com/zy/core/utils/CrnOperateProcessUtils.java

@@ -115,16 +115,6 @@
            return;
        }

        List<WrkMast> inWrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
                .eq("crn_no", basCrnp.getCrnNo())
                .eq("io_type", WrkIoType.IN.id)
        );
        // 检查是否超过最大入库任务数
        if(inWrkMasts.size() >= basCrnp.getMaxInTask()){
            News.info("堆垛机:{} 已达最大入库任务数，当前任务数:{}", basCrnp.getCrnNo(), inWrkMasts.size());
            return;
        }

        Integer crnNo = basCrnp.getCrnNo();

        for (StationObjModel stationObjModel : inStationList) {
@@ -209,16 +199,6 @@
        List<StationObjModel> outStationList = basCrnp.getOutStationList$();
        if(outStationList.isEmpty()){
            News.info("堆垛机:{} 出库站点未设置", basCrnp.getCrnNo());
            return;
        }

        List<WrkMast> outWrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
                .eq("crn_no", basCrnp.getCrnNo())
                .eq("io_type", WrkIoType.OUT.id)
        );
        // 检查是否超过最大出库任务数
        if(outWrkMasts.size() >= basCrnp.getMaxOutTask()){
            News.info("堆垛机:{} 已达最大出库任务数，当前任务数:{}", basCrnp.getCrnNo(), outWrkMasts.size());
            return;
        }