From df143921e8ec85b43420b71961d73825521911d1 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 23 十月 2025 10:14:49 +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/sd/BasicDataService.java | 2 --
north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java | 5 -----
north-glass-erp/src/main/java/com/example/erp/service/sd/CustomerService.java | 8 --------
north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java | 26 --------------------------
4 files changed, 0 insertions(+), 41 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/sd/BasicDataService.java b/north-glass-erp/src/main/java/com/example/erp/service/sd/BasicDataService.java
index 9c4612f..b4146fa 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/sd/BasicDataService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/sd/BasicDataService.java
@@ -34,7 +34,6 @@
//鍒涘缓List瀵硅薄
orderBasicDataMap = getBasicDataByType("order");
-
//鑾峰彇瀹㈡埛鍒楄〃
List<Object> orderBasicDataList = new ArrayList<>();
orderBasicDataMap.put("customer",orderBasicDataList);
@@ -150,7 +149,6 @@
}
public int deleteBasicData(BasicData basicData) {
-
return basicDataMapper.deleteById(basicData.getId());
}
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 59f2b87..6589b2a 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
@@ -63,9 +63,7 @@
log.setFunction("insertCustomer鏂板");
}
logService.saveLog(log);
-
}
-
} catch (Exception e) {
TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
//灏嗗紓甯镐紶鍏ユ暟鎹簱
@@ -96,11 +94,7 @@
log.setContent(object.toString());
log.setFunction("deleteCustomer鍒犻櫎");
logService.saveLog(log);
-
}
-
-
-
} catch (Exception e) {
TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
//灏嗗紓甯镐紶鍏ユ暟鎹簱
@@ -109,7 +103,6 @@
sysError.setFunc("saveOrder");
sysErrorService.insert(sysError);
saveState = false;
-
}
return saveState;
@@ -135,7 +128,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);
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java b/north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java
index 74b716a..f83fd73 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java
@@ -407,9 +407,7 @@
sysError.setFunc("insertDelivery");
sysErrorService.insert(sysError);
saveState = "false4";
-
}
-
return saveState;
}
@@ -462,7 +460,6 @@
sysError.setFunc("addDeliveryDetail");
sysErrorService.insert(sysError);
saveState = "false";
-
}
return saveState;
@@ -508,7 +505,6 @@
sysError.setFunc("deleteDelivery");
sysErrorService.insert(sysError);
saveState = false;
-
}
return saveState;
@@ -576,7 +572,6 @@
itemmap.put("DeliveryDetail", detail);
itemmap.put("DeliveryDetailList", deliveryDetailList2);
list.add(itemmap);
-
}
/*Delivery delivery=deliveryMapper.getSelectShippingOrderDetailDeliveryPrinting(deliveryDetail);
delivery.setMoney(delivery.getMoney()+otherMoney);
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java b/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java
index 7002221..143aec9 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java
@@ -89,7 +89,6 @@
updateOrder(order,OrderDetails,orderOtherMoneyList,(Map<String, String>) orderMap.get("position"));
log.setFunction("saveOrder淇敼:"+order.getOrderId());
}
-
logService.saveLog(log);
}catch (Exception e){
TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
@@ -99,7 +98,6 @@
sysError.setFunc("saveOrder");
sysErrorService.insert(sysError);
saveState = false;
-
//throw new Exception();
}
return saveState;
@@ -108,7 +106,6 @@
public boolean saveOrderTitle(Map<String,Object> orderMap) throws Exception {
JSONObject orderJson = new JSONObject(orderMap);
Order order = JSONObject.parseObject(JSONObject.toJSONString(orderJson.get("title")), Order.class);
-
boolean saveState = true;
//璁剧疆鍥炴粴鐐�
Object savePoint = TransactionAspectSupport.currentTransactionStatus().createSavepoint();
@@ -147,7 +144,6 @@
sysError.setFunc("saveOrder");
sysErrorService.insert(sysError);
saveState = false;
-
//throw new Exception();
}
return saveState;
@@ -174,7 +170,6 @@
order.setOrderId(orderId);
order.setCreateOrder(2);
orderMapper.insert(order);
-
insertOtherDetail(orderId,OrderDetails,orderOtherMoneyList,position);
}
@@ -205,7 +200,6 @@
String formattedDate = dateFormat.format(currentDate);
orderId = "NG"+formattedDate+formattedNumber;
}
-
return orderId;
}
@@ -276,7 +270,6 @@
if(otherColumns!=null){
otherColumns.values().removeIf(value -> value == null || value.equals(""));
OrderDetails.get(i).setOtherColumns(JSON.toJSONString(otherColumns));
-
otherColumns.forEach((key, value) ->{
if(value!=null && !value.equals("") && key.contains("M")) {
@@ -292,25 +285,19 @@
}else{
OrderDetails.get(i).setOtherColumns("{}");
}
-
if(OrderDetails.get(i).getFileName()!=null&&!OrderDetails.get(i).getFileName().trim().isEmpty()){
orderMapper.saveOrderFile(OrderDetails.get(i).getFileName(), OrderDetails.get(i).getFileData(),orderId,OrderDetails.get(i).getOrderNumber(),OrderDetails.get(i).getFileJson());
}
-
if(OrderDetails.get(i).getShape()==null){
OrderDetails.get(i).setShape("1");
}
}
-
-
-
//寰�鏄庣粏琛ㄦ彃鏁版嵁
orderDetailMapper.insertBatch(OrderDetails);
//寰�灏忕墖琛ㄤ紶鍏ヤ骇鍝佹暟鎹�
orderGlassDetailMapper.insertOrderGlassDetail(orderId,position.get("outside"),position.get("inside"));
-
//淇敼鎴愬搧鎷遍珮
List<OrderDetail> orderDetails = orderDetailMapper
.selectList(new LambdaQueryWrapper<OrderDetail>()
@@ -371,8 +358,6 @@
//淇敼璁㈠崟涓昏〃闈㈢Н涓庡懆闀夸互鍙婇噸閲�
orderMapper.updateOrderParameter(orderId);
-
-
}
public static List<OrderProcessDetail> getOrderProcessDetails(List<OrderGlassDetail> orderGlassDetails) {
@@ -434,8 +419,6 @@
List<OrderDetail> orderDetails = orderDetailMapper.selectList(new QueryWrapper<OrderDetail>().eq("order_id",id));
List<OrderOtherMoney> orderOtherMoneyList = orderOtherMoneyMapper.findById(id);
List<Map<String,String>> orderFileList = orderMapper.selectOrderFileList(id);
-
-
Map<String,Object> map = new HashMap<>();
map.put("order",order);
map.put("orderDetails",orderDetails);
@@ -852,16 +835,7 @@
});
returns.put("orderDetail",orderProductDetail);
-
-
-
-
-
-
return returns;
-
-
-
}
public boolean updateOrderPrintNumber(String orderId) {
--
Gitblit v1.8.0