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

fix(wmsstorage): 修复单据导出状态更新逻辑并调整界面表格列宽度

Browse Source
This commit is contained in:
zxy 2026-04-02 18:28:08 +08:00
parent b4ed055dca
commit d590a1e248
3 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -78,15 +78,16 @@ public class WmsStorageServiceImpl implements WmsStorageService {
// wmsStorageDetailMapper.delete(WmsStorageDetailDO::getXzdWmsId, id); // wmsStorageDetailMapper.delete(WmsStorageDetailDO::getXzdWmsId, id);
// storageLogService // storageLogService
StorageLogDO storageLogDO = storageLogMapper.selectOne(StorageLogDO::getXzdStockId, wmsStorage.getId()); List<StorageLogDO> logDOS = storageLogMapper.selectList(StorageLogDO::getXzdStockId, wmsStorage.getId());
if (storageLogDO != null) { Long loginUserId = SecurityFrameworkUtils.getLoginUserId();
storageLogDO.setIsExport(0); for (StorageLogDO logDO : logDOS) {
storageLogDO.setUpdater(""); logDO.setIsExport(0);
storageLogDO.setUpdateTime(LocalDateTime.now()); logDO.setUpdater(String.valueOf(loginUserId));
storageLogDO.setXzdStockId(null); logDO.setUpdateTime(LocalDateTime.now());
storageLogDO.setXzdStockNo(null); logDO.setXzdStockId(null);
storageLogDO.setIncoiceCode(null); logDO.setXzdStockNo(null);
storageLogMapper.updateById(storageLogDO); logDO.setIncoiceCode(null);
storageLogMapper.updateById(logDO);
} }
} }

18
mes-ui/mes-ui-admin-vue3/src/views/heli/wmsstorage/index.vue
View File

@ -23,7 +23,7 @@
v-model="queryParams.stockType" v-model="queryParams.stockType"
placeholder="请选择单据类型" placeholder="请选择单据类型"
clearable clearable
class="!w-240px" class="!w-260px"
> >
<el-option <el-option
v-for="item in HeliStockTypeDict" v-for="item in HeliStockTypeDict"
@ -34,7 +34,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="单据状态" prop="status"> <el-form-item label="单据状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择状态" clearable class="!w-240px"> <el-select v-model="queryParams.status" placeholder="请选择状态" clearable class="!w-260px">
<el-option <el-option
v-for="item in HeliStorageStatusDict" v-for="item in HeliStorageStatusDict"
:key="item.value" :key="item.value"
@ -90,7 +90,7 @@
{{ getHeliStockTypeLabel(scope.row.stockType) }} {{ getHeliStockTypeLabel(scope.row.stockType) }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column fixed="left" label="单据状态" min-width="140" align="center" prop="status"> <el-table-column fixed="left" label="单据状态" min-width="100" align="center" prop="status">
<template #default="scope"> <template #default="scope">
<el-tag v-if="scope.row.status === 1" type="success"> <el-tag v-if="scope.row.status === 1" type="success">
<Icon icon="ep:check" class="mr-5px" /> <Icon icon="ep:check" class="mr-5px" />
@ -105,22 +105,22 @@
<el-table-column <el-table-column
label="单据编号" label="单据编号"
fixed="left" fixed="left"
min-width="220" min-width="140"
align="center" align="center"
prop="stockNo" prop="stockNo"
/> />
<el-table-column label="仓库" min-width="200" align="center" prop="whName" /> <el-table-column label="仓库" min-width="180" align="center" prop="whName" />
<el-table-column label="业务日期" width="120" align="center" prop="busiDate"> <el-table-column label="业务日期" width="120" align="center" prop="busiDate">
<template #default="scope"> <template #default="scope">
{{ formatDate(scope.row.busiDate, 'YYYY-MM-DD') }} {{ formatDate(scope.row.busiDate, 'YYYY-MM-DD') }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="供应商名称" min-width="300" align="center" prop="supplierName" /> <el-table-column label="供应商名称" min-width="250" align="center" prop="supplierName" />
<el-table-column label="价格类型" min-width="160" align="center" prop="priceType" /> <el-table-column label="价格类型" min-width="130" align="center" prop="priceType" />
<el-table-column label="部门" min-width="500" align="center" prop="deptName" /> <el-table-column label="部门" min-width="400" align="center" prop="deptName" />
<!-- <el-table-column label="业务类型" align="center" prop="busiType" />--> <!-- <el-table-column label="业务类型" align="center" prop="busiType" />-->
<!-- <el-table-column label="备注" align="center" prop="description" />--> <!-- <el-table-column label="备注" align="center" prop="description" />-->
<el-table-column label="辅助项" min-width="200" align="center" prop="auItem" /> <el-table-column label="辅助项" min-width="180" align="center" prop="auItem" />
<el-table-column label="操作" align="center" width="150" fixed="right"> <el-table-column label="操作" align="center" width="150" fixed="right">
<template #default="scope"> <template #default="scope">
<el-button <el-button

16
mes-ui/mes-ui-admin-vue3/src/views/heli/xzdstoragelog/index.vue
View File

@ -16,7 +16,7 @@
<el-date-picker <el-date-picker
v-model="queryParams.createTime" v-model="queryParams.createTime"
:default-time="[new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 1, 1, 23, 59, 59)]" :default-time="[new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 1, 1, 23, 59, 59)]"
class="!w-280px" class="!w-260px"
end-placeholder="结束日期" end-placeholder="结束日期"
start-placeholder="开始日期" start-placeholder="开始日期"
type="daterange" type="daterange"
@ -29,7 +29,7 @@
placeholder="物料编号" placeholder="物料编号"
clearable clearable
@keyup.enter="handleQuery" @keyup.enter="handleQuery"
class="!w-240px" class="!w-260px"
/> />
</el-form-item> </el-form-item>
<el-form-item label="物料名称" prop="matName"> <el-form-item label="物料名称" prop="matName">
@ -46,7 +46,7 @@
v-model="queryParams.stockType" v-model="queryParams.stockType"
placeholder="请选择单据类型" placeholder="请选择单据类型"
clearable clearable
class="!w-280px" class="!w-260px"
> >
<el-option <el-option
v-for="item in HeliStockTypeDict" v-for="item in HeliStockTypeDict"
@ -61,7 +61,7 @@
v-model="queryParams.isExport" v-model="queryParams.isExport"
placeholder="请选择状态" placeholder="请选择状态"
clearable clearable
class="!w-240px" class="!w-260px"
> >
<el-option <el-option
v-for="item in HeliStorageIsExportDict" v-for="item in HeliStorageIsExportDict"
@ -126,13 +126,13 @@
height="calc(100vh - 410px)" height="calc(100vh - 410px)"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
> >
<el-table-column type="selection" width="50" :selectable="checkSelectable" /> <el-table-column type="selection" width="40" :selectable="checkSelectable" />
<el-table-column type="index" width="60" label="序号" align="center" fixed="left" /> <el-table-column type="index" width="60" label="序号" align="center" fixed="left" />
<el-table-column <el-table-column
label="单据类型" label="单据类型"
align="center" align="center"
prop="stockMode" prop="stockMode"
min-width="110" min-width="100"
fixed="left" fixed="left"
> >
<template #default="scope"> <template #default="scope">
@ -143,7 +143,7 @@
label="单据状态" label="单据状态"
align="center" align="center"
prop="stockMode" prop="stockMode"
min-width="110" min-width="100"
fixed="left" fixed="left"
> >
<template #default="scope"> <template #default="scope">
@ -158,7 +158,7 @@
label="单据编号" label="单据编号"
align="center" align="center"
prop="xzdStockNo" prop="xzdStockNo"
min-width="220" min-width="130"
/> />
<el-table-column label="物料编码" align="center" prop="matCode" min-width="200"> <el-table-column label="物料编码" align="center" prop="matCode" min-width="200">