Compare commits

..

3 Commits

Author SHA1 Message Date
fd34fe0c72 Fix Bug #517: [库房管理-领用管理] 业务逻辑校验缺失:允许保存并提交领用数量大于库存数量(零库存领用)的单据
根因分析:
- 前端 handleSubmitApproval(提交审批)未做库存校验,直接调用后端 API
- 后端 submitApproval 也未做库存校验,仅在保存时(addOrEditIssueReceipt)有 validateRequisitionStock
- 用户可绕过前端保存校验(如编辑已有草稿后直接提交审批),将超库存单据提交审批流

修复方案:
1. 后端:在 submitApproval 方法中增加 validateRequisitionStockByBusNo,通过单据详情查询已保存明细,逐行校验领用数量是否超过源仓库库存
2. 前端:在 handleSubmitApproval 提交前逐行调用 validateRequisitionQtyVsStock 校验库存,超库存时拦截并提示

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
2026-05-17 21:31:28 +08:00
14dc9964d5 Fix Bug #536: [门诊手术安排]手术申请查询弹窗底部,分页组件与界面底部元素重叠
根因:弹窗底部存在多层冗余间距叠加(分页容器inline样式+48px spacer div+
footer margin-top+CSS padding),导致弹窗尺寸变化时分页与footer重叠。

修复:移除冗余spacer div和分页容器inline样式,统一用CSS管理分页与footer
间距,避免固定高度堆叠导致的布局溢出问题。

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
2026-05-17 21:31:28 +08:00
33424d0a72 Fix Bug #528: [住院医生工作站-检查申请] 修改申请单成功后弹窗自动关闭且列表自动刷新 - 调整submit函数中emits('submitOk')与resetForm()的执行顺序,确保先通知父组件关闭弹窗再重置表单状态
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
2026-05-17 21:31:28 +08:00
4 changed files with 100 additions and 16 deletions

View File

@@ -256,6 +256,9 @@ public class RequisitionIssueAppServiceImpl implements IRequisitionIssueAppServi
*/
@Override
public R<?> submitApproval(String busNo) {
// 提交审批前校验库存,防止超库存单据进入审批流
this.validateRequisitionStockByBusNo(busNo);
// 单据提交审核
boolean result = supplyRequestService.submitApproval(busNo);
return result ? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null))
@@ -419,4 +422,80 @@ public class RequisitionIssueAppServiceImpl implements IRequisitionIssueAppServi
}
}
}
/**
* 根据单据号校验领用数量是否超过源仓库实际库存(提交审批前调用)
*
* @param busNo 单据号
*/
private void validateRequisitionStockByBusNo(String busNo) {
Integer tenantId = SecurityUtils.getLoginUser().getTenantId();
// 通过单据详情查询已保存的单据明细
R<List<IssueDetailDto>> detailResult = this.getDetail(busNo);
if (detailResult.getCode() != 200 || detailResult.getData() == null) {
return;
}
List<IssueDetailDto> detailList = detailResult.getData();
for (IssueDetailDto detail : detailList) {
Long itemId = detail.getItemId();
String lotNumber = detail.getLotNumber();
Long sourceLocationId = detail.getSourceLocationId();
BigDecimal reqQuantity = detail.getItemQuantity();
String itemTable = CommonConstants.TableName.MED_MEDICATION_DEFINITION;
// 根据药品类型判断表名
if (ItemType.DEVICE.getValue().equals(detail.getItemType())) {
itemTable = CommonConstants.TableName.ADM_DEVICE_DEFINITION;
}
// 查询定义信息(拆零比、单位)
BigDecimal partPercent = BigDecimal.ONE;
String unitCode = detail.getUnitCode();
String minUnitCode = detail.getMinUnitCode();
if (CommonConstants.TableName.MED_MEDICATION_DEFINITION.equals(itemTable)) {
MedicationDefinition medDef = medicationDefinitionService.getById(itemId);
if (medDef != null) {
unitCode = medDef.getUnitCode();
minUnitCode = medDef.getMinUnitCode();
if (medDef.getPartPercent() != null) {
partPercent = medDef.getPartPercent();
}
}
} else if (CommonConstants.TableName.ADM_DEVICE_DEFINITION.equals(itemTable)) {
DeviceDefinition devDef = deviceDefinitionService.getById(itemId);
if (devDef != null) {
unitCode = devDef.getUnitCode();
minUnitCode = devDef.getMinUnitCode();
if (devDef.getPartPercent() != null) {
partPercent = devDef.getPartPercent();
}
}
}
// 计算领用数量折合最小单位的值
BigDecimal reqQuantityInMinUnit;
if (unitCode != null && detail.getUnitCode().equals(unitCode)) {
reqQuantityInMinUnit = reqQuantity.multiply(partPercent);
} else {
reqQuantityInMinUnit = reqQuantity;
}
// 查询源仓库实际库存
List<InventoryItem> inventoryItemList = inventoryItemService.selectInventoryByItemId(
itemId, lotNumber, sourceLocationId, tenantId);
// 累加总库存
BigDecimal totalStock = BigDecimal.ZERO;
for (InventoryItem inventoryItem : inventoryItemList) {
if (inventoryItem.getLocationId().equals(sourceLocationId)) {
totalStock = totalStock.add(inventoryItem.getQuantity());
}
}
// 比较领用数量与库存
if (reqQuantityInMinUnit.compareTo(totalStock) > 0) {
throw new ServiceException("提交失败,单据中存在领用数量超过库存的明细,请核对后重新保存");
}
}
}
}

View File

@@ -501,8 +501,8 @@ const submit = () => {
if (res.code === 200) {
ElMessage.success(res.msg || (props.isEditMode ? '修改成功' : '保存成功'));
applicationList.value = [];
resetForm();
emits('submitOk');
resetForm();
} else {
ElMessage.error(res.msg || '保存失败');
}

View File

@@ -982,6 +982,16 @@ function handleSubmitApproval() {
} else if (!form.purchaseinventoryList[length - 1].isSave) {
proxy.$modal.msgWarning('第' + length + '行单据未保存,请先保存');
} else {
// 提交审批前逐行校验库存,防止超库存单据进入审批
for (let i = 0; i < form.purchaseinventoryList.length; i++) {
const line = form.purchaseinventoryList[i];
if (!line) continue;
const err = validateRequisitionQtyVsStock(line, i + 1);
if (err) {
proxy.$modal.msgWarning(err);
return;
}
}
submitApproval(receiptHeaderForm.busNo).then((response) => {
if (response.code == 200) {
proxy.$modal.msgSuccess('提交审批成功');

View File

@@ -781,7 +781,7 @@
</el-table>
<!-- 底部分页区 -->
<div class="pagination-container apply-pagination" style="margin-top: 10px; padding-bottom: 20px">
<div class="pagination-container apply-pagination">
<pagination
v-show="applyTotal > 0"
:total="applyTotal"
@@ -792,12 +792,9 @@
@pagination="getSurgicalScheduleList"
/>
</div>
<!-- 分页与底部操作区之间的间隔 -->
<div style="height: 48px"></div>
<!-- 底部操作区 -->
<template #footer>
<div class="dialog-footer" style="margin-top: 24px; padding-top: 12px; border-top: 1px solid #ebeef5">
<div class="dialog-footer" style="padding-top: 12px; border-top: 1px solid #ebeef5">
<el-button @click="cancelApplyDialog">取消</el-button>
<el-button type="primary" @click="confirmApply">确认</el-button>
</div>
@@ -2408,15 +2405,14 @@ function getRowClassName({ row, rowIndex }) {
/* 手术申请查询弹窗 — 分页与footer间距 */
.surgery-apply-dialog :deep(.el-dialog__body) {
padding-bottom: 32px;
padding-bottom: 16px;
}
.surgery-apply-dialog :deep(.el-dialog__footer) {
padding-top: 0;
padding-top: 8px;
}
.surgery-apply-dialog :deep(.apply-pagination) {
padding-bottom: 24px;
margin-bottom: 16px;
border-bottom: 1px solid #ebeef5;
padding-top: 12px;
padding-bottom: 16px;
}
.surgery-apply-dialog :deep(.apply-pagination .el-pagination) {
margin-right: 80px;
@@ -2436,17 +2432,16 @@ function getRowClassName({ row, rowIndex }) {
<style>
/* 手术申请查询弹窗 — 非 scoped 确保穿透 teleport */
.surgery-apply-dialog .apply-pagination {
padding-bottom: 24px !important;
margin-bottom: 16px !important;
border-bottom: 1px solid #ebeef5 !important;
padding-top: 12px !important;
padding-bottom: 16px !important;
}
.surgery-apply-dialog .apply-pagination .el-pagination {
margin-right: 80px !important;
}
.surgery-apply-dialog .el-dialog__body {
padding-bottom: 32px !important;
padding-bottom: 16px !important;
}
.surgery-apply-dialog .el-dialog__footer {
padding-top: 0 !important;
padding-top: 8px !important;
}
</style>