From 64bcbf0f94ecc61290e30c79cce4e1c0e5f1e518 Mon Sep 17 00:00:00 2001
From: siontion <siontion_2000@163.com>
Date: Sun, 21 Jan 2024 17:44:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=85=A5=E5=BA=93=20=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E6=94=B9=E5=8F=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

出入库 状态改变
---
 .../heli/controller/admin/storage/StorageController.java    | 5 ++++-
 .../mes-ui-admin-vue3/src/views/heli/storage/StorageOut.vue | 6 ++----
 2 files changed, 6 insertions(+), 5 deletions(-)

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 @@
                 <el-upload ref="matUploadRef" :file-list="matUploadFiles" multiple :limit="10" :action="uploadUrl"
                   :headers="{ 'Authorization': 'Bearer ' + getAccessToken(), 'tenant-id': getTenantId() }" name="files"
                   :show-file-list="false" :auto-upload="false"
-                  :data="matUploadData
+                  :data="matUploadData"
                   :on-change="matUploadChange" class="upload-file-uploader">
                   <el-button type="primary">
                     <Icon icon="ep:upload-filled" />上传
@@ -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'))