From c759c8bc55f4a0926d4149b8c7f533ed0e6d7a07 Mon Sep 17 00:00:00 2001
From: chenhao <chenhao2@unisinsight.com>
Date: Wed, 11 Feb 2026 09:21:39 +0800
Subject: [PATCH] =?UTF-8?q?feat(inventory):=20=E6=B7=BB=E5=8A=A0=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E6=89=A7=E8=A1=8C=E8=B7=9F=E8=B8=AA=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 新增 exportExecution API 接口用于导出订单数据
- 在前端界面添加导出按钮并集成权限控制
- 更新服务层实现导出逻辑并调整表头字段顺序
- 增加订单生效时间和要求到货时间字段显示
- 完善后端控制器的导出接口权限验证机制
---
 .../oms_vue/src/api/inventory/execution.js    |  8 ++++++
 .../src/views/inventory/execution/index.vue   | 28 +++++++++++++++++--
 .../vue/VueInventoryExecutionController.java  | 19 +++++++++++++
 .../impl/ProjectOrderInfoServiceImpl.java     |  6 +++-
 4 files changed, 58 insertions(+), 3 deletions(-)

diff --git a/oms_web/oms_vue/src/api/inventory/execution.js b/oms_web/oms_vue/src/api/inventory/execution.js
index eed1d478..c9ddff5b 100644
--- a/oms_web/oms_vue/src/api/inventory/execution.js
+++ b/oms_web/oms_vue/src/api/inventory/execution.js
@@ -70,6 +70,14 @@ export function recallExecution(id) {
         params: { id }
     })
 }
+export function exportExecution(data) {
+    return request({
+        url: `/inventory/execution/vue/export`,
+        method: 'post',
+        data: { data },
+      headers: { 'Content-Type': 'multipart/form-data' },
+    })
+}
 
 // 查询出库预览信息
 export function getCheckOutPreview(data) {
diff --git a/oms_web/oms_vue/src/views/inventory/execution/index.vue b/oms_web/oms_vue/src/views/inventory/execution/index.vue
index a9fb26a7..43a554b8 100644
--- a/oms_web/oms_vue/src/views/inventory/execution/index.vue
+++ b/oms_web/oms_vue/src/views/inventory/execution/index.vue
@@ -81,7 +81,13 @@
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
+    <el-row :gutter="10" class="mb8">
 
+      <el-col :span="1.5">
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" v-hasPermi="['project:order:export']">导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
     <el-table v-loading="loading" :data="executionList" @sort-change="handleSortChange">
       <el-table-column label="序号" type="index" width="55" align="center" />
       <el-table-column label="项目编号" align="center" prop="projectCode" />
@@ -212,11 +218,11 @@
 </template>
 
 <script>
-import { listExecution, recallExecution, downloadSignFile } from "@/api/inventory/execution";
+import { listExecution, recallExecution, downloadSignFile,exportExecution } from "@/api/inventory/execution";
 import { getToken } from "@/utils/auth";
 import OrderDetailDrawer from '../../project/order/OrderDetailDrawer.vue';
 import ProjectDetailDrawer from '../../project/info/ProjectDetailDrawer.vue';
-import Edit from './edit.vue'; // Import the Edit component
+import Edit from './edit.vue';
 
 export default {
   name: "Execution",
@@ -328,6 +334,24 @@ export default {
       };
       this.upload.open = true;
     },
+
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有订单管理数据项?', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        this.exportLoading = true;
+        return exportExecution(queryParams);
+      }).then(response => {
+        this.exportLoading = false;
+        console.log("response:", response)
+        const fileName = response.msg;
+        window.location.href = process.env.VUE_APP_BASE_API + "/common/download?fileName=" + encodeURIComponent(fileName) + "&delete=" + true;
+
+      })
+    },
     // 文件上传中处理
     handleFileUploadProgress(event, file, fileList) {
       this.upload.isUploading = true;
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/vue/VueInventoryExecutionController.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/vue/VueInventoryExecutionController.java
index dab2f306..82996e18 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/vue/VueInventoryExecutionController.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/vue/VueInventoryExecutionController.java
@@ -62,6 +62,25 @@ public class VueInventoryExecutionController extends BaseController
         List<ProjectOrderInfo> list = projectOrderInfoService.selectProjectOrderInfoList(projectOrderInfo);
         return getDataTable(list);
     }
+    /**
+     * 查询订单执行跟踪列表
+     */
+    @RequiresPermissions("project:order:export")
+    @PostMapping("/export")
+    public AjaxResult export(ProjectOrderInfo projectOrderInfo)
+    {
+        projectOrderInfo.setOrderStatus(ProjectOrderInfo.OrderStatus.APPROVE_COMPLETE.getCode());
+        if (!inventoryAuthService.authAll()) {
+            List<String> productCodeList = inventoryAuthService.authProductCode();
+
+            if (CollUtil.isEmpty(productCodeList)) {
+                return AjaxResult.error("无数据导出");
+            }
+            projectOrderInfo.setProductCodeList(productCodeList);
+        }
+        String fileName = projectOrderInfoService.exportList(projectOrderInfo);
+        return AjaxResult.success(fileName);
+    }
 
     /**
      * 获取订单执行跟踪详细信息
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectOrderInfoServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectOrderInfoServiceImpl.java
index 8137a5d5..46c07e74 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectOrderInfoServiceImpl.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectOrderInfoServiceImpl.java
@@ -793,6 +793,8 @@ public class ProjectOrderInfoServiceImpl implements IProjectOrderInfoService, To
         List<List<String>> headerList = new ArrayList<>();
         headerList.add(Collections.singletonList("项目编号"));
         headerList.add(Collections.singletonList("下单时间"));
+        headerList.add(Collections.singletonList("订单生效时间"));
+        headerList.add(Collections.singletonList("要求到货时间"));
         headerList.add(Collections.singletonList("合同编号"));
         headerList.add(Collections.singletonList("项目名称"));
         headerList.add(Collections.singletonList("代表处"));
@@ -977,7 +979,7 @@ public class ProjectOrderInfoServiceImpl implements IProjectOrderInfoService, To
             totalPrice = processProducts(deployList, maxDeployService, row, totalPrice);
             //添加维保
             totalPrice = processProducts(maintenanceList, maxMaintenanceService, row, totalPrice);
-            int insertIndex=21;
+            int insertIndex=23;
             row.add(insertIndex++, wssDto.getQuantity());
             row.add(insertIndex++, wssDto.getAllPrice());
             row.add(insertIndex++, wssDto.getTaxRate());
@@ -1034,6 +1036,8 @@ public class ProjectOrderInfoServiceImpl implements IProjectOrderInfoService, To
     private  void addBasicFields(ProjectOrderInfo info, List<Object> row) {
         row.add(info.getProjectCode());
         row.add(DateUtil.format(info.getEstimatedOrderTime(), "yyyy-MM-dd"));
+        row.add(DateUtil.format(info.getApproveTime(), "yyyy-MM-dd"));
+        row.add(DateUtil.format(info.getDeliveryTime(), "yyyy-MM-dd"));
         row.add(info.getOrderCode());
         row.add(info.getProjectName());
         row.add(info.getAgentName());