From 45c2bf51fae3030c8e22fa2f2016b64a28928547 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期三, 04 十月 2023 10:22:50 +0800
Subject: [PATCH] AGV调试整改
---
src/main/java/com/zy/asrs/controller/OrderController.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index 4ccd232..6c1d2e7 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -356,14 +356,14 @@
@Transactional
public R delete(@RequestParam Long orderId){
orderService.remove(orderId);
-// Order order = orderService.selectById(orderId);
-// if (order != null) {
-// order.setStatus(0);
-// }
-// if (!orderService.updateById(order)) {
-// throw new CoolException("鍒犻櫎璁㈠崟澶辫触");
-// }
-// orderDetlService.modifyStatus(orderId, 0);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/order/report/auth")
+ @ManagerAuth(memo = "鎵嬪姩涓婁紶璁㈠崟")
+ @Transactional
+ public R report(@RequestParam Long orderId){
+ orderService.report(orderId,getUserId());
return R.ok();
}
@@ -443,7 +443,7 @@
String uuid = dataFormatter.formatCellValue(row.getCell(0));
// 鐗╂枡鍙�
String maktx = dataFormatter.formatCellValue(row.getCell(1));
- // 鍗曟嵁鍙�
+ // 鐗╂枡鍙�
String matnr = dataFormatter.formatCellValue(row.getCell(2));
// 鏁伴噺
Double anfme = Double.parseDouble(dataFormatter.formatCellValue(row.getCell(3)));
--
Gitblit v1.9.1