From 8d6b17bfa56fd767c6f9de666eb0dd44c6b032cd Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 22 五月 2025 15:42:38 +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/mm/MaterialStoreService.java | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/mm/MaterialStoreService.java b/north-glass-erp/src/main/java/com/example/erp/service/mm/MaterialStoreService.java
index 31d79e7..9b10bb7 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/mm/MaterialStoreService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/mm/MaterialStoreService.java
@@ -60,6 +60,8 @@
}
Log log = new Log();
+ log.setOperatorId(object.get("userId").toString());
+ log.setOperator(object.get("userName").toString());
log.setContent(object.toString());
DecimalFormat decimalFormat = new DecimalFormat("#0.00");
@@ -104,6 +106,14 @@
return map;
}
+ public Map<String, Object> getSelectMaterialStores(MaterialStore materialStore) {
+
+
+ Map<String, Object> map = new HashMap<>();
+ map.put("data", materialStoreMapper.getSelectMaterialStores(materialStore));
+ return map;
+ }
+
public String deleteMaterialStore(Map<String,Object> object) {
String saveState = "true";
//璁剧疆鍥炴粴鐐�
@@ -123,6 +133,8 @@
}
Log log = new Log();
+ log.setOperatorId(object.get("userId").toString());
+ log.setOperator(object.get("userName").toString());
log.setContent(object.toString());
log.setFunction("deleteMaterialStore鍒犻櫎锛�"+id);
logService.saveLog(log);
--
Gitblit v1.8.0