From 6965db086df978e46e0a1bd7227b981ad48a9b1c Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 20 二月 2024 16:19:52 +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 | 42 ++++++++++++++++++++++++++++++++++++++++++
1 files changed, 42 insertions(+), 0 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 1cc93d7..59d6b27 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
@@ -4,12 +4,15 @@
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.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.example.erp.common.Constants;
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.exception.ServiceException;
import com.example.erp.mapper.sd.OrderDetailMapper;
import com.example.erp.mapper.sd.OrderGlassDetailMapper;
import com.example.erp.mapper.sd.OrderMapper;
@@ -80,6 +83,7 @@
String orderId = "NG"+formattedDate+formattedNumber;
//寰�涓昏〃鎻掓暟鎹�
order.setOrderId(orderId);
+ order.setCreateOrder(2);
orderMapper.insert(order);
insertOtherDetail(orderId,OrderDetails);
@@ -160,4 +164,42 @@
map.put("selectDate",list);
return map;
}
+
+ public Integer deleteOrder(String id) {
+ return orderMapper.delete(
+ new QueryWrapper<Order>().eq("order_id",id)
+ );
+ }
+
+
+ //鏌ヨ璁㈠崟涓昏〃涓庡壇琛ㄤ俊鎭�
+ public Map<String,Object> getOrderById(String id) {
+ Order order = orderMapper.selectOne(new QueryWrapper<Order>().eq("order_id",id));
+ List<OrderDetail> orderDetails = orderDetailMapper.selectList(new QueryWrapper<OrderDetail>().eq("order_id",id));
+ Map<String,Object> map = new HashMap<>();
+ map.put("order",order);
+ map.put("orderDetails",orderDetails);
+ return map;
+ }
+
+ public boolean reviewOrderById(String id,Integer status) {
+ Order order = orderMapper.selectOne(new QueryWrapper<Order>().eq("order_id",id));
+ if(order.getProcessReview()!=2){
+ throw new ServiceException(Constants.Code_600,"璇ヨ鍗曡繕鏈鏍�");
+ }
+ return orderMapper.reviewOrderById(id,status);
+ }
+
+ public boolean reviewProcessById(String id, Integer status) {
+ return orderMapper.reviewProcessById(id,status);
+ }
+
+ public Map<String,Object> getOrderCraftById(String id) {
+ Order order = orderMapper.selectOne(new QueryWrapper<Order>().eq("order_id",id));
+ List<OrderGlassDetail> orderGlassDetails = orderGlassDetailMapper.selectOrderGlassDetailByOrderId(id);
+ Map<String,Object> map = new HashMap<>();
+ map.put("order",order);
+ map.put("orderGlassDetails",orderGlassDetails);
+ return map;
+ }
}
--
Gitblit v1.8.0