From 47245a7dee73e45520565392157a25caaecfd0a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com>
Date: Tue, 14 Apr 2026 08:52:18 +0800
Subject: [PATCH] =?UTF-8?q?nc=E6=8E=A8=E9=80=81=E4=BF=AE=E6=94=B9;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../billManage/repository/persistence/BillManageImpl.java | 7 +++++--
 .../repository/persistence/ReconciliationImpl.java        | 8 ++++++--
 sql/wkx20260403.sql                                       | 2 +-
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/persistence/BillManageImpl.java b/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/persistence/BillManageImpl.java
index 2bb5edc3b..d08e95350 100644
--- a/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/persistence/BillManageImpl.java
+++ b/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/persistence/BillManageImpl.java
@@ -278,7 +278,9 @@ public class BillManageImpl extends ServiceImpl<BillManageMapper, BillManage> im
                                 }
                                 String invoiceItem1 = item1.getInvoiceItem();
                                 if (invoiceItem1 != null && !invoiceItem1.isEmpty()) {
-                                    item.setDef29(invoiceItem1);
+                                    String[] split = invoiceItem1.split(",");
+                                    item.setDef29(split[0]);
+                                    //item.setDef29(invoiceItem1);
                                 }
                                 item.setTaxcodeid("ZL01");
                                 item.setInvoiceno(invoiceNumber);
@@ -564,7 +566,8 @@ public class BillManageImpl extends ServiceImpl<BillManageMapper, BillManage> im
                             }
                             String invoiceItem1 = firstItem.getInvoiceItem();
                             if (invoiceItem1 != null && !invoiceItem1.isEmpty()) {
-                                item.setDef29(invoiceItem1);
+                                String[] split = invoiceItem1.split(",");
+                                item.setDef29(split[0]);
                             }
                             item.setPk_currtype(settlementCurrencyNcCode);
                             item.setMoney_cr(String.valueOf(totalInvoiceValue));
diff --git a/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/persistence/ReconciliationImpl.java b/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/persistence/ReconciliationImpl.java
index ff56c5a6d..8e6ee732a 100644
--- a/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/persistence/ReconciliationImpl.java
+++ b/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/persistence/ReconciliationImpl.java
@@ -1592,7 +1592,9 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
                             }
                             String invoiceItem1 = firstItem.getInvoiceItem();
                             if (invoiceItem1 != null && !invoiceItem1.isEmpty()) {
-                                item.setDef29(invoiceItem1);
+                                String[] split = invoiceItem1.split(",");
+                                item.setDef29(split[0]);
+                                //item.setDef29(invoiceItem1);
                             }
                             item.setPk_currtype(settlementCurrencyNcCode);
                             item.setMoney_cr(String.valueOf(totalInvoiceValue));
@@ -1876,7 +1878,9 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
                             }
                             String invoiceItem1 = firstItem.getInvoiceItem();
                             if (invoiceItem1 != null && !invoiceItem1.isEmpty()) {
-                                item.setDef29(invoiceItem1);
+                                String[] split = invoiceItem1.split(",");
+                                item.setDef29(split[0]);
+                                //item.setDef29(invoiceItem1);
                             }
                             item.setPk_currtype(settlementCurrencyNcCode);
                             item.setMoney_cr(String.valueOf(totalInvoiceValue));
diff --git a/sql/wkx20260403.sql b/sql/wkx20260403.sql
index 8570e6346..37665075e 100644
--- a/sql/wkx20260403.sql
+++ b/sql/wkx20260403.sql
@@ -28,7 +28,7 @@ COMMENT ON COLUMN "NGWL_TEST_WMS"."STOCK_IN_ORDER"."SALESMAN_NAME" IS '业务员
 
 COMMENT ON COLUMN "NGWL_TEST_WMS"."STOCK_IN_ORDER"."SETTLEMENT_CURRENCY" IS '结算币种';
 
-COMMENT ON COLUMN "NGWL_TEST_WMS"."STOCK_IN_ORDER"."SALESMAN_ID" IS '业务员id'
+COMMENT ON COLUMN "NGWL_TEST_WMS"."STOCK_IN_ORDER"."SALESMAN_ID" IS '业务员id';
 
 ALTER TABLE "NGWL_TEST_WMS"."STOCK_OUT_ORDER" ADD COLUMN "BILLING_JSON" CLOB;