From 4e7fce25f60aaf58603a3d2f3d749d1a83675c44 Mon Sep 17 00:00:00 2001
From: pjb <123456>
Date: 星期四, 04 七月 2024 15:33:12 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/PlaQtyController.java | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/PlaQtyController.java b/src/main/java/com/zy/asrs/controller/PlaQtyController.java
index 3e2ef0b..2440cc2 100644
--- a/src/main/java/com/zy/asrs/controller/PlaQtyController.java
+++ b/src/main/java/com/zy/asrs/controller/PlaQtyController.java
@@ -57,6 +57,9 @@
if (Cools.isEmpty(manPakOut.getStatus()) || manPakOut.getStatus() != 1) {
return false;
}
+ if(plaQty.getReturned() > 0){
+ return false;
+ }
return true;
}).collect(Collectors.toList());
@@ -74,11 +77,12 @@
@RequestMapping(value = "/orderNoQuery/auth")
@ManagerAuth
public R query(String condition) {
- EntityWrapper<PlaQty> wrapper = new EntityWrapper<>();
- wrapper.setSqlSelect("order_no");
- wrapper.like("id", condition);
- wrapper.groupBy("order_no");
- List<String> list = plaQtyService.selectOrderNo();
+// EntityWrapper<PlaQty> wrapper = new EntityWrapper<>();
+// wrapper.setSqlSelect("order_no");
+// wrapper.like("order_no", Cools.isEmpty(condition) ? "0" : condition);
+// wrapper.groupBy("order_no");
+// Page<PlaQty> plaQtyPage = plaQtyService.selectPage(new Page<>(1, 20), wrapper);
+ List<String> list = plaQtyService.selectOrderNo(Cools.isEmpty(condition) ? "0" : condition);
List<Map<String, Object>> result = new ArrayList<>();
for (String orderNo : list){
Map<String, Object> map = new HashMap<>();
@@ -86,6 +90,7 @@
map.put("id", plaQty.getId());
map.put("value", orderNo);
map.put("customer", plaQty.getCustomer());
+ map.put("type","returned");
result.add(map);
}
return R.ok(result);
@@ -99,7 +104,7 @@
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
} else {
- wrapper.like(entry.getKey(), val);
+ wrapper.eq(entry.getKey(), val);
}
}
}
--
Gitblit v1.9.1