From b6bf5c99a551f042616c184313a9abb9cab1008a Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 10 二月 2025 15:04:18 +0800
Subject: [PATCH] 导入聚乳酸明细时 牌号为161,171,181并且物资类别为改性树脂时指定主体为海正生物，生产车间为一车间
---
src/main/java/com/zy/asrs/controller/OrderController.java | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index 39c3cbe..7e97795 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -12,6 +12,7 @@
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.OrderDomainParam;
import com.zy.asrs.entity.result.OrderDetlVo;
+import com.zy.asrs.mapper.OrderDetlMapper;
import com.zy.asrs.service.*;
import com.zy.common.CodeRes;
import com.zy.common.model.DetlDto;
@@ -52,6 +53,9 @@
@Resource
private UserService userService;
+
+ @Resource
+ private OrderDetlMapper orderDetlMapper;
@RequestMapping(value = "/order/nav/list/auth")
@ManagerAuth
@@ -168,7 +172,7 @@
param.getCstmr(), // 瀹㈡埛缂栧彿
param.getCstmrName(), // 瀹㈡埛
param.getTel(), // 鑱旂郴鏂瑰紡
- null, // 鎿嶄綔浜哄憳
+ getUser().getUsername(), // 鎿嶄綔浜哄憳
null, // 鍚堣閲戦
null, // 浼樻儬鐜�
null, // 浼樻儬閲戦
@@ -191,6 +195,7 @@
now, // 淇敼鏃堕棿
null // 澶囨敞
);
+ order.setOperMemb(getUser().getUsername());
if (!orderService.insert(order)) {
throw new CoolException("淇濆瓨璁㈠崟涓绘。澶辫触");
}
@@ -469,6 +474,20 @@
.doWrite(orderDetlVos);
}
+ @PostMapping (value = "/order/exportAll/auth")
+ @ManagerAuth
+ public R export() {
+
+ User user = getUser();
+ Long userId = null;
+ if (user.getRoleId() != 2 && user.getRoleId() != 24) {
+ userId = user.getId();
+ }
+ List<OrderDetlExcelVo> orderDetlExcelVoList = orderDetlMapper.selectExportExcelAllDataList(userId);
+
+ return R.ok(orderDetlExcelVoList);
+ }
+
@RequestMapping(value = "/order/list/all")
public R orderList() {
--
Gitblit v1.9.1