From d3a5c4420a7daf89bc9832f22ca8ed9d7e1adaf9 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期五, 27 三月 2026 17:34:32 +0800
Subject: [PATCH] yys 1.完善销售下单，生成生产订单
---
src/main/java/com/ruoyi/production/controller/ProductProcessController.java | 26 ++++++++++++++++++++++----
1 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/controller/ProductProcessController.java b/src/main/java/com/ruoyi/production/controller/ProductProcessController.java
index cff0c60..d578d78 100644
--- a/src/main/java/com/ruoyi/production/controller/ProductProcessController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProductProcessController.java
@@ -11,6 +11,7 @@
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.oA.pojo.OaProject;
import com.ruoyi.production.dto.ProductProcessDto;
+import com.ruoyi.production.dto.SysDeptAndUserDto;
import com.ruoyi.production.pojo.ProductProcess;
import com.ruoyi.production.service.impl.ProductProcessServiceImpl;
import io.swagger.annotations.Api;
@@ -33,6 +34,26 @@
@Autowired
private ProductProcessServiceImpl productProcessService;
+ /**
+ * 鑾峰彇閮ㄩ棬鐢ㄦ埛鏍�
+ */
+ @GetMapping("/listDeptUserTree")
+ @ApiOperation("鑾峰彇閮ㄩ棬鐢ㄦ埛鏍�")
+ public AjaxResult listDeptUserTree() {
+ List<SysDeptAndUserDto> list = productProcessService.listDeptUserTree();
+ if (CollectionUtils.isEmpty(list)) {
+ return AjaxResult.warn("鏆傛棤鏁版嵁");
+ }
+ return AjaxResult.success(list);
+ }
+
+
+ /**
+ * 鍒嗛〉鏌ヨ宸ュ簭
+ * @param page
+ * @param productProcessDto
+ * @return
+ */
@GetMapping("/listPage")
@Log(title = "宸ュ簭-鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
@ApiOperation("宸ュ簭-鍒嗛〉鏌ヨ")
@@ -59,10 +80,7 @@
@DeleteMapping("/batchDelete")
@Log(title = "鍒犻櫎", businessType = BusinessType.DELETE)
public AjaxResult batchDelete(@RequestBody List<Integer> ids) {
- if(CollectionUtils.isEmpty(ids)){
- return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
- }
- return AjaxResult.success(productProcessService.removeBatchByIds(ids));
+ return AjaxResult.success(productProcessService.batchDelete(ids));
}
@ApiOperation("鏌ヨ鎵�鏈夊伐搴�")
--
Gitblit v1.9.3