pda组托逻辑调整

王佳豪

2021-04-28 4a96e56c8f510486c589047d2b378b417fb29039

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

@@ -68,6 +68,14 @@
                param.remove("modi_time");
            }
        }
        /* 通知单号为空，删除入参通知单号supplier */
        if (Cools.isEmpty(param.get("supplier"))) {
            param.remove("supplier");
        }
        /* 生产单号为空，删除生产单号warehouse */
        if (Cools.isEmpty(param.get("warehouse"))) {
            param.remove("warehouse");
        }
        return R.ok(locDetlService.getStockOut(toPage(curr, limit, param, LocDetl.class)));
    }

@@ -79,8 +87,13 @@
                  @RequestParam(required = false)String orderByType,
                  @RequestParam(required = false)String condition,
                  @RequestParam Map<String, Object> param){

        excludeTrash(param);
        EntityWrapper<LocDetl> wrapper = new EntityWrapper<>();
        if ("0".equals(param.get("mat_status"))) {
            wrapper.isNull("mat_status");
            param.remove("mat_status");
        }
        convert(param, wrapper);
        allLike(LocDetl.class, param.keySet(), wrapper, condition);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
@@ -177,4 +190,26 @@
        return R.ok();
    }

    /**
     * 批量修改物料状态
     * @return
     */
    @RequestMapping(value = "/locDetl/getAllLocDetlData")
    @ManagerAuth(memo = "批量修改物料状态")
    public R getAllLocDetlData(@RequestBody JSONObject param) {
        List<LocDetl> list = JSONObject.parseArray(param.getJSONArray("list").toJSONString(), LocDetl.class);
        Integer result = locDetlService.getAllLocDetlData(list);
        return R.ok().add(result);
    }

    /**
     * 查询总库存（立库+平仓）
     */
    @RequestMapping(value = "/locDetl/queryAllMatDetl")
    @ManagerAuth(memo = "查询总库存")
    public R queryAllMatDetl(@RequestParam(defaultValue = "1")Integer curr,
                             @RequestParam(defaultValue = "10")Integer limit,
                             @RequestParam Map<String, Object> param) {
        return R.ok(locDetlService.queryAllMatDetl(toPage(curr, limit, param, LocDetl.class)));
    }
}