From c8ebeb63d549adf498e7c3fbd2cf91ba8923e5f0 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 02 二月 2024 15:39:52 +0800
Subject: [PATCH] 重新上传差异问题
---
north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java | 140 +++++++++++++++++++++++++++++++++++++---------
1 files changed, 113 insertions(+), 27 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 d98e2b2..4f433d7 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
@@ -3,49 +3,73 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.example.erp.entity.sd.Order;
import com.example.erp.entity.sd.OrderDetail;
+import com.example.erp.entity.sd.OrderGlassDetail;
+import com.example.erp.entity.sd.OrderProcessDetail;
+import com.example.erp.entity.userInfo.SysError;
import com.example.erp.mapper.sd.OrderDetailMapper;
+import com.example.erp.mapper.sd.OrderGlassDetailMapper;
import com.example.erp.mapper.sd.OrderMapper;
-import org.springframework.beans.factory.annotation.Autowired;
+import com.example.erp.mapper.sd.OrderProcessDetailMapper;
+import com.example.erp.service.userInfo.SysErrorService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
-import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
@Service
@DS("sd")
+@Transactional(rollbackFor = Exception.class)
public class OrderService {
- @Autowired
- private OrderMapper orderMapper;
- @Autowired
- private OrderDetailMapper orderDetailMapper;
+ private final OrderMapper orderMapper;
+ private final OrderDetailMapper orderDetailMapper;
+ private final OrderGlassDetailMapper orderGlassDetailMapper;
+ private final SysErrorService sysErrorService;
- public boolean saveOrder(Map<String,Object> orderMap) {
+ private final OrderProcessDetailMapper orderProcessDetailMapper;
+ public OrderService(OrderMapper orderMapper, OrderDetailMapper orderDetailMapper, OrderGlassDetailMapper orderGlassDetailMapper, OrderProcessDetailMapper orderProcessDetailMapper, SysErrorService sysErrorService) {
+ this.orderMapper = orderMapper;
+ this.orderDetailMapper = orderDetailMapper;
+ this.orderGlassDetailMapper = orderGlassDetailMapper;
+ this.orderProcessDetailMapper = orderProcessDetailMapper;
+ this.sysErrorService = sysErrorService;
+ }
+
+ public boolean saveOrder(Map<String,Object> orderMap) throws Exception {
JSONObject orderJson = new JSONObject(orderMap);
Order order = JSONObject.parseObject(JSONObject.toJSONString(orderJson.get("title")), Order.class);
List<OrderDetail> OrderDetails = JSONArray.parseArray(JSONObject.toJSONString(orderJson.get("detail")), OrderDetail.class);
boolean saveState = true;
+ //璁剧疆鍥炴粴鐐�
+ Object savePoint = TransactionAspectSupport.currentTransactionStatus().createSavepoint();
//鍒ゆ柇浼犲叆id鍙傛暟鏄惁涓虹┖锛屾湭浼犲叆id涓虹┖鎻掑叆璁㈠崟琛紝浼犲叆鏇存柊琛�
- if(order.getOrderId() == null){
- saveState = insertOrder(order,OrderDetails);
- }else {
- saveState = updateOrder(order,OrderDetails);
+ try{
+ if(order.getOrderId() == null || order.getOrderId().isEmpty()){
+ insertOrder(order,OrderDetails);
+ }else {
+ updateOrder(order,OrderDetails);
+ }
+ }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 false;
+ return saveState;
}
- @Transactional
- public boolean insertOrder(Order order,List<OrderDetail> OrderDetails) {
+ //鐢熸垚璁㈠崟鏁版嵁
+ public void insertOrder(Order order,List<OrderDetail> OrderDetails) {
Integer maxOrderId = orderMapper.selectMaxOrderId();
//鏌ヨ璁㈠崟id锛屽苟涓旇嚜澧�
String formattedNumber = String.format("%02d", maxOrderId+1);
@@ -53,20 +77,82 @@
Date currentDate = new Date();
SimpleDateFormat dateFormat = new SimpleDateFormat("yyMMdd");
String formattedDate = dateFormat.format(currentDate);
+ String orderId = "NG"+formattedDate+formattedNumber;
//寰�涓昏〃鎻掓暟鎹�
+ order.setOrderId(orderId);
orderMapper.insert(order);
+ insertOtherDetail(orderId,OrderDetails);
+
+ }
+ //淇敼璁㈠崟鏁版嵁锛屽苟涓旈噸鏂扮敓鎴愬涓壇琛ㄦ暟鎹�
+ public void updateOrder(Order order,List<OrderDetail> OrderDetails) {
+ 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()));
+ //鍒犻櫎璁㈠崟宸ヨ壓琛�
+ orderProcessDetailMapper.delete(new LambdaQueryWrapper<OrderProcessDetail>().eq(OrderProcessDetail::getOrderId, order.getOrderId()));
+ insertOtherDetail(order.getOrderId(),OrderDetails);
+ }
+
+
+ //鎻掑叆鍏朵粬鍓〃鏁版嵁锛岃鍏朵粬鏂规硶寮曠敤
+ public void insertOtherDetail(String orderId,List<OrderDetail> OrderDetails) {
//寰幆缁欒鍗曟槑缁嗚〃瀛楁娣诲姞搴忓彿鍜屽懆闀�
for (int i = 0; i < OrderDetails.size(); i++) {
OrderDetails.get(i).setOrderNumber(i+1);
- order.setOrderId(formattedDate);
- OrderDetails.get(i).setPerimeter(OrderDetails.get(i).getWidth()*OrderDetails.get(i).getHeight()*2);
+ OrderDetails.get(i).setOrderId(orderId);
+ OrderDetails.get(i).setPerimeter(OrderDetails.get(i).getWidth()*OrderDetails.get(i).getHeight()*2/1000);
+ OrderDetails.get(i).setWeight(1.0);
}
//寰�鏄庣粏琛ㄦ彃鏁版嵁
orderDetailMapper.insertBatch(OrderDetails);
- return false;
+ //淇敼璁㈠崟涓昏〃闈㈢Н涓庡懆闀夸互鍙婇噸閲�
+ orderMapper.updateOrderParameter(orderId);
+ //寰�灏忕墖琛ㄤ紶鍏ヤ骇鍝佹暟鎹�
+ orderGlassDetailMapper.insertOrderGlassDetail(orderId);
+ //鏌ヨ璁㈠崟灏忕墖琛ㄨ幏鍙栧伐鑹轰紶鍏ュ皬鐗囧伐鑹鸿〃
+ List<OrderGlassDetail> orderGlassDetails = orderGlassDetailMapper.selectOrderGlassDetail(orderId);
+ List<OrderProcessDetail> orderProcessDetailList = getOrderProcessDetails(orderGlassDetails);
+ //璧嬪�艰鍗曞伐鑹鸿〃
+ orderProcessDetailMapper.insertOrderProcessDetail(orderProcessDetailList);
}
- public boolean updateOrder(Order order,List<OrderDetail> OrderDetails) {
- return false;
+ private static List<OrderProcessDetail> getOrderProcessDetails(List<OrderGlassDetail> orderGlassDetails) {
+ List<OrderProcessDetail> orderProcessDetailList = new ArrayList<>();
+ for (OrderGlassDetail orderGlassDetail : orderGlassDetails) {
+ String[] processList = orderGlassDetail.getProcess().split("->");
+ for (String process : processList) {
+ OrderProcessDetail orderProcessDetail = new OrderProcessDetail();
+ orderProcessDetail.setOrderId(orderGlassDetail.getOrderId());
+ orderProcessDetail.setOrderNumber(orderGlassDetail.getOrderNumber());
+ orderProcessDetail.setTechnologyNumber(orderGlassDetail.getTechnologyNumber());
+ orderProcessDetail.setProcess(process);
+ orderProcessDetailList.add(orderProcessDetail);
+ }
+ }
+ return orderProcessDetailList;
+ }
+
+ //鏌ヨ鑾峰彇鍒楄〃
+ public Map<String,Object> getOrderList(Integer pageNum, Integer pageSize, List<LocalDate> selectDate, Order order,Integer orderType) {
+ Integer offset = (pageNum-1)*pageSize;
+ LocalDate endDate = LocalDate.now();
+ LocalDate startDate = endDate.minusDays(15);
+
+ if(selectDate == null && selectDate.size()==2){
+ startDate = selectDate.get(0);
+ endDate = selectDate.get(1);
+ }
+
+ Map<String,Object> map = new HashMap<>();
+ map.put("data",orderMapper.getOrderList(offset, pageSize, startDate, endDate, order,orderType));
+ map.put("total",orderMapper.getPageTotal(offset, pageSize, startDate, endDate, order,orderType));
+ map.put("startDate",startDate);
+ map.put("endDate",endDate);
+ return map;
}
}
--
Gitblit v1.8.0