| | |
| | | if (!Cools.isEmpty(orderByField)) { |
| | | wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType)); |
| | | } |
| | | wrapper.eq("full_plt", "N"); |
| | | // 移除 full_plt = "N" 的限制,允许查询所有状态的库位(包括满托和空托) |
| | | // 如果需要在后端管理页面过滤,可以在前端进行过滤 |
| | | return R.ok(locCacheService.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()); |
| | | // 将驼峰命名转换为下划线命名(如 locNo -> loc_no) |
| | | String columnName = humpToLine(entry.getKey()); |
| | | if (val.contains(RANGE_TIME_LINK)) { |
| | | String[] dates = val.split(RANGE_TIME_LINK); |
| | | wrapper.ge(entry.getKey(), DateUtils.convert(dates[0])); |
| | | wrapper.le(entry.getKey(), DateUtils.convert(dates[1])); |
| | | wrapper.ge(columnName, DateUtils.convert(dates[0])); |
| | | wrapper.le(columnName, DateUtils.convert(dates[1])); |
| | | } else { |
| | | wrapper.like(entry.getKey(), val); |
| | | wrapper.like(columnName, val); |
| | | } |
| | | } |
| | | } |
| | |
| | | return locCacheService.initLocCache(param, getUserId()); |
| | | } |
| | | |
| | | /** |
| | | * 锁定/解锁缓存库位 |
| | | * @param locNo 库位号 |
| | | * @param lock 是否锁定,true-锁定,false-解锁 |
| | | * @param fullPlt 是否满托,true-满托(设置为F),false-空托(设置为D),解锁时可为空 |
| | | * @return 操作结果 |
| | | */ |
| | | @RequestMapping(value = "/locCache/lockOrUnlock/auth", method = RequestMethod.POST) |
| | | @ManagerAuth |
| | | public R lockOrUnlock(@RequestParam String locNo, @RequestParam Boolean lock, @RequestParam(required = false) Boolean fullPlt) { |
| | | if (Cools.isEmpty(locNo)) { |
| | | return R.error("库位号不能为空"); |
| | | } |
| | | if (lock == null) { |
| | | return R.error("锁定参数不能为空"); |
| | | } |
| | | return locCacheService.lockOrUnlockLocCache(locNo, lock, fullPlt, getUserId()); |
| | | } |
| | | |
| | | /** |
| | | * 锁定/解锁当前排的所有库位 |
| | | * @param locNo 库位号(用于获取排号) |
| | | * @param lock 是否锁定,true-锁定,false-解锁 |
| | | * @param fullPlt 是否满托,true-满托(设置为F),false-空托(设置为D),解锁时可为空 |
| | | * @return 操作结果 |
| | | */ |
| | | @RequestMapping(value = "/locCache/lockOrUnlockRow/auth", method = RequestMethod.POST) |
| | | @ManagerAuth |
| | | public R lockOrUnlockRow(@RequestParam String locNo, @RequestParam Boolean lock, @RequestParam(required = false) Boolean fullPlt) { |
| | | if (Cools.isEmpty(locNo)) { |
| | | return R.error("库位号不能为空"); |
| | | } |
| | | if (lock == null) { |
| | | return R.error("锁定参数不能为空"); |
| | | } |
| | | return locCacheService.lockOrUnlockRowLocCache(locNo, lock, fullPlt, getUserId()); |
| | | } |
| | | |
| | | /** |
| | | * 锁定/解锁当前列的所有库位 |
| | | * @param locNo 库位号(用于获取列号bay1) |
| | | * @param lock 是否锁定,true-锁定,false-解锁 |
| | | * @param fullPlt 是否满托,true-满托(设置为F),false-空托(设置为D),解锁时可为空 |
| | | * @return 操作结果 |
| | | */ |
| | | @RequestMapping(value = "/locCache/lockOrUnlockBay/auth", method = RequestMethod.POST) |
| | | @ManagerAuth |
| | | public R lockOrUnlockBay(@RequestParam String locNo, @RequestParam Boolean lock, @RequestParam(required = false) Boolean fullPlt) { |
| | | if (Cools.isEmpty(locNo)) { |
| | | return R.error("库位号不能为空"); |
| | | } |
| | | if (lock == null) { |
| | | return R.error("锁定参数不能为空"); |
| | | } |
| | | return locCacheService.lockOrUnlockBayLocCache(locNo, lock, fullPlt, getUserId()); |
| | | } |
| | | |
| | | /** |
| | | * 清空整排的所有库位(所有列) |
| | | * @param locNo 库位号(用于获取排号row1) |
| | | * @param lock 是否锁定,true-锁定,false-解锁(清空) |
| | | * @param fullPlt 是否满托,true-满托(设置为F),false-空托(设置为D),解锁时可为空 |
| | | * @return 操作结果 |
| | | */ |
| | | @RequestMapping(value = "/locCache/clearAllColumnsInRow/auth", method = RequestMethod.POST) |
| | | @ManagerAuth |
| | | public R clearAllColumnsInRow(@RequestParam String locNo, @RequestParam Boolean lock, @RequestParam(required = false) Boolean fullPlt) { |
| | | if (Cools.isEmpty(locNo)) { |
| | | return R.error("库位号不能为空"); |
| | | } |
| | | if (lock == null) { |
| | | return R.error("锁定参数不能为空"); |
| | | } |
| | | return locCacheService.clearAllColumnsInRow(locNo, lock, fullPlt, getUserId()); |
| | | } |
| | | |
| | | } |