From 2c98be64470f8298d3083ce337b0ffb948bee5f7 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期一, 09 六月 2025 16:45:34 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 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 c47bdda..1e8777e 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,6 +12,7 @@
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;
@@ -213,9 +214,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);
@@ -346,7 +354,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");
@@ -383,6 +391,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,"璇ヨ鍗曡繕鏈鏍�");
@@ -395,6 +409,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;
@@ -409,7 +426,7 @@
// //璧嬪�艰鍗曞伐鑹鸿〃
// orderProcessDetailMapper.insertOrderProcessDetail(orderProcessDetailList);
}
-
+ logService.saveLog(log);
return orderMapper.reviewProcessById(id,status);
}
//宸ヨ壓瀹℃牳鐣岄潰鏁版嵁鏌ヨ
--
Gitblit v1.8.0