From 70557ca360e6416dee78773e5278d2e600d1b4b6 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Wed, 24 Dec 2025 09:24:22 +0800
Subject: [PATCH] =?UTF-8?q?2025-12-24=20pda=E5=85=B6=E4=BB=96=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E6=8F=90=E4=BA=A4=E6=97=B6=E8=B0=83=E7=94=A8=E6=89=93?=
 =?UTF-8?q?=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/OtherInboundController.java    | 38 +++++++++++++++++++
 .../otherInbound/dao/OtherInboundMapper.java  | 10 +++++
 .../otherInbound/OtherInboundMapper.xml       | 14 +++++++
 3 files changed, 62 insertions(+)

diff --git a/src/main/java/com/gaotao/modules/otherInbound/controller/OtherInboundController.java b/src/main/java/com/gaotao/modules/otherInbound/controller/OtherInboundController.java
index 8211d6f..d0709ea 100644
--- a/src/main/java/com/gaotao/modules/otherInbound/controller/OtherInboundController.java
+++ b/src/main/java/com/gaotao/modules/otherInbound/controller/OtherInboundController.java
@@ -2,6 +2,7 @@ package com.gaotao.modules.otherInbound.controller;
 
 import com.gaotao.common.utils.R;
 import com.gaotao.modules.otherInbound.service.OtherInboundService;
+import com.gaotao.modules.otherInbound.dao.OtherInboundMapper;
 import com.gaotao.modules.sys.controller.AbstractController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -23,6 +24,9 @@ public class OtherInboundController extends AbstractController {
     @Autowired
     private OtherInboundService otherInboundService;
 
+    @Autowired
+    private OtherInboundMapper otherInboundMapper;
+
     /**
      * 获取其他入库单列表
      * 数据来源：inbound_notification_head表，类型为其他入库
@@ -340,4 +344,38 @@ public class OtherInboundController extends AbstractController {
             return R.error("添加物料失败: " + e.getMessage());
         }
     }
+
+    /**
+     * 获取用户默认打印机配置
+     * 根据 site、username、labelNo 查询配置的打印机名称
+     */
+    @PostMapping("/getUserDefaultPrinter")
+    @ApiOperation("获取用户默认打印机配置")
+    public R getUserDefaultPrinter(@RequestBody Map<String, Object> params) {
+        try {
+            String username = (String) params.get("username");
+            String labelNo = (String) params.get("labelNo");
+            
+            // 如果未传用户名，使用当前登录用户
+            if (username == null || username.trim().isEmpty()) {
+                username = getUser().getUsername();
+            }
+            
+            // 查询用户的打印机配置
+            Map<String, Object> printerConfig = otherInboundMapper.getUserDefaultPrinter(username, labelNo);
+            
+            if (printerConfig != null && printerConfig.get("printerName") != null) {
+                return R.ok()
+                    .put("printerName", printerConfig.get("printerName"))
+                    .put("printerIp", printerConfig.get("printerIp"))
+                    .put("labelNo", printerConfig.get("labelNo"));
+            }
+            
+            // 没有配置打印机
+            return R.ok().put("printerName", null).put("printerIp", null);
+        } catch (Exception e) {
+            logger.error("获取用户默认打印机配置失败", e);
+            return R.error("获取打印机配置失败: " + e.getMessage());
+        }
+    }
 }
diff --git a/src/main/java/com/gaotao/modules/otherInbound/dao/OtherInboundMapper.java b/src/main/java/com/gaotao/modules/otherInbound/dao/OtherInboundMapper.java
index c3e9d8d..40aa125 100644
--- a/src/main/java/com/gaotao/modules/otherInbound/dao/OtherInboundMapper.java
+++ b/src/main/java/com/gaotao/modules/otherInbound/dao/OtherInboundMapper.java
@@ -69,4 +69,14 @@ public interface OtherInboundMapper {
      * @return 已扫描标签列表
      */
     List<Map<String, Object>> getScannedLabelList(Map<String, Object> params);
+
+    /**
+     * 获取用户默认打印机配置
+     * @param site 站点
+     * @param username 用户名
+     * @param labelNo 标签模板编号（可选）
+     * @return 打印机配置 {printerName, printerIp, labelNo}
+     */
+    Map<String, Object> getUserDefaultPrinter(@Param("username") String username,
+                                              @Param("labelNo") String labelNo);
 }
\ No newline at end of file
diff --git a/src/main/resources/mapper/otherInbound/OtherInboundMapper.xml b/src/main/resources/mapper/otherInbound/OtherInboundMapper.xml
index cd501ef..eab847c 100644
--- a/src/main/resources/mapper/otherInbound/OtherInboundMapper.xml
+++ b/src/main/resources/mapper/otherInbound/OtherInboundMapper.xml
@@ -150,4 +150,18 @@
         ORDER BY RollNo DESC
     </select>
 
+    <!-- 获取用户默认打印机配置 -->
+    <select id="getUserDefaultPrinter" resultType="map">
+        SELECT TOP 1
+            rfp.NewPrinterName AS printerName,
+            rfp.IPAddress AS printerIp,
+            rfp.ReportID AS labelNo
+        FROM ReportFileList_UserPrinter rfp
+        WHERE rfp.UserID = #{username}
+          <if test="labelNo != null and labelNo != ''">
+              AND rfp.ReportID = #{labelNo}
+          </if>
+        ORDER BY rfp.ReportID
+    </select>
+
 </mapper>