From a6a6cb74f3cb3e647477838272687fdbf5929c26 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期一, 16 十月 2023 16:30:16 +0800
Subject: [PATCH] 连接ERP 获取ERP库存信息
---
src/main/java/com/zy/asrs/controller/OrderController.java | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index 9cf0b36..bccf4af 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,getUser().getUsername());
return R.ok();
}
@@ -441,9 +441,9 @@
Row row = sheet.getRow(i);
// 璁㈠崟缂栧彿
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)));
@@ -497,9 +497,9 @@
null, // 鐗╂祦鍗曞彿
1L, // 璁㈠崟鐘舵��
1, // 鐘舵��
- 9527L, // 娣诲姞浜哄憳
+ userId, // 娣诲姞浜哄憳
now, // 娣诲姞鏃堕棿
- 9527L, // 淇敼浜哄憳
+ userId, // 淇敼浜哄憳
now, // 淇敼鏃堕棿
null // 澶囨敞
);
@@ -516,9 +516,9 @@
orderDetl.setAnfme(anfme);
orderDetl.setOrderId(order.getId());
orderDetl.setOrderNo(order.getOrderNo());
- orderDetl.setCreateBy(9527L);
+ orderDetl.setCreateBy(userId);
orderDetl.setCreateTime(now);
- orderDetl.setUpdateBy(9527L);
+ orderDetl.setUpdateBy(userId);
orderDetl.setUpdateTime(now);
orderDetl.setStatus(1);
orderDetl.setQty(0.0D);
--
Gitblit v1.9.1