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

提交即出库

Browse Source
This commit is contained in:
zxy 2026-01-19 11:59:34 +08:00
parent f7858c9d09
commit 476bbed2a6
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storage/StorageController.java
View File

@ -158,6 +158,10 @@ public class StorageController {
} }
updateReqVO = BeanUtils.toBean(targetDo, StorageSaveReqVO.class); updateReqVO = BeanUtils.toBean(targetDo, StorageSaveReqVO.class);
//出库即审核
if (updateReqVO.getStockType() == 2) {
updateReqVO.setStatus(4);
}
storageService.updateStorage(updateReqVO); storageService.updateStorage(updateReqVO);
int status = targetDo.getStatus(); int status = targetDo.getStatus();
StorageSaveReqVO saveReqVO; StorageSaveReqVO saveReqVO;
@ -265,7 +269,7 @@ public class StorageController {
} }
} }
storageService.updateLogList(targetDo.getId(),status,targetDo.getStockType(),targetDo.getStockNo()); storageService.updateLogList(targetDo.getId(),status,targetDo.getStockType(),targetDo.getStockNo());
if (saveReqVO.getInOutFlag()){ if (saveReqVO.getInOutFlag() != null && saveReqVO.getInOutFlag()) {
//增加出库日志 //增加出库日志
storageService.updateLogList(targetDo.getId(), saveReqVO.getStatus(), saveReqVO.getStockType(), saveReqVO.getStockNo()); storageService.updateLogList(targetDo.getId(), saveReqVO.getStatus(), saveReqVO.getStockType(), saveReqVO.getStockNo());
} }

11
mes-ui/mes-ui-admin-vue3/src/views/heli/storage/outdex.vue
View File

@ -127,6 +127,13 @@
{{ warehouseList.find((tag) => tag.id === scope.row.whId)?.whName }} {{ warehouseList.find((tag) => tag.id === scope.row.whId)?.whName }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="即入即出" align="center" prop="inOutFlag" min-width="100" >
<template #default="scope">
<el-tag :type="scope.row.inOutFlag ? 'success' : 'info'">
{{ scope.row.inOutFlag ? '是' : '否' }}
</el-tag>
</template>
</el-table-column>
<el-table-column label="领料人" align="center" prop="materialReceiver" min-width="120"> <el-table-column label="领料人" align="center" prop="materialReceiver" min-width="120">
<template #default="scope"> <template #default="scope">
{{ userList.find((user) => user.id === scope.row.materialReceiver)?.nickname }} {{ userList.find((user) => user.id === scope.row.materialReceiver)?.nickname }}
@ -180,9 +187,13 @@
<el-button link type="primary" @click="openDetail('update', scope.row.id)" v-if="scope.row.status != 3&&scope.row.status != 4"> <el-button link type="primary" @click="openDetail('update', scope.row.id)" v-if="scope.row.status != 3&&scope.row.status != 4">
编辑 编辑
</el-button> </el-button>
<!-- <el-button link type="danger" @click="handleDelete(scope.row.id)" v-if="scope.row.status == 4">-->
<!-- 作废-->
<!-- </el-button>-->
<el-button link type="primary" @click="openDetail('review', scope.row.id)"> <el-button link type="primary" @click="openDetail('review', scope.row.id)">
查看详情 查看详情
</el-button> </el-button>
<!-- <el-button <!-- <el-button
link link
type="danger" type="danger"