采购审批增加仓库

huminmin

2026-06-01 b3f4cc9eddb07921fec539317c1a9064699fc711

采购审批增加仓库

 docs/´óÂÞËØ.sql

@@ -5,3 +5,5 @@
    add warehouse varchar(255)  null comment '仓库';
alter table stock_in_record
    add warehouse varchar(255)  null comment '仓库';
alter table approval_instance
    add warehouse varchar(255)  null comment '仓库';

 src/main/java/com/ruoyi/approve/pojo/ApprovalInstance.java

@@ -148,4 +148,7 @@

    @Schema(description = "表单数据")
    private String formConfig;

    @Schema(description = "仓库")
    private String warehouse;
}

 src/main/java/com/ruoyi/approve/service/impl/ApprovalInstanceServiceImpl.java

@@ -255,6 +255,12 @@
            return R.fail("审批实例不存在");
        }

        // å¦‚果前端传递了仓库信息，更新审批实例的仓库字段
        if (StringUtils.hasText(approvalInstanceDto.getWarehouse())) {
            instance.setWarehouse(approvalInstanceDto.getWarehouse());
            this.updateById(instance);
        }

        ApprovalInstanceNode currentNode = approveProcessConfigNodeUtils.getCurrentNode(instance.getId());
        if (currentNode == null) {
            return R.fail("当前没有待处理的审批节点");
@@ -647,7 +653,9 @@
                            salesLedgerProduct.getQuantity(),
                            StockInQualifiedRecordTypeEnum.PURCHASE_STOCK_IN.getCode(),
                            purchaseLedger.getId(),
                            purchaseLedger.getPurchaseContractNumber() + "-" + salesLedgerProduct.getId()
                            purchaseLedger.getPurchaseContractNumber() + "-" + salesLedgerProduct.getId(),
                            null,
                            instance.getWarehouse()
                    );
                }
            }

 src/main/java/com/ruoyi/procurementrecord/utils/StockUtils.java

@@ -115,7 +115,7 @@
     * @param recordId
     */
    public void addStockWithBatchNo(Long productModelId, BigDecimal quantity, String recordType, Long recordId, String batchNo) {
        addStockWithBatchNo(productModelId, quantity, recordType, recordId, batchNo, null);
        addStockWithBatchNo(productModelId, quantity, recordType, recordId, batchNo, null, null);
    }

    /**
@@ -124,6 +124,16 @@
     * @param recordId
     */
    public void addStockWithBatchNo(Long productModelId, BigDecimal quantity, String recordType, Long recordId, String batchNo, LocalDateTime createTime) {
        addStockWithBatchNo(productModelId, quantity, recordType, recordId, batchNo, createTime, null);
    }

    /**
     * åˆæ ¼å…¥åº“带批次号（含仓库）
     * @param recordType
     * @param recordId
     * @param warehouse
     */
    public void addStockWithBatchNo(Long productModelId, BigDecimal quantity, String recordType, Long recordId, String batchNo, LocalDateTime createTime, String warehouse) {
        StockInventoryDto stockInventoryDto = new StockInventoryDto();
        stockInventoryDto.setRecordId(recordId);
        stockInventoryDto.setRecordType(String.valueOf(recordType));
@@ -131,6 +141,7 @@
        stockInventoryDto.setProductModelId(productModelId);
        stockInventoryDto.setBatchNo(batchNo);
        stockInventoryDto.setCreateTime(createTime);
        stockInventoryDto.setWarehouse(warehouse);
        stockInventoryService.addStockInRecordOnly(stockInventoryDto);
    }