From c92b9d9c28f781506fa5f0707d49be19b7925c22 Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Wed, 14 Jan 2026 11:01:31 +0800
Subject: [PATCH] =?UTF-8?q?demand:=20=20TMS=E7=B3=BB=E7=BB=9F=20-=20?=
 =?UTF-8?q?=E5=AE=A2=E6=88=B7=E8=B4=A6=E5=8D=95=E7=AE=A1=E7=90=86=20-=20?=
 =?UTF-8?q?=E9=94=80=E8=B4=A6=E5=AE=A1=E6=A0=B8=E9=80=9A=E8=BF=87=E5=90=8E?=
 =?UTF-8?q?=E4=BA=A4=E6=98=93=E6=97=B6=E9=97=B4=E5=8F=96=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=E7=9A=84=E4=BA=A4=E6=98=93=E6=97=B6=E9=97=B4=20=20TMS=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=20-=20=E5=AE=A2=E6=88=B7=E8=B4=A6=E5=8D=95=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=20-=20=E4=B8=9A=E5=8A=A1=E9=94=80=E8=B4=A6=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=20-=20=E5=A2=9E=E5=8A=A0=E6=A0=A1=E9=AA=8C=E4=B8=8D?=
 =?UTF-8?q?=E5=90=8C=E6=94=AF=E4=BB=98=E7=B1=BB=E5=9E=8B=E7=9A=84=E8=BF=90?=
 =?UTF-8?q?=E5=8D=95=E4=B8=8D=E8=83=BD=E4=B8=80=E8=B5=B7=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=20=20TMS=E7=B3=BB=E7=BB=9F=20-=20=E5=AE=A2?=
 =?UTF-8?q?=E6=88=B7=E8=B4=A6=E5=8D=95=E7=AE=A1=E7=90=86=20-=20=E8=B4=A2?=
 =?UTF-8?q?=E5=8A=A1=E9=94=80=E8=B4=A6=E5=AE=A1=E6=A0=B8=20-=20=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8=E9=80=9A=E8=BF=87=E5=90=8E=E9=94=80=E8=B4=A6=E6=94=B6?=
 =?UTF-8?q?=E6=AC=BE=E7=B1=BB=E5=9E=8B=E3=80=81=E8=B4=A6=E5=8D=95=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E5=8F=96=E5=80=BC=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/EmisWriteoffApplyServiceImpl.java      | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWriteoffApplyServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWriteoffApplyServiceImpl.java
index c2e7743e8..c050f2936 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWriteoffApplyServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWriteoffApplyServiceImpl.java
@@ -186,6 +186,21 @@ public class EmisWriteoffApplyServiceImpl extends EmisBaseService implements IEm
         }
     }
 
+    /**
+     * 将结算类型数字转换为文字
+     * 
+     * @param settleType 结算类型 1-现金 2-月结
+     * @return 结算类型文字描述
+     */
+    private String getSettleTypeName(String settleType) {
+        if ("1".equals(settleType)) {
+            return "现金";
+        } else if ("2".equals(settleType)) {
+            return "月结";
+        }
+        return settleType; // 如果未知类型，返回原值
+    }
+
     /**
      * 验证明细列表中结算账单的结算类型是否一致
      *
@@ -212,7 +227,7 @@ public class EmisWriteoffApplyServiceImpl extends EmisBaseService implements IEm
                 firstSettleType = settleType;
             } else if (!firstSettleType.equals(settleType)) {
                 throw new EmisBizError("明细列表中的结算账单类型不一致，运单号 " + detail.getBillCode()
-                        + " 的结算类型为 " + settleType + "，与其他明细的结算类型 " + firstSettleType + " 不一致");
+                        + " 的结算类型为 " + getSettleTypeName(settleType) + "，与其他明细的结算类型 " + getSettleTypeName(firstSettleType) + " 不一致");
             }
         }
     }