From e4d55b12053c4da904adeef2c05c36fb4135cdb3 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期三, 21 二月 2024 13:59:56 +0800
Subject: [PATCH] 订单工艺审核部分功能
---
north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java | 18 ++++++++++++++----
1 files changed, 14 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 59d6b27..7847416 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
@@ -164,7 +164,7 @@
map.put("selectDate",list);
return map;
}
-
+ //鍒犻櫎璁㈠崟
public Integer deleteOrder(String id) {
return orderMapper.delete(
new QueryWrapper<Order>().eq("order_id",id)
@@ -181,7 +181,7 @@
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){
@@ -189,11 +189,21 @@
}
return orderMapper.reviewOrderById(id,status);
}
+ //宸ヨ壓瀹℃牳鐣岄潰瀹℃牳鏇存柊鏁版嵁
+ public boolean reviewProcessById(String id, Integer status,List<OrderGlassDetail> orderGlassDetails) {
+ if(!orderGlassDetails.isEmpty() && status==2){
+ orderGlassDetailMapper.updateSizeAndProcess(orderGlassDetails);
+ orderProcessDetailMapper.delete(new QueryWrapper<OrderProcessDetail>().eq("order_id",id));
+ //鏌ヨ璁㈠崟灏忕墖琛ㄨ幏鍙栧伐鑹轰紶鍏ュ皬鐗囧伐鑹鸿〃
+ List<OrderGlassDetail> orderGlassDetailList = orderGlassDetailMapper.selectOrderGlassDetail(id);
+ List<OrderProcessDetail> orderProcessDetailList = getOrderProcessDetails(orderGlassDetailList);
+ //璧嬪�艰鍗曞伐鑹鸿〃
+ orderProcessDetailMapper.insertOrderProcessDetail(orderProcessDetailList);
+ }
- 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);
--
Gitblit v1.8.0