From 4ea70af2b72b18819c0efce4cf2267439c754148 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期二, 06 八月 2024 19:31:52 +0800
Subject: [PATCH] pda获取出库物料列表
---
src/main/java/com/zy/asrs/controller/LocDetlController.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java
index 132d7c5..1d780d4 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -41,10 +41,13 @@
public R pdaSelect(@RequestParam(defaultValue = "1")Integer curr,
@RequestParam(defaultValue = "10")Integer limit,
@RequestParam String matnr) {
- EntityWrapper<LocDetl> locDetlEntityWrapper = new EntityWrapper<>();
- locDetlEntityWrapper.like("model", matnr).orderBy("manu_date",true);
- Page<LocDetl> locDetlPage = locDetlService.selectPage(new Page<>(curr, limit), locDetlEntityWrapper);
- return R.ok(locDetlPage);
+ Map<String,Object> param = new HashMap<>();
+ param.put("model",matnr);
+ 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(stockOut);
}
@RequestMapping(value = "/locDetl/update")
--
Gitblit v1.9.1