From 40631d025469ac3fb60a57dfab1d9022cb0298a6 Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期二, 25 三月 2025 16:57:46 +0800
Subject: [PATCH] 站点退回操作,防止改成空库位

---
 src/main/java/com/zy/asrs/controller/AdjDetlController.java |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/AdjDetlController.java b/src/main/java/com/zy/asrs/controller/AdjDetlController.java
index 1405ead..9a670d9 100644
--- a/src/main/java/com/zy/asrs/controller/AdjDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/AdjDetlController.java
@@ -44,8 +44,9 @@
         excludeTrash(param);
         EntityWrapper<AdjDetl> wrapper = new EntityWrapper<>();
         convert(param, wrapper);
+        wrapper.orderBy("appe_time",false);
         allLike(AdjDetl.class, param.keySet(), wrapper, condition);
-        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "desc".equals(orderByType));}
         return R.ok(adjDetlService.selectPage(new Page<>(curr, limit), wrapper));
     }
 
@@ -73,7 +74,7 @@
 	@ManagerAuth
     public R update(AdjDetl adjDetl){
         if (Cools.isEmpty(adjDetl) || null==adjDetl.getAdjId()){
-            return R.error();
+            return R.error("璇锋眰鍙傛暟涓虹┖");
         }
         adjDetlService.updateById(adjDetl);
         return R.ok();
@@ -84,7 +85,7 @@
     public R delete(@RequestParam String param){
         List<AdjDetl> list = JSONArray.parseArray(param, AdjDetl.class);
         if (Cools.isEmpty(list)){
-            return R.error();
+            return R.error("璇锋眰鍙傛暟涓虹┖");
         }
         for (AdjDetl entity : list){
             adjDetlService.delete(new EntityWrapper<>(entity));

--
Gitblit v1.9.1