blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
chenlu
2025-08-26 296203344a6d3c0b7f9208960c89a6cb02d59ed9 
 north-glass-erp/src/main/java/com/example/erp/service/mm/FinishedGoodsInventoryService.java


@@ -6,6 +6,7 @@


import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;


import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;


import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;


import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;


import com.example.erp.dto.mm.FinishedOperateLogDTO;


import com.example.erp.entity.mm.FinishedGoodsInventory;


import com.example.erp.entity.mm.FinishedOperateLog;


@@ -30,6 +31,7 @@




import java.math.BigDecimal;


import java.math.RoundingMode;


import java.sql.SQLOutput;


import java.text.SimpleDateFormat;


import java.time.LocalDate;


import java.util.*;


@@ -906,10 +908,18 @@


        for (OrderDetail orderDetail : list) {


            //获取单号


            String oddNumber= orderNumberSetting("出库");


            OrderDetail orderDetailNew= finishedGoodsInventoryMapper.findOrderDetailNumberd(orderDetail.getDeliveryDetail().getOrderId(),orderDetail.getDeliveryDetail().getOrderNumber());


            OrderDetail orderDetailNew= finishedGoodsInventoryMapper.


                    findOrderDetailNumberd(


                            orderDetail.getDeliveryDetail().getOrderId(),


                            orderDetail.getDeliveryDetail().getOrderNumber());


            //添加出入库记录


            finishedOperateLogMapper.insertOutFinishedOperateLog(orderDetail,userName,oddNumber,orderDetail.getDeliveryDetail().getBoxNo());




            orderDetailMapper.update(null,


                    new UpdateWrapper<OrderDetail>()


                            .setSql("out_stock_num = ifnull(out_stock_num,0)+"+orderDetail.getDeliveryDetail().getQuantity())


                            .eq("order_id",orderDetail.getDeliveryDetail().getOrderId())


                            .eq("order_number",orderDetail.getDeliveryDetail().getOrderNumber())


            );


            //判断发货单的库存是否存在


            Integer finishedGoodsInventorycount = finishedGoodsInventoryMapper.findOrderNumberdcount(orderDetail.getDeliveryDetail().getOrderId(),orderDetail.getDeliveryDetail().getOrderNumber(),orderDetail.getDeliveryDetail().getBoxNo());




@@ -924,11 +934,14 @@


            Integer deliverysum = finishedGoodsInventoryMapper.findDeliveryQuantity(orderDetail.getDeliveryDetail().getDeliveryId());


            //获取已经出库的数量


            Integer deliverydetailsum = finishedGoodsInventoryMapper.findDeliverydetailsum(orderDetail.getDeliveryDetail().getDeliveryId(),0);


            //获取订单已经出库的数量


            OrderDetail orderDetail1  = orderDetailMapper.


                    selectOne(new QueryWrapper<OrderDetail>()


                            .select("ifnull(sum(out_stock_num),0) as out_stock_num")


                            .eq("order_id",orderDetail.getDeliveryDetail().getOrderId())


                    );




            Integer finishedOperateLogQuantitySum = finishedGoodsInventoryMapper.findFinishedOperateLogQuantity(orderDetail.getDeliveryDetail().getOrderId());


            if(finishedOperateLogQuantitySum==null){


                finishedOperateLogQuantitySum=0;


            }




            if(deliverydetailsum==null){


                deliverydetailsum=0;


            }


@@ -959,10 +972,11 @@


                        //修改订单表发货状态


                        finishedGoodsInventoryMapper.updateOrderDeliveryState(orderDetail.getDeliveryDetail().getOrderId(),1);


                        //判断订单是否全部发货


                        if (ordersum==finishedOperateLogQuantitySum) {


                        if (Objects.equals(ordersum, orderDetail1.getOutStockNum())) {


                            //if (ordersum == (orderDeliveryQuantitySum + orderDetail.getWarehouseNum())) {


                            //修改订单表发货状态


                            finishedGoodsInventoryMapper.updateOrderDeliveryState(orderDetail.getDeliveryDetail().getOrderId(),2);


                            finishedGoodsInventoryMapper.


                                    updateOrderDeliveryState(orderDetail.getDeliveryDetail().getOrderId(),2);


                        }


                        if (deliverysum==deliverydetailsum+orderDetail.getDeliveryDetail().getQuantity()) {


                            //修改发货表状态


@@ -1043,6 +1057,20 @@


                        finishedOperateLog.getQuantity(),


                        finishedOperateLog.getRemarks()


                );


                //修改订单明细 出库数量


                orderDetailMapper.update(null,


                        new LambdaUpdateWrapper<OrderDetail>().


                                setSql("out_stock_num = ifnull(out_stock_num,0)-"+finishedOperateLog.getQuantity())


                        .eq(OrderDetail::getOrderId, finishedOperateLog.getOrderId())


                        .eq(OrderDetail::getOrderNumber, finishedOperateLog.getOperationNumber())


                );




                OrderDetail orderDetail1  = orderDetailMapper.


                        selectOne(new QueryWrapper<OrderDetail>()


                                .select("ifnull(sum(out_stock_num),0) as out_stock_num")


                                .eq("order_id",finishedOperateLog.getOrderId())


                        );




                //修改发货明细表状态


                finishedGoodsInventoryMapper.updateDeliveryDetailState(


                        finishedOperateLog.getOrderId(),


@@ -1057,7 +1085,7 @@


                //修改订单表发货状态


                finishedGoodsInventoryMapper.updateOrderDeliveryState(finishedOperateLog.getOrderId(),1);


                //判断订单是否全部发货


                if (ordersum==finishedOperateLog.getQuantity()+ordernumbersum){


                if (orderDetail1.getOutStockNum()==0){


                    //修改订单表发货状态


                    finishedGoodsInventoryMapper.updateOrderDeliveryState(finishedOperateLog.getOrderId(),0);