From a660db06773007b1be690e0674829c00a57aeb7b Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 24 十二月 2025 16:21:23 +0800
Subject: [PATCH] 订单首页流程卡新增楼层编号显示
---
north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java | 15 +++++++++++++++
1 files changed, 15 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 d52563d..1c9a7b0 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
@@ -9,7 +9,9 @@
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.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.example.erp.common.Constants;
+import com.example.erp.common.Result;
import com.example.erp.dto.sd.OrderDTO;
import com.example.erp.dto.sd.OrderSearchDTO;
import com.example.erp.entity.sd.*;
@@ -619,6 +621,7 @@
}
List<OrderDetail> orderDetailList = orderDetailMapper.getOrderReport(offset, pageSize, startDate, endDate, orderDetail,model,scope);
List<BasicOtherMoney> basicOtherMoneyList=basicOtherMoneyMapper.selectList(new QueryWrapper<BasicOtherMoney>());
+
ObjectMapper objectMapper = new ObjectMapper();
for (OrderDetail detail : orderDetailList) {
@@ -640,6 +643,10 @@
map.put("data",orderDetailList);
map.put("title",basicOtherMoneyList);
map.put("total",orderDetailMapper.getOrderReportTotal(offset, pageSize, startDate, endDate, orderDetail,"order"));
+ map.put("orderOtherMoney",
+ Collections.singletonList(
+ basicOtherMoneyMapper.selectList(new QueryWrapper<BasicOtherMoney>().eq("state",1))
+ ));
List<String> list = new ArrayList<>();
list.add(startDate);
list.add(endDate);
@@ -1123,4 +1130,12 @@
map.put("data",processList);
return map;
}
+
+ public Result sizeCheck(String orderId) {
+
+ return Result.success(
+ orderMapper.update(null,
+ new UpdateWrapper<Order>().set("size_check",1).eq("order_id",orderId))
+ );
+ }
}
--
Gitblit v1.8.0