From d6719145faa252473fb376fed821ceb7f984c8a1 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期三, 19 六月 2024 16:52:29 +0800
Subject: [PATCH] 商标方式和包装方式可以手动输入
---
north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java | 11 +++++++++--
1 files changed, 9 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 2b82f2e..47a0279 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,12 @@
JSONObject orderJson = new JSONObject(orderMap);
Order order = JSONObject.parseObject(JSONObject.toJSONString(orderJson.get("title")), Order.class);
Map<String,Object> map = new HashMap<>();
- map.put("data",orderMapper.selectOrder(order));
+ if(order.getOrderId()!=null){
+ map.put("data",0);
+ }else{
+ map.put("data",orderMapper.selectOrder(order));
+ }
+
return map;
}
//鐢熸垚璁㈠崟鏁版嵁
@@ -467,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