From b864a88a6d34cbed2cfaad7f5e843ea1330c9c91 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 18 七月 2024 10:31:33 +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, 4 insertions(+), 3 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 e03f694..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
@@ -47,9 +47,10 @@
         BasicOtherMoney basicOtherMoney = basicOtherMoneyList.get(0);
         String getColumn = basicOtherMoney.getColumn()==null?
                 "0":
-                basicOtherMoney.getColumn().
-                        replace("M","").
-                        replace("S","");
+                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