From 16bbf8260110e2790f304e8421cf7591837ca302 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期一, 14 七月 2025 11:16:06 +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 | 116 ++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 101 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 b28f9c7..ba2e441 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
@@ -11,7 +11,7 @@
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.example.erp.common.Constants;
import com.example.erp.dto.sd.OrderDTO;
-import com.example.erp.dto.sd.OrderDetailProductDTO;
+import com.example.erp.dto.sd.OrderSearchDTO;
import com.example.erp.entity.sd.*;
import com.example.erp.entity.userInfo.Log;
import com.example.erp.entity.userInfo.SysError;
@@ -21,20 +21,16 @@
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;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
import java.math.BigDecimal;
import java.math.RoundingMode;
-import java.sql.SQLOutput;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.util.*;
import java.util.stream.Collectors;
-
-import static org.apache.coyote.http11.Constants.a;
@Service
@DS("sd")
@@ -123,7 +119,15 @@
log.setFunction("saveOrderTitle淇濆瓨琛ㄥご:"+order.getOrderId());
Order order1 = orderMapper.selectOrderId(order.getOrderId());
+ //浣跨敤璁㈠崟鍘熸湰鐨勭姸鎬佸拰璁＄畻鏂瑰紡
order.setCalculateType(order1.getCalculateType());
+ order.setCreateOrder(order1.getCreateOrder());
+ order.setProcessReview(order1.getProcessReview());
+ order.setOrderReview(order1.getOrderReview());
+ order.setProductionOrder(order1.getProductionOrder());
+ order.setProcessingCard(order1.getProcessingCard());
+ order.setWarehousing(order1.getWarehousing());
+ order.setDelivery(order1.getDelivery());
LambdaUpdateWrapper<Order> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.eq(Order::getOrderId, order.getOrderId());
@@ -205,9 +209,16 @@
//淇敼璁㈠崟鏁版嵁锛屽苟涓旈噸鏂扮敓鎴愬涓壇琛ㄦ暟鎹�
- public void updateOrder(Order order,List<OrderDetail> OrderDetails,List<OrderOtherMoney> orderOtherMoneyList) {
-
+ public void updateOrder(Order order,List<OrderDetail> OrderDetails,List<OrderOtherMoney> orderOtherMoneyList) throws Exception {
+ Order oldOrder = orderMapper.selectOne(new LambdaQueryWrapper<Order>().eq(Order::getOrderId,order.getOrderId()));
+ if(oldOrder.getProcessReview()==2){
+ throw new ServiceException(Constants.Code_600,"璇ヨ鍗曞凡缁忓鏍革紝鏃犳硶淇敼");
+ }
+ if(!Objects.equals(oldOrder.getVersion(), order.getVersion())){
+ throw new ServiceException(Constants.Code_600,"璇ヨ鍗曞凡缁忎慨鏀癸紝璇峰埛鏂伴〉闈�");
+ }
order.setCreateTime(null);
+ order.setVersion(order.getVersion()+1);
LambdaUpdateWrapper<Order> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.eq(Order::getOrderId, order.getOrderId());
orderMapper.update(order,updateWrapper);
@@ -245,7 +256,7 @@
Product product = productMapper.selectById(OrderDetails.get(i).getProductId());
OrderDetails.get(i).setWeight(Double.valueOf(String.format("%.2f",product.getThickness()*OrderDetails.get(i).getWidth()*OrderDetails.get(i).getHeight()/1000000*2.5)));
- if(OrderDetails.get(i).getBendRadius()!=null && OrderDetails.get(i).getBendRadius()!=0){
+ /*if(OrderDetails.get(i).getBendRadius()!=null && OrderDetails.get(i).getBendRadius()!=0){
//鑾峰彇寮挗寮у害
Double bendRadius = OrderDetails.get(i).getBendRadius();
//鑾峰彇瀹�
@@ -254,7 +265,7 @@
String archRiseS = String.format("%.1f",bendRadius-(bendRadius*Math.cos(width/2/bendRadius)));
Double archRise = Double.parseDouble(archRiseS);
OrderDetails.get(i).setArchRise(archRise);
- }
+ }*/
Map<String,Object> otherColumns = JSON.parseObject(OrderDetails.get(i).getOtherColumns(), new TypeReference<Map<String, Object>>(){});
int finalI = i;
@@ -287,6 +298,45 @@
orderDetailMapper.insertBatch(OrderDetails);
//寰�灏忕墖琛ㄤ紶鍏ヤ骇鍝佹暟鎹�
orderGlassDetailMapper.insertOrderGlassDetail(orderId);
+
+ //淇敼鎴愬搧鎷遍珮
+ List<OrderDetail> orderDetails = orderDetailMapper
+ .selectList(new LambdaQueryWrapper<OrderDetail>()
+ .eq(OrderDetail::getOrderId, orderId)
+ .isNotNull(OrderDetail::getBendRadius)
+ );
+
+ orderDetails.forEach(orderDetail -> {
+ //鑾峰彇鏈�灏忓姬搴�
+ OrderGlassDetail orderGlassDetail = orderGlassDetailMapper
+ .selectOne(new LambdaQueryWrapper<OrderGlassDetail>()
+ .eq(OrderGlassDetail::getOrderId, orderId)
+ .eq(OrderGlassDetail::getOrderNumber, orderDetail.getOrderNumber())
+ .orderByDesc(OrderGlassDetail::getArc)
+ .last("limit 1")
+ );
+ //鑾峰彇褰撳墠搴忓彿浜у搧Math.cos(
+ Product product = productMapper.selectById(orderDetail.getProductId());
+ //鍐呭崐寰�
+ Double radius = orderDetail.getBendRadius() - product.getTotalThickness();
+
+ //鍐呯墖鍐呭姬闀�
+ Double innerArc = orderGlassDetail.getArc()
+ -orderGlassDetail.getArc()*product.getTotalThickness()/orderDetail.getBendRadius();
+
+ //鎷遍珮
+ String archRiseS = String.format("%.1f",radius-radius*Math.cos(innerArc/2/radius));
+ Double archRise = Double.parseDouble(archRiseS);
+ orderDetail.setArchRise(archRise);
+
+ orderDetailMapper.update(null,new LambdaUpdateWrapper<OrderDetail>()
+ .set(OrderDetail::getArchRise,archRise)
+ .eq(OrderDetail::getId, orderDetail.getId())
+ );
+
+ });
+
+
if(orderOtherMoneyList!=null){
orderOtherMoneyList.forEach(orderOtherMoney ->{
orderOtherMoney.setId(null);
@@ -338,7 +388,7 @@
}
}
JSONObject orderJson = new JSONObject(config);
- Order order = JSONObject.parseObject(JSONObject.toJSONString(orderJson.get("filter")), Order.class);
+ OrderSearchDTO order = JSONObject.parseObject(JSONObject.toJSONString(orderJson.get("filter")), OrderSearchDTO.class);
Map<String,String> sortDate = (Map<String, String>) config.get("sort");
String field = sortDate.get("field").replaceAll("(?<!^)([A-Z])", "_$1").toLowerCase();
String orderBy = sortDate.get("order");
@@ -375,6 +425,12 @@
}
//璁㈠崟瀹℃牳
public boolean reviewOrderById(String id, Integer status, String userId, String userName) {
+ Log log = new Log();
+ log.setOperator(userName);
+ log.setOperatorId(userId);
+ log.setContent(status.toString());
+ log.setFunction("reviewOrderById:"+id);
+ logService.saveLog(log);
Order order = orderMapper.selectOne(new QueryWrapper<Order>().eq("order_id",id));
if(order.getProcessReview()!=2){
throw new ServiceException(Constants.Code_600,"璇ヨ鍗曡繕鏈鏍�");
@@ -387,6 +443,9 @@
}
//宸ヨ壓瀹℃牳鐣岄潰瀹℃牳鏇存柊鏁版嵁
public boolean reviewProcessById(String id, Integer status,List<OrderGlassDetail> orderGlassDetails) {
+ Log log = new Log();
+ log.setContent(orderGlassDetails.toString());
+ log.setFunction("reviewProcessById:"+id);
if(!orderGlassDetails.isEmpty() && status==2){
orderGlassDetails.forEach(orderGlassDetail ->{
double area = Math.round((orderGlassDetail.getChildWidth()*orderGlassDetail.getChildHeight()/1000000) * 100) * 0.01d;
@@ -401,7 +460,7 @@
// //璧嬪�艰鍗曞伐鑹鸿〃
// orderProcessDetailMapper.insertOrderProcessDetail(orderProcessDetailList);
}
-
+ logService.saveLog(log);
return orderMapper.reviewProcessById(id,status);
}
//宸ヨ壓瀹℃牳鐣岄潰鏁版嵁鏌ヨ
@@ -494,9 +553,21 @@
BigDecimal getPrice= BigDecimal.valueOf(orderDetail.getPrice());
BigDecimal getQuantity= BigDecimal.valueOf(orderDetail.getQuantity());
BigDecimal getComputeGrossArea= BigDecimal.valueOf(orderDetail.getComputeGrossArea());
+ BigDecimal getComputeArea= BigDecimal.valueOf(orderDetail.getComputeArea());
+ BigDecimal getWidth= BigDecimal.valueOf(orderDetail.getWidth());
+ BigDecimal getHeight= BigDecimal.valueOf(orderDetail.getHeight());
if (calculateType == 3) {
orderDetail.setGrossAmount(getPrice.multiply(getQuantity).setScale(2, RoundingMode.HALF_UP).doubleValue());
- } else {
+ }else if (calculateType == 4) {
+ if(Objects.equals(orderDetail.getArea(), orderDetail.getComputeArea())&&Objects.equals(orderDetail.getGrossArea(), orderDetail.getComputeGrossArea())){
+ orderDetail.setGrossAmount(getWidth.multiply(getHeight).multiply(getQuantity).multiply(getPrice).
+ divide(BigDecimal.valueOf(1000000), 2, RoundingMode.HALF_UP).doubleValue());
+ }else{
+ orderDetail.setGrossAmount(getPrice.multiply(getComputeGrossArea).setScale(2, RoundingMode.HALF_UP).doubleValue());
+ }
+ }else if (calculateType == 1){
+ orderDetail.setGrossAmount(getPrice.multiply(getComputeArea).multiply(getQuantity).setScale(2, RoundingMode.HALF_UP).doubleValue());
+ }else{
orderDetail.setGrossAmount(getPrice.multiply(getComputeGrossArea).setScale(2, RoundingMode.HALF_UP).doubleValue());
}
return orderDetail;
@@ -508,7 +579,7 @@
}
- public Map<String,Object> getOrderReport(Integer pageNum, Integer pageSize, List<String> selectDate, OrderDetail orderDetail) {
+ public Map<String,Object> getOrderReport(Integer pageNum, Integer pageSize, List<String> selectDate, OrderDetail orderDetail, Integer model, Integer scope) {
Integer offset = (pageNum-1)*pageSize;
String endDate = LocalDate.now().toString();
String startDate = LocalDate.now().minusDays(15).toString();
@@ -520,9 +591,8 @@
endDate = selectDate.get(1);
}
}
-
Map<String,Object> map = new HashMap<>();
- map.put("data",orderDetailMapper.getOrderReport(offset, pageSize, startDate, endDate, orderDetail));
+ map.put("data",orderDetailMapper.getOrderReport(offset, pageSize, startDate, endDate, orderDetail,model,scope));
map.put("total",orderDetailMapper.getOrderReportTotal(offset, pageSize, startDate, endDate, orderDetail,"order"));
List<String> list = new ArrayList<>();
list.add(startDate);
@@ -886,4 +956,20 @@
log.setFunction("updateOrderMoney閲戦閲嶇疆:"+orderId);
return true;
}
+
+ public Object scannerGlassInfo(String projectNo) {
+ try{
+ String projectId = "P" + projectNo.substring(0,8);
+ //鐐夊彿
+ Integer heatNo = Integer.valueOf(projectNo.substring(8,11));
+ //鐐夊唴搴忓彿
+ Integer sortNo = Integer.valueOf(projectNo.substring(11,14));
+ String processId = orderMapper.getProcessIdByOptimizeHeatDetail(projectId,heatNo,sortNo);
+ String orderId = flowCardMapper.getOrderIdByProcessId(processId);
+ return orderMapper.scannerGlassInfo(projectId,heatNo,sortNo,orderId);
+ }catch (Exception e){
+ return null;
+ }
+
+ }
}
--
Gitblit v1.8.0