lty
2025-03-28 d2b000d74d23f5c70e9f1414b57cab892c2b6eec
#输送线暂存数优化
5个文件已修改
20 ■■■■ 已修改文件
src/main/java/com/zy/asrs/service/BasDevpService.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/impl/TaskWrkServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/application.yml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/BasDevpService.java
@@ -44,4 +44,7 @@
     */
    BasDevp checkSiteStatus(Integer devpNo, boolean put);
    int getStoreCount();
}
src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java
@@ -1,8 +1,10 @@
package com.zy.asrs.service.impl;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.core.exception.CoolException;
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.entity.TaskWrk;
import com.zy.asrs.mapper.BasDevpMapper;
import com.zy.asrs.service.BasDevpService;
import com.zy.asrs.service.WrkMastService;
@@ -64,4 +66,9 @@
        }
        return station;
    }
    @Override
    public int getStoreCount() {
        return baseMapper.selectCount(new EntityWrapper<BasDevp>().in("loading","Y"));
    }
}
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -998,9 +998,9 @@
                        if (!crnProtocol.getStatusType().equals(CrnStatusType.IDLE) || crnProtocol.getTaskNo() != 0) {
                            break;
                        }
                        int storeCount = taskWrkService.getStoreCount(taskWrk.getCrnNo());
                        int storeCount = basDevpService.getStoreCount();
                        if(storeCount >= maxCount){
                            log.error("{}号堆垛机暂存数已满!", taskWrk.getCrnNo());
                            log.error("输送线暂存数达到上限");
                            break;
                        }
src/main/java/com/zy/asrs/service/impl/TaskWrkServiceImpl.java
@@ -231,7 +231,7 @@
    @Override
    public int getStoreCount(Integer crnNo){
        return selectCount(new EntityWrapper<TaskWrk>().eq("crn_no", crnNo).in("wrk_sts",12,14,2));
        return selectCount(new EntityWrapper<TaskWrk>().eq("crn_no", crnNo).in("wrk_sts",12,2));
    }
    @Override
src/main/resources/application.yml
@@ -44,8 +44,8 @@
  publicKeysStorePath: publicCerts.keystore
wms:
  #堆垛机任务暂存数
  count: 5
  #输送线暂存数
  count: 8
  # 是否开启上报
  start: true
  # WMS系统ip