From b9fcf2858b9d5492489a5ba1e3443a5681adbe4a Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 20 六月 2024 17:00:29 +0800
Subject: [PATCH] 修改基础数据别名跟登录的俄文切换
---
north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java | 6 ++++--
1 files changed, 4 insertions(+), 2 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 e9fdc48..110b790 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
@@ -107,7 +107,7 @@
JSONObject orderJson = new JSONObject(orderMap);
Order order = JSONObject.parseObject(JSONObject.toJSONString(orderJson.get("title")), Order.class);
Map<String,Object> map = new HashMap<>();
- if(order.getOrderId()!=null){
+ if(order.getOrderId()!=null && !order.getOrderId().isEmpty()){
map.put("data",0);
}else{
map.put("data",orderMapper.selectOrder(order));
@@ -472,7 +472,9 @@
new QueryWrapper<OrderGlassDetail>().
eq("order_id",orderId).
eq("order_number",orderDetail.getOrderNumber())
- );
+ );
+ Integer differentSize = orderGlassDetailMapper.getDifferentSizeNumber(orderId,orderDetail.getOrderNumber());
+ orderDetail.setDifferentSize(differentSize);
orderDetail.setOrderGlassDetails(orderGlassDetails);
});
--
Gitblit v1.8.0