From 47ca985e28ec69867e8cce2505529fb9091bf823 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 28 二月 2025 16:03:06 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/service/mm/MaterialStoreService.java | 27 +++++++++++++++++++++++++++
1 files changed, 27 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 63f6a3c..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
@@ -2,10 +2,12 @@
import com.baomidou.dynamic.datasource.annotation.DS;
import com.example.erp.entity.mm.MaterialStore;
+import com.example.erp.entity.userInfo.Log;
import com.example.erp.entity.userInfo.SysError;
import com.example.erp.mapper.mm.BasicWarehouseTypeMapper;
import com.example.erp.mapper.mm.MaterialInventoryMapper;
import com.example.erp.mapper.mm.MaterialStoreMapper;
+import com.example.erp.service.userInfo.LogService;
import com.example.erp.service.userInfo.SysErrorService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -27,6 +29,8 @@
BasicWarehouseTypeMapper basicWarehouseTypeMapper;
@Autowired
SysErrorService sysErrorService;
+ @Autowired
+ LogService logService;
public String saveMaterialStore(Map<String,Object> object) {
String saveState = "true";
@@ -54,6 +58,12 @@
if (object.get("height") != null) {
height = Double.parseDouble(object.get("height").toString());
}
+
+ 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");
singlePieceArea= Double.parseDouble(decimalFormat.format(width * height / 100000));
Integer jsonCount=materialStoreMapper.selectMaterialStoreJson(json);
@@ -63,12 +73,15 @@
if (Objects.equals(type, "鍘熺墖")){
materialInventoryMapper.updateMaterialInventoryArea(Long.valueOf(id),singlePieceArea);
}
+ log.setFunction("saveMaterialStore淇敼");
}else{
materialStoreMapper.insertMaterialStore(type,json);
+ log.setFunction("saveMaterialStore鏂板");
}
}else{
saveState = "false1";
}
+ logService.saveLog(log);
} catch (Exception e) {
TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
@@ -93,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";
//璁剧疆鍥炴粴鐐�
@@ -111,6 +132,12 @@
}
}
+ 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