From 1a2f494454d0da24bb9ca7ad7c0e91902819405a Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期五, 21 十一月 2025 13:18:42 +0800
Subject: [PATCH] 1.获取erp订单数据时过滤掉状态》5 2.同步erp删除数据时，只删除指定的订单明细 3.订单出库按批号排序

---
 src/main/java/com/zy/asrs/controller/OrderDetlController.java |   32 +++++++++++++++++++++++++++++---
 1 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/OrderDetlController.java b/src/main/java/com/zy/asrs/controller/OrderDetlController.java
index 1c3cd11..629fd5d 100644
--- a/src/main/java/com/zy/asrs/controller/OrderDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderDetlController.java
@@ -39,14 +39,22 @@
                   @RequestParam(required = false)String orderByField,
                   @RequestParam(required = false)String orderByType,
                   @RequestParam Map<String, Object> param){
+
         EntityWrapper<OrderDetl> wrapper = new EntityWrapper<>();
-        excludeTrash(param);
-        convert(param, wrapper);
+        if(!Cools.isEmpty(param.get("abnormal"))&&param.get("abnormal").equals("1")){
+            wrapper.addFilter("anfme < qty");
+        }else{
+            param.remove("abnormal");
+            excludeTrash(param);
+            convert(param, wrapper);
+        }
         if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} else {
             wrapper.orderBy("create_time", false);
         }
+
         wrapper.eq("status", 1);
-        return R.ok(orderDetlService.selectPage(new Page<>(curr, limit), wrapper));
+        Page<OrderDetl> orderDetlPage = orderDetlService.selectPage(new Page<>(curr, limit), wrapper);
+        return R.ok(orderDetlPage);
     }
 
     @RequestMapping(value = "/orderDetl/pakout/list/auth")
@@ -57,6 +65,24 @@
         return R.ok(orderDetlService.getPakoutPage(toPage(curr, limit, param, OrderDetl.class)));
     }
 
+    //鍙湁閿�鍞崟
+    @RequestMapping(value = "/orderDetl/pakout/list/auth/xs")
+    @ManagerAuth
+    public R pakoutListxs(@RequestParam(defaultValue = "1")Integer curr,
+                        @RequestParam(defaultValue = "10")Integer limit,
+                        @RequestParam Map<String, Object> param){
+        return R.ok(orderDetlService.getPakoutPagexs(toPage(curr, limit, param, OrderDetl.class)));
+    }
+
+    //娌℃湁閿�鍞崟
+    @RequestMapping(value = "/orderDetl/pakout/list/auth/notxs")
+    @ManagerAuth
+    public R pakoutListnotxs(@RequestParam(defaultValue = "1")Integer curr,
+                        @RequestParam(defaultValue = "10")Integer limit,
+                        @RequestParam Map<String, Object> param){
+        return R.ok(orderDetlService.getPakoutPagenotxs(toPage(curr, limit, param, OrderDetl.class)));
+    }
+
     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());

--
Gitblit v1.9.1