From 8e943b7104561c3b14cf223016698709c5ade4b5 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期二, 03 二月 2026 15:37:26 +0800
Subject: [PATCH] #pda料箱组托和换码

---
 src/main/java/com/zy/asrs/controller/WaitPakinLogController.java |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/WaitPakinLogController.java b/src/main/java/com/zy/asrs/controller/WaitPakinLogController.java
index ab32674..a21a8f7 100644
--- a/src/main/java/com/zy/asrs/controller/WaitPakinLogController.java
+++ b/src/main/java/com/zy/asrs/controller/WaitPakinLogController.java
@@ -45,7 +45,7 @@
         convert(param, wrapper);
         if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
         else {
-            wrapper.orderBy("id", false);
+            wrapper.orderBy("modi_time", false);
         }
         return R.ok(waitPakinLogService.selectPage(new Page<>(curr, limit), wrapper));
     }
@@ -67,17 +67,17 @@
     @ManagerAuth
     public R add(WaitPakinLog waitPakinLog) {
         waitPakinLogService.insert(waitPakinLog);
-        return R.ok();
+        return R.ok("response.save_success");
     }
 
 	@RequestMapping(value = "/waitPakinLog/update/auth")
 	@ManagerAuth
     public R update(WaitPakinLog waitPakinLog){
-        if (Cools.isEmpty(waitPakinLog) || null==waitPakinLog.getId()){
-            return R.error();
+        if (Cools.isEmpty(waitPakinLog)){
+            return R.error("response.param_error");
         }
         waitPakinLogService.updateById(waitPakinLog);
-        return R.ok();
+        return R.ok("response.update_success");
     }
 
     @RequestMapping(value = "/waitPakinLog/delete/auth")
@@ -85,12 +85,12 @@
     public R delete(@RequestParam String param){
         List<WaitPakinLog> list = JSONArray.parseArray(param, WaitPakinLog.class);
         if (Cools.isEmpty(list)){
-            return R.error();
+            return R.error("response.param_error");
         }
         for (WaitPakinLog entity : list){
             waitPakinLogService.delete(new EntityWrapper<>(entity));
         }
-        return R.ok();
+        return R.ok("response.delete_success");
     }
 
     @RequestMapping(value = "/waitPakinLog/export/auth")
@@ -113,8 +113,8 @@
         List<Map<String, Object>> result = new ArrayList<>();
         for (WaitPakinLog waitPakinLog : page.getRecords()){
             Map<String, Object> map = new HashMap<>();
-            map.put("id", waitPakinLog.getId());
-            map.put("value", waitPakinLog.getId());
+            map.put("id", waitPakinLog.getZpallet());
+            map.put("value", waitPakinLog.getZpallet());
             result.add(map);
         }
         return R.ok(result);

--
Gitblit v1.9.1