agv工作档增加 is_deleted

chen.llin

5 小时以前 375f337b2a91e59beb0b41dc89353de1e92aa6a1

agv工作档增加 is_deleted

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

@@ -40,6 +40,7 @@
        EntityWrapper<Task> wrapper = new EntityWrapper<>();
        excludeTrash(param);
        convert(param, wrapper);
        wrapper.eq("is_deleted", 0);
        allLike(Task.class, param.keySet(), wrapper, condition);
        if (!Cools.isEmpty(orderByField)) {
            wrapper.orderBy(humpToLine(orderByField), "desc".equals(orderByType));
@@ -115,6 +116,7 @@
        List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
        Map<String, Object> map = excludeTrash(param.getJSONObject("task"));
        convert(map, wrapper);
        wrapper.eq("is_deleted", 0);
        List<Task> list = taskService.selectList(wrapper);
        return R.ok(exportSupport(list, fields));
    }
@@ -124,6 +126,7 @@
    public R query(String condition) {
        EntityWrapper<Task> wrapper = new EntityWrapper<>();
        wrapper.like("id", condition);
        wrapper.eq("is_deleted", 0);
        Page<Task> page = taskService.selectPage(new Page<>(0, 10), wrapper);
        List<Map<String, Object>> result = new ArrayList<>();
        for (Task task : page.getRecords()) {

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

@@ -214,7 +214,7 @@
                throw new CoolException("入库类型错误,type：" + type);
        }
        // 条码存在agv任务
        int count = taskService.selectCount(new EntityWrapper<Task>().eq("barcode", barcode));
        int count = taskService.selectCount(new EntityWrapper<Task>().eq("barcode", barcode).eq("is_deleted", 0));
        if (count > 0) {
            throw new CoolException(barcode+ "：条码存在agv搬运任务!");
        }

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

@@ -93,7 +93,7 @@
            try {
                Integer wrkNo = Integer.parseInt(numericId);
                task = taskService.selectOne(
                    new EntityWrapper<Task>().eq("wrk_no", wrkNo)
                    new EntityWrapper<Task>().eq("wrk_no", wrkNo).eq("is_deleted", 0)
                );
                if (task != null) {
                    log.debug("通过工作号（wrk_no={}）找到任务，taskId：{}", wrkNo, task.getId());
@@ -122,7 +122,7 @@
        if (task == null) {
            log.debug("通过工作号和任务ID都没找到，尝试通过其他字段查询，taskId：{}", taskId);
            task = taskService.selectOne(
                new EntityWrapper<Task>().eq("sheet_no", taskId)
                new EntityWrapper<Task>().eq("sheet_no", taskId).eq("is_deleted", 0)
            );
        }
        

 src/main/java/com/zy/common/web/WcsController.java

@@ -75,7 +75,7 @@
            return R.error("站点编号和工作号不能为空");
        }
        Task searchTask = taskService.selectOne(new EntityWrapper<Task>()
                .eq("source_sta_no", param.getStaNo())
                .eq("source_sta_no", param.getStaNo()) .eq("is_deleted", 0)
        );
        if (!Cools.isEmpty(searchTask)){
            return R.error("任务已存在");