From ef012984e2a1d92e4a35844c6dce92ebb66c7c87 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 23 十二月 2025 11:01:45 +0800
Subject: [PATCH] #getArmType$

---
 src/main/java/com/zy/asrs/controller/OrderPakinController.java |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/OrderPakinController.java b/src/main/java/com/zy/asrs/controller/OrderPakinController.java
index 05e35be..277a5c0 100644
--- a/src/main/java/com/zy/asrs/controller/OrderPakinController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderPakinController.java
@@ -87,9 +87,20 @@
             wrapper.orderBy("settle").orderBy("create_time", false);
         }
         wrapper.eq("status", 1);
+        wrapper.eq("move_status", 0);
         return R.ok(orderService.selectPage(new Page<>(curr, limit), wrapper));
     }
 
+    @RequestMapping(value = "/actual/shipment/order/report/auth")
+    @ManagerAuth(memo = "涓婃姤MES瀹為檯缁勮揣鍗�")
+    public R actualShipmentOrder(@RequestParam String orderNo) {
+        try{
+            orderService.updateOrderStatus(orderNo);   //鏇存柊璁㈠崟鐘舵�� 0 -> 1
+            return R.ok("鎴愬姛").add("鎴愬姛");
+        } catch (Exception e) {}
+        return R.error("澶辫触").add("澶辫触");
+    }
+
     @RequestMapping(value = "/order/detl/all/auth")
     @ManagerAuth
     public R head(@RequestParam Long orderId){

--
Gitblit v1.9.1