feat(stock): 添加批号字段并优化出入库记录导出功能

liyong

6 天以前 ab328dcee3499bdc622e4eae787abd76c8c845c0

feat(stock): 添加批号字段并优化出入库记录导出功能

- 在StockInRecordExportData中新增批号字段
- 在StockInventoryExportData中新增批号字段
- 在StockOutRecordExportData中新增批号字段并修复出库数量字段名
- 在StockUnInventoryExportData中新增批号字段
- 优化入库和出库时间字段的Excel格式配置
- 统一所有导出数据类中的批号字段定义

 src/main/java/com/ruoyi/stock/service/impl/StockInRecordServiceImpl.java

@@ -120,7 +120,7 @@
    public void exportStockInRecord(HttpServletResponse response, StockInRecordDto stockInRecordDto) {
        List<StockInRecordExportData> list = stockInRecordMapper.listStockInRecordExportData(stockInRecordDto);
        for (StockInRecordExportData stockInRecordExportData : list) {
            if (stockInRecordExportData.getType().equals("0")) {
            if (!stockInRecordExportData.getType().equals("0")) {
                stockInRecordExportData.setRecordType(EnumUtil.fromCode(StockOutQualifiedRecordTypeEnum.class, Integer.parseInt(stockInRecordExportData.getRecordType())).getValue());
            }else {
                stockInRecordExportData.setRecordType(EnumUtil.fromCode(StockInQualifiedRecordTypeEnum.class, Integer.parseInt(stockInRecordExportData.getRecordType())).getValue());

 src/main/resources/mapper/stock/StockInventoryMapper.xml

@@ -226,6 +226,7 @@
            model,
            unit,
            product_name,
            batch_no,
            MAX(warn_num) as warn_num,
            MAX(remark) as remark,
            MAX(update_time) as update_time
@@ -238,6 +239,7 @@
            si.product_model_id,
            si.create_time,
            si.update_time,
            si.batch_no,
            COALESCE(si.warn_num, 0) as warn_num,
            si.remark,
            pm.model,
@@ -259,6 +261,7 @@
            su.create_time,
            su.update_time,
            0 as warn_num,
            su.batch_no,
            su.remark,
            pm.model,
            pm.unit,
@@ -281,7 +284,7 @@
                and combined.product_id in (select id from product_tree)
            </if>
        </where>
        group by product_model_id, model, unit, product_name
        group by product_model_id, model, unit, product_name,batch_no
    </select>
    <select id="stockInventoryPage" resultType="com.ruoyi.stock.dto.StockInRecordDto">
        select sir.*,si.qualitity as current_stock,