*

lsh

9 天以前 a1c4d0ef7980d9af390ab238041db0a8966f1881

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

@@ -51,9 +51,32 @@
            }
            wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
        }else {
            wrapper.orderBy("io_time", false);
            wrapper.orderBy("modi_time", false);
        }
        return R.ok(wrkMastLogService.selectPage(new Page<>(curr, limit), wrapper));
    }

    @RequestMapping(value = "/inventoryFlow/list/auth")
    @ManagerAuth(memo = "库存移动流水记录")
    public R inventoryFlowList(@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);
        if (Cools.isEmpty(param.get("io_time"))) {
            param.put("startTime","");
            param.put("endTime","");
        } else {
            String ioTime = (String) param.get("io_time");
            if (ioTime.contains(RANGE_TIME_LINK)){
                String[] dates = ioTime.split(RANGE_TIME_LINK);
                param.put("startTime",dates[0]);
                param.put("endTime",dates[1]);
            }
        }
        return wrkMastLogService.inventoryFlowList(curr,limit,param);
    }

    private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
@@ -64,7 +87,11 @@
                wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
                wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
            } else {
                wrapper.like(entry.getKey(), val);
                if (entry.getKey().equals("manu_type")) {
                    wrapper.like(entry.getKey(), val);
                } else {
                    wrapper.eq(entry.getKey(), val);
                }
            }
        }
    }