From 73cacea552c98e114992987efe72b433ecf5d807 Mon Sep 17 00:00:00 2001
From: kangwenjing <1138819403@qq.com>
Date: Wed, 2 Sep 2026 09:36:33 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E5=B8=A6=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E7=9A=84=E5=8F=91=E8=B4=A7=E5=AF=BC=E5=85=A5=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF=E4=B8=8B=E8=BD=BD=E5=8A=9F=E8=83=BD=EF=BC=8C=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E5=AE=A1=E6=89=B9=E7=8A=B6=E6=80=81=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E4=B8=8E=E4=BA=A7=E5=93=81=E7=AD=9B=E9=80=89=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1. 新增/importTemplateData接口，支持下载带查询数据的发货导入模板
2. 修复审批标签页和状态显示文本不一致问题，将"已通过"改为"已处理"
3. 优化产品二级类型筛选逻辑，配件类型不显示终端配置项
4. 移除本地日志路径配置，修正MyBatis权限查询条件
5. 更新前端模板下载调用逻辑，传入查询参数
---
 oms_web/oms_vue/src/api/inventory/outer.js    |  8 ++++
 .../oms_vue/src/views/approve/all/index.vue   |  6 +--
 .../outer/components/GenerateDeliveryForm.vue | 10 ++++-
 .../src/views/system/product/index.vue        |  5 ++-
 ruoyi-admin/src/main/resources/logback.xml    |  1 +
 .../controller/InventoryOuterController.java  | 44 +++++++++++++++++++
 .../mapper/sip/ApprovalTaskMapper.xml         | 16 +++----
 7 files changed, 75 insertions(+), 15 deletions(-)

diff --git a/oms_web/oms_vue/src/api/inventory/outer.js b/oms_web/oms_vue/src/api/inventory/outer.js
index abe96b70..94d04075 100644
--- a/oms_web/oms_vue/src/api/inventory/outer.js
+++ b/oms_web/oms_vue/src/api/inventory/outer.js
@@ -79,6 +79,14 @@ export function exportDownloadTemplate() {
     method: 'get'
   })
 }
+// 下载带列表数据的发货导入模板
+export function exportDownloadTemplateData(data) {
+  return request({
+    url: '/inventory/outer/importTemplateData',
+    method: 'post',
+    data: data
+  })
+}
 export function importSnData(formData) {
   return request({
     url: '/inventory/outer/vue/importData',
diff --git a/oms_web/oms_vue/src/views/approve/all/index.vue b/oms_web/oms_vue/src/views/approve/all/index.vue
index 7bb61638..cba3ffa1 100644
--- a/oms_web/oms_vue/src/views/approve/all/index.vue
+++ b/oms_web/oms_vue/src/views/approve/all/index.vue
@@ -546,7 +546,7 @@ export default {
       tabs: [
         { label: '全部', name: 'all' },
         { label: '待处理', name: 'pending' },
-        { label: '已通过', name: 'processed' },
+        { label: '已处理', name: 'processed' },
         { label: '已归档', name: 'approved' },
         { label: '已驳回', name: 'returned' }
       ],
@@ -758,9 +758,9 @@ export default {
     },
     getApproveStatusLabel(row) {
       if (row.approveStatus === '1') {
-        return this.isCurrentApproveUser(row) ? '待处理' : '已通过'
+        return this.isCurrentApproveUser(row) ? '待处理' : '已处理'
       }
-      const map = { 2: '已通过', 3: '已驳回' }
+      const map = { 2: '已处理', 3: '已驳回' }
       return map[row.approveStatus] || ''
     },
     getApproveStatusTagType(row) {
diff --git a/oms_web/oms_vue/src/views/inventory/outer/components/GenerateDeliveryForm.vue b/oms_web/oms_vue/src/views/inventory/outer/components/GenerateDeliveryForm.vue
index ab72c159..33818ef7 100644
--- a/oms_web/oms_vue/src/views/inventory/outer/components/GenerateDeliveryForm.vue
+++ b/oms_web/oms_vue/src/views/inventory/outer/components/GenerateDeliveryForm.vue
@@ -106,7 +106,7 @@
 
 <script>
 import { addDelivery, listProductSn } from '@/api/inventory/delivery';
-import {importSnData,exportDownloadTemplate,assignDeliverySnData} from '@/api/inventory/outer'
+import {importSnData,exportDownloadTemplateData,assignDeliverySnData} from '@/api/inventory/outer'
 import PurchaseOrderSelectDialog from '../../../purchaseorder/components/PurchaseOrderSelectDialog.vue';
 import {handleTree} from "@/utils/ruoyi";
 import { productMatchBindList } from '@/api/project/order';
@@ -270,7 +270,13 @@ export default {
       this.selectedSnList = selection;
     },
     handleDownloadTemplate() {
-      exportDownloadTemplate().then(response => {
+      exportDownloadTemplateData({
+        productCode: this.queryParams.productCode,
+        warehouseId: this.queryParams.warehouseId,
+        orderCode: this.queryParams.orderCode,
+        purchaseNo: this.queryParams.purchaseNo,
+        inventoryStatus: this.queryParams.inventoryStatus
+      }).then(response => {
         const fileName = response.msg;
         window.location.href = process.env.VUE_APP_BASE_API + "/common/download?fileName=" + encodeURIComponent(fileName) + "&delete=" + true;
       }).catch(() => {
diff --git a/oms_web/oms_vue/src/views/system/product/index.vue b/oms_web/oms_vue/src/views/system/product/index.vue
index 369350d8..f625f0b1 100644
--- a/oms_web/oms_vue/src/views/system/product/index.vue
+++ b/oms_web/oms_vue/src/views/system/product/index.vue
@@ -566,8 +566,9 @@ export default {
       });
     },
     handleLevel2TypeChange(level2Type) {
-      // 产品类型为硬件时显示云终端配置
-      if (this.form.type == 2) {
+      // 产品类型为硬件，且二级类型不是"硬件-配件"(dictValue=6)时，显示终端/国产化/CPU字段
+      const isAccessory = level2Type == 6;
+      if (this.form.type == 2 && !isAccessory) {
         this.level2TypeRelation = true;
         // 显示时添加必填验证
         this.rules.terminalType = [{ required: true, message: "终端类型不能为空", trigger: "change" }];
diff --git a/ruoyi-admin/src/main/resources/logback.xml b/ruoyi-admin/src/main/resources/logback.xml
index 860080b7..ede6e534 100644
--- a/ruoyi-admin/src/main/resources/logback.xml
+++ b/ruoyi-admin/src/main/resources/logback.xml
@@ -2,6 +2,7 @@
 <configuration>
     <!-- 日志存放路径 -->
 	<property name="log.path" value="/Users/jiliu/WorkSpace/java/RuoYi/logs" />
+<!--    <property name="log.path" value="/Users/kangwenjing/Downloads/project/logs" />-->
     <!-- 日志输出格式 -->
 	<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
 
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/InventoryOuterController.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/InventoryOuterController.java
index 027a217d..f7d297a0 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/InventoryOuterController.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/InventoryOuterController.java
@@ -3,11 +3,14 @@ package com.ruoyi.sip.controller;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.*;
+import java.util.stream.Collectors;
 
 import cn.hutool.core.collection.CollUtil;
 import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.sip.dto.inventory.InventoryInfoExcelDto;
 import com.ruoyi.sip.service.IInventoryAuthService;
+import com.ruoyi.sip.service.IInventoryInfoService;
 import com.ruoyi.sip.service.IOmsInventoryInnerService;
 import com.ruoyi.sip.vo.OuterDeliveryVo;
 import com.ruoyi.sip.vo.OuterViewVo;
@@ -18,6 +21,7 @@ import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.*;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.sip.domain.InventoryInfo;
 import com.ruoyi.sip.domain.InventoryOuter;
 import com.ruoyi.sip.service.IInventoryOuterService;
 import com.ruoyi.common.core.controller.BaseController;
@@ -41,6 +45,8 @@ public class InventoryOuterController extends BaseController
     @Autowired
     private IInventoryOuterService inventoryOuterService;
     @Autowired
+    private IInventoryInfoService inventoryInfoService;
+    @Autowired
     private IOmsInventoryInnerService innerService;
     @Autowired
     private IInventoryAuthService inventoryAuthService;
@@ -161,6 +167,44 @@ public class InventoryOuterController extends BaseController
         return util.importTemplateExcel("发货数据");
     }
 
+    /**
+     * 下载带列表数据的发货导入模板
+     */
+    @PostMapping("/importTemplateData")
+    @ResponseBody
+    public AjaxResult importTemplateData(@RequestBody(required = false) InventoryInfo query)
+    {
+        ExcelUtil<InventoryInfoExcelDto> util = new ExcelUtil<InventoryInfoExcelDto>(InventoryInfoExcelDto.class);
+        if (query == null || StringUtils.isEmpty(query.getProductCode()))
+        {
+            return util.importTemplateExcel("发货数据");
+        }
+        // 与列表查询保持一致：权限过滤 + 库存状态为入库(0)
+        if (!inventoryAuthService.authAll())
+        {
+            List<String> productCodeList = inventoryAuthService.authProductCode();
+            if (CollUtil.isEmpty(productCodeList))
+            {
+                return util.exportExcel(Collections.emptyList(), "发货数据");
+            }
+            query.setProductCodeList(productCodeList);
+        }
+        if (StringUtils.isEmpty(query.getInventoryStatus()))
+        {
+            query.setInventoryStatus(InventoryInfo.InventoryStatusEnum.INNER.getCode());
+        }
+        List<InventoryInfo> list = inventoryInfoService.selectInventoryInfoList(query);
+        List<InventoryInfoExcelDto> dataList = list.stream().map(item -> {
+            InventoryInfoExcelDto dto = new InventoryInfoExcelDto();
+            dto.setProductCode(item.getProductCode());
+            dto.setModel(item.getModel());
+            dto.setProductDesc(item.getProductDesc());
+            dto.setWarehouseName(item.getWarehouseName());
+            return dto;
+        }).collect(Collectors.toList());
+        return util.exportExcel(dataList, "发货数据");
+    }
+
     @PostMapping("/importData")
     @ResponseBody
     public AjaxResult importTemplate(@RequestPart("file") MultipartFile file, @RequestParam(value = "productCode") String productCode
diff --git a/ruoyi-sip/src/main/resources/mapper/sip/ApprovalTaskMapper.xml b/ruoyi-sip/src/main/resources/mapper/sip/ApprovalTaskMapper.xml
index a18c44da..a2715ad1 100644
--- a/ruoyi-sip/src/main/resources/mapper/sip/ApprovalTaskMapper.xml
+++ b/ruoyi-sip/src/main/resources/mapper/sip/ApprovalTaskMapper.xml
@@ -1287,7 +1287,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             left join (
                     select business_key, count(1) as bu_todo_count from bu_todo as tt 
                     where tt.process_key in ('finance_payment')
-                    <if test="approveUser != null and approveUser != &quot;1&quot; and !financeView">
+                    <if test="approveUser != null and approveUser != &quot;1&quot;">
                         and tt.approve_user = #{approveUser}
                     </if>
                     group by business_key
@@ -1319,7 +1319,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             left join (
                     select business_key, count(1) as bu_todo_count from bu_todo as tt 
                     where tt.process_key in ('finance_refund')
-                    <if test="approveUser != null and approveUser != &quot;1&quot; and !financeView">
+                    <if test="approveUser != null and approveUser != &quot;1&quot;">
                         and tt.approve_user = #{approveUser}
                     </if>
                     group by business_key
@@ -1351,7 +1351,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             left join (
                     select business_key, count(1) as bu_todo_count from bu_todo as tt 
                     where tt.process_key in ('fianance_ticket')
-                    <if test="approveUser != null and approveUser != &quot;1&quot; and !financeView">
+                    <if test="approveUser != null and approveUser != &quot;1&quot;">
                         and tt.approve_user = #{approveUser}
                     </if>
                     group by business_key
@@ -1383,7 +1383,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             left join (
                     select business_key, count(1) as bu_todo_count from bu_todo as tt 
                     where tt.process_key in ('finance_ticket_refound')
-                    <if test="approveUser != null and approveUser != &quot;1&quot; and !financeView">
+                    <if test="approveUser != null and approveUser != &quot;1&quot;">
                         and tt.approve_user = #{approveUser}
                     </if>
                     group by business_key
@@ -1415,7 +1415,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             left join (
                     select business_key, count(1) as bu_todo_count from bu_todo as tt 
                     where tt.process_key in ('finance_receipt_approve')
-                    <if test="approveUser != null and approveUser != &quot;1&quot; and !financeView">
+                    <if test="approveUser != null and approveUser != &quot;1&quot;">
                         and tt.approve_user = #{approveUser}
                     </if>
                     group by business_key
@@ -1447,7 +1447,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             left join (
                     select business_key, count(1) as bu_todo_count from bu_todo as tt 
                     where tt.process_key in ('finance_receipt_refound')
-                    <if test="approveUser != null and approveUser != &quot;1&quot; and !financeView">
+                    <if test="approveUser != null and approveUser != &quot;1&quot;">
                         and tt.approve_user = #{approveUser}
                     </if>
                     group by business_key
@@ -1479,7 +1479,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             left join (
                     select business_key, count(1) as bu_todo_count from bu_todo as tt 
                     where tt.process_key in ('finance_invoice_approve')
-                    <if test="approveUser != null and approveUser != &quot;1&quot; and !financeView">
+                    <if test="approveUser != null and approveUser != &quot;1&quot;">
                         and tt.approve_user = #{approveUser}
                     </if>
                     group by business_key
@@ -1511,7 +1511,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             left join (
                     select business_key, count(1) as bu_todo_count from bu_todo as tt 
                     where tt.process_key in ('finance_invoice_refound')
-                    <if test="approveUser != null and approveUser != &quot;1&quot; and !financeView">
+                    <if test="approveUser != null and approveUser != &quot;1&quot;">
                         and tt.approve_user = #{approveUser}
                     </if>
                     group by business_key