1.0.3 平仓入库调整-改为用uuid库区编码作为库区主键

王佳豪

2021-03-16 eacf0e50b4a7fe138a3788af7f71d894d3be0394

 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));}
@@ -185,7 +198,7 @@
     */
    @RequestMapping(value = "/locDetl/getAllLocDetlData")
    @ManagerAuth
    public List<LocDetl> getAllLocDetlData(String loc_no, String matnr, String matStatusFlag) {
       return locDetlService.getAllLocDetlData(loc_no, matnr, matStatusFlag);
    public List<LocDetl> getAllLocDetlData(String loc_no, String matnr, String mat_status) {
       return locDetlService.getAllLocDetlData(loc_no, matnr, mat_status);
    }
}