From edc227277159601c5cb86829f1c5ce14cf7903a4 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 24 九月 2024 10:12:55 +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 | 15 +++++++++++++++
1 files changed, 15 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..31d79e7 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,10 @@
if (object.get("height") != null) {
height = Double.parseDouble(object.get("height").toString());
}
+
+ Log log = new Log();
+ 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 +71,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);
@@ -111,6 +122,10 @@
}
}
+ Log log = new Log();
+ log.setContent(object.toString());
+ log.setFunction("deleteMaterialStore鍒犻櫎锛�"+id);
+ logService.saveLog(log);
--
Gitblit v1.8.0