Merge branch 'master' of http://bore.pub:10439/r/ERP_override

guoyuji

2024-06-25 f94dec7ddbd0aa96f642f04d41d0f74ca0edfdc7

 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 && !order.getOrderId().isEmpty()){
            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);
            });