自动化立体仓库 - WMS系统
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
chen.llin
2025-12-24 5dca49269399c21333b16d62945c7f74570f9ad5 
 src/main/java/com/zy/asrs/service/impl/MonthlySettleServiceImpl.java


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


import com.baomidou.mybatisplus.mapper.EntityWrapper;


import com.baomidou.mybatisplus.plugins.Page;


import com.baomidou.mybatisplus.service.impl.ServiceImpl;


import com.core.common.Cools;


import com.core.common.SnowflakeIdWorker;


import com.core.exception.CoolException;


import com.zy.asrs.entity.MonthlySettle;


@@ -91,12 +92,21 @@


        cal.set(Calendar.MILLISECOND, 999);


        endDate = cal.getTime();


        


        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");


        // 注意：order_time 是 varchar 类型，需要格式化为完整的日期时间字符串进行比较


        SimpleDateFormat dateTimeFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");


        String startDateStr = dateFormat.format(startDate);


        // 起始日期设置为当天的 00:00:00


        Calendar startCal = Calendar.getInstance();


        startCal.setTime(startDate);


        startCal.set(Calendar.HOUR_OF_DAY, 0);


        startCal.set(Calendar.MINUTE, 0);


        startCal.set(Calendar.SECOND, 0);


        startCal.set(Calendar.MILLISECOND, 0);


        String startDateStr = dateTimeFormat.format(startCal.getTime());


        String endDateStr = dateTimeFormat.format(endDate);


        int count = this.baseMapper.countUnfinishedOrdersInRange(startDateStr, endDateStr);


        return count > 0;


        // 分两次查询：入库和出库


        int pakinCount = this.baseMapper.countUnfinishedOrdersInRangePakin(startDateStr, endDateStr);


        int pakoutCount = this.baseMapper.countUnfinishedOrdersInRangePakout(startDateStr, endDateStr);


        return (pakinCount + pakoutCount) > 0;


    }




    @Override


@@ -141,9 +151,16 @@


        }




        // 统计物料出入库数量（分别查询两个表，在Java代码中合并）


        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");


        // 注意：order_time 是 varchar 类型，需要格式化为完整的日期时间字符串进行比较


        SimpleDateFormat dateTimeFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");


        String startDateStr = dateFormat.format(startDate);


        // 起始日期设置为当天的 00:00:00


        Calendar startCal = Calendar.getInstance();


        startCal.setTime(startDate);


        startCal.set(Calendar.HOUR_OF_DAY, 0);


        startCal.set(Calendar.MINUTE, 0);


        startCal.set(Calendar.SECOND, 0);


        startCal.set(Calendar.MILLISECOND, 0);


        String startDateStr = dateTimeFormat.format(startCal.getTime());


        String endDateStr = dateTimeFormat.format(endDate);


        


        // 分别查询入库表和出库表


@@ -259,6 +276,9 @@


            currentMaterialMap.put(key, stat);


        }




        // 收集所有明细记录，用于批量插入


        List<MonthlySettleDetail> detailList = new java.util.ArrayList<>();




        // 1. 处理本期有出入库的物料


        for (MaterialInOutStatDTO stat : materialStats) {


            // 1. 提取基础信息


@@ -274,16 +294,16 @@


            // 3. 计算库存相关数量


            BigDecimal beginningQty = getBeginningQty(matnr, batch, brand, previousEndingQtyMap);


            BigDecimal endingQty = calculateEndingQty(beginningQty, inQty, outQty);


            BigDecimal stockQtyDecimal = getCurrentStockQty(matnr, batch);


            BigDecimal diffQty = calculateDiffQty(stockQtyDecimal, endingQty);


            // 差异数量 = 期末库存 - 期初库存（期末大于期初时为正数）


            BigDecimal diffQty = calculateDiffQty(beginningQty, endingQty);


            


            // 4. 创建并保存明细记录


            // 4. 创建明细记录（暂不插入）


            MonthlySettleDetail detail = buildMonthlySettleDetail(


                monthlySettle.getId(), settleNo, matnr, batch, maktx, brand,


                beginningQty, inQty, outQty, endingQty, stockQtyDecimal, diffQty


                beginningQty, inQty, outQty, endingQty, diffQty


            );


            detail.setIsDeleted(0); // 未删除


            monthlySettleDetailMapper.insert(detail);


            detailList.add(detail);




            // 5. 累计统计


            totalInQty = totalInQty.add(inQty);


@@ -315,21 +335,33 @@


                    BigDecimal beginningQty = previousEndingQty;


                    // 期末库存 = 期初 + 入库 - 出库 = 期初（因为本期没有出入库）


                    BigDecimal endingQty = beginningQty;


                    // 获取当前实际库存


                    BigDecimal stockQtyDecimal = getCurrentStockQty(matnr, batch);


                    // 计算差异


                    BigDecimal diffQty = calculateDiffQty(stockQtyDecimal, endingQty);


                    // 差异数量 = 期初库存 - 期末库存（期初大于期末时为正数）


                    BigDecimal diffQty = calculateDiffQty(beginningQty, endingQty);


                    


                    // 创建并保存明细记录


                    // 创建明细记录（暂不插入）


                    MonthlySettleDetail detail = buildMonthlySettleDetail(


                        monthlySettle.getId(), settleNo, matnr, batch, maktx, brand,


                        beginningQty, inQty, outQty, endingQty, stockQtyDecimal, diffQty


                        beginningQty, inQty, outQty, endingQty, diffQty


                    );


                    detail.setIsDeleted(0); // 未删除


                    monthlySettleDetailMapper.insert(detail);


                    detailList.add(detail);


                    


                    // 累计统计（虽然入库和出库为0，但也要计入物料种类数）


                    materialCount++;


                }


            }


        }




        // 分批插入，每批1000条，避免一次性插入过多数据


        if (!detailList.isEmpty()) {


            int batchSize = 1000;


            for (int i = 0; i < detailList.size(); i += batchSize) {


                int end = Math.min(i + batchSize, detailList.size());


                List<MonthlySettleDetail> batch = detailList.subList(i, end);


                for (MonthlySettleDetail detail : batch) {


                    if (monthlySettleDetailMapper.insert(detail) <= 0) {


                        throw new CoolException("插入月结明细失败");


                    }


                }


            }


        }


@@ -429,18 +461,21 @@


    }




    /**


     * 获取当前实际库存数量


     * 获取当前实际库存数量（已废弃，改用批量查询）


     * @deprecated 使用批量查询方法替代，避免N+1查询问题


     */


    @Deprecated


    private BigDecimal getCurrentStockQty(String matnr, String batch) {


        Double stockQty = manLocDetlService.queryStockAnfme(matnr, batch);


        return stockQty != null ? BigDecimal.valueOf(stockQty) : BigDecimal.ZERO;


    }




    /**


     * 计算差异数量（实际库存-期末库存）


     * 计算差异数量（期末库存-期初库存）


     * 期末大于期初时为正数，表示库存增加


     */


    private BigDecimal calculateDiffQty(BigDecimal stockQty, BigDecimal endingQty) {


        return stockQty.subtract(endingQty);


    private BigDecimal calculateDiffQty(BigDecimal beginningQty, BigDecimal endingQty) {


        return endingQty.subtract(beginningQty);


    }




    /**


@@ -449,7 +484,7 @@


    private MonthlySettleDetail buildMonthlySettleDetail(


            Long settleId, String settleNo, String matnr, String batch, String maktx, String brand,


            BigDecimal beginningQty, BigDecimal inQty, BigDecimal outQty, BigDecimal endingQty,


            BigDecimal stockQty, BigDecimal diffQty) {


            BigDecimal diffQty) {


        MonthlySettleDetail detail = new MonthlySettleDetail();


        // 基本信息


        detail.setSettleId(settleId);


@@ -463,7 +498,8 @@


        detail.setInQty(inQty);


        detail.setOutQty(outQty);


        detail.setEndingQty(endingQty);


        detail.setStockQty(stockQty);


        // stock_qty 字段已废弃，实际库存等于期末库存，不再单独存储


        // detail.setStockQty(endingQty);


        detail.setDiffQty(diffQty);


        // 时间信息


        detail.setCreateTime(new Date());


@@ -499,5 +535,59 @@


        settle.setUpdateTime(new Date());


        this.updateById(settle);


    }




    @Override


    public boolean isOrderTimeInSettledRange(String orderTime) {


        if (Cools.isEmpty(orderTime)) {


            return false;


        }


        try {


            // 解析订单业务时间


            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");


            Date orderDate = sdf.parse(orderTime);


            


            // 查询所有已月结的记录（status=1且未删除）


            EntityWrapper<MonthlySettle> wrapper = new EntityWrapper<>();


            wrapper.eq("status", 1);


            wrapper.eq("is_deleted", 0);


            List<MonthlySettle> settledList = this.selectList(wrapper);


            


            if (settledList == null || settledList.isEmpty()) {


                return false;


            }


            


            // 检查订单时间是否在任何已月结的区间内


            for (MonthlySettle settle : settledList) {


                Date startDate = settle.getStartDate();


                Date endDate = settle.getEndDate();


                


                // 确保startDate是当天的00:00:00


                Calendar startCal = Calendar.getInstance();


                startCal.setTime(startDate);


                startCal.set(Calendar.HOUR_OF_DAY, 0);


                startCal.set(Calendar.MINUTE, 0);


                startCal.set(Calendar.SECOND, 0);


                startCal.set(Calendar.MILLISECOND, 0);


                


                // 确保endDate是当天的23:59:59.999


                Calendar endCal = Calendar.getInstance();


                endCal.setTime(endDate);


                endCal.set(Calendar.HOUR_OF_DAY, 23);


                endCal.set(Calendar.MINUTE, 59);


                endCal.set(Calendar.SECOND, 59);


                endCal.set(Calendar.MILLISECOND, 999);


                


                // 判断订单时间是否在区间内：[startDate的00:00:00, endDate的23:59:59.999]


                if (!orderDate.before(startCal.getTime()) && !orderDate.after(endCal.getTime())) {


                    return true;


                }


            }


            


            return false;


        } catch (Exception e) {


            log.error("检查订单时间是否在已月结区间内失败", e);


            return false;


        }


    }


}