From 215a413fa2bb598cc70c71a0c9691925f814f90b Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 07 八月 2024 09:07:47 +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 | 120 ++++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 105 insertions(+), 15 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 3410d33..64f429e 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
@@ -12,9 +12,11 @@
import com.example.erp.dto.sd.OrderDTO;
import com.example.erp.dto.sd.OrderDetailProductDTO;
import com.example.erp.entity.sd.*;
+import com.example.erp.entity.userInfo.Log;
import com.example.erp.entity.userInfo.SysError;
import com.example.erp.exception.ServiceException;
import com.example.erp.mapper.sd.*;
+import com.example.erp.service.userInfo.LogService;
import com.example.erp.service.userInfo.SysErrorService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -36,9 +38,10 @@
private final SysErrorService sysErrorService;
private final OrderOtherMoneyMapper orderOtherMoneyMapper;
private final ProductMapper productMapper;
+ private final LogService logService;
private final OrderProcessDetailMapper orderProcessDetailMapper;
- public OrderService(OrderMapper orderMapper, OrderDetailMapper orderDetailMapper, OrderGlassDetailMapper orderGlassDetailMapper, OrderProcessDetailMapper orderProcessDetailMapper, SysErrorService sysErrorService, OrderOtherMoneyMapper orderOtherMoneyMapper, ProductMapper productMapper) {
+ public OrderService(OrderMapper orderMapper, OrderDetailMapper orderDetailMapper, OrderGlassDetailMapper orderGlassDetailMapper, OrderProcessDetailMapper orderProcessDetailMapper, SysErrorService sysErrorService, OrderOtherMoneyMapper orderOtherMoneyMapper, ProductMapper productMapper, LogService logService) {
this.orderMapper = orderMapper;
this.orderDetailMapper = orderDetailMapper;
this.orderGlassDetailMapper = orderGlassDetailMapper;
@@ -46,6 +49,7 @@
this.sysErrorService = sysErrorService;
this.orderOtherMoneyMapper = orderOtherMoneyMapper;
this.productMapper = productMapper;
+ this.logService = logService;
}
public boolean saveOrder(Map<String,Object> orderMap) throws Exception {
@@ -63,11 +67,20 @@
Object savePoint = TransactionAspectSupport.currentTransactionStatus().createSavepoint();
//鍒ゆ柇浼犲叆id鍙傛暟鏄惁涓虹┖锛屾湭浼犲叆id涓虹┖鎻掑叆璁㈠崟琛紝浼犲叆鏇存柊琛�
try{
+ Log log = new Log();
+ log.setOperator(orderJson.getString("creator"));
+ log.setOperatorId(orderJson.getString("creatorId"));
+ log.setContent(orderMap.toString());
+
if(order.getOrderId() == null || order.getOrderId().isEmpty()){
insertOrder(order,OrderDetails,orderOtherMoneyList,orderIdType);
+ log.setFunction("saveOrder鍒涘缓:"+order.getOrderId());
}else {
updateOrder(order,OrderDetails,orderOtherMoneyList);
+ log.setFunction("saveOrder淇敼:"+order.getOrderId());
}
+
+ logService.saveLog(log);
}catch (Exception e){
TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
//灏嗗紓甯镐紶鍏ユ暟鎹簱
@@ -93,6 +106,7 @@
try{
LambdaUpdateWrapper<Order> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.eq(Order::getOrderId, order.getOrderId());
+ order.setCreateTime(null);
orderMapper.update(order,updateWrapper);
//淇敼璁㈠崟涓昏〃闈㈢Н涓庡懆闀夸互鍙婇噸閲�
orderMapper.updateOrderParameter(order.getOrderId());
@@ -155,6 +169,13 @@
String formattedDate = dateFormat.format(currentDate);
orderId = "NG"+formattedDate+formattedNumber;
+ }else if(dateType.equals("year")){
+ Integer maxOrderId = orderMapper.selectMaxOrderIdByYear();
+ String formattedNumber = String.format("%06d", maxOrderId+1);
+ Date currentDate = new Date();
+ SimpleDateFormat dateFormat = new SimpleDateFormat("yy");
+ String formattedDate = dateFormat.format(currentDate);
+ orderId = "NG"+formattedDate+formattedNumber;
}
return orderId;
@@ -163,6 +184,7 @@
//淇敼璁㈠崟鏁版嵁锛屽苟涓旈噸鏂扮敓鎴愬涓壇琛ㄦ暟鎹�
public void updateOrder(Order order,List<OrderDetail> OrderDetails,List<OrderOtherMoney> orderOtherMoneyList) {
+ order.setCreateTime(null);
LambdaUpdateWrapper<Order> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.eq(Order::getOrderId, order.getOrderId());
orderMapper.update(order,updateWrapper);
@@ -182,7 +204,6 @@
//鎻掑叆鍏朵粬鍓〃鏁版嵁锛岃鍏朵粬鏂规硶寮曠敤
public void insertOtherDetail(String orderId,List<OrderDetail> OrderDetails,List<OrderOtherMoney> orderOtherMoneyList) {
-
//鍏堟妸鍏朵粬閲戦鍓〃鐨勯噾棰濅笌鏁伴噺缃�0
orderOtherMoneyList.forEach(orderOtherMoney -> {
orderOtherMoney.setQuantity(0.0);
@@ -222,7 +243,6 @@
});
}else if(OrderDetails.get(i).getOtherColumns()==null){
-
OrderDetails.get(i).setOtherColumns("{}");
}
}
@@ -368,6 +388,7 @@
.eq("`column`",orderOtherMoney.getColumn()));
});
order.setMoney(money+orderOtherMoneyMapper.selectGrossAmount(order.getOrderId()));
+ order.setOtherMoney(orderOtherMoneyMapper.selectGrossAmount(order.getOrderId()));
orderMapper.updateMoney(order);
orderDetailMapper.updateOrderMoney(OrderDetails);
return false;
@@ -414,6 +435,34 @@
public List<OrderDTO> exportOrderReport(List<LocalDate> dates) {
return orderDetailMapper.exportOrderReport(dates);
+ }
+
+ public Map<String,Object> getOrderSummaryReport(Integer pageNum, Integer pageSize, List<String> selectDate, Order order) {
+ Integer offset = (pageNum-1)*pageSize;
+ String endDate = LocalDate.now().toString();
+ String startDate = LocalDate.now().minusDays(15).toString();
+ if(selectDate !=null && selectDate.size()==2){
+ if(!selectDate.get(0).isEmpty()){
+ startDate = selectDate.get(0);
+ }
+ if(!selectDate.get(1).isEmpty()){
+ endDate = selectDate.get(1);
+ }
+ }
+
+ Map<String,Object> map = new HashMap<>();
+ map.put("data",orderDetailMapper.getOrderSummaryReport(offset, pageSize, startDate, endDate, order));
+ map.put("total",orderDetailMapper.getOrderSummaryReportTotal(offset, pageSize, startDate, endDate, order,"order"));
+ List<String> list = new ArrayList<>();
+ list.add(startDate);
+ list.add(endDate);
+ map.put("selectDate",list);
+// map.put("total",orderMapper.getPageTotal(offset, pageSize, startDate, endDate, orderDetail));
+ return map;
+ }
+
+ public List<Order> exportOrderSummary(List<LocalDate> dates) {
+ return orderDetailMapper.exportOrderSummary(dates);
}
public Map<String,Object> getOrderProductSummary(Integer pageNum, Integer pageSize, List<String> selectDate, OrderDetail orderDetail) {
@@ -466,16 +515,6 @@
orderProductDetailMap.put("productId",map.get("productId"));
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",
- orderDetail.getWidth()*orderDetail.getHeight()/1000000)
- ) * orderDetail.getQuantity()))
- );
- });
-
orderProductDetailMap.put("productDetail",orderDetails);
orderProductDetail.add(orderProductDetailMap);
});
@@ -514,6 +553,56 @@
return returns;
}
+ public Object printOrderProductGlassDetailMonolithic(String orderId,List<String> productId) {
+ List<Map<String,Object>> orderProductDistinct;
+ if (productId.size()>0){
+ orderProductDistinct = orderDetailMapper.getOrderProductDistinctByIds(orderId,productId);
+ }else{
+ orderProductDistinct = orderDetailMapper.getOrderProductDistinctById(orderId);
+ }
+
+ Map<String,Object> returns = new HashMap<>();
+ returns.put("order",orderMapper.selectOne(new QueryWrapper<Order>().eq("order_id",orderId)));
+
+ List<Map<String,Object>> orderProductDetail = new ArrayList<>();
+
+ orderProductDistinct.forEach(map->{
+ Map<String,Object> orderProductDetailMap = new HashMap<>();
+ orderProductDetailMap.put("productId",map.get("productId"));
+ orderProductDetailMap.put("productName",map.get("productName"));
+ List<Map<String,Object>> orderDetails = orderDetailMapper.getOrderProductByProductIds(map.get("productId"),orderId);
+ List<Map<String,Object>> orderProductDetail1 = new ArrayList<>();
+
+ for(Map<String,Object> objectMap:orderDetails){
+ Map<String,Object> orderProductDetailMap1 = new HashMap<>();
+ orderProductDetailMap1.put("detail",objectMap.get("detail").toString());
+ List<Map<String,Object>> orderGlassDetails =orderGlassDetailMapper.getOrderGlassDetailByProductId(objectMap.get("order_id").toString(),
+ objectMap.get("detail").toString(), Long.valueOf(objectMap.get("product_id").toString()));
+ orderProductDetailMap1.put("orderGlassDetails",orderGlassDetails);
+ orderProductDetail1.add(orderProductDetailMap1);
+ }
+
+ /*orderDetails.forEach(orderDetail->{
+ List<OrderGlassDetail> glassChildList=orderGlassDetailMapper.getOrderGlassDetailByProductIdGlassChild(orderDetail.getOrderId(),orderDetail.getOrderNumber());
+
+ for (OrderGlassDetail glassChildLists:glassChildList){
+ orderProductDetailMap1.put("glassChild",glassChildLists.getGlassChild());
+ List<OrderGlassDetail> orderGlassDetails =orderGlassDetailMapper.getOrderGlassDetailByProductId(orderDetail.getOrderId(),orderDetail.getOrderNumber(),glassChildLists.getGlassChild());
+ Integer differentSize = orderGlassDetailMapper.getDifferentSizeNumber(orderId,orderDetail.getOrderNumber());
+ orderDetail.setDifferentSize(differentSize);
+ orderDetail.setOrderGlassDetails(orderGlassDetails);
+ orderProductDetailMap1.put("orderGlassDetail",orderGlassDetails);
+ }
+ orderProductDetail1.add(orderProductDetailMap1);
+
+ });*/
+ orderProductDetailMap.put("productDetail",orderProductDetail1);
+ orderProductDetail.add(orderProductDetailMap);
+ });
+ returns.put("orderDetail",orderProductDetail);
+ return returns;
+ }
+
public Object printOrderProductGlassDetail(String orderId) {
Map<String,Object> returns = new HashMap<>();
returns.put("order",orderMapper.selectOne(new QueryWrapper<Order>().eq("order_id",orderId)));
@@ -527,10 +616,11 @@
List<OrderDetail> orderDetails = orderDetailMapper.getOrderProductByProductId(map.get("productId"),orderId);
orderDetails.forEach(orderDetail->{
orderDetail.setGrossArea(
- Double.parseDouble(String.format("%.3f",Double.parseDouble(
+ /*Double.parseDouble(String.format("%.3f",Double.parseDouble(
String.format("%.3f",
orderDetail.getWidth()*orderDetail.getHeight()/1000000)
- ) * orderDetail.getQuantity()))
+ ) * orderDetail.getQuantity()))*/
+ orderDetail.getComputeGrossArea()
);
List<OrderGlassDetail> orderGlassDetails =
--
Gitblit v1.8.0