From 6db03250bcbf51193b8dd71a698ea2b202c6d6ad Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 26 十二月 2025 15:59:20 +0800
Subject: [PATCH] 班组产量汇总报表，客户名称不能重复创建显示
---
north-glass-erp/src/main/java/com/example/erp/service/sd/CustomerService.java | 31 ++++++++++++++++---------------
1 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/sd/CustomerService.java b/north-glass-erp/src/main/java/com/example/erp/service/sd/CustomerService.java
index 6863176..e751c03 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/sd/CustomerService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/sd/CustomerService.java
@@ -47,23 +47,28 @@
public Boolean insertCustomer(Map<String,Object> object) {
boolean saveState = true;
Log log = new Log();
+ log.setOperatorId(object.get("userId").toString());
+ log.setOperator(object.get("userName").toString());
log.setContent(object.toString());
//璁剧疆鍥炴粴鐐�
Object savePoint = TransactionAspectSupport.currentTransactionStatus().createSavepoint();
try {
Customer customer = JSONObject.parseObject(JSONObject.toJSONString(object.get("customer")), Customer.class);
if(customer!=null){
- if (customer.getId()!=null && customer.getId()!=0){
- customerMapper.updateCustomer(customer);
- log.setFunction("insertCustomer淇敼");
- }else{
- customerMapper.insertCustomer(customer);
- log.setFunction("insertCustomer鏂板");
+ Integer count = customerMapper.countByCustomerName(customer);
+ if (count > 0) {
+ saveState = false;
+ }else {
+ if (customer.getId()!=null && customer.getId()!=0){
+ customerMapper.updateCustomer(customer);
+ log.setFunction("insertCustomer淇敼");
+ }else{
+ customerMapper.insertCustomer(customer);
+ log.setFunction("insertCustomer鏂板");
+ }
+ logService.saveLog(log);
}
- logService.saveLog(log);
-
}
-
} catch (Exception e) {
TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
//灏嗗紓甯镐紶鍏ユ暟鎹簱
@@ -89,14 +94,12 @@
customerMapper.deleteCustomer(customer);
}
Log log = new Log();
+ log.setOperatorId(object.get("userId").toString());
+ log.setOperator(object.get("userName").toString());
log.setContent(object.toString());
log.setFunction("deleteCustomer鍒犻櫎");
logService.saveLog(log);
-
}
-
-
-
} catch (Exception e) {
TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
//灏嗗紓甯镐紶鍏ユ暟鎹簱
@@ -105,7 +108,6 @@
sysError.setFunc("saveOrder");
sysErrorService.insert(sysError);
saveState = false;
-
}
return saveState;
@@ -131,7 +133,6 @@
map.put("data", customerMapper.getSelectCustomerDeliveryDate(offset, pageSize,startDate,endDate, orderDetail));
map.put("total", customerMapper.getSelectCustomerDeliveryDatePageTotal(offset, pageSize,startDate,endDate, orderDetail));
}
-
List<String> list = new ArrayList<>();
list.add(startDate);
list.add(endDate);
--
Gitblit v1.8.0