From e0cc9278a0bcbf480446f87a78b9d7ddd8819eeb Mon Sep 17 00:00:00 2001
From: sen <sen@qq.com>
Date: 星期一, 18 八月 2025 11:32:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master
---
service/src/main/java/com/ruoyi/cwgl/controller/DispatchOrderController.java | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 54 insertions(+), 1 deletions(-)
diff --git a/service/src/main/java/com/ruoyi/cwgl/controller/DispatchOrderController.java b/service/src/main/java/com/ruoyi/cwgl/controller/DispatchOrderController.java
index d13f333..5f87b9a 100644
--- a/service/src/main/java/com/ruoyi/cwgl/controller/DispatchOrderController.java
+++ b/service/src/main/java/com/ruoyi/cwgl/controller/DispatchOrderController.java
@@ -1,6 +1,13 @@
package com.ruoyi.cwgl.controller;
import java.util.List;
+
+import com.ruoyi.common.config.RuoYiConfig;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.file.FileUtils;
+import com.ruoyi.cwgl.domain.vo.DispatchOrderAttachmentVo;
+import com.ruoyi.cwgl.domain.vo.DispatchOrderItemVo;
+import org.springframework.http.MediaType;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -20,6 +27,8 @@
import com.ruoyi.cwgl.service.IDispatchOrderService;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
+
+import javax.servlet.http.HttpServletResponse;
/**
* 璋冨害鍗旵ontroller
@@ -44,8 +53,39 @@
public TableDataInfo list(DispatchOrder dispatchOrder)
{
startPage();
- List<DispatchOrder> list = dispatchOrderService.selectDispatchOrderList(dispatchOrder);
+ List<DispatchOrder> list = dispatchOrderService.selectDispatchOrderList2(dispatchOrder);
return getDataTable(list);
+ } /**
+ * 鏌ヨ璋冨害鍗曞垪琛�
+ */
+ @PreAuthorize("@ss.hasPermi('cwgl:dispatchOrder:item')")
+ @GetMapping("/item")
+ public AjaxResult item(String no)
+ {
+ List<DispatchOrderItemVo> list = dispatchOrderService.selectDispatchOrderItem(no);
+ return AjaxResult.success(list);
+ }
+
+ /**
+ * 鏌ヨ璋冨害鍗曞垪琛�
+ */
+ @PreAuthorize("@ss.hasPermi('cwgl:dispatchOrder:attachment')")
+ @GetMapping("/attachment")
+ public TableDataInfo attachment(String no)
+ {
+ startPage();
+
+ List<DispatchOrderAttachmentVo> list = dispatchOrderService.selectDispatchOrderAttachment(no);
+ return getDataTable(list);
+ }
+
+ @PreAuthorize("@ss.hasPermi('cwgl:dispatchOrder:attachment')")
+ @GetMapping("/downAttachment")
+ public void downAttachment(String no, HttpServletResponse response) throws Exception {
+ String filePath = dispatchOrderService.downAttachment(no);
+ response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);
+ FileUtils.setAttachmentResponseHeader(response, FileUtils.getName(filePath));
+ FileUtils.writeBytes(filePath, response.getOutputStream());
}
/**
@@ -60,6 +100,19 @@
dispatchOrderService.export(dispatchOrder,exportKey);
return AjaxResult.success("瀵煎嚭璇锋眰鎴愬姛锛岃绋嶅悗鐐瑰嚮涓嬭浇...!");
}
+ /**
+ * 瀵煎嚭璋冨害鍗曞垪琛�
+ * @param dispatchOrder 鏌ヨ鏉′欢瀵硅薄
+ */
+ @PreAuthorize("@ss.hasPermi('cwgl:dispatchOrder:export')")
+ @Log(title = "璋冨害鍗�", businessType = BusinessType.EXPORT)
+ @GetMapping("/export2")
+ public AjaxResult export2(DispatchOrder dispatchOrder,String exportKey)
+ {
+ dispatchOrderService.export2(dispatchOrder,exportKey);
+ return AjaxResult.success("瀵煎嚭璇锋眰鎴愬姛锛岃绋嶅悗鐐瑰嚮涓嬭浇...!");
+ }
+
--
Gitblit v1.8.0