From ae0bbc7e8fce2cc23e15aa730e0c53c524b4112e Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 07 三月 2024 16:19:05 +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 | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 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 6037cbc..26a2178 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
@@ -98,7 +98,7 @@
//鍒犻櫎璁㈠崟灏忕墖琛�
orderGlassDetailMapper.delete(new LambdaQueryWrapper<OrderGlassDetail>().eq(OrderGlassDetail::getOrderId, order.getOrderId()));
//鍒犻櫎璁㈠崟宸ヨ壓琛�
- orderProcessDetailMapper.delete(new LambdaQueryWrapper<OrderProcessDetail>().eq(OrderProcessDetail::getOrderId, order.getOrderId()));
+ // orderProcessDetailMapper.delete(new LambdaQueryWrapper<OrderProcessDetail>().eq(OrderProcessDetail::getOrderId, order.getOrderId()));
insertOtherDetail(order.getOrderId(),OrderDetails);
}
@@ -119,13 +119,13 @@
//寰�灏忕墖琛ㄤ紶鍏ヤ骇鍝佹暟鎹�
orderGlassDetailMapper.insertOrderGlassDetail(orderId);
//鏌ヨ璁㈠崟灏忕墖琛ㄨ幏鍙栧伐鑹轰紶鍏ュ皬鐗囧伐鑹鸿〃
- List<OrderGlassDetail> orderGlassDetails = orderGlassDetailMapper.selectOrderGlassDetail(orderId);
- List<OrderProcessDetail> orderProcessDetailList = getOrderProcessDetails(orderGlassDetails);
+ //List<OrderGlassDetail> orderGlassDetails = orderGlassDetailMapper.selectOrderGlassDetail(orderId);
+ /*List<OrderProcessDetail> orderProcessDetailList = getOrderProcessDetails(orderGlassDetails);
//璧嬪�艰鍗曞伐鑹鸿〃
- orderProcessDetailMapper.insertOrderProcessDetail(orderProcessDetailList);
+ orderProcessDetailMapper.insertOrderProcessDetail(orderProcessDetailList);*/
}
- private static List<OrderProcessDetail> getOrderProcessDetails(List<OrderGlassDetail> orderGlassDetails) {
+ public static List<OrderProcessDetail> getOrderProcessDetails(List<OrderGlassDetail> orderGlassDetails) {
List<OrderProcessDetail> orderProcessDetailList = new ArrayList<>();
for (OrderGlassDetail orderGlassDetail : orderGlassDetails) {
String[] processList = orderGlassDetail.getProcess().split("->");
@@ -200,10 +200,10 @@
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);
+ //List<OrderGlassDetail> orderGlassDetailList = orderGlassDetailMapper.selectOrderGlassDetail(id);
+// List<OrderProcessDetail> orderProcessDetailList = getOrderProcessDetails(orderGlassDetailList);
+// //璧嬪�艰鍗曞伐鑹鸿〃
+// orderProcessDetailMapper.insertOrderProcessDetail(orderProcessDetailList);
}
return orderMapper.reviewProcessById(id,status);
--
Gitblit v1.8.0