Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

chenlu

2024-05-13 d35d14bc183e7275e79cb64537ce28dc83f271f0

 north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java

@@ -108,6 +108,11 @@

    //插入其他副表数据，被其他方法引用
    public void insertOtherDetail(String orderId,List<OrderDetail> OrderDetails,List<OrderOtherMoney> orderOtherMoneyList) {
        //先把其他金额副表的金额与数量置0
        orderOtherMoneyList.forEach(orderOtherMoney -> {
            orderOtherMoney.setQuantity(0.0);
        });

        //循环给订单明细表字段添加序号和周长
        for (int i = 0; i < OrderDetails.size(); i++) {
            OrderDetails.get(i).setOrderNumber(i+1);
@@ -116,19 +121,25 @@
            OrderDetails.get(i).setWeight(1.0);
            Map<String,Double> otherColumns = JSON.parseObject(OrderDetails.get(i).getOtherColumns(), new TypeReference<Map<String, Double>>(){});
            int finalI = i;
            otherColumns.forEach((key, value) ->{
                orderOtherMoneyList.forEach(orderOtherMoney ->{
                    if(orderOtherMoney.getColumn().equals(key)){
                        orderOtherMoney.setQuantity (orderOtherMoney.getQuantity()==null?0:orderOtherMoney.getQuantity());
                        orderOtherMoney.setQuantity(((value==null?0:value)*OrderDetails.get(finalI).getQuantity()));
                    }
                });

            });

            if(otherColumns!=null){
                otherColumns.forEach((key, value) ->{
                    if(value!=null) {
                        orderOtherMoneyList.forEach(orderOtherMoney -> {
                            if (orderOtherMoney.getColumn().equals(key)) {
                                orderOtherMoney.setQuantity(orderOtherMoney.getQuantity()+(value * OrderDetails.get(finalI).getQuantity()));
                            }
                        });
                    }

                });
            }
        }




        //往明细表插数据
        orderDetailMapper.insertBatch(OrderDetails);
        //往小片表传入产品数据