库存盘点

库存盘点
pull/2/head
siontion 9 months ago
parent 55386366a6
commit 701c51173a

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

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

@ -1,56 +1,58 @@
package com.chanko.yunxi.mes.module.heli.controller.admin.storagecheck.vo; package com.chanko.yunxi.mes.module.heli.controller.admin.storagecheck.vo;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*; import lombok.*;
import java.util.*; import java.util.*;
import javax.validation.constraints.*; import javax.validation.constraints.*;
import java.util.*; import java.util.*;
import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime; import java.time.LocalDateTime;
@Schema(description = "管理后台 - 入/出库盘点新增/修改 Request VO") @Schema(description = "管理后台 - 入/出库盘点新增/修改 Request VO")
@Data @Data
public class StorageCheckSaveReqVO { public class StorageCheckSaveReqVO {
@Schema(description = "主键id", requiredMode = Schema.RequiredMode.REQUIRED) @Schema(description = "主键id", requiredMode = Schema.RequiredMode.REQUIRED)
private Long id; private Long id;
@Schema(description = "盘点单号", requiredMode = Schema.RequiredMode.REQUIRED) @Schema(description = "盘点单号", requiredMode = Schema.RequiredMode.REQUIRED)
@NotEmpty(message = "盘点单号不能为空") private String stockNo;
private String stockNo;
@Schema(description = "盘点类型1部分盘点2整体盘点")
@Schema(description = "盘点类型1部分盘点2整体盘点") private Integer checkType;
private Integer checkType;
@Schema(description = "盘点开始时间")
@Schema(description = "排除库存为0的物料1是2否") private LocalDateTime checkTime;
private Integer noZero;
@Schema(description = "排除库存为0的物料1是2否")
@Schema(description = "备注") private Integer noZero;
private String description;
@Schema(description = "备注")
@Schema(description = "状态1已保存2已提交3已删除") private String description;
private Integer status;
@Schema(description = "状态1已保存2已提交3已删除")
@Schema(description = "仓库Id对应 wms_wh 表中的Id", requiredMode = Schema.RequiredMode.REQUIRED) private Integer status;
@NotNull(message = "仓库Id对应 wms_wh 表中的Id不能为空")
private Long whId; @Schema(description = "仓库Id对应 wms_wh 表中的Id", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "仓库Id对应 wms_wh 表中的Id不能为空")
@Schema(description = "入库人") private Long whId;
private Long keeper;
@Schema(description = "入库人")
@Schema(description = "入库时间") private Long keeper;
private LocalDateTime keeperTime;
@Schema(description = "入库时间")
@Schema(description = "出库人") private LocalDateTime keeperTime;
private Long outbound;
@Schema(description = "出库人")
@Schema(description = "出库时间") private Long outbound;
private LocalDateTime outboundTime;
@Schema(description = "出库时间")
@Schema(description = "作废人") private LocalDateTime outboundTime;
private Long cancel;
@Schema(description = "作废人")
@Schema(description = "作废时间") private Long cancel;
private LocalDateTime cancelTime;
@Schema(description = "作废时间")
} private LocalDateTime cancelTime;
}

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

@ -1,74 +1,81 @@
package com.chanko.yunxi.mes.module.heli.service.storagecheck; package com.chanko.yunxi.mes.module.heli.service.storagecheck;
import org.springframework.stereotype.Service; import cn.hutool.core.lang.UUID;
import javax.annotation.Resource; import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated; import javax.annotation.Resource;
import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.annotation.Validated;
import org.springframework.transaction.annotation.Transactional;
import java.util.*;
import com.chanko.yunxi.mes.module.heli.controller.admin.storagecheck.vo.*; import java.util.*;
import com.chanko.yunxi.mes.module.heli.dal.dataobject.storagecheck.StorageCheckDO; import com.chanko.yunxi.mes.module.heli.controller.admin.storagecheck.vo.*;
import com.chanko.yunxi.mes.framework.common.pojo.PageResult; import com.chanko.yunxi.mes.module.heli.dal.dataobject.storagecheck.StorageCheckDO;
import com.chanko.yunxi.mes.framework.common.pojo.PageParam; import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
import com.chanko.yunxi.mes.framework.common.util.object.BeanUtils; import com.chanko.yunxi.mes.framework.common.pojo.PageParam;
import com.chanko.yunxi.mes.framework.common.util.object.BeanUtils;
import com.chanko.yunxi.mes.module.heli.dal.mysql.storagecheck.StorageCheckMapper;
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.ErrorCodeConstants.*; 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;
* / Service import static com.chanko.yunxi.mes.module.heli.enums.ErrorCodeConstants.*;
*
* @author /**
*/ * / Service
@Service *
@Validated * @author
public class StorageCheckServiceImpl implements StorageCheckService { */
@Service
@Resource @Validated
private StorageCheckMapper storageCheckMapper; public class StorageCheckServiceImpl implements StorageCheckService {
@Override @Resource
public Long createStorageCheck(StorageCheckSaveReqVO createReqVO) { private StorageCheckMapper storageCheckMapper;
// 插入
StorageCheckDO storageCheck = BeanUtils.toBean(createReqVO, StorageCheckDO.class); @Override
storageCheckMapper.insert(storageCheck); public Long createStorageCheck(StorageCheckSaveReqVO createReqVO) {
// 返回 // 插入
return storageCheck.getId(); StorageCheckDO storageCheck = BeanUtils.toBean(createReqVO, StorageCheckDO.class);
} storageCheck.setStockNo(UUID.fastUUID().toString(true));
storageCheckMapper.insert(storageCheck);
@Override
public void updateStorageCheck(StorageCheckSaveReqVO updateReqVO) { storageCheck.setStockNo(STOCK_CHECK.getCode(storageCheck.getId().toString()));
// 校验存在 storageCheckMapper.updateById(storageCheck);
validateStorageCheckExists(updateReqVO.getId()); // 返回
// 更新 return storageCheck.getId();
StorageCheckDO updateObj = BeanUtils.toBean(updateReqVO, StorageCheckDO.class); }
storageCheckMapper.updateById(updateObj);
} @Override
public void updateStorageCheck(StorageCheckSaveReqVO updateReqVO) {
@Override // 校验存在
public void deleteStorageCheck(Long id) { validateStorageCheckExists(updateReqVO.getId());
// 校验存在 // 更新
validateStorageCheckExists(id); StorageCheckDO updateObj = BeanUtils.toBean(updateReqVO, StorageCheckDO.class);
// 删除 storageCheckMapper.updateById(updateObj);
storageCheckMapper.deleteById(id); }
}
@Override
private void validateStorageCheckExists(Long id) { public void deleteStorageCheck(Long id) {
if (storageCheckMapper.selectById(id) == null) { // 校验存在
throw exception(STORAGE_CHECK_NOT_EXISTS); validateStorageCheckExists(id);
} // 删除
} storageCheckMapper.deleteById(id);
}
@Override
public StorageCheckDO getStorageCheck(Long id) { private void validateStorageCheckExists(Long id) {
return storageCheckMapper.selectById(id); if (storageCheckMapper.selectById(id) == null) {
} throw exception(STORAGE_CHECK_NOT_EXISTS);
}
@Override }
public PageResult<StorageCheckDO> getStorageCheckPage(StorageCheckPageReqVO pageReqVO) {
return storageCheckMapper.selectPage(pageReqVO); @Override
} public StorageCheckDO getStorageCheck(Long id) {
return storageCheckMapper.selectById(id);
} }
@Override
public PageResult<StorageCheckDO> getStorageCheckPage(StorageCheckPageReqVO pageReqVO) {
return storageCheckMapper.selectPage(pageReqVO);
}
}

@ -1,47 +1,48 @@
import request from '@/config/axios' import request from '@/config/axios'
export interface StorageCheckVO { export interface StorageCheckVO {
id: number id: number
stockNo: string stockNo: string
checkType: number checkType: number
noZero: number checkTime: Date
description: string noZero: number
status: number description: string
whId: number status: number
keeper: number whId: number
keeperTime: Date keeper: number
outbound: number keeperTime: Date
outboundTime: Date outbound: number
cancel: number outboundTime: Date
cancelTime: Date cancel: number
} cancelTime: Date
}
// 查询入/出库盘点分页
export const getStorageCheckPage = async (params) => { // 查询入/出库盘点分页
return await request.get({ url: `/heli/storage-check/page`, params }) export const getStorageCheckPage = async (params) => {
} return await request.get({ url: `/heli/storage-check/page`, params })
}
// 查询入/出库盘点详情
export const getStorageCheck = async (id: number) => { // 查询入/出库盘点详情
return await request.get({ url: `/heli/storage-check/get?id=` + id }) export const getStorageCheck = async (id: number) => {
} return await request.get({ url: `/heli/storage-check/get?id=` + id })
}
// 新增入/出库盘点
export const createStorageCheck = async (data: StorageCheckVO) => { // 新增入/出库盘点
return await request.post({ url: `/heli/storage-check/create`, data }) export const createStorageCheck = async (data: StorageCheckVO) => {
} return await request.post({ url: `/heli/storage-check/create`, data })
}
// 修改入/出库盘点
export const updateStorageCheck = async (data: StorageCheckVO) => { // 修改入/出库盘点
return await request.put({ url: `/heli/storage-check/update`, data }) export const updateStorageCheck = async (data: StorageCheckVO) => {
} return await request.put({ url: `/heli/storage-check/update`, data })
}
// 删除入/出库盘点
export const deleteStorageCheck = async (id: number) => { // 删除入/出库盘点
return await request.delete({ url: `/heli/storage-check/delete?id=` + id }) export const deleteStorageCheck = async (id: number) => {
} return await request.delete({ url: `/heli/storage-check/delete?id=` + id })
}
// 导出入/出库盘点 Excel
export const exportStorageCheck = async (params) => { // 导出入/出库盘点 Excel
return await request.download({ url: `/heli/storage-check/export-excel`, params }) export const exportStorageCheck = async (params) => {
} return await request.download({ url: `/heli/storage-check/export-excel`, params })
}

@ -224,6 +224,8 @@ export enum DICT_TYPE {
HELI_STORAGE_OUT_TYPE = 'heli_storage_out_type',//出库类型 HELI_STORAGE_OUT_TYPE = 'heli_storage_out_type',//出库类型
HELI_STORAGE_STATUS = 'heli_storage_status',//入库出库状态 HELI_STORAGE_STATUS = 'heli_storage_status',//入库出库状态
HELI_STORAGE_TYPE = 'heli_storage_type', // 入库类型 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_PROJECT_ORDER_STATUS = 'heli_project_order_status', //项目订单状态
HELI_DELIVERY_STATUS = 'heli_delivery_status', // 发货状态 HELI_DELIVERY_STATUS = 'heli_delivery_status', // 发货状态

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

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