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

guoyujie

2025-11-20 5fb1f180d0e6eceb83cda226c1daeca3f634e813

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

@@ -21,6 +21,7 @@
import com.example.erp.mapper.mm.BasicWarehouseTypeMapper;
import com.example.erp.mapper.mm.FinishedGoodsInventoryMapper;
import com.example.erp.mapper.mm.FinishedOperateLogMapper;
import com.example.erp.mapper.pp.FlowCardMapper;
import com.example.erp.mapper.sd.OrderDetailMapper;
import com.example.erp.mapper.sd.OrderMapper;
import com.example.erp.service.userInfo.LogService;
@@ -54,6 +55,8 @@
    @Autowired
    OrderMapper orderMapper;
    @Autowired
    FlowCardMapper flowCardMapper;
    @Autowired
    SysErrorService sysErrorService;
    @Autowired
    LogService logService;
@@ -71,6 +74,19 @@
        Map<String, Object> map = new HashMap<>();
        map.put("data", finishedGoodsInventoryMapper.getSelectWarehousing(offset, pageSize, flowCard));
        map.put("total", finishedGoodsInventoryMapper.getSelectWarehousingPageTotal(offset, pageSize, flowCard));

        return map;
    }

    public Map<String, Object> getSelectWarehousingApp(String processId) {
        Map<String, Object> map = new HashMap<>();
        FlowCard flowCard=new FlowCard();
        if(processId!=null){
            flowCard.setProcessId(processId.substring(0,14));
            map.put("data", finishedGoodsInventoryMapper.getSelectWarehousing(0, 999999999, flowCard));
            map.put("total", finishedGoodsInventoryMapper.getSelectWarehousingPageTotal(0, 999999999, flowCard));
        }


        return map;
    }
@@ -248,6 +264,14 @@
        Map<String, Object> map = new HashMap<>();
        map.put("data", finishedGoodsInventoryMapper.getSelectDeliveryDetail(offset, pageSize, orderDetail));
        map.put("total", finishedGoodsInventoryMapper.getSelectDeliveryDetailPageTotal(offset, pageSize, orderDetail));
        return map;
    }

    public Map<String, Object> getSelectDeliveryDetailApp() {
        Map<String, Object> map = new HashMap<>();
        OrderDetail orderDetail=new OrderDetail();
        map.put("data", finishedGoodsInventoryMapper.getSelectDeliveryDetail(0, 999999999, orderDetail));
        map.put("total", finishedGoodsInventoryMapper.getSelectDeliveryDetailPageTotal(0, 999999999, orderDetail));
        return map;
    }

@@ -739,16 +763,92 @@
            if(order.getWarehousing()!=2){
                List<OrderDetail> orderDetailList=finishedGoodsInventoryMapper.getSelectOrderDetail(orderId);
                for (OrderDetail orderDetail:orderDetailList){
                    FlowCard flowCard  =flowCardMapper.selectOne(
                            new LambdaQueryWrapper<FlowCard>()
                            .eq(FlowCard::getOrderId, orderDetail.getOrderId())
                            .eq(FlowCard::getOrderNumber, orderDetail.getOrderNumber())
                            .groupBy(FlowCard::getOrderId,FlowCard::getOrderNumber));
                    FinishedGoodsInventory finishedGoodsInventory = finishedGoodsInventoryMapper.findOrderNumberd(orderDetail.getOrderId(),orderDetail.getOrderNumber());
                    if(finishedGoodsInventory!=null){
                        finishedOperateLogMapper.updateOrderFinishedOperateLog(orderDetail,userName,oddNumber);
                        //修改库存表入库数量


                    // 计算剩余数量
                    long quantity;
                    if (flowCard != null) {
                        quantity = flowCard.getQuantity() - flowCard.getReceivedQuantity();
                    } else {
                        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{
                    } else {
                        finishedGoodsInventoryMapper.insertOrderFinishedGoodsInventory(orderDetail);
                    }
                    finishedOperateLogMapper.insertOrderFinishedOperateLog(orderDetail,userName,oddNumber);
                    finishedGoodsInventoryMapper.updateOrderNumberConut(orderDetail.getOrderId(),orderDetail.getOrderNumber(),orderDetail.getQuantity());

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

                    // 更新流程卡
                    if (flowCard != null) {
                        flowCard.setInventoryQuantity((int) quantity);
                        Order order1 = new Order();
                        order1.setOrderId(flowCard.getOrderId());
                        flowCard.setOrder(order1);
                        finishedGoodsInventoryMapper.updateflowcard(flowCard);
                    }

                }
                finishedGoodsInventoryMapper.updateOrderWarehousingState(orderId,2);
            }
@@ -1104,11 +1204,9 @@

                    //修改订单明细表入库数量
                    finishedGoodsInventoryMapper.updateOutOrderNumberConut(finishedOperateLog.getOrderId(),finishedOperateLog.getOperationNumber(),finishedOperateLog.getCancelAvailable());
                    //判断订单是否全部入库
                    if (Objects.equals(ordersum, ordernumbersum)) {
                        //修改订单表入库状态
                        finishedGoodsInventoryMapper.updateOrderWarehousingState(finishedOperateLog.getOrderId(),1);
                    }

                    //修改订单表入库状态
                    finishedGoodsInventoryMapper.updateOrderWarehousingState(finishedOperateLog.getOrderId(),1);
                    if (ordernumbersum-finishedOperateLog.getQuantity()==0) {
                        //修改订单表入库状态
                        finishedGoodsInventoryMapper.updateOrderWarehousingState(finishedOperateLog.getOrderId(),0);