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 | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderPakinController.java b/src/main/java/com/zy/asrs/controller/OrderPakinController.java
index 08f5297..277a5c0 100644
--- a/src/main/java/com/zy/asrs/controller/OrderPakinController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderPakinController.java
@@ -87,7 +87,18 @@
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")
@@ -129,7 +140,7 @@
null, // 璋冩嫧椤圭洰缂栧彿
null, // 鍒濆绁ㄦ嵁鍙�
null, // 绁ㄦ嵁鍙�
- locOwner.getOwnerUuid(), // 瀹㈡埛缂栧彿
+ null, // 瀹㈡埛缂栧彿
locOwner.getOwner(), // 瀹㈡埛
null, // 鑱旂郴鏂瑰紡
null, // 鎿嶄綔浜哄憳
--
Gitblit v1.9.1