From 34747639ae7f8930816054d513d88df4daa2c71d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E6=B6=9B?= <a15234804788@163.com>
Date: Sat, 28 Mar 2026 19:05:33 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E7=AE=A1=E7=90=86=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../desk/oem/service/impl/OemStatementServiceImpl.java      | 2 +-
 .../desk/produce/service/impl/PlateAroundServiceImpl.java   | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/oem/service/impl/OemStatementServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/oem/service/impl/OemStatementServiceImpl.java
index 5bf9343d..570fd313 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/oem/service/impl/OemStatementServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/oem/service/impl/OemStatementServiceImpl.java
@@ -233,7 +233,7 @@ public class OemStatementServiceImpl extends BaseServiceImpl<OemStatementMapper,
         page.setSize(999);
         List<StatementVO> statementVOS = baseMapper.selectOemStatementPage(page, query);
         if (statementVOS == null || statementVOS.isEmpty()) {
-            return R.fail(String.format("【%】无未结算的结算单", woCode));
+            return R.fail(String.format("[%]无未结算的结算单", woCode));
         }
         return oemSettleAccounts(statementVOS, BigDecimal.ZERO, date);
     }
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/PlateAroundServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/PlateAroundServiceImpl.java
index 7a3a2366..27302280 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/PlateAroundServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/PlateAroundServiceImpl.java
@@ -229,7 +229,11 @@ public class PlateAroundServiceImpl extends BaseServiceImpl<PlateAroundMapper, P
                 // todo 计算主工序对应的金额
 //                bsTeamWagesLevelService.countTeamSalary(wo.getWoId());
                 // 调用外协结算
-                oemStatementService.autoSettlement(wo.getWoCode(), now);
+                try {
+                    oemStatementService.autoSettlement(wo.getWoCode(), now);
+                } catch (Exception e) {
+                    log.error("外协结算失败", e);
+                }
             }
         }
         if (paType.equals(PlateAround.AFTER_PLAN_IN)) {