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

chenlu

12 小时以前 2e1553e8a7120c2d38d69a8f400dcca2557b09fb

 north-glass-erp/src/main/java/com/example/erp/service/mm/FinishedGoodsInventoryService.java

@@ -765,14 +765,83 @@
            if(order.getWarehousing()!=2){
                List<OrderDetail> orderDetailList=finishedGoodsInventoryMapper.getSelectOrderDetail(orderId);
                for (OrderDetail orderDetail:orderDetailList){
                    FlowCard flowCard  =flowCardMapper.selectOne(
                    List<FlowCard> flowCards = flowCardMapper.selectList(
                            new LambdaQueryWrapper<FlowCard>()
                            .eq(FlowCard::getOrderId, orderDetail.getOrderId())
                            .eq(FlowCard::getOrderNumber, orderDetail.getOrderNumber())
                            .groupBy(FlowCard::getOrderId,FlowCard::getOrderNumber));
                                    .groupBy(FlowCard::getOrderId, FlowCard::getOrderNumber,FlowCard::getProcessId));
                    if (flowCards.isEmpty()) {
                    FinishedGoodsInventory finishedGoodsInventory = finishedGoodsInventoryMapper.findOrderNumberd(orderDetail.getOrderId(),orderDetail.getOrderNumber());
                            // 计算剩余数量
                            long quantity;
                            quantity = orderDetail.getQuantity() - orderDetail.getWarehouseNum();

                            if (quantity <= 0) continue;

                            int calculateType = order.getCalculateType();
                            double deliveryDetailMoney = 0.0;
                            double deliveryDetailArea = 0.0;

                            BigDecimal getComputeArea = BigDecimal.valueOf(orderDetail.getComputeArea());
                            BigDecimal getQuantity = BigDecimal.valueOf(quantity);
                            BigDecimal getPrice = BigDecimal.valueOf(orderDetail.getPrice());
                            BigDecimal getWidth = BigDecimal.valueOf(orderDetail.getWidth());
                            BigDecimal getHeight = BigDecimal.valueOf(orderDetail.getHeight());
                            BigDecimal singlePieceArea = getComputeArea.multiply(getQuantity).setScale(2, RoundingMode.HALF_UP)
                                    .multiply(getPrice).setScale(2, RoundingMode.HALF_UP);
                            //根据订单计算方式进行金额计算
                            if (calculateType == 1) {
                                deliveryDetailMoney = singlePieceArea.doubleValue();
                                deliveryDetailArea = getComputeArea.multiply(getQuantity).doubleValue();

                            } else if (calculateType == 2) {
                                //判断实际单片面积跟结算单片面积是否相等 结算总面积跟实际总面积是否相等
                                if (Objects.equals(orderDetail.getArea(), orderDetail.getComputeArea()) && Objects.equals(orderDetail.getGrossArea(), orderDetail.getComputeGrossArea())) {
                                    deliveryDetailMoney = getWidth.multiply(getHeight).multiply(getQuantity).divide(BigDecimal.valueOf(1000000), 2, RoundingMode.HALF_UP)
                                            .multiply(getPrice).setScale(2, RoundingMode.HALF_UP).doubleValue();
                                    deliveryDetailArea = getWidth.multiply(getHeight).multiply(getQuantity).divide(BigDecimal.valueOf(1000000), 2, RoundingMode.HALF_UP).doubleValue();
                                } else {
                                    deliveryDetailMoney = singlePieceArea.doubleValue();
                                    deliveryDetailArea = getComputeArea.multiply(getQuantity).doubleValue();
                                }
                            } else if (calculateType == 3) {
                                deliveryDetailMoney = getQuantity.multiply(getPrice).setScale(2, RoundingMode.HALF_UP).doubleValue();
                                deliveryDetailArea = getComputeArea.multiply(getQuantity).doubleValue();

                            } else if (calculateType == 4) {
                                //判断实际单片面积跟结算单片面积是否相等 结算总面积跟实际总面积是否相等
                                if (Objects.equals(orderDetail.getArea(), orderDetail.getComputeArea()) && Objects.equals(orderDetail.getGrossArea(), orderDetail.getComputeGrossArea())) {
                                    deliveryDetailMoney = getWidth.multiply(getHeight).multiply(getQuantity).multiply(getPrice).
                                            divide(BigDecimal.valueOf(1000000), 2, RoundingMode.HALF_UP).doubleValue();
                                    deliveryDetailArea = getWidth.multiply(getHeight).multiply(getQuantity).divide(BigDecimal.valueOf(1000000), 2, RoundingMode.HALF_UP).doubleValue();
                                } else {
                                    deliveryDetailMoney = getComputeArea.multiply(getQuantity).multiply(getPrice).setScale(2, RoundingMode.HALF_UP).doubleValue();
                                    deliveryDetailArea = getComputeArea.multiply(getQuantity).doubleValue();
                                }
                            }

                            // 更新订单明细
                            orderDetail.setQuantity(quantity);
                            orderDetail.setGrossAmount(deliveryDetailMoney);
                            orderDetail.setComputeGrossArea(deliveryDetailArea);

                            // 更新库存
                            if (finishedGoodsInventory != null) {
                                finishedGoodsInventoryMapper.updateOrderInventory(orderDetail);
                            } else {
                                finishedGoodsInventoryMapper.insertOrderFinishedGoodsInventory(orderDetail);
                            }

                            // 记录操作日志
                            String processId =  "";
                            finishedOperateLogMapper.insertOrderFinishedOperateLog(orderDetail, userName, oddNumber, processId);
                            finishedGoodsInventoryMapper.updateOrderNumberConut(orderDetail.getOrderId(), orderDetail.getOrderNumber(), orderDetail.getQuantity());



                    }else{
                        for (FlowCard flowCard:flowCards){
                            FinishedGoodsInventory finishedGoodsInventory = finishedGoodsInventoryMapper.findOrderNumberd(orderDetail.getOrderId(), orderDetail.getOrderNumber());
                    // 计算剩余数量
                    long quantity;
                    if (flowCard != null) {
@@ -850,6 +919,8 @@
                        flowCard.setOrder(order1);
                        finishedGoodsInventoryMapper.updateflowcard(flowCard);
                    }
                        }
                    }

                }
                finishedGoodsInventoryMapper.updateOrderWarehousingState(orderId,2);