feat: Spring Boot 3.5.14 全量升级 + 组件升级
核心升级: - Spring Boot 2.7.18 → 3.5.14 - MyBatis Plus 3.5.5 → 3.5.16 (spring-boot3-starter) - Springdoc 1.8.0 → 2.8.6 (OpenAPI 3) - Flowable 6.8.0 → 7.1.0 - Druid 1.2.x → 1.2.28 (boot3-starter) - kotlin-reflect 1.9.10 → 1.9.25 迁移适配: - javax → jakarta 命名空间 (620+ 文件) - Swagger 注解迁移到 OpenAPI 3 (@Tag/@Schema/@Operation/@Parameter) - Spring Security 6.2 适配 (antMatchers→requestMatchers, EnableMethodSecurity) - Druid 包名迁移 (boot→boot3) - Redis 配置路径迁移 (spring.redis→spring.data.redis) - Flyway 适配 (flyway-database-postgresql) - Flowable 7.x 适配 (MULE_TASK_IMAGE 移除) 修复: - spring-boot-maven-plugin 2.5.15→3.5.14 (SPI服务发现失效) - mybatis-plus-boot-starter 3.5.5→3.5.16 (kotlin-reflect+fastjson2冲突) - Flowable database-schema-update 启用自动建表 验证: 23/23 测试通过, 1374 API端点正常
This commit is contained in:
@@ -0,0 +1,213 @@
|
||||
import request from '@/utils/request'
|
||||
|
||||
// 查询管理列表
|
||||
export function getTransferProductList(query) {
|
||||
return request({
|
||||
url:'/issue-manage/requisition/requisition-issue-page',
|
||||
method: 'get',
|
||||
params: query
|
||||
})
|
||||
}
|
||||
|
||||
// 详情
|
||||
export function getTransferProductDetail(busNo) {
|
||||
return request({
|
||||
url: '/issue-manage/requisition/requisition-issue-detail',
|
||||
method: 'get',
|
||||
params: { busNo } // 确保参数正确传递
|
||||
})
|
||||
}
|
||||
|
||||
// 添加/编辑单据
|
||||
export function addTransferProduct(data) {
|
||||
return request({
|
||||
url: '/issue-manage/requisition/requisition-issue-edit',
|
||||
method: 'put',
|
||||
data: data
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
// 查询单据初始化数据
|
||||
export function getInit() {
|
||||
return request({
|
||||
url: '/issue-manage/requisition/init',
|
||||
method: 'get'
|
||||
})
|
||||
}
|
||||
export function getBusNoInit() { //单据号
|
||||
return request({
|
||||
url: '/issue-manage/requisition/bus-no-init',
|
||||
method: 'get'
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
// 删除单据
|
||||
export function delTransferProduct(param) {
|
||||
return request({
|
||||
url: '/issue-manage/requisition/requisition-issue-del?supplyRequestIds=' + param,
|
||||
// '/inventory-manage/purchase/inventory-receipt?supplyRequestIds=' + param,
|
||||
method: 'delete',
|
||||
})
|
||||
}
|
||||
|
||||
// 提交审批
|
||||
export function submitApproval(busNo) {
|
||||
return request({
|
||||
url: '/issue-manage/requisition/submit-approval',
|
||||
// '/inventory-manage/purchase/submit-approval',
|
||||
method: 'put',
|
||||
data: { busNo }
|
||||
})
|
||||
}
|
||||
|
||||
// 撤回审批
|
||||
export function withdrawApproval(busNo) {
|
||||
return request({
|
||||
url: '/issue-manage/requisition/withdraw-approval',
|
||||
// '/inventory-manage/purchase/withdraw-approval',
|
||||
method: 'put',
|
||||
data: { busNo }
|
||||
})
|
||||
}
|
||||
|
||||
// 获取药品目录
|
||||
export function getMedicineList(queryParams) {
|
||||
return request({
|
||||
url: '/app-common/inventory-item',
|
||||
method: 'get',
|
||||
params: queryParams
|
||||
})
|
||||
}
|
||||
|
||||
// 获取药品目录
|
||||
export function getCount(queryParams) {
|
||||
return request({
|
||||
url:'/app-common/inventory-item-info',
|
||||
// url: '/inventory-manage/purchase/inventory-item-info',
|
||||
method: 'get',
|
||||
params: queryParams
|
||||
})
|
||||
}
|
||||
|
||||
// 获取药房列表
|
||||
export function getPharmacyList() {
|
||||
return request({
|
||||
url: '/app-common/pharmacy-list',
|
||||
method: 'get',
|
||||
})
|
||||
}
|
||||
// 药房药库列表
|
||||
export function getPharmacyCabinetList() {
|
||||
return request({
|
||||
url: '/app-common/pharmacy-cabinet-list',
|
||||
method: 'get',
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
// 获取药库列表
|
||||
export function getDispensaryList() {
|
||||
return request({
|
||||
url: '/app-common/cabinet-list',
|
||||
method: 'get',
|
||||
})
|
||||
}
|
||||
|
||||
// 查询管理列表
|
||||
export function getTHTransferProductlist(query) {
|
||||
return request({
|
||||
url:'/issue-manage/return/return-issue-page',
|
||||
method: 'get',
|
||||
params: query
|
||||
})
|
||||
}
|
||||
|
||||
// 详情
|
||||
export function getTHTransferProductDetail(busNo) {
|
||||
return request({
|
||||
url: '/issue-manage/return/return-issue-detail',
|
||||
method: 'get',
|
||||
params: { busNo } // 确保参数正确传递
|
||||
})
|
||||
}
|
||||
|
||||
// 添加/编辑单据
|
||||
export function addTHTransferProduct(data) {
|
||||
return request({
|
||||
url: '/issue-manage/return/return-issue-edit',
|
||||
method: 'put',
|
||||
data: data
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
// 查询单据初始化数据
|
||||
export function getTHInit() {
|
||||
return request({
|
||||
url: '/issue-manage/return/init',
|
||||
method: 'get'
|
||||
})
|
||||
}
|
||||
export function getTHBusNoInit() { //单据号
|
||||
return request({
|
||||
url: '/issue-manage/return/bus-no-init',
|
||||
method: 'get'
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
// 删除单据
|
||||
export function delTHTransferProduct(param) {
|
||||
return request({
|
||||
url: '/issue-manage/return/return-issue-del?supplyRequestId=' + param,
|
||||
// '/inventory-manage/purchase/inventory-receipt?supplyRequestIds=' + param,
|
||||
method: 'delete',
|
||||
})
|
||||
}
|
||||
|
||||
// 提交审批
|
||||
export function submitTHApproval(busNo) {
|
||||
return request({
|
||||
url: '/issue-manage/return/submit-approval',
|
||||
// '/inventory-manage/purchase/submit-approval',
|
||||
method: 'put',
|
||||
data: { busNo }
|
||||
})
|
||||
}
|
||||
|
||||
// 撤回审批
|
||||
export function withdrawTHApproval(busNo) {
|
||||
return request({
|
||||
url: '/issue-manage/return/withdraw-approval',
|
||||
// '/inventory-manage/purchase/withdraw-approval',
|
||||
method: 'put',
|
||||
data: { busNo }
|
||||
})
|
||||
}
|
||||
/**
|
||||
* 审批驳回
|
||||
*/
|
||||
export function reject(busNo) {
|
||||
return request({
|
||||
url: '/inventory-manage/receipt/reject?busNo=' + busNo,
|
||||
method: 'put',
|
||||
})
|
||||
}
|
||||
/**
|
||||
* 领用出库审批通过
|
||||
*/
|
||||
export function requisitionIssueApproved(busNo) {
|
||||
return request({
|
||||
url: '/inventory-manage/receipt/requisition-issue-approved?busNo=' + busNo,
|
||||
method: 'put',
|
||||
})
|
||||
}
|
||||
// 领用退库审批通过
|
||||
export function returnIssueApproved(busNo) {
|
||||
return request({
|
||||
url: '/inventory-manage/receipt/return-issue-approved?busNo=' + busNo,
|
||||
method: 'put',
|
||||
})
|
||||
}
|
||||
@@ -0,0 +1,144 @@
|
||||
<template>
|
||||
<div>
|
||||
<el-table
|
||||
ref="medicineRef"
|
||||
height="400"
|
||||
:data="medicineList"
|
||||
@cell-click="clickRow"
|
||||
>
|
||||
<el-table-column
|
||||
label="项目名称"
|
||||
align="center"
|
||||
prop="name"
|
||||
width="200"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column
|
||||
label="项目类型"
|
||||
align="center"
|
||||
prop="itemType_enumText"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column
|
||||
label="包装单位"
|
||||
align="center"
|
||||
prop="unitCode_dictText"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column
|
||||
label="最小单位"
|
||||
align="center"
|
||||
prop="minUnitCode_dictText"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column
|
||||
label="规格"
|
||||
align="center"
|
||||
prop="volume"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column
|
||||
label="产品批号"
|
||||
align="center"
|
||||
prop="lotNumber"
|
||||
/>
|
||||
<el-table-column
|
||||
label="包装单位"
|
||||
align="center"
|
||||
prop="unitCode_dictText"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<!-- <el-table-column label="用法" align="center" prop="methodCode_dictText" />
|
||||
<el-table-column label="单次剂量" align="center" prop="dose" />
|
||||
<el-table-column
|
||||
label="剂量单位"
|
||||
align="center"
|
||||
prop="doseUnitCode_dictText"
|
||||
/> -->
|
||||
<el-table-column
|
||||
label="生产厂家"
|
||||
align="center"
|
||||
prop="manufacturerText"
|
||||
/>
|
||||
<el-table-column
|
||||
label="编码"
|
||||
align="center"
|
||||
prop="ybNo"
|
||||
/>
|
||||
</el-table>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import {getMedicineList} from './api';
|
||||
import {watch} from 'vue';
|
||||
import {throttle} from 'lodash-es';
|
||||
|
||||
const props = defineProps({
|
||||
searchKey: {
|
||||
type: String,
|
||||
default: '',
|
||||
},
|
||||
itemType: {
|
||||
type: String,
|
||||
default: '',
|
||||
},
|
||||
/** 表头所选出库仓库：传入后药品列表只含该仓有库存的行，避免选到别仓批号导致 inventory-item-info 一直为 0 */
|
||||
orgLocationId: {
|
||||
type: [String, Number],
|
||||
default: undefined,
|
||||
},
|
||||
});
|
||||
const emit = defineEmits(['selectRow']);
|
||||
const queryParams = ref({
|
||||
// pageNum: 1,
|
||||
// pageSize: 50,
|
||||
itemType: props.itemType,
|
||||
purchaseFlag: 0,
|
||||
// sourceLocationId: props.sourceLocationId,
|
||||
// purposeLocationId:props.purposeLocationId
|
||||
});
|
||||
const medicineList = ref([]);
|
||||
|
||||
// 节流函数
|
||||
const throttledGetList = throttle(
|
||||
() => {
|
||||
getList();
|
||||
},
|
||||
300,
|
||||
{ leading: true, trailing: true }
|
||||
);
|
||||
|
||||
watch(
|
||||
() => props,
|
||||
(newValue) => {
|
||||
queryParams.value.searchKey = newValue.searchKey;
|
||||
queryParams.value.itemType = newValue.itemType;
|
||||
queryParams.value.purchaseFlag = 0;
|
||||
if (newValue.orgLocationId != null && newValue.orgLocationId !== '') {
|
||||
queryParams.value.orgLocationId = newValue.orgLocationId;
|
||||
} else {
|
||||
delete queryParams.value.orgLocationId;
|
||||
}
|
||||
throttledGetList();
|
||||
},
|
||||
{ immediate: true, deep: true }
|
||||
);
|
||||
|
||||
getList();
|
||||
function getList() {
|
||||
getMedicineList(queryParams.value).then((res) => {
|
||||
medicineList.value = res.data;
|
||||
});
|
||||
}
|
||||
|
||||
function clickRow(row) {
|
||||
emit('selectRow', row);
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
:deep(.hover_row) {
|
||||
width: 100vw !important;
|
||||
}
|
||||
</style>
|
||||
Reference in New Issue
Block a user