From cbcf5944ab612775f3b1341769cc72ff84087d76 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期二, 20 二月 2024 16:03:13 +0800
Subject: [PATCH] 工艺流程修改前端和后端文件提交
---
north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java | 16 ++++++++++++++++
1 files changed, 16 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 9b68a8d..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
@@ -6,11 +6,13 @@
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;
@@ -81,6 +83,7 @@
String orderId = "NG"+formattedDate+formattedNumber;
//寰�涓昏〃鎻掓暟鎹�
order.setOrderId(orderId);
+ order.setCreateOrder(2);
orderMapper.insert(order);
insertOtherDetail(orderId,OrderDetails);
@@ -180,10 +183,23 @@
}
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