From 0146de915c3bb74dcce2c39debcbdb8cf692623d Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期日, 05 五月 2024 20:42:41 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/controller/OrderController.java     |   13 ++++++++++++-
 src/main/java/com/zy/asrs/controller/OrderDetlController.java |    9 ++-------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index cf452b0..a939626 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -130,7 +130,17 @@
                         @RequestParam(required = false)String orderByField,
                         @RequestParam(required = false)String orderByType,
                         @RequestParam Map<String, Object> param){
-        return R.ok(orderDetlService.getPakoutPage(toPage(curr, limit, param, OrderDetl.class)));
+        EntityWrapper<OrderDetl> wrapper = new EntityWrapper<>();
+        excludeTrash(param);
+        convert(param, wrapper);
+//        return R.ok(orderDetlService.getPakoutPage(toPage(curr, limit, param, OrderDetl.class)));
+        List<DocType> pakins = docTypeService.selectList(new EntityWrapper<DocType>().eq("pakin", 1));
+        List<Long> docIds = new ArrayList<>();
+        for (DocType pakin : pakins) {
+            docIds.add(pakin.getDocId());
+        }
+        wrapper.in("source",docIds);
+        return R.ok(orderDetlService.selectPage(new Page<>(curr, limit), wrapper));
 //        EntityWrapper<OrderDetl> wrapper = new EntityWrapper<>();
 //        excludeTrash(param);
 //        convert(param, wrapper);
@@ -573,6 +583,7 @@
             if (orderDetl == null) {
                 orderDetl = new OrderDetl();
                 orderDetl.sync(mat);
+                orderDetl.setSource(docType.getDocId().intValue());
                 orderDetl.setBatch(null);
                 orderDetl.setAnfme(anfme);
                 orderDetl.setOrderId(order.getId());
diff --git a/src/main/java/com/zy/asrs/controller/OrderDetlController.java b/src/main/java/com/zy/asrs/controller/OrderDetlController.java
index d38f1b6..495bb62 100644
--- a/src/main/java/com/zy/asrs/controller/OrderDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderDetlController.java
@@ -116,13 +116,8 @@
         for (DocType pakin : pakins) {
             docIds.add(pakin.getDocId());
         }
-        EntityWrapper<Order> orderEntityWrapper = new EntityWrapper<>();
-        List<Order> orders = orderService.selectList(orderEntityWrapper.in("doc_type",docIds));
-        List<String> orderNos = new ArrayList<>();
-        for (Order order : orders) {
-            orderNos.add(order.getOrderNo());
-        }
-        wrapper.in("order_no",orderNos);
+
+        wrapper.in("source",docIds);
         Page<OrderDetl> page = orderDetlService.selectPage(new Page<>(curr, limit), wrapper);
         for (OrderDetl record : page.getRecords()) {
             Double sumAnfme = agvLocDetlService.getSumAnfme(record.getMatnr(), record.getThreeCode());

--
Gitblit v1.9.1