From ac518f8f76323c5554c05108ed21b378c3013101 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 12 九月 2024 16:15:55 +0800
Subject: [PATCH] 进度报表筛选功能修复，产量报表查询修改，修改补片流程卡打印查询问题
---
north-glass-erp/src/main/java/com/example/erp/service/mm/MaterialStoreService.java | 50 +++++++++++++++++++++++++++++++++++++-------------
1 files changed, 37 insertions(+), 13 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 e6d1fc7..63f6a3c 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
@@ -28,8 +28,11 @@
@Autowired
SysErrorService sysErrorService;
- public Boolean saveMaterialStore(Map<String,Object> object) {
- boolean saveState = true;
+ public String saveMaterialStore(Map<String,Object> object) {
+ String saveState = "true";
+ //璁剧疆鍥炴粴鐐�
+ Object savePoint = TransactionAspectSupport.currentTransactionStatus().createSavepoint();
+ try {
String id = "";
String type = "";
String json = "";
@@ -53,15 +56,30 @@
}
DecimalFormat decimalFormat = new DecimalFormat("#0.00");
singlePieceArea= Double.parseDouble(decimalFormat.format(width * height / 100000));
- if(Long.parseLong(id)>0){
- materialStoreMapper.updateMaterialStore(type,json, Long.valueOf(id));
- if (Objects.equals(type, "鍘熺墖")){
- materialInventoryMapper.updateMaterialInventoryArea(Long.valueOf(id),singlePieceArea);
+ Integer jsonCount=materialStoreMapper.selectMaterialStoreJson(json);
+ if(jsonCount==0){
+ if(Long.parseLong(id)>0){
+ materialStoreMapper.updateMaterialStore(type,json, Long.valueOf(id));
+ if (Objects.equals(type, "鍘熺墖")){
+ materialInventoryMapper.updateMaterialInventoryArea(Long.valueOf(id),singlePieceArea);
+ }
+ }else{
+ materialStoreMapper.insertMaterialStore(type,json);
}
}else{
- materialStoreMapper.insertMaterialStore(type,json);
+ saveState = "false1";
}
+ } catch (Exception e) {
+ TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
+ //灏嗗紓甯镐紶鍏ユ暟鎹簱
+ SysError sysError = new SysError();
+ sysError.setError(e+Arrays.toString(e.getStackTrace()));
+ sysError.setFunc("saveMaterialStore");
+ sysErrorService.insert(sysError);
+ saveState = "false";
+
+ }
return saveState;
}
@@ -75,8 +93,8 @@
return map;
}
- public Boolean deleteMaterialStore(Map<String,Object> object) {
- boolean saveState = true;
+ public String deleteMaterialStore(Map<String,Object> object) {
+ String saveState = "true";
//璁剧疆鍥炴粴鐐�
Object savePoint = TransactionAspectSupport.currentTransactionStatus().createSavepoint();
try {
@@ -85,7 +103,13 @@
id = object.get("id").toString();
}
if(id!=null){
- materialStoreMapper.deleteMaterialStore(Long.valueOf(id));
+ Integer materialCount=materialStoreMapper.selectMaterialStore(Long.valueOf(id));
+ if(materialCount==0){
+ materialStoreMapper.deleteMaterialStore(Long.valueOf(id));
+ }else{
+ saveState="false1";
+ }
+
}
@@ -94,10 +118,10 @@
TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
//灏嗗紓甯镐紶鍏ユ暟鎹簱
SysError sysError = new SysError();
- sysError.setError(e.toString());
- sysError.setFunc("saveOrder");
+ sysError.setError(e+Arrays.toString(e.getStackTrace()));
+ sysError.setFunc("deleteMaterialStore");
sysErrorService.insert(sysError);
- saveState = false;
+ saveState = "false";
}
return saveState;
--
Gitblit v1.8.0