From e748d7c052c9b06f2a2ffe5dbc1cb21babfdbdb4 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 05 七月 2024 10:09:07 +0800
Subject: [PATCH] 添加右键菜单相关语言，对应界面添加客户名称字段，配置标签打印按钮和打印类型下拉框
---
north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java | 9 ++++-----
1 files changed, 4 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 1bc363b..9656fd4 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
@@ -338,7 +338,6 @@
.eq("order_id",orderOtherMoney.getOrderId())
.eq("`column`",orderOtherMoney.getColumn()));
});
-
order.setMoney(money+orderOtherMoneyMapper.selectGrossAmount(order.getOrderId()));
orderMapper.updateMoney(order);
orderDetailMapper.updateOrderMoney(OrderDetails);
@@ -458,12 +457,12 @@
return returns;
}
- public Object printOrderProductDetails(String orderId,String productId) {
+ public Object printOrderProductDetails(String orderId,List<String> productId) {
List<Map<String,Object>> orderProductDistinct;
- if (productId!=""){
- orderProductDistinct = orderDetailMapper.getOrderProductDistinctByIds(orderId,productId);
+ if (productId.size()>0){
+ orderProductDistinct = orderDetailMapper.getOrderProductDistinctByIds(orderId,productId);
}else{
- orderProductDistinct = orderDetailMapper.getOrderProductDistinctById(orderId);
+ orderProductDistinct = orderDetailMapper.getOrderProductDistinctById(orderId);
}
List<Map<String,Object>> orderProductDetail = new ArrayList<>();
--
Gitblit v1.8.0