From 9e50037f45269812b3f343de22c56db2fb9d89a1 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 09 十二月 2024 15:47:26 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/LocDetlController.java | 14 ++++----------
1 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java
index c180e32..58f2e66 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -82,17 +82,11 @@
param.remove("modi_time");
}
}
- param.remove("curr");
- param.remove("limit");
- EntityWrapper<LocDetl> wrapper = new EntityWrapper<>();
- convert(param, wrapper);
- // 涓嶅悓缁ф壙瑙掕壊鏄剧ず涓嶅悓搴撲俊鎭�
- RoleUtils.addRoleWrapperByLocNo(getUserId(),wrapper);
- Page<LocDetl> locDetlPage = locDetlService.selectPage(new Page<>(curr, limit), wrapper);
- if (locDetlPage.getRecords().size()==0){
- locDetlPage = locDetlService.selectPage(new Page<>(1, limit), wrapper);
+ Page<LocDetl> stockOut = locDetlService.getStockOut(toPage(curr, limit, param, LocDetl.class));
+ if (stockOut.getRecords().size()==0){
+ stockOut = locDetlService.getStockOut(toPage(1, limit, param, LocDetl.class));
}
- return R.ok(locDetlPage);
+ return R.ok(stockOut);
}
@RequestMapping(value = "/stock/out/crn/list/auth")
--
Gitblit v1.9.1