From b9cd7d99e4916d5a6b721d43644b0ae080ddfd7c Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 17 十二月 2024 13:53:15 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/controller/MobileController.java |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index e8955ae..7a8c84c 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -235,7 +235,16 @@
             return R.ok();
         }
 //        List<Order> orders = orderService.selectorderNoL(batch);
-        OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("matnr", combParam.getMatnr()).eq("batch", combParam.getBatch()).eq("order_no",combParam.getOrderNo()));
+//        OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("matnr", combParam.getMatnr()).eq("batch", combParam.getBatch()).eq("order_no",combParam.getOrderNo()));
+        Order order = OrderInAndOutUtil.selectByNo(Boolean.FALSE, combParam.getOrderNo());
+        List<OrderDetl> orderDetlList = OrderInAndOutUtil.selectByOrderId(Boolean.FALSE, order.getId());
+        OrderDetl orderDetl = null;
+        for (OrderDetl orderDetl1 : orderDetlList){
+            if (combParam.getMatnr().equals(orderDetl1.getMatnr()) && combParam.getBatch().equals(orderDetl1.getBatch())){
+                orderDetl = orderDetl1;
+                break;
+            }
+        }
         if (Cools.isEmpty(orderDetl)){
             return R.error("鏈煡鍒版暟鎹�");
         }
@@ -244,7 +253,8 @@
         }
         //澶嶆牳鏁�
         orderDetl.setSource(1);
-        orderDetlService.updateById(orderDetl);
+//        orderDetlService.updateById(orderDetl);
+        OrderInAndOutUtil.updateOrderDetl(Boolean.FALSE,order,orderDetl);
         return R.ok();
     }
 

--
Gitblit v1.9.1