优化定时任务间隔及字段命名，调整环境配置

zhangc

2025-01-10 1da002910c1d9d44cd195bd24d951b4942a4e29c

优化定时任务间隔及字段命名，调整环境配置

 src/main/java/com/zy/asrs/controller/AgvMobileController.java

@@ -77,7 +77,7 @@
    @RequestMapping("/pick/again/auth")
    @ManagerAuth(memo = "再次拣料")
    public R pickAgain(@RequestBody PickParam pickParams) {
        if (pickParams == null || Cools.isEmpty(pickParams.getLocNo()) || Cools.isEmpty(pickParams.getLocNo())) {
        if (pickParams == null ) {
            return R.error("缺少参数");
        }
        agvMobileService.pickAgain(pickParams, 1l);
@@ -553,7 +553,7 @@
                // 更新订单
                OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("order_no", "DB" + agvLocDetl.getOrderNo()).eq("matnr", agvLocDetl.getMatnr()).eq("three_code", agvLocDetl.getThreeCode()));
                if (orderDetl == null) {
                    throw new CoolException("订单明细不存在");
                    throw new CoolException("调拨单明细不存在");
                }
                orderDetl.setQty(orderDetl.getQty() + agvLocDetl.getAnfme());
                if (!orderDetlService.update(orderDetl, new EntityWrapper<OrderDetl>().eq("order_no", "DB" + agvLocDetl.getOrderNo()).eq("matnr", agvLocDetl.getMatnr()).eq("three_code", agvLocDetl.getThreeCode()))) {

 src/main/java/com/zy/asrs/controller/AgvWarnController.java

@@ -69,13 +69,13 @@
        List<AgvWarn> agvWarns = new ArrayList<>();
        List<AgvWarn> updates = new ArrayList<>();
        for (AgvWarnBody body : agvWarnBodies) {
            List<AgvWarn> agvWarnList = agvWarnService.selectList(new EntityWrapper<AgvWarn>().eq("robot_code", body.getRobotCode()).eq("begin_time", body.getBeginTime()).eq("warn_content", body.getWarnContent()));
            List<AgvWarn> agvWarnList = agvWarnService.selectList(new EntityWrapper<AgvWarn>().eq("robot_code", body.getRobotCode()).eq("begin_time", body.getBeginDate()).eq("warn_content", body.getWarnContent()));
            if (Cools.isEmpty(agvWarnList)) {
                agvWarn = new AgvWarn();
                agvWarn.setBeginTime(body.getBeginTime());
                agvWarn.setBeginTime(body.getBeginDate());
                agvWarn.setAppeTime(new Date());
                agvWarn.setTimes(0);
                agvWarn.setModiTime(DateUtils.convert(body.getBeginTime(), DateUtils.yyyyMMddHHmmss_F));
                agvWarn.setModiTime(DateUtils.convert(body.getBeginDate(), DateUtils.yyyyMMddHHmmss_F));
                agvWarn.setRobotCode(body.getRobotCode());
                agvWarn.setWarnContent(body.getWarnContent());
                if (body.getTaskCode() != null) {

 src/main/java/com/zy/asrs/entity/param/AgvWarnBody.java

@@ -10,7 +10,7 @@

    private String robotCode;

    private String beginTime;
    private String beginDate;

    private String warnContent;


 src/main/java/com/zy/asrs/task/OrderSyncScheduler.java

@@ -98,9 +98,9 @@
    定时查询状态为2.作业中的单据，检查是否完成
     */
    //@Scheduled(cron = "0 */1 * * * ? ")
    @Scheduled(fixedDelay = 60000)
    @Scheduled(fixedDelay = 300000)
    public void completeOrder() {
        List<Order> orderList = orderService.selectList(new EntityWrapper<Order>().eq("settle", 2).isNotNull("plt_type"));
        List<Order> orderList = orderService.selectList(new EntityWrapper<Order>().eq("settle", 2));
        orderList.forEach(order -> {
            orderService.checkComplete2(order.getOrderNo());
        });

 src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java

@@ -408,7 +408,7 @@
        }
        List<AgvWrkMast> agvWrkMasts = agvWrkMastService.selectList(new EntityWrapper<AgvWrkMast>().eq("io_type", 109).like("source_loc_no", floor).or().eq("io_type", 113));
        if (agvWrkMasts.size() >= 5) {
            log.error("暂停回流");
            //log.error("暂停回流");
            return FAIL;
            //throw new CoolException("暂停回流");
        }

 src/main/resources/application.yml

@@ -1,4 +1,4 @@
spring:
  profiles:
    #dev loc prod
    active: loc
    active: prod