From d5bb894f9be2e0a3b62d475b60b44f2ab138528c Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期四, 12 六月 2025 16:48:35 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/service/sd/BasicOtherMoneyService.java | 14 +++++++++++++-
1 files changed, 13 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..ee61c06 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));
@@ -53,4 +58,11 @@
basicOtherMoneyMapper.insert(newBasicOtherMoney);
return true;
}
+
+ public List<BasicOtherMoney> findAllByState() {
+ return basicOtherMoneyMapper.selectList(
+ new QueryWrapper<BasicOtherMoney>().
+ eq("state",1).
+ like("`column`","S"));
+ }
}
--
Gitblit v1.8.0