From cab6e1c3d1d05f36b916fd8dd03b8528c0293086 Mon Sep 17 00:00:00 2001
From: zhaoyf <1783123481@qq.com>
Date: Sat, 4 Jul 2026 10:49:02 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E9=87=87=E8=B4=AD=E5=8D=95=E6=89=93?=
 =?UTF-8?q?=E5=8D=B0=E6=9C=BA=E5=8F=82=E6=95=B0=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/org/nl/config/PrinterProperties.java     | 15 ---------------
 .../service/impl/PurchaseServiceImpl.java         | 12 +++++++-----
 .../wms/system_manage/enums/SysParamConstant.java |  8 ++++++++
 3 files changed, 15 insertions(+), 20 deletions(-)
 delete mode 100644 nladmin-system/wms-server/src/main/java/org/nl/config/PrinterProperties.java

diff --git a/nladmin-system/wms-server/src/main/java/org/nl/config/PrinterProperties.java b/nladmin-system/wms-server/src/main/java/org/nl/config/PrinterProperties.java
deleted file mode 100644
index 583b551..0000000
--- a/nladmin-system/wms-server/src/main/java/org/nl/config/PrinterProperties.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.nl.config;
-
-import lombok.Data;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.context.annotation.Configuration;
-
-@Data
-@Configuration
-@ConfigurationProperties("printer")
-public class PrinterProperties {
-
-    private String ip = "192.168.1.100";
-
-    private int port = 9100;
-}
\ No newline at end of file
diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/pm_manage/purchase/service/impl/PurchaseServiceImpl.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/pm_manage/purchase/service/impl/PurchaseServiceImpl.java
index 3e23d24..6d9cc23 100644
--- a/nladmin-system/wms-server/src/main/java/org/nl/wms/pm_manage/purchase/service/impl/PurchaseServiceImpl.java
+++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/pm_manage/purchase/service/impl/PurchaseServiceImpl.java
@@ -24,11 +24,12 @@ import org.nl.wms.pm_manage.purchase.service.dto.PurchaseDto;
 import org.nl.wms.pm_manage.purchase.service.vo.PurchasemstListVo;
 import org.nl.wms.ext_manage.purchase.service.dto.EasAuditRequestDto;
 import org.nl.wms.pm_manage.purchase.util.ZplUtil;
+import org.nl.wms.system_manage.enums.SysParamConstant;
+import org.nl.wms.system_manage.service.param.ISysParamService;
 import org.nl.wms.warehouse_manage.enums.IOSEnum;
 import org.nl.wms.warehouse_manage.stockReturn.service.IPmStockReturnService;
 import org.nl.wms.warehouse_manage.stockReturn.service.dao.PmStockReturn;
 import org.nl.wms.warehouse_manage.stockReturn.service.enums.StockReturnStatusEnum;
-import org.nl.config.PrinterProperties;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -55,7 +56,7 @@ public class PurchaseServiceImpl extends ServiceImpl<PurchasemstMapper, Purchase
     private WmsToErpService wmsToErpService;
 
     @Autowired
-    private PrinterProperties printerProperties;
+    private ISysParamService sysParamService;
 
     @Override
     public IPage<PurchasemstListVo> queryAll(Map whereJson, PageQuery page) {
@@ -194,6 +195,8 @@ public class PurchaseServiceImpl extends ServiceImpl<PurchasemstMapper, Purchase
 
     @Override
     public void print(Set<String> ids) {
+        String ip = sysParamService.findByCode(SysParamConstant.PRINTER_IP).getValue();
+        String port = sysParamService.findByCode(SysParamConstant.PRINTER_PORT).getValue();
         List<Purchasemst> mstList = purchasemstMapper.selectBatchIds(ids);
         if (ObjectUtil.isEmpty(mstList)) {
             throw new BadRequestException("未找到选中的单据");
@@ -213,15 +216,14 @@ public class PurchaseServiceImpl extends ServiceImpl<PurchasemstMapper, Purchase
                 labelCount++;
             }
         }
-        try (Socket socket = new Socket(printerProperties.getIp(), printerProperties.getPort());
+        try (Socket socket = new Socket(ip, Integer.parseInt(port));
              OutputStream out = socket.getOutputStream()) {
             out.write(allZpl.toString().getBytes(StandardCharsets.UTF_8));
             out.flush();
         } catch (Exception e) {
-            log.error("打印失败, 打印机: {}:{}, 标签数: {}", printerProperties.getIp(), printerProperties.getPort(), labelCount, e);
+            log.error("打印失败, 打印机: {}:{}, 标签数: {}", ip, port, labelCount, e);
             throw new BadRequestException("打印机连接失败: " + e.getMessage());
         }
-        log.info("打印成功, 打印机: {}:{}, 标签数: {}", printerProperties.getIp(), printerProperties.getPort(), labelCount);
     }
 
     @Override
diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/system_manage/enums/SysParamConstant.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/system_manage/enums/SysParamConstant.java
index d24e2fd..ea2c350 100644
--- a/nladmin-system/wms-server/src/main/java/org/nl/wms/system_manage/enums/SysParamConstant.java
+++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/system_manage/enums/SysParamConstant.java
@@ -30,5 +30,13 @@ public class SysParamConstant {
      * MES URL
      */
     public final static String MES_URL = "mes_url";
+    /**
+     * 打印机ip
+     */
+    public final static String PRINTER_IP = "printer_ip";
+    /**
+     * 打印机端口
+     */
+    public final static String PRINTER_PORT = "printer_port";
 
 }