From 05b730c07f34b4392caa7ad877bf2b1964888253 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 25 六月 2024 08:06:17 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override

---
 north-glass-erp/src/main/java/com/example/erp/service/sd/BasicOtherMoneyService.java |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/north-glass-erp/src/main/java/com/example/erp/service/sd/BasicOtherMoneyService.java b/north-glass-erp/src/main/java/com/example/erp/service/sd/BasicOtherMoneyService.java
index 982af9d..4dd26b8 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/sd/BasicOtherMoneyService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/sd/BasicOtherMoneyService.java
@@ -45,7 +45,12 @@
         }
 
         BasicOtherMoney basicOtherMoney = basicOtherMoneyList.get(0);
-        String getColumn = basicOtherMoney.getColumn()==null?"0":basicOtherMoney.getColumn().replace("M","");
+        String getColumn = basicOtherMoney.getColumn()==null?
+                "0":
+                String.valueOf(basicOtherMoney.getId());
+//                basicOtherMoney.getColumn().
+//                        replace("M","").
+//                        replace("S","");
         int  columnNum = Integer.parseInt(getColumn)+1;
         BasicOtherMoney newBasicOtherMoney = new  BasicOtherMoney();
         newBasicOtherMoney.setColumn("M"+String.format("%02d", columnNum));

--
Gitblit v1.8.0