From d0d64cf47ce37027307ceb64dc72e3ae36796a92 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期四, 27 二月 2025 18:28:00 +0800
Subject: [PATCH] 四期

---
 src/main/java/com/zy/asrs/controller/OrderController.java |   73 ++++++++++++++++++++++++++++++++++++
 1 files changed, 72 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index 3fa397e..30b2cf3 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -1,6 +1,7 @@
 package com.zy.asrs.controller;
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.enums.SqlLike;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.mapper.Wrapper;
 import com.baomidou.mybatisplus.plugins.Page;
@@ -215,6 +216,39 @@
 //        return R.ok(orderDetlService.selectPage(new Page<>(curr, limit), wrapper));
     }
 
+
+    //  鍏ュ簱璁㈠崟鏄庣粏
+    @RequestMapping(value = "/order/detls/pakin/page/auth/v2")
+    @ManagerAuth
+    public R orderDetlsV2(@RequestParam(defaultValue = "1") Integer curr,
+                          @RequestParam(defaultValue = "100") Integer limit,
+                          @RequestParam(required = false) String orderByField,
+                          @RequestParam(required = false) String orderByType,
+                          @RequestParam Map<String, Object> param) {
+        EntityWrapper<OrderDetl> wrapper = new EntityWrapper<>();
+        excludeTrash(param);
+        Object o = param.get("orderType");
+        if (o != null) {
+            String[] split = o.toString().split(",");
+            if (split[0].equals("39")) {
+                wrapper.andNew().like("matnr", "401", SqlLike.RIGHT).or().like("matnr", "402", SqlLike.RIGHT).andNew().in("source", split);
+            } else {
+                wrapper.in("source", split);
+            }
+            param.remove("orderType");
+        }
+        convert(param, wrapper);
+//        List<DocType> pakins = docTypeService.selectList(new EntityWrapper<DocType>().eq("pakin", 1));
+//        List<Long> docIds = new ArrayList<>();
+//        for (DocType pakin : pakins) {
+//            if (pakin.getDocId() != 32) {
+//                docIds.add(pakin.getDocId());
+//            }
+//        }
+        return R.ok(orderDetlService.selectPage(new Page<>(curr, limit), wrapper));
+    }
+
+
     @RequestMapping(value = "/order/detls/pakin")
     @ManagerAuth
     public R orderDetlsIn(@RequestParam(defaultValue = "1") Integer curr,
@@ -269,10 +303,11 @@
         List<DocType> pakins = docTypeService.selectList(new EntityWrapper<DocType>().eq("pakin", 1));
         List<Long> docIds = new ArrayList<>();
         for (DocType pakin : pakins) {
-            if (pakin.getDocId() == 36) {
+            if (pakin.getDocId() == 36 || pakin.getDocId() == 39) {
                 docIds.add(pakin.getDocId());
             }
         }
+        wrapper.like("matnr", "50", SqlLike.RIGHT);
         wrapper.in("source", docIds);
         return R.ok(orderDetlService.selectPage(new Page<>(curr, limit), wrapper));
     }
@@ -318,6 +353,7 @@
                 docIds.add(pakin.getDocId());
             }
         }
+        wrapper.notLike("matnr", "401", SqlLike.RIGHT).notLike("matnr", "402", SqlLike.RIGHT);
         wrapper.in("source", docIds);
         Page<OrderDetl> page = orderDetlService.selectPage(new Page<>(curr, limit), wrapper);
         for (OrderDetl record : page.getRecords()) {
@@ -327,6 +363,41 @@
         return R.ok(page);
     }
 
+
+    @RequestMapping(value = "/order/bcpDb/detls/pakin/page/auth/v2")
+    @ManagerAuth
+    public R bcpDbOrderDetlsV2(@RequestParam(defaultValue = "1") Integer curr,
+                               @RequestParam(defaultValue = "100") Integer limit,
+                               @RequestParam(required = false) String orderByField,
+                               @RequestParam(required = false) String orderByType,
+                               @RequestParam Map<String, Object> param) {
+        EntityWrapper<OrderDetl> wrapper = new EntityWrapper<>();
+        excludeTrash(param);
+        Object o = param.get("orderType");
+        if (o != null) {
+            String[] split = o.toString().split(",");
+            wrapper.in("source", split);
+            param.remove("orderType");
+        }
+        convert(param, wrapper);
+//        return R.ok(orderDetlService.getPakoutPage(toPage(curr, limit, param, OrderDetl.class)));
+//        List<DocType> pakins = docTypeService.selectList(new EntityWrapper<DocType>().eq("pakout", 1));
+//        List<Long> docIds = new ArrayList<>();
+//        for (DocType pakin : pakins) {
+//            if (pakin.getDocId() == 33) {
+//                docIds.add(pakin.getDocId());
+//            }
+//        }
+        wrapper.like("order_no", "DC", SqlLike.RIGHT);
+        //     wrapper.in("source", docIds);
+        Page<OrderDetl> page = orderDetlService.selectPage(new Page<>(curr, limit), wrapper);
+        for (OrderDetl record : page.getRecords()) {
+            Double sumAnfme = agvLocDetlService.getSumAnfmeDb(record.getMatnr(), record.getThreeCode(), 1);
+            record.setStock(sumAnfme == null ? 0 : sumAnfme);
+        }
+        return R.ok(page);
+    }
+
     @RequestMapping(value = "/order/backStocks/detls/pakin/page/auth")
     @ManagerAuth
     public R backStocksOrderDetls(@RequestParam(defaultValue = "1") Integer curr,

--
Gitblit v1.9.1