diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/wmsstorage/WmsStorageServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/wmsstorage/WmsStorageServiceImpl.java index 957ac827..fd95156b 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/wmsstorage/WmsStorageServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/wmsstorage/WmsStorageServiceImpl.java @@ -78,15 +78,16 @@ public class WmsStorageServiceImpl implements WmsStorageService { // wmsStorageDetailMapper.delete(WmsStorageDetailDO::getXzdWmsId, id); // storageLogService - StorageLogDO storageLogDO = storageLogMapper.selectOne(StorageLogDO::getXzdStockId, wmsStorage.getId()); - if (storageLogDO != null) { - storageLogDO.setIsExport(0); - storageLogDO.setUpdater(""); - storageLogDO.setUpdateTime(LocalDateTime.now()); - storageLogDO.setXzdStockId(null); - storageLogDO.setXzdStockNo(null); - storageLogDO.setIncoiceCode(null); - storageLogMapper.updateById(storageLogDO); + List logDOS = storageLogMapper.selectList(StorageLogDO::getXzdStockId, wmsStorage.getId()); + Long loginUserId = SecurityFrameworkUtils.getLoginUserId(); + for (StorageLogDO logDO : logDOS) { + logDO.setIsExport(0); + logDO.setUpdater(String.valueOf(loginUserId)); + logDO.setUpdateTime(LocalDateTime.now()); + logDO.setXzdStockId(null); + logDO.setXzdStockNo(null); + logDO.setIncoiceCode(null); + storageLogMapper.updateById(logDO); } } diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/wmsstorage/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/wmsstorage/index.vue index 1aecdc02..c40edc8a 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/wmsstorage/index.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/wmsstorage/index.vue @@ -23,7 +23,7 @@ v-model="queryParams.stockType" placeholder="请选择单据类型" clearable - class="!w-240px" + class="!w-260px" > - + - +