gongchunyi
4 天以前 5b08b6df3883a502990785a23dc2ecc9e58e0e41
feat: 入库管理新增"缺货字段"和"缺货情况"
已修改6个文件
49 ■■■■■ 文件已修改
src/main/java/com/ruoyi/procurementrecord/dto/Details.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDto.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/procurementrecord/dto/ProcurementUpdateDto.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementRecordStorage.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/procurementrecord/dto/Details.java
@@ -15,4 +15,14 @@
    private BigDecimal warnNum;
    private Long productModelId;
    /**
     * 缺货数量
     */
    private BigDecimal outStockQuantity;
    /**
     * 缺货情况
     */
    private String shortageDescription;
}
src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDto.java
@@ -151,4 +151,14 @@
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private LocalDate endDate;
    /**
     * 缺货数量
     */
    private BigDecimal outStockQuantity;
    /**
     * 缺货情况
     */
    private String shortageDescription;
}
src/main/java/com/ruoyi/procurementrecord/dto/ProcurementUpdateDto.java
@@ -20,4 +20,15 @@
    private List<Integer> ids;
    /**
     * 缺货数量
     */
    private BigDecimal outStockQuantity;
    /**
     * 缺货情况
     */
    private String shortageDescription;
}
src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementRecordStorage.java
@@ -46,6 +46,16 @@
//    private BigDecimal minStock;
    /**
     * 缺货数量
     */
    private BigDecimal outStockQuantity;
    /**
     * 缺货情况
     */
    private String shortageDescription;
    /**
     * 入库用户
     */
    private String createBy;
src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java
@@ -106,6 +106,8 @@
        procurementRecordStorageById.setWarnNum(procurementDto.getWarnNum());
        procurementRecordStorageById.setUpdateUser(SecurityUtils.getLoginUser().getUserId());
        procurementRecordStorageById.setUpdateTime(LocalDateTime.now());
        procurementRecordStorageById.setOutStockQuantity(procurementDto.getOutStockQuantity());
        procurementRecordStorageById.setShortageDescription(procurementDto.getShortageDescription());
        return procurementRecordMapper.updateById(procurementRecordStorageById);
    }
@@ -413,6 +415,8 @@
                    .inboundBatches(aLong.equals(0L) ? "第1批次" : "第"+ (aLong + 1) + "批次")
                    .inboundNum(detail.getInboundQuantity())
                    .warnNum(detail.getWarnNum())
                    .outStockQuantity(detail.getOutStockQuantity())
                    .shortageDescription(detail.getShortageDescription())
                    .createTime(LocalDateTime.now())
                    .createUser(loginUser.getUserId())
                    .updateTime(LocalDateTime.now())
src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
@@ -49,7 +49,9 @@
        t1.create_time,
        t1.update_time,
        t1.create_by,
        t2.warn_num
        t2.warn_num,
        t1.out_stock_quantity as outStockQuantity,
        t1.shortage_description as shortageDescription
        from  procurement_record_storage t1
                  left join sales_ledger_product t2 on t2.id = t1.sales_ledger_product_id
                  left join purchase_ledger t3 on t3.id = t2.sales_ledger_id