From 7b8cc84950a3caeb8cae5e99a7aa99c1aafa6ac7 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期四, 22 二月 2024 14:18:17 +0800
Subject: [PATCH] 提交分架代码
---
north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java | 75 +++++++++++++++++++++++++++++++++----
1 files changed, 66 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 4f433d7..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
@@ -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);
@@ -138,21 +142,74 @@
}
//鏌ヨ鑾峰彇鍒楄〃
- public Map<String,Object> getOrderList(Integer pageNum, Integer pageSize, List<LocalDate> selectDate, Order order,Integer orderType) {
+ public Map<String,Object> getOrderList(Integer pageNum, Integer pageSize, List<String> selectDate, Order order,Integer orderType) {
Integer offset = (pageNum-1)*pageSize;
- LocalDate endDate = LocalDate.now();
- LocalDate startDate = endDate.minusDays(15);
-
- if(selectDate == null && selectDate.size()==2){
- startDate = selectDate.get(0);
- endDate = selectDate.get(1);
+ String endDate = LocalDate.now().toString();
+ String startDate = LocalDate.now().minusDays(15).toString();
+ if(selectDate !=null && selectDate.size()==2){
+ if(!selectDate.get(0).isEmpty()){
+ startDate = selectDate.get(0);
+ }
+ if(!selectDate.get(1).isEmpty()){
+ endDate = selectDate.get(1);
+ }
}
Map<String,Object> map = new HashMap<>();
map.put("data",orderMapper.getOrderList(offset, pageSize, startDate, endDate, order,orderType));
map.put("total",orderMapper.getPageTotal(offset, pageSize, startDate, endDate, order,orderType));
- map.put("startDate",startDate);
- map.put("endDate",endDate);
+ List<String> list = new ArrayList<>();
+ list.add(startDate);
+ list.add(endDate);
+ 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,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);
+ }
+
+ 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