入库 reload

入库 reload

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

@@ -11,6 +11,7 @@ import io.swagger.v3.oas.annotations.Operation;
 import javax.validation.constraints.*;
 import javax.validation.*;
 import javax.servlet.http.*;
+import java.time.LocalDateTime;
 import java.util.*;
 import java.io.IOException;
 
@@ -52,6 +53,26 @@ public class StorageController {
         storageService.updateStorage(updateReqVO);
         return success(true);
     }
+    @PutMapping("/update-status")
+    @Operation(summary = "更新入/出库")
+    @PreAuthorize("@ss.hasPermission('heli:storage:update')")
+    public CommonResult<Boolean> updateStorageStatus(@Valid @RequestBody StorageSaveReqVO updateReqVO) {
+        StorageDO targetDo = storageService.getStorage(updateReqVO.getId());
+        targetDo.setStatus(updateReqVO.getStatus());
+
+        LocalDateTime currTime = LocalDateTime.now();
+        if(updateReqVO.getStatus().equals(2)){
+            targetDo.setKeeper(updateReqVO.getKeeper());
+            targetDo.setKeeperTime(currTime);
+        }else{
+            targetDo.setCancel(updateReqVO.getCancel());
+            targetDo.setCancelTime(currTime);
+        }
+        updateReqVO = BeanUtils.toBean(targetDo, StorageSaveReqVO.class);
+
+        storageService.updateStorage(updateReqVO);
+        return success(true);
+    }
 
     @DeleteMapping("/delete")
     @Operation(summary = "删除入/出库")

mes-ui/mes-ui-admin-vue3/src/api/heli/storage/index.ts

@@ -37,6 +37,10 @@ export const createStorage = async (data: StorageVO) => {
 export const updateStorage = async (data: StorageVO) => {
   return await request.put({ url: `/heli/storage/update`, data })
 }
+// 修改入/出库
+export const updateStorageStatus = async (data: StorageVO) => {
+  return await request.put({ url: `/heli/storage/update-status`, data })
+}
 
 // 删除入/出库
 export const deleteStorage = async (id: number) => {

mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageForm.vue

@@ -272,13 +272,13 @@
         </el-row>
         <el-row justify="center">
           <el-col :span="8">
-            <el-form-item prop="outbound" label="作废人">
+            <el-form-item prop="cancel" label="作废人">
-              {{ userList.find((user) => user.id == formData.outbound)?.nickname }}
+              {{ userList.find((user) => user.id == formData.cancel)?.nickname }}
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item prop="outboundTime" label="作废时间">
+            <el-form-item prop="cancelTime" label="作废时间">
-              {{ formatDate(formData.outboundTime, 'YYYY-MM-DD HH:mm') }}
+              {{ formatDate(formData.cancelTime, 'YYYY-MM-DD HH:mm') }}
             </el-form-item>
           </el-col>
         </el-row>
@@ -304,6 +304,7 @@ import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
 import * as StorageApi from '@/api/heli/storage'
 import * as StorageMatApi from '@/api/heli/storagemat'
 import { getAccessToken, getTenantId } from "@/utils/auth"
+import { useUserStore } from '@/store/modules/user'
 
 import * as MaterialApi from '@/api/heli/material'
 import * as WarehouseApi from '@/api/heli/warehouse'
@@ -367,7 +368,14 @@ const handleStatus = (async (num) => {
   formData.value.status = num
 
   const dataUpdate = formData.value as unknown as StorageApi.StorageVO
-  await StorageApi.updateStorage(dataUpdate)
+
+  if(num==2){
+    dataUpdate.keeper = useUserStore().getUser.id
+  }else{
+    dataUpdate.cancel = useUserStore().getUser.id
+  }
+
+  await StorageApi.updateStorageStatus(dataUpdate)
 
   message.success(t('common.updateSuccess'))
 
@@ -387,6 +395,7 @@ const handleStatus = (async (num) => {
     default:
       break
   }
+  reload();
 })
 const userList = ref<UserApi.UserVO[]>([]) // 用户列表
 
@@ -479,6 +488,7 @@ const submitForm = async () => {
 
     // 成功后刷新
     reload();
+
   } finally {
     formLoading.value = false
   }

mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageOut.vue

@@ -242,25 +242,25 @@
         </el-row>
         <el-row justify="center">
           <el-col :span="8">
-            <el-form-item prop="keeper" label="出库人">
+            <el-form-item prop="outbound" label="出库人">
-              {{ userList.find((user) => user.id == formData.keeper)?.nickname }}
+              {{ userList.find((user) => user.id == formData.outbound)?.nickname }}
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item prop="keeperTime" label="出库时间">
+            <el-form-item prop="outboundTime" label="出库时间">
-              {{ formatDate(formData.keeperTime, 'YYYY-MM-DD HH:mm') }}
+              {{ formatDate(formData.outboundTime, 'YYYY-MM-DD HH:mm') }}
             </el-form-item>
           </el-col>
         </el-row>
         <el-row justify="center">
           <el-col :span="8">
-            <el-form-item prop="outbound" label="作废人">
+            <el-form-item prop="cancel" label="作废人">
-              {{ userList.find((user) => user.id == formData.outbound)?.nickname }}
+              {{ userList.find((user) => user.id == formData.cancel)?.nickname }}
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item prop="outboundTime" label="作废时间">
+            <el-form-item prop="cancelTime" label="作废时间">
-              {{ formatDate(formData.outboundTime, 'YYYY-MM-DD HH:mm') }}
+              {{ formatDate(formData.cancelTime, 'YYYY-MM-DD HH:mm') }}
             </el-form-item>
           </el-col>
         </el-row>
@@ -286,6 +286,7 @@ import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
 import * as StorageApi from '@/api/heli/storage'
 import * as StorageMatApi from '@/api/heli/storagemat'
 import { getAccessToken, getTenantId } from "@/utils/auth"
+import { useUserStore } from '@/store/modules/user'
 
 import * as MaterialApi from '@/api/heli/material'
 import * as WarehouseApi from '@/api/heli/warehouse'
@@ -349,6 +350,13 @@ const handleStatus = (async (num) => {
   formData.value.status = 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)
 
   message.success(t('common.updateSuccess'))
@@ -369,6 +377,7 @@ const handleStatus = (async (num) => {
     default:
       break
   }
+  reload()
 })
 const userList = ref<UserApi.UserVO[]>([]) // 用户列表
 
@@ -429,6 +438,23 @@ const submitForm = async () => {
   } catch (e) {
     return
   }
+
+  //获取最新库存信息
+  const matCurrentData = await StorageMatApi.getStorageMatList()
+  var hasRestNum = true
+  formData.value.matItemDOList.forEach( (rest) =>{
+
+    if(matCurrentData.find((mat)=>{ mat.matId == rest.matId && mat.pnId == rest.pnId && mat.matRest<rest.matRest}))
+    { 
+      hasRestNum = fasle
+    }
+  })
+  if(!hasRestNum){
+    message.alertWarning('物料库存不足')
+    return
+  }
+
+
   // 提交请求
   formLoading.value = true
   try {
@@ -709,6 +735,7 @@ onMounted(async () => {
       item.matUnit = matVos.list.find((record) => record.id == item.matId)?.unit
       item.pnlist = pnList.value.filter((pn) => pn.rgId == item.rgId)
       item.matRest = matLastData.value.find((rest) => rest.rgId == item.rgId && rest.pnId == item.pnId)?.matRest
+      item.matRest = item.matRest == undefined?0:item.matRest
       matCount = matCount + 1