licq/heli-mes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(storagelog): 修复库存记录显示逻辑并完善事务处理

Browse Source
This commit is contained in:
zxy 2026-04-03 11:01:51 +08:00
parent d590a1e248
commit 918c57e233
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/storagelog/StorageLogMapper.java
View File

@ -67,7 +67,7 @@ public interface StorageLogMapper extends BaseMapperX<StorageLogDO> {
.orderByDesc(StorageLogDO::getId); .orderByDesc(StorageLogDO::getId);
query query
.notIn(StorageLogDO::getStockMode,24,14) .notIn(StorageLogDO::getStockMode, 24, 14)
.like(!StringUtils.isEmpty(reqVO.getMatName()), StorageLogDO::getMatName, reqVO.getMatName()) .like(!StringUtils.isEmpty(reqVO.getMatName()), StorageLogDO::getMatName, reqVO.getMatName())
.like(!StringUtils.isEmpty(reqVO.getMatCode()), MaterialDO::getCode, reqVO.getMatCode()) .like(!StringUtils.isEmpty(reqVO.getMatCode()), MaterialDO::getCode, reqVO.getMatCode())
.eq(!StringUtils.isEmpty(reqVO.getStockType()), StorageLogDO::getStockType, reqVO.getStockType()) .eq(!StringUtils.isEmpty(reqVO.getStockType()), StorageLogDO::getStockType, reqVO.getStockType())

1
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/wmsstorage/WmsStorageServiceImpl.java
View File

@ -63,6 +63,7 @@ public class WmsStorageServiceImpl implements WmsStorageService {
} }
@Override @Override
@Transactional(rollbackFor = Exception.class)
public void deleteWmsStorage(Long id) { public void deleteWmsStorage(Long id) {
// 校验存在 // 校验存在
validateWmsStorageExists(id); validateWmsStorageExists(id);

2
mes-ui/mes-ui-admin-vue3/src/views/heli/storagelog/index.vue
View File

@ -70,7 +70,7 @@
<el-table-column label="物料编码" align="center" prop="matCode" min-width="250" > <el-table-column label="物料编码" align="center" prop="matCode" min-width="250" >
<template #default="scope"> <template #default="scope">
<template v-if="scope.row.goodsType == 2"> <template v-if="scope.row.stock_mode == 11 ">
<el-form-item class="mb-0px!"> <el-form-item class="mb-0px!">
<el-select <el-select
v-model="scope.row.matId" v-model="scope.row.matId"