From 2e82ef6fd6dfbcb1eb88a8d4b705eae7fb99065b Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期五, 06 六月 2025 17:04:11 +0800
Subject: [PATCH] 123
---
src/main/java/com/zy/asrs/controller/InventoryCheckOrderController.java | 66 +++++++++++++++++++-------------
1 files changed, 39 insertions(+), 27 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/InventoryCheckOrderController.java b/src/main/java/com/zy/asrs/controller/InventoryCheckOrderController.java
index 9c7d50f..ef95b5a 100644
--- a/src/main/java/com/zy/asrs/controller/InventoryCheckOrderController.java
+++ b/src/main/java/com/zy/asrs/controller/InventoryCheckOrderController.java
@@ -22,6 +22,7 @@
import org.springframework.web.bind.annotation.*;
import java.util.*;
+import java.util.stream.Collectors;
@RestController
public class InventoryCheckOrderController extends BaseController {
@@ -63,14 +64,14 @@
@RequestMapping("/inventoryCheckOrder/select/status/1")
@ManagerAuth()
- public R availableTakeCheckSite(){
+ public R availableTakeCheckSite() {
return R.ok().add(inventoryCheckOrderService.selectList(new EntityWrapper<InventoryCheckOrder>().eq("status", "1")));
}
@RequestMapping(value = "/inventoryCheckOrder/nav/list/auth")
@ManagerAuth
- public R navList(@RequestParam(required = false) String orderNo){
+ public R navList(@RequestParam(required = false) String orderNo) {
EntityWrapper<InventoryCheckOrder> wrapper = new EntityWrapper<>();
if (!Cools.isEmpty(orderNo)) {
wrapper.like("order_no", orderNo);
@@ -82,6 +83,15 @@
return R.ok().add(orders);
}
+ @RequestMapping(value = "/inventoryCheckOrder/nav/auth")
+ @ManagerAuth
+ public R navList() {
+ EntityWrapper<InventoryCheckOrder> wrapper = new EntityWrapper<>();
+ List<InventoryCheckOrder> orders = inventoryCheckOrderService.selectList(wrapper.eq("status", "1"));
+ List<String> locNoList = orders.stream().map(InventoryCheckOrder::getOrderNo).distinct().collect(Collectors.toList());
+ return R.ok().add(locNoList);
+ }
+
@RequestMapping(value = "/inventoryCheckOrder/{id}/auth")
@ManagerAuth
public R get(@PathVariable("id") String id) {
@@ -90,24 +100,26 @@
@RequestMapping(value = "/inventoryCheckOrder/list/auth")
@ManagerAuth
- public R list(@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){
+ public R list(@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) {
EntityWrapper<InventoryCheckOrder> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
allLike(InventoryCheckOrder.class, param.keySet(), wrapper, condition);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ }
return R.ok(inventoryCheckOrderService.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()){
+ 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());
- if (val.contains(RANGE_TIME_LINK)){
+ 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]));
@@ -117,21 +129,21 @@
}
}
- @PostMapping (value = "/inventoryCheckOrder/add/auth")
+ @PostMapping(value = "/inventoryCheckOrder/add/auth")
@ManagerAuth
public R add(@RequestBody InventoryCheckOrder inventoryCheckOrder) {
String orderNo = inventoryCheckOrder.getOrderNo();
long time = new Date().getTime();
if (Cools.isEmpty(orderNo)) {
- switch (inventoryCheckOrder.getArea()){
+ switch (inventoryCheckOrder.getArea()) {
case "鍫嗗灈鏈�":
- orderNo = "DDJ"+time;
+ orderNo = "DDJ" + time;
break;
case "鍥涘悜搴�":
- orderNo = "SXK"+time;
+ orderNo = "SXK" + time;
break;
case "CTU":
- orderNo = "CTU"+time;
+ orderNo = "CTU" + time;
break;
}
inventoryCheckOrder.setOrderNo(orderNo);
@@ -142,7 +154,7 @@
return R.parse("鍗曟嵁缂栧彿宸茬粡瀛樺湪锛�" + orderNo);
}
- inventoryCheckOrder.setCreateBy(getUserId().toString());
+ inventoryCheckOrder.setCreateBy(getUserId());
inventoryCheckOrder.setCreateTime(new Date());
inventoryCheckOrder.setStatus("1");
@@ -150,10 +162,10 @@
return R.ok(orderNo + "鏂板鎴愬姛");
}
- @RequestMapping(value = "/inventoryCheckOrder/update/auth")
- @ManagerAuth
- public R update(InventoryCheckOrder inventoryCheckOrder){
- if (Cools.isEmpty(inventoryCheckOrder) || null==inventoryCheckOrder.getId()){
+ @RequestMapping(value = "/inventoryCheckOrder/update/auth")
+ @ManagerAuth
+ public R update(InventoryCheckOrder inventoryCheckOrder) {
+ if (Cools.isEmpty(inventoryCheckOrder) || null == inventoryCheckOrder.getId()) {
return R.error();
}
inventoryCheckOrderService.updateById(inventoryCheckOrder);
@@ -162,8 +174,8 @@
@RequestMapping(value = "/inventoryCheckOrder/delete/auth")
@ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
+ public R delete(@RequestParam(value = "ids[]") Long[] ids) {
+ for (Long id : ids) {
inventoryCheckOrderService.deleteById(id);
}
return R.ok();
@@ -171,7 +183,7 @@
@RequestMapping(value = "/inventoryCheckOrder/export/auth")
@ManagerAuth
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
EntityWrapper<InventoryCheckOrder> wrapper = new EntityWrapper<>();
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
Map<String, Object> map = excludeTrash(param.getJSONObject("inventoryCheckOrder"));
@@ -187,7 +199,7 @@
wrapper.like("id", condition);
Page<InventoryCheckOrder> page = inventoryCheckOrderService.selectPage(new Page<>(0, 1000), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (InventoryCheckOrder inventoryCheckOrder : page.getRecords()){
+ for (InventoryCheckOrder inventoryCheckOrder : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", inventoryCheckOrder.getId());
map.put("value", inventoryCheckOrder.getId());
@@ -200,7 +212,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<InventoryCheckOrder> wrapper = new EntityWrapper<InventoryCheckOrder>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != inventoryCheckOrderService.selectOne(wrapper)){
+ if (null != inventoryCheckOrderService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(InventoryCheckOrder.class, String.valueOf(param.get("key"))));
}
return R.ok();
--
Gitblit v1.9.1