diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storage/StorageController.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storage/StorageController.java index e361f232..9c61884e 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storage/StorageController.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storage/StorageController.java @@ -61,9 +61,12 @@ public class StorageController { targetDo.setStatus(updateReqVO.getStatus()); LocalDateTime currTime = LocalDateTime.now(); - if(updateReqVO.getStatus().equals(2)){ + if(updateReqVO.getStatus().equals(2) && updateReqVO.getStockType().equals(1)){ targetDo.setKeeper(updateReqVO.getKeeper()); targetDo.setKeeperTime(currTime); + }if(updateReqVO.getStatus().equals(2) && updateReqVO.getStockType().equals(2)){ + targetDo.setOutbound(updateReqVO.getOutbound()); + targetDo.setOutboundTime(currTime); }else{ targetDo.setCancel(updateReqVO.getCancel()); targetDo.setCancelTime(currTime); diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageOut.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageOut.vue index 0bc8d180..1d1d0611 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageOut.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageOut.vue @@ -189,7 +189,7 @@ 上传 @@ -352,12 +352,10 @@ const handleStatus = (async (num) => { const dataUpdate = formData.value as unknown as StorageApi.StorageVO if(num==2){ dataUpdate.outbound = useUserStore().getUser.id - dataUpdate.outboundTime = new Date().toLocaleString() }else{ dataUpdate.cancel = useUserStore().getUser.id - dataUpdate.cancelTime = new Date().toLocaleString() } - await StorageApi.updateStorage(dataUpdate) + await StorageApi.updateStorageStatus(dataUpdate) message.success(t('common.updateSuccess'))