From d08f906904a74ef6a2047e1a5453a988b615e8c5 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期五, 26 一月 2024 16:14:35 +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 | 37 ++++++++++++++++++++++++++++++++-----
1 files changed, 32 insertions(+), 5 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 980b63b..d98e2b2 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
@@ -5,6 +5,7 @@
import com.baomidou.dynamic.datasource.annotation.DS;
import com.example.erp.entity.sd.Order;
import com.example.erp.entity.sd.OrderDetail;
+import com.example.erp.mapper.sd.OrderDetailMapper;
import com.example.erp.mapper.sd.OrderMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -23,11 +24,28 @@
public class OrderService {
@Autowired
private OrderMapper orderMapper;
- @Transactional
+ @Autowired
+ private OrderDetailMapper orderDetailMapper;
+
public boolean saveOrder(Map<String,Object> orderMap) {
JSONObject orderJson = new JSONObject(orderMap);
Order order = JSONObject.parseObject(JSONObject.toJSONString(orderJson.get("title")), Order.class);
List<OrderDetail> OrderDetails = JSONArray.parseArray(JSONObject.toJSONString(orderJson.get("detail")), OrderDetail.class);
+ boolean saveState = true;
+ //鍒ゆ柇浼犲叆id鍙傛暟鏄惁涓虹┖锛屾湭浼犲叆id涓虹┖鎻掑叆璁㈠崟琛紝浼犲叆鏇存柊琛�
+ if(order.getOrderId() == null){
+ saveState = insertOrder(order,OrderDetails);
+ }else {
+ saveState = updateOrder(order,OrderDetails);
+ }
+
+
+
+
+ return false;
+ }
+ @Transactional
+ public boolean insertOrder(Order order,List<OrderDetail> OrderDetails) {
Integer maxOrderId = orderMapper.selectMaxOrderId();
//鏌ヨ璁㈠崟id锛屽苟涓旇嚜澧�
String formattedNumber = String.format("%02d", maxOrderId+1);
@@ -35,11 +53,20 @@
Date currentDate = new Date();
SimpleDateFormat dateFormat = new SimpleDateFormat("yyMMdd");
String formattedDate = dateFormat.format(currentDate);
- order.setOrderId("NG"+formattedDate + formattedNumber);
-
- //System.out.println(order);
+ //寰�涓昏〃鎻掓暟鎹�
orderMapper.insert(order);
-
+ //寰幆缁欒鍗曟槑缁嗚〃瀛楁娣诲姞搴忓彿鍜屽懆闀�
+ for (int i = 0; i < OrderDetails.size(); i++) {
+ OrderDetails.get(i).setOrderNumber(i+1);
+ order.setOrderId(formattedDate);
+ OrderDetails.get(i).setPerimeter(OrderDetails.get(i).getWidth()*OrderDetails.get(i).getHeight()*2);
+ }
+ //寰�鏄庣粏琛ㄦ彃鏁版嵁
+ orderDetailMapper.insertBatch(OrderDetails);
return false;
}
+
+ public boolean updateOrder(Order order,List<OrderDetail> OrderDetails) {
+ return false;
+ }
}
--
Gitblit v1.8.0