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/WrkDetlLogController.java |   47 ++++++++++++++++++++++++++++++++---------------
 1 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/WrkDetlLogController.java b/src/main/java/com/zy/asrs/controller/WrkDetlLogController.java
index b2df62c..40508b0 100644
--- a/src/main/java/com/zy/asrs/controller/WrkDetlLogController.java
+++ b/src/main/java/com/zy/asrs/controller/WrkDetlLogController.java
@@ -79,6 +79,11 @@
         try {
             Integer wrkNo = null;
             String orderNo = null;
+            String matnr = null;
+            String specs = null;
+            String zpallet = null;
+            String batch = null;
+            Double anfme = null;
             Date modiTimeStart = null, modiTimeEnd = null;
             for (Map.Entry<String, Object> entry : param.entrySet()) {
                 String val = String.valueOf(entry.getValue());
@@ -93,14 +98,24 @@
                     wrkNo = Integer.parseInt(val);
                 } else if (entry.getKey().equals("order_no")) {
                     orderNo = val;
+                } else if (entry.getKey().equals("specs")) {
+                    specs = val;
+                } else if (entry.getKey().equals("zpallet")) {
+                    zpallet = val;
+                } else if (entry.getKey().equals("batch")) {
+                    batch = val;
+                } else if (entry.getKey().equals("anfme")) {
+                    anfme = Double.parseDouble(val);
+                }else if (entry.getKey().equals("matnr")) {
+                    matnr = val;
                 }
             }
-            List<WrkDetlLog> wrkDetlLogs = wrkDetlLogService.selectWrkDetlLogs(wrkNo, orderNo, modiTimeStart, modiTimeEnd, curr, limit);
+            List<WrkDetlLog> wrkDetlLogs = wrkDetlLogService.selectWrkDetlLogs(wrkNo, orderNo,matnr,specs,zpallet,batch,anfme, modiTimeStart, modiTimeEnd, curr, limit);
             Page<WrkDetlLog> page1 = new Page<WrkDetlLog>(curr, limit).setRecords(wrkDetlLogs);
-            page1.setTotal(wrkDetlLogService.selectWrkDetlLogsTotal(wrkNo, orderNo, modiTimeStart, modiTimeEnd));
+            page1.setTotal(wrkDetlLogService.selectWrkDetlLogsTotal(wrkNo, orderNo,matnr,specs,zpallet,batch,anfme, modiTimeStart, modiTimeEnd));
             return R.ok(page1);
         } catch (Exception e) {
-            return R.error("寮傚父" + e);
+            return R.error("response.server_exception");
         }
     }
 
@@ -118,37 +133,37 @@
     }
 
     @RequestMapping(value = "/wrkDetlLog/add/auth")
-    @ManagerAuth
+    @ManagerAuth(memo = "response.wrk_detl_log_add")
     public R add(WrkDetlLog wrkDetlLog) {
         wrkDetlLogService.insert(wrkDetlLog);
-        return R.ok();
+        return R.ok("response.save_success");
     }
 
     @RequestMapping(value = "/wrkDetlLog/update/auth")
-    @ManagerAuth
+    @ManagerAuth(memo = "response.wrk_detl_log_update")
     public R update(WrkDetlLog wrkDetlLog) {
         if (Cools.isEmpty(wrkDetlLog) || null == wrkDetlLog.getWrkNo()) {
-            return R.error();
+            return R.error("response.parameter_error");
         }
         wrkDetlLogService.updateById(wrkDetlLog);
-        return R.ok();
+        return R.ok("response.update_success");
     }
 
     @RequestMapping(value = "/wrkDetlLog/delete/auth")
-    @ManagerAuth
+    @ManagerAuth(memo = "response.wrk_detl_log_delete")
     public R delete(@RequestParam String param) {
         List<WrkDetlLog> list = JSONArray.parseArray(param, WrkDetlLog.class);
         if (Cools.isEmpty(list)) {
-            return R.error();
+            return R.error("response.parameter_error");
         }
         for (WrkDetlLog entity : list) {
             wrkDetlLogService.delete(new EntityWrapper<>(entity));
         }
-        return R.ok();
+        return R.ok("response.delete_success");
     }
 
     @RequestMapping(value = "/wrkDetlLog/export/auth")
-    @ManagerAuth
+    @ManagerAuth(memo = "response.wrk_detl_log_export")
     public R export(@RequestBody JSONObject param) {
         EntityWrapper<WrkDetlLog> wrapper = new EntityWrapper<>();
         List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
@@ -178,10 +193,12 @@
     @ManagerAuth
     public R query(@RequestBody JSONObject param) {
         Wrapper<WrkDetlLog> wrapper = new EntityWrapper<WrkDetlLog>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
-        if (null != wrkDetlLogService.selectOne(wrapper)) {
-            return R.parse(BaseRes.REPEAT).add(getComment(WrkDetlLog.class, String.valueOf(param.get("key"))));
+        if (null != wrkDetlLogService.selectOne(wrapper)){
+            R r = R.parse(BaseRes.REPEAT);
+            r.put("data", getComment(WrkDetlLog.class, String.valueOf(param.get("key"))));
+            return r;
         }
-        return R.ok();
+        return R.ok("response.operation_success");
     }
 
 }

--
Gitblit v1.9.1