From 3760bb766253ea2b2291e00d7bc5147bdee9bb44 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期三, 19 六月 2024 16:58:09 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java | 86 +++++++++++++++++++++++++++++++++++--------
1 files changed, 70 insertions(+), 16 deletions(-)
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 b386c6b..47a0279 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
@@ -72,6 +72,49 @@
}
return saveState;
}
+
+ 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();
+ //鍒ゆ柇浼犲叆id鍙傛暟鏄惁涓虹┖锛屾湭浼犲叆id涓虹┖鎻掑叆璁㈠崟琛紝浼犲叆鏇存柊琛�
+ try{
+ LambdaUpdateWrapper<Order> updateWrapper = new LambdaUpdateWrapper<>();
+ updateWrapper.eq(Order::getOrderId, order.getOrderId());
+ orderMapper.update(order,updateWrapper);
+ //淇敼璁㈠崟涓昏〃闈㈢Н涓庡懆闀夸互鍙婇噸閲�
+ orderMapper.updateOrderParameter(order.getOrderId());
+
+ }catch (Exception e){
+ TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
+ //灏嗗紓甯镐紶鍏ユ暟鎹簱
+ SysError sysError = new SysError();
+ sysError.setError(e.toString());
+ sysError.setFunc("saveOrder");
+ sysErrorService.insert(sysError);
+ saveState = false;
+
+ //throw new Exception();
+ }
+ return saveState;
+ }
+
+
+ public Map<String,Object> selectOrder(Map<String,Object> orderMap) throws Exception {
+ JSONObject orderJson = new JSONObject(orderMap);
+ Order order = JSONObject.parseObject(JSONObject.toJSONString(orderJson.get("title")), Order.class);
+ Map<String,Object> map = new HashMap<>();
+ if(order.getOrderId()!=null){
+ map.put("data",0);
+ }else{
+ map.put("data",orderMapper.selectOrder(order));
+ }
+
+ return map;
+ }
//鐢熸垚璁㈠崟鏁版嵁
public void insertOrder(Order order,List<OrderDetail> OrderDetails,List<OrderOtherMoney> orderOtherMoneyList) {
Integer maxOrderId = orderMapper.selectMaxOrderId();
@@ -86,7 +129,9 @@
order.setOrderId(orderId);
order.setCreateOrder(2);
orderMapper.insert(order);
+
insertOtherDetail(orderId,OrderDetails,orderOtherMoneyList);
+
}
//淇敼璁㈠崟鏁版嵁锛屽苟涓旈噸鏂扮敓鎴愬涓壇琛ㄦ暟鎹�
@@ -94,17 +139,17 @@
LambdaUpdateWrapper<Order> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.eq(Order::getOrderId, order.getOrderId());
orderMapper.update(order,updateWrapper);
- //鍒犻櫎璁㈠崟鏄庣粏琛�
- orderDetailMapper.delete(new LambdaQueryWrapper<OrderDetail>().eq(OrderDetail::getOrderId, order.getOrderId()));
- //鍒犻櫎璁㈠崟灏忕墖琛�
- orderGlassDetailMapper.delete(new LambdaQueryWrapper<OrderGlassDetail>().eq(OrderGlassDetail::getOrderId, order.getOrderId()));
- //鍒犻櫎鍏朵粬閲戦鏄庣粏琛�
- orderOtherMoneyMapper.delete(new LambdaQueryWrapper<OrderOtherMoney>().eq(OrderOtherMoney::getOrderId, order.getOrderId()));
+ //鍒犻櫎璁㈠崟鏄庣粏琛�
+ orderDetailMapper.delete(new LambdaQueryWrapper<OrderDetail>().eq(OrderDetail::getOrderId, order.getOrderId()));
+ //鍒犻櫎璁㈠崟灏忕墖琛�
+ orderGlassDetailMapper.delete(new LambdaQueryWrapper<OrderGlassDetail>().eq(OrderGlassDetail::getOrderId, order.getOrderId()));
+ //鍒犻櫎鍏朵粬閲戦鏄庣粏琛�
+ orderOtherMoneyMapper.delete(new LambdaQueryWrapper<OrderOtherMoney>().eq(OrderOtherMoney::getOrderId, order.getOrderId()));
- //鍒犻櫎璁㈠崟宸ヨ壓琛�
- // orderProcessDetailMapper.delete(new LambdaQueryWrapper<OrderProcessDetail>().eq(OrderProcessDetail::getOrderId, order.getOrderId()));
- insertOtherDetail(order.getOrderId(),OrderDetails,orderOtherMoneyList);
+ //鍒犻櫎璁㈠崟宸ヨ壓琛�
+ // orderProcessDetailMapper.delete(new LambdaQueryWrapper<OrderProcessDetail>().eq(OrderProcessDetail::getOrderId, order.getOrderId()));
+ insertOtherDetail(order.getOrderId(),OrderDetails,orderOtherMoneyList);
}
@@ -239,8 +284,12 @@
Order order = orderMapper.selectOne(new QueryWrapper<Order>().eq("order_id",id));
if(order.getProcessReview()!=2){
throw new ServiceException(Constants.Code_600,"璇ヨ鍗曡繕鏈鏍�");
+ }else if(status==0){
+ return orderMapper.reviewOrderByIds(id,status,userId,userName);
+ }else{
+ return orderMapper.reviewOrderById(id,status,userId,userName);
}
- return orderMapper.reviewOrderById(id,status,userId,userName);
+
}
//宸ヨ壓瀹℃牳鐣岄潰瀹℃牳鏇存柊鏁版嵁
public boolean reviewProcessById(String id, Integer status,List<OrderGlassDetail> orderGlassDetails) {
@@ -379,10 +428,12 @@
orderProductDetailMap.put("productName",map.get("productName"));
List<OrderDetail> orderDetails = orderDetailMapper.getOrderProductByProductId(map.get("productId"),orderId);
orderDetails.forEach(orderDetail->{
+
orderDetail.setGrossArea(
- Double.parseDouble(String.format("%.3f",
+ Double.parseDouble(String.format("%.3f",Double.parseDouble(
+ String.format("%.3f",
orderDetail.getWidth()*orderDetail.getHeight()/1000000)
- ) * orderDetail.getQuantity()
+ ) * orderDetail.getQuantity()))
);
});
@@ -410,9 +461,10 @@
List<OrderDetail> orderDetails = orderDetailMapper.getOrderProductByProductId(map.get("productId"),orderId);
orderDetails.forEach(orderDetail->{
orderDetail.setGrossArea(
- Double.parseDouble(String.format("%.3f",
- orderDetail.getWidth()*orderDetail.getHeight()/1000000)
- ) * orderDetail.getQuantity()
+ Double.parseDouble(String.format("%.3f",Double.parseDouble(
+ String.format("%.3f",
+ orderDetail.getWidth()*orderDetail.getHeight()/1000000)
+ ) * orderDetail.getQuantity()))
);
List<OrderGlassDetail> orderGlassDetails =
@@ -420,7 +472,9 @@
new QueryWrapper<OrderGlassDetail>().
eq("order_id",orderId).
eq("order_number",orderDetail.getOrderNumber())
- );
+ );
+ Integer differentSize = orderGlassDetailMapper.getDifferentSizeNumber(orderId,orderDetail.getOrderNumber());
+ orderDetail.setDifferentSize(differentSize);
orderDetail.setOrderGlassDetails(orderGlassDetails);
});
--
Gitblit v1.8.0