库存盘点

库存盘点

mes-module-heli/mes-module-heli-api/src/main/java/com/chanko/yunxi/mes/module/heli/enums/CodeEnum.java

@@ -40,6 +40,7 @@ public enum CodeEnum {
     WAREHOUSE("仓库", "Wa", 4),
     STOCK_IN("入库单", "WI", 4, "yyyyMMdd"),
     STOCK_OUT("出库单", "WO", 4, "yyyyMMdd"),
+    STOCK_CHECK("盘点单据", "WC", 4, "yyyyMMdd"),
     PROJECT_ORDER("业务订单", 3, "yyyyMM"),
     PROJECT_DELIVERY_ORDER("发货单", "HL", 3, "yyyyMM"),
     ;

mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagecheck/vo/StorageCheckRespVO.java

@@ -86,4 +86,9 @@ public class StorageCheckRespVO {
     @ExcelProperty("作废时间")
     private LocalDateTime cancelTime;
 
+    @Schema(description = "盘点单据时间")
+    @ExcelProperty("盘点单据时间")
+    private LocalDateTime checkTime;
+
+
 }

mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagecheck/vo/StorageCheckSaveReqVO.java

@@ -16,12 +16,14 @@ public class StorageCheckSaveReqVO {
     private Long id;
 
     @Schema(description = "盘点单号", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotEmpty(message = "盘点单号不能为空")
     private String stockNo;
 
     @Schema(description = "盘点类型：1部分盘点2整体盘点")
     private Integer checkType;
 
+    @Schema(description = "盘点开始时间")
+    private LocalDateTime checkTime;
+
     @Schema(description = "排除库存为0的物料：1是2否")
     private Integer noZero;
 

mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/storagecheck/StorageCheckDO.java

@@ -85,4 +85,6 @@ public class StorageCheckDO extends BaseDO {
      */
     private LocalDateTime cancelTime;
 
+    private LocalDateTime checkTime;
+
 }

mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagecheck/StorageCheckServiceImpl.java

@@ -1,5 +1,6 @@
 package com.chanko.yunxi.mes.module.heli.service.storagecheck;
 
+import cn.hutool.core.lang.UUID;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -15,6 +16,8 @@ import com.chanko.yunxi.mes.framework.common.util.object.BeanUtils;
 import com.chanko.yunxi.mes.module.heli.dal.mysql.storagecheck.StorageCheckMapper;
 
 import static com.chanko.yunxi.mes.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static com.chanko.yunxi.mes.module.heli.enums.CodeEnum.STOCK_CHECK;
+import static com.chanko.yunxi.mes.module.heli.enums.CodeEnum.STOCK_IN;
 import static com.chanko.yunxi.mes.module.heli.enums.ErrorCodeConstants.*;
 
 /**
@@ -33,7 +36,11 @@ public class StorageCheckServiceImpl implements StorageCheckService {
     public Long createStorageCheck(StorageCheckSaveReqVO createReqVO) {
         // 插入
         StorageCheckDO storageCheck = BeanUtils.toBean(createReqVO, StorageCheckDO.class);
+        storageCheck.setStockNo(UUID.fastUUID().toString(true));
         storageCheckMapper.insert(storageCheck);
+
+        storageCheck.setStockNo(STOCK_CHECK.getCode(storageCheck.getId().toString()));
+        storageCheckMapper.updateById(storageCheck);
         // 返回
         return storageCheck.getId();
     }

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

@@ -4,6 +4,7 @@ export interface StorageCheckVO {
   id: number
   stockNo: string
   checkType: number
+  checkTime: Date
   noZero: number
   description: string
   status: number

mes-ui/mes-ui-admin-vue3/src/utils/dict.ts

@@ -224,6 +224,8 @@ export enum DICT_TYPE {
   HELI_STORAGE_OUT_TYPE = 'heli_storage_out_type',//出库类型
   HELI_STORAGE_STATUS = 'heli_storage_status',//入库出库状态
   HELI_STORAGE_TYPE = 'heli_storage_type', // 入库类型
+  HELI_STORAGE_MAT_CHECK_TYPE = 'heli_storage_mat_check_type',//盘点类型
+  HELI_STORAGE_MAT_CHECK_STATUS = 'heli_storage_mat_check_status',//盘点状态
 
   HELI_PROJECT_ORDER_STATUS = 'heli_project_order_status', //项目订单状态
   HELI_DELIVERY_STATUS = 'heli_delivery_status', // 发货状态

mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/StorageCheckForm.vue

@@ -1,84 +1,42 @@
 <template>
   <Dialog :title="dialogTitle" v-model="dialogVisible">
-    <el-form
-      ref="formRef"
-      :model="formData"
-      :rules="formRules"
-      label-width="100px"
-      v-loading="formLoading"
-    >
-      <el-form-item label="盘点单号" prop="stockNo">
-        <el-input v-model="formData.stockNo" placeholder="请输入盘点单号" />
+    <el-form ref="formRef" :model="formData" :rules="formRules" label-width="200px" v-loading="formLoading">
+      <el-form-item label="盘点单号" prop="stockNo"  class="!w-800px">
+        <el-input v-model="formData.stockNo" placeholder="系统自动生成" disabled/>
       </el-form-item>
-      <el-form-item label="盘点类型：1部分盘点2整体盘点" prop="checkType">
-        <el-select v-model="formData.checkType" placeholder="请选择盘点类型：1部分盘点2整体盘点">
-          <el-option
-            v-for="dict in getIntDictOptions(DICT_TYPE.HELI_STORAGE_MAT_CHECK_TYPE)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
+      <el-form-item label="单据状态" prop="status"  >
+        <el-select v-model="formData.status" placeholder="单据状态" disabled class="!w-600px">
+          <el-option v-for="dict in getIntDictOptions(DICT_TYPE.HELI_STORAGE_MAT_CHECK_STATUS)" :key="dict.value"
+            :label="dict.label" :value="dict.value" />
         </el-select>
       </el-form-item>
-      <el-form-item label="排除库存为0的物料：1是2否" prop="noZero">
+      <el-form-item label="盘点类型" prop="checkType"  class="!w-800px">
+        <el-select v-model="formData.checkType" placeholder="盘点类型" class="!w-700px">
+          <el-option v-for="dict in getIntDictOptions(DICT_TYPE.HELI_STORAGE_MAT_CHECK_TYPE)" :key="dict.value"
+            :label="dict.label" :value="dict.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="排除库存为0的物料?" prop="noZero"  >
         <el-radio-group v-model="formData.noZero">
-          <el-radio
-            v-for="dict in getIntDictOptions(DICT_TYPE.HELI_COMMON_IS_OR_NOT)"
-            :key="dict.value"
-            :label="dict.value"
-          >
+          <el-radio v-for="dict in getIntDictOptions(DICT_TYPE.HELI_COMMON_IS_OR_NOT)" :key="dict.value"
+            :label="dict.value">
             {{ dict.label }}
           </el-radio>
         </el-radio-group>
       </el-form-item>
-      <el-form-item label="备注" prop="description">
-        <Editor v-model="formData.description" height="150px" />
-      </el-form-item>
-      <el-form-item label="状态：1已保存；2已提交；3已删除" prop="status">
-        <el-select v-model="formData.status" placeholder="请选择状态：1已保存；2已提交；3已删除">
-          <el-option
-            v-for="dict in getIntDictOptions(DICT_TYPE.HELI_STORAGE_MAT_CHECK_STATUS)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
+
+
+      <el-form-item label="盘点仓库" prop="whId"  >
+        <el-select v-model="formData.whId" placeholder="下拉选择" clearable class="!w-600px" >
+          <el-option v-for="dict in whList" :key="dict.id" :label="dict.wh_name"
+            :value="dict.id" />
         </el-select>
       </el-form-item>
-      <el-form-item label="仓库Id，对应 wms_wh 表中的Id" prop="whId">
-        <el-input v-model="formData.whId" placeholder="请输入仓库Id，对应 wms_wh 表中的Id" />
-      </el-form-item>
-      <el-form-item label="入库人" prop="keeper">
-        <el-input v-model="formData.keeper" placeholder="请输入入库人" />
-      </el-form-item>
-      <el-form-item label="入库时间" prop="keeperTime">
-        <el-date-picker
-          v-model="formData.keeperTime"
-          type="date"
-          value-format="x"
-          placeholder="选择入库时间"
-        />
-      </el-form-item>
-      <el-form-item label="出库人" prop="outbound">
-        <el-input v-model="formData.outbound" placeholder="请输入出库人" />
+      <el-form-item label="盘点开始时间" prop="checkTime"  class="!w-800px">
+        <el-date-picker v-model="formData.checkTime" type="date" value-format="x" placeholder="盘点开始时间" class="!w-700px" />
       </el-form-item>
-      <el-form-item label="出库时间" prop="outboundTime">
-        <el-date-picker
-          v-model="formData.outboundTime"
-          type="date"
-          value-format="x"
-          placeholder="选择出库时间"
-        />
-      </el-form-item>
-      <el-form-item label="作废人" prop="cancel">
-        <el-input v-model="formData.cancel" placeholder="请输入作废人" />
-      </el-form-item>
-      <el-form-item label="作废时间" prop="cancelTime">
-        <el-date-picker
-          v-model="formData.cancelTime"
-          type="date"
-          value-format="x"
-          placeholder="选择作废时间"
-        />
+      <el-form-item label="备注" prop="description"  class="!w-800px">
+        <el-input type="textarea" v-model="formData.description" show-word-limit maxlength="200" />
       </el-form-item>
     </el-form>
     <template #footer>
@@ -91,6 +49,8 @@
 import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
 import * as StorageCheckApi from '@/api/heli/storagecheck'
 
+import * as WarehouseApi from '@/api/heli/warehouse'
+
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 
@@ -102,29 +62,35 @@ const formData = ref({
   id: undefined,
   stockNo: undefined,
   checkType: undefined,
-  noZero: undefined,
+  checkTime: undefined,
+  noZero: 1,
   description: undefined,
   status: undefined,
   whId: undefined,
-  keeper: undefined,
-  keeperTime: undefined,
-  outbound: undefined,
-  outboundTime: undefined,
-  cancel: undefined,
-  cancelTime: undefined,
 })
 const formRules = reactive({
-  stockNo: [{ required: true, message: '盘点单号不能为空', trigger: 'blur' }],
-  whId: [{ required: true, message: '仓库Id，对应 wms_wh 表中的Id不能为空', trigger: 'blur' }],
+  //stockNo: [{ required: true, message: '盘点单号不能为空', trigger: 'blur' }],
+  whId: [{ required: true, message: '盘点仓库不能为空', trigger: 'blur' }],
+  checkType: [{ required: true, message: '盘点类型不能为空', trigger: 'blur' }],
+  checkTime: [{ required: true, message: '盘点开始时间不能为空', trigger: 'blur' }],
+  noZero: [{ required: true, message: '排除库存为0的物料不能为空', trigger: 'blur' }],
 })
 const formRef = ref() // 表单 Ref
 
+
+const whList = ref([])
+//仓库列表
+const init_page_wh = (async ()=>{
+  whList.value = await WarehouseApi.getSimpList()
+})
 /** 打开弹窗 */
 const open = async (type: string, id?: number) => {
   dialogVisible.value = true
   dialogTitle.value = t('action.' + type)
   formType.value = type
   resetForm()
+
+  await init_page_wh()
   // 修改时，设置数据
   if (id) {
     formLoading.value = true
@@ -145,7 +111,9 @@ const submitForm = async () => {
   // 提交请求
   formLoading.value = true
   try {
+    
     const data = formData.value as unknown as StorageCheckApi.StorageCheckVO
+    data.status = 1
     if (formType.value === 'create') {
       await StorageCheckApi.createStorageCheck(data)
       message.success(t('common.createSuccess'))
@@ -167,16 +135,11 @@ const resetForm = () => {
     id: undefined,
     stockNo: undefined,
     checkType: undefined,
-    noZero: undefined,
+    checkTime: undefined,
+    noZero: 1,
     description: undefined,
     status: undefined,
     whId: undefined,
-    keeper: undefined,
-    keeperTime: undefined,
-    outbound: undefined,
-    outboundTime: undefined,
-    cancel: undefined,
-    cancelTime: undefined,
   }
   formRef.value?.resetFields()
 }

mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/index.vue

@@ -1,204 +1,39 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <el-form
-      class="-mb-15px"
-      :model="queryParams"
-      ref="queryFormRef"
-      :inline="true"
-      label-width="68px"
-    >
-      <el-form-item label="主键id" prop="id">
-        <el-input
-          v-model="queryParams.id"
-          placeholder="请输入主键id"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
+    <el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
       <el-form-item label="盘点单号" prop="stockNo">
-        <el-input
-          v-model="queryParams.stockNo"
-          placeholder="请输入盘点单号"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
+        <el-input v-model="queryParams.stockNo" placeholder="盘点单号" clearable @keyup.enter="handleQuery"
+          class="!w-240px" />
       </el-form-item>
-      <el-form-item label="盘点类型：1部分盘点2整体盘点" prop="checkType">
-        <el-select
-          v-model="queryParams.checkType"
-          placeholder="请选择盘点类型：1部分盘点2整体盘点"
-          clearable
-          class="!w-240px"
-        >
-          <el-option
-            v-for="dict in getIntDictOptions(DICT_TYPE.HELI_STORAGE_MAT_CHECK_TYPE)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
+      <el-form-item label="盘点仓库" prop="whId">
+        <el-input v-model="queryParams.whId" placeholder="盘点仓库" clearable @keyup.enter="handleQuery" class="!w-240px" />
       </el-form-item>
-      <el-form-item label="排除库存为0的物料：1是2否" prop="noZero">
-        <el-select
-          v-model="queryParams.noZero"
-          placeholder="请选择排除库存为0的物料：1是2否"
-          clearable
-          class="!w-240px"
-        >
-          <el-option
-            v-for="dict in getIntDictOptions(DICT_TYPE.HELI_COMMON_IS_OR_NOT)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
+      <el-form-item label="盘点类型" prop="checkType">
+        <el-select v-model="queryParams.checkType" placeholder="盘点类型" clearable class="!w-240px">
+          <el-option v-for="dict in getIntDictOptions(DICT_TYPE.HELI_STORAGE_MAT_CHECK_TYPE)" :key="dict.value"
+            :label="dict.label" :value="dict.value" />
         </el-select>
       </el-form-item>
-      <el-form-item label="状态：1已保存；2已提交；3已删除" prop="status">
-        <el-select
-          v-model="queryParams.status"
-          placeholder="请选择状态：1已保存；2已提交；3已删除"
-          clearable
-          class="!w-240px"
-        >
-          <el-option
-            v-for="dict in getIntDictOptions(DICT_TYPE.HELI_STORAGE_MAT_CHECK_STATUS)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
+      <el-form-item label="单据状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="单据状态" clearable class="!w-240px">
+          <el-option v-for="dict in getIntDictOptions(DICT_TYPE.HELI_STORAGE_MAT_CHECK_STATUS)" :key="dict.value"
+            :label="dict.label" :value="dict.value" />
         </el-select>
       </el-form-item>
-      <el-form-item label="仓库Id，对应 wms_wh 表中的Id" prop="whId">
-        <el-input
-          v-model="queryParams.whId"
-          placeholder="请输入仓库Id，对应 wms_wh 表中的Id"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="记录的创建人,对应员工表中的 Id" prop="creator">
-        <el-input
-          v-model="queryParams.creator"
-          placeholder="请输入记录的创建人,对应员工表中的 Id"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="创建时间" prop="createTime">
-        <el-date-picker
-          v-model="queryParams.createTime"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          type="daterange"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="记录的修改人,对应员工表中的 Id" prop="updater">
-        <el-input
-          v-model="queryParams.updater"
-          placeholder="请输入记录的修改人,对应员工表中的 Id"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="更新时间" prop="updateTime">
-        <el-date-picker
-          v-model="queryParams.updateTime"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          type="daterange"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="入库人" prop="keeper">
-        <el-input
-          v-model="queryParams.keeper"
-          placeholder="请输入入库人"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="入库时间" prop="keeperTime">
-        <el-date-picker
-          v-model="queryParams.keeperTime"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          type="daterange"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="出库人" prop="outbound">
-        <el-input
-          v-model="queryParams.outbound"
-          placeholder="请输入出库人"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="出库时间" prop="outboundTime">
-        <el-date-picker
-          v-model="queryParams.outboundTime"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          type="daterange"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="作废人" prop="cancel">
-        <el-input
-          v-model="queryParams.cancel"
-          placeholder="请输入作废人"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="作废时间" prop="cancelTime">
-        <el-date-picker
-          v-model="queryParams.cancelTime"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          type="daterange"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-          class="!w-240px"
-        />
+      <el-form-item label="盘点开始时间" prop="checkTime">
+        <el-date-picker v-model="queryParams.checkTime" value-format="YYYY-MM-DD" type="date" class="!w-240px" />
       </el-form-item>
+
       <el-form-item>
-        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
-        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
-        <el-button
-          type="primary"
-          plain
-          @click="openForm('create')"
-          v-hasPermi="['heli:storage-check:create']"
-        >
-          <Icon icon="ep:plus" class="mr-5px" /> 新增
+        <el-button @click="handleQuery">
+          <Icon icon="ep:search" class="mr-5px" /> 搜索
         </el-button>
-        <el-button
-          type="success"
-          plain
-          @click="handleExport"
-          :loading="exportLoading"
-          v-hasPermi="['heli:storage-check:export']"
-        >
-          <Icon icon="ep:download" class="mr-5px" /> 导出
+        <el-button @click="resetQuery">
+          <Icon icon="ep:refresh" class="mr-5px" /> 重置
+        </el-button>
+        <el-button type="primary" plain @click="openForm('create')" v-hasPermi="['heli:storage-check:create']">
+          <Icon icon="ep:plus" class="mr-5px" /> 新增
         </el-button>
       </el-form-item>
     </el-form>
@@ -207,93 +42,47 @@
   <!-- 列表 -->
   <ContentWrap>
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-      <el-table-column label="主键id" align="center" prop="id" />
       <el-table-column label="盘点单号" align="center" prop="stockNo" />
-      <el-table-column label="盘点类型：1部分盘点2整体盘点" align="center" prop="checkType">
+      <el-table-column label="盘点类型" align="center" prop="checkType">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.HELI_STORAGE_MAT_CHECK_TYPE" :value="scope.row.checkType" />
         </template>
       </el-table-column>
-      <el-table-column label="排除库存为0的物料：1是2否" align="center" prop="noZero">
+      <el-table-column label="盘点仓库" align="center" prop="whId">
         <template #default="scope">
-          <dict-tag :type="DICT_TYPE.HELI_COMMON_IS_OR_NOT" :value="scope.row.noZero" />
+          {{ whList.find((tag) => tag.id === scope.row.whId)?.wh_name }}
+        </template>
+      </el-table-column>
+      <el-table-column label="盘点开始时间" align="center" prop="checkTime"  width="180px">
+        <template #default="scope">
+          <span>{{ formatDate(scope.row.checkTime, 'YYYY-MM-DD') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="备注" align="center" prop="description" />
-      <el-table-column label="状态：1已保存；2已提交；3已删除" align="center" prop="status">
+      <el-table-column label="创建人" align="center" prop="creator" />
+      <el-table-column label="创建时间" align="center" prop="createTime" :formatter="dateFormatter" width="180px" />
+      <el-table-column label="提交人" align="center" prop="keeper" />
+      <el-table-column label="提交时间" align="center" prop="keeperTime" :formatter="dateFormatter" width="180px" />
+      <el-table-column label="单据状态" align="center" prop="status">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.HELI_STORAGE_MAT_CHECK_STATUS" :value="scope.row.status" />
         </template>
       </el-table-column>
-      <el-table-column label="仓库Id，对应 wms_wh 表中的Id" align="center" prop="whId" />
-      <el-table-column label="记录的创建人,对应员工表中的 Id" align="center" prop="creator" />
-      <el-table-column
-        label="创建时间"
-        align="center"
-        prop="createTime"
-        :formatter="dateFormatter"
-        width="180px"
-      />
-      <el-table-column label="记录的修改人,对应员工表中的 Id" align="center" prop="updater" />
-      <el-table-column
-        label="更新时间"
-        align="center"
-        prop="updateTime"
-        :formatter="dateFormatter"
-        width="180px"
-      />
-      <el-table-column label="入库人" align="center" prop="keeper" />
-      <el-table-column
-        label="入库时间"
-        align="center"
-        prop="keeperTime"
-        :formatter="dateFormatter"
-        width="180px"
-      />
-      <el-table-column label="出库人" align="center" prop="outbound" />
-      <el-table-column
-        label="出库时间"
-        align="center"
-        prop="outboundTime"
-        :formatter="dateFormatter"
-        width="180px"
-      />
-      <el-table-column label="作废人" align="center" prop="cancel" />
-      <el-table-column
-        label="作废时间"
-        align="center"
-        prop="cancelTime"
-        :formatter="dateFormatter"
-        width="180px"
-      />
       <el-table-column label="操作" align="center">
         <template #default="scope">
-          <el-button
-            link
-            type="primary"
-            @click="openForm('update', scope.row.id)"
-            v-hasPermi="['heli:storage-check:update']"
-          >
+          <el-button link type="primary" @click="openForm('update', scope.row.id)"
+            v-hasPermi="['heli:storage-check:update']">
             编辑
           </el-button>
-          <el-button
-            link
-            type="danger"
-            @click="handleDelete(scope.row.id)"
-            v-hasPermi="['heli:storage-check:delete']"
-          >
+          <el-button link type="danger" @click="handleDelete(scope.row.id)" v-hasPermi="['heli:storage-check:delete']">
             删除
           </el-button>
         </template>
       </el-table-column>
     </el-table>
     <!-- 分页 -->
-    <Pagination
-      :total="total"
-      v-model:page="queryParams.pageNo"
-      v-model:limit="queryParams.pageSize"
-      @pagination="getList"
-    />
+    <Pagination :total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize"
+      @pagination="getList" />
   </ContentWrap>
 
   <!-- 表单弹窗：添加/修改 -->
@@ -302,10 +91,11 @@
 
 <script setup lang="ts">
 import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
-import { dateFormatter } from '@/utils/formatTime'
+import { dateFormatter, formatDate } from '@/utils/formatTime'
 import download from '@/utils/download'
 import * as StorageCheckApi from '@/api/heli/storagecheck'
 import StorageCheckForm from './StorageCheckForm.vue'
+import * as WarehouseApi from '@/api/heli/warehouse'
 
 defineOptions({ name: 'StorageCheck' })
 
@@ -338,7 +128,11 @@ const queryParams = reactive({
 })
 const queryFormRef = ref() // 搜索的表单
 const exportLoading = ref(false) // 导出的加载中
-
+const whList = ref([])
+//仓库列表
+const init_page_wh = (async () => {
+  whList.value = await WarehouseApi.getSimpList()
+})
 /** 查询列表 */
 const getList = async () => {
   loading.value = true
@@ -379,7 +173,7 @@ const handleDelete = async (id: number) => {
     message.success(t('common.delSuccess'))
     // 刷新列表
     await getList()
-  } catch {}
+  } catch { }
 }
 
 /** 导出按钮操作 */
@@ -398,7 +192,8 @@ const handleExport = async () => {
 }
 
 /** 初始化 **/
-onMounted(() => {
-  getList()
+onMounted(async () => {
+  await init_page_wh()
+  await getList()
 })
 </script>