#

whycq

2024-05-21 7e8c8abedab8d33ea5faff80545e566aa71306d6

#

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

@@ -57,6 +57,30 @@
        return R.ok(agvWrkMastService.selectPage(new Page<>(curr, limit), wrapper));
    }

    @RequestMapping(value = "/wrkMast/list/auth/dbList")
    @ManagerAuth
    public R dbList(@RequestParam(defaultValue = "1")Integer curr,
                  @RequestParam(defaultValue = "10")Integer limit,
                  @RequestParam(required = false)String orderByField,
                  @RequestParam(required = false)String orderByType,
                  @RequestParam(required = false)String condition,
                  @RequestParam Map<String, Object> param){
        excludeTrash(param);
        EntityWrapper<AgvWrkMast> wrapper = new EntityWrapper<>();
        convert(param, wrapper);
        allLike(AgvWrkMast.class, param.keySet(), wrapper, condition);
        if (!Cools.isEmpty(orderByField)){
            if (orderByField.endsWith("$")){
                orderByField = orderByField.substring(0, orderByField.length()-1);
            }
            wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
        }else {
            wrapper.orderBy("io_time", false);
        }
        wrapper.in("io_type",108,111,112);
        return R.ok(agvWrkMastService.selectPage(new Page<>(curr, limit), wrapper));
    }

    private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
        for (Map.Entry<String, Object> entry : map.entrySet()){
            String val = String.valueOf(entry.getValue());

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

@@ -190,7 +190,7 @@
                    
                    agvWrkMastWorking = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>()
                            .eq("source_loc_no",agvWrkMast.getLocNo())
                            .lt("loc_sts",204L));
                            .le("wrk_sts",204L));

                    if(!Cools.isEmpty(agvWrkMastWorking)){
                        return;