Merge remote-tracking branch 'origin/master'

src/api/wms/baseLocation/index.ts

@@ -0,0 +1,77 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { BaseLocationVO, BaseLocationForm, BaseLocationQuery } from '@/api/wms/baseLocation/types';
+
+/**
+ * 查询库位基础信息列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listBaseLocation = (query?: BaseLocationQuery): AxiosPromise<BaseLocationVO[]> => {
+  return request({
+    url: '/wms/baseLocation/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询库位基础信息详细
+ * @param locationId
+ */
+export const getBaseLocation = (locationId: string | number): AxiosPromise<BaseLocationVO> => {
+  return request({
+    url: '/wms/baseLocation/' + locationId,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增库位基础信息
+ * @param data
+ */
+export const addBaseLocation = (data: BaseLocationForm) => {
+  return request({
+    url: '/wms/baseLocation',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改库位基础信息
+ * @param data
+ */
+export const updateBaseLocation = (data: BaseLocationForm) => {
+  return request({
+    url: '/wms/baseLocation',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除库位基础信息
+ * @param locationId
+ */
+export const delBaseLocation = (locationId: string | number | Array<string | number>) => {
+  return request({
+    url: '/wms/baseLocation/' + locationId,
+    method: 'delete'
+  });
+};
+
+
+/**
+ * 下拉框查询库位基础信息列表
+ * @param query
+ * @returns {*}
+ */
+export function getBaseLocationList (query) {
+    return request({
+        url: '/wms/baseLocation/getBaseLocationList',
+        method: 'get',
+        params: query
+    });
+};

src/api/wms/baseLocation/types.ts

@@ -0,0 +1,105 @@
+export interface BaseLocationVO {
+  /**
+   * 表主键
+   */
+  locationId: string | number;
+
+  /**
+   * 所属仓库
+   */
+  warehouseId: string | number;
+
+  /**
+   * 库位编码
+   */
+  locationCode: string;
+
+  /**
+   * 排
+   */
+  lineNum: number;
+
+  /**
+   * 层
+   */
+  layerNum: number;
+
+  /**
+   * 位
+   */
+  locationNum: number;
+
+  /**
+   * 创建时间
+   */
+  createTime: string;
+
+  /**
+   * 更新时间
+   */
+  updateTime: string;
+
+}
+
+export interface BaseLocationForm extends BaseEntity {
+  /**
+   * 表主键
+   */
+  locationId?: string | number;
+  /**
+   * 所属仓库
+   */
+  warehouseId?: string | number;
+
+  /**
+   * 库位编码
+   */
+  locationCode?: string;
+
+  /**
+   * 排
+   */
+  lineNum?: number;
+
+  /**
+   * 层
+   */
+  layerNum?: number;
+
+  /**
+   * 位
+   */
+  locationNum?: number;
+
+}
+
+export interface BaseLocationQuery extends PageQuery {
+
+  /**
+   * 所属仓库
+   */
+  warehouseId?: string | number;
+
+  /**
+   * 库位编码
+   */
+  locationCode?: string;
+
+  /**
+   * 排
+   */
+  lineNum?: number;
+
+  /**
+   * 层
+   */
+  layerNum?: number;
+
+    /**
+     * 日期范围参数
+     */
+    params?: any;
+}
+
+
+

src/api/wms/baseWarehouse/index.ts

@@ -0,0 +1,77 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { BaseWarehouseVO, BaseWarehouseForm, BaseWarehouseQuery } from '@/api/wms/baseWarehouse/types';
+
+/**
+ * 查询仓库基础信息列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listBaseWarehouse = (query?: BaseWarehouseQuery): AxiosPromise<BaseWarehouseVO[]> => {
+  return request({
+    url: '/wms/baseWarehouse/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询仓库基础信息详细
+ * @param warehouseId
+ */
+export const getBaseWarehouse = (warehouseId: string | number): AxiosPromise<BaseWarehouseVO> => {
+  return request({
+    url: '/wms/baseWarehouse/' + warehouseId,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增仓库基础信息
+ * @param data
+ */
+export const addBaseWarehouse = (data: BaseWarehouseForm) => {
+  return request({
+    url: '/wms/baseWarehouse',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改仓库基础信息
+ * @param data
+ */
+export const updateBaseWarehouse = (data: BaseWarehouseForm) => {
+  return request({
+    url: '/wms/baseWarehouse',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除仓库基础信息
+ * @param warehouseId
+ */
+export const delBaseWarehouse = (warehouseId: string | number | Array<string | number>) => {
+  return request({
+    url: '/wms/baseWarehouse/' + warehouseId,
+    method: 'delete'
+  });
+};
+
+
+/**
+ * 下拉框查询仓库基础信息列表
+ * @param query
+ * @returns {*}
+ */
+export function getBaseWarehouseList (query) {
+    return request({
+        url: '/wms/baseWarehouse/getWmsBaseWarehouseList',
+        method: 'get',
+        params: query
+    });
+};

src/api/wms/baseWarehouse/types.ts

@@ -0,0 +1,151 @@
+export interface BaseWarehouseVO {
+  /**
+   * 表主键
+   */
+  warehouseId: string | number;
+
+  /**
+   * 仓库编码
+   */
+  warehouseCode: string;
+
+  /**
+   * 仓库名称
+   */
+  warehouseName: string;
+
+  /**
+   * 物料大类
+   */
+  materialCategories: string;
+
+  /**
+   * 仓库位置
+   */
+  warehouseLocation: string;
+
+  /**
+   * 关联车间
+   */
+  workshopId: string | number;
+
+  /**
+   * 仓库类型
+   */
+  warehouseType: string;
+
+  /**
+   * 创建人
+   */
+  createBy: number;
+
+  /**
+   * 创建时间
+   */
+  createTime: string;
+
+  /**
+   * 更新人
+   */
+  updateBy: number;
+
+  /**
+   * 更新时间
+   */
+  updateTime: string;
+
+}
+
+export interface BaseWarehouseForm extends BaseEntity {
+  /**
+   * 表主键
+   */
+  warehouseId?: string | number;
+
+  /**
+   * 仓库编码
+   */
+  warehouseCode?: string;
+
+  /**
+   * 仓库名称
+   */
+  warehouseName?: string;
+
+  /**
+   * 物料大类
+   */
+  materialCategories?: string;
+
+  /**
+   * 仓库位置
+   */
+  warehouseLocation?: string;
+
+  /**
+   * 关联车间
+   */
+  workshopId?: string | number;
+
+  /**
+   * 仓库类型
+   */
+  warehouseType?: string;
+
+  /**
+   * 创建人
+   */
+  createBy?: number;
+
+  /**
+   * 创建时间
+   */
+  createTime?: string;
+
+  /**
+   * 更新人
+   */
+  updateBy?: number;
+
+  /**
+   * 更新时间
+   */
+  updateTime?: string;
+
+}
+
+export interface BaseWarehouseQuery extends PageQuery {
+
+  /**
+   * 仓库编码
+   */
+  warehouseCode?: string;
+
+  /**
+   * 仓库名称
+   */
+  warehouseName?: string;
+
+  /**
+   * 物料大类
+   */
+  materialCategories?: string;
+
+  /**
+   * 关联车间
+   */
+  workshopId?: string | number;
+
+  /**
+   * 仓库类型
+   */
+  warehouseType?: string;
+
+    /**
+     * 日期范围参数
+     */
+    params?: any;
+}
+
+
+

src/api/wms/instockRecord/index.ts

@@ -0,0 +1,63 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { InstockRecordVO, InstockRecordForm, InstockRecordQuery } from '@/api/wms/instockRecord/types';
+
+/**
+ * 查询入库记录列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listInstockRecord = (query?: InstockRecordQuery): AxiosPromise<InstockRecordVO[]> => {
+  return request({
+    url: '/wms/instockRecord/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询入库记录详细
+ * @param instockRecordId
+ */
+export const getInstockRecord = (instockRecordId: string | number): AxiosPromise<InstockRecordVO> => {
+  return request({
+    url: '/wms/instockRecord/' + instockRecordId,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增入库记录
+ * @param data
+ */
+export const addInstockRecord = (data: InstockRecordForm) => {
+  return request({
+    url: '/wms/instockRecord',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改入库记录
+ * @param data
+ */
+export const updateInstockRecord = (data: InstockRecordForm) => {
+  return request({
+    url: '/wms/instockRecord',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除入库记录
+ * @param instockRecordId
+ */
+export const delInstockRecord = (instockRecordId: string | number | Array<string | number>) => {
+  return request({
+    url: '/wms/instockRecord/' + instockRecordId,
+    method: 'delete'
+  });
+};

src/api/wms/instockRecord/types.ts

@@ -0,0 +1,202 @@
+export interface InstockRecordVO {
+  /**
+   * 入库单号
+   */
+  instockRecordId:  string | number;
+  instockCode: string;
+
+  /**
+   * 批次码
+   */
+  batchCode: string;
+
+  /**
+   * 物料id
+   */
+  materialId: string | number;
+
+  /**
+   * 仓库ID
+   */
+  warehouseId: string | number;
+
+  /**
+   * 库位编码
+   */
+  locationCode: string;
+
+  /**
+   * 物料编码
+   */
+  materialCode: string;
+
+  /**
+   * 物料名称
+   */
+  materialName: string;
+
+  /**
+   * 入库数量
+   */
+  instockQty: number;
+
+  /**
+   * 物料大类
+   */
+  materialCategories: string;
+
+  /**
+   * 入库人
+   */
+  createBy: number;
+
+  /**
+   * 入库时间
+   */
+  createTime: string;
+
+  /**
+   * erp同步状态
+   */
+  erpSynchronousStatus: string;
+
+  /**
+   * erp同步数量
+   */
+  erpSynchronousQty: number;
+
+  /**
+   * 同步时间
+   */
+  updateTime: string;
+
+}
+
+export interface InstockRecordForm extends BaseEntity {
+  /**
+   * 入库单号
+   */
+  instockCode?: string;
+
+  /**
+   * 批次码
+   */
+  batchCode?: string;
+
+  /**
+   * 物料id
+   */
+  materialId?: string | number;
+
+  /**
+   * 仓库ID
+   */
+  warehouseId?: string | number;
+
+  /**
+   * 库位编码
+   */
+  locationCode?: string;
+
+  /**
+   * 物料编码
+   */
+  materialCode?: string;
+
+  /**
+   * 物料名称
+   */
+  materialName?: string;
+
+  /**
+   * 入库数量
+   */
+  instockQty?: number;
+
+  /**
+   * 物料大类
+   */
+  materialCategories?: string;
+
+  /**
+   * 入库人
+   */
+  createBy?: number;
+
+  /**
+   * 入库时间
+   */
+  createTime?: string;
+
+  /**
+   * erp同步状态
+   */
+  erpSynchronousStatus?: string;
+
+  /**
+   * erp同步数量
+   */
+  erpSynchronousQty?: number;
+
+}
+
+export interface InstockRecordQuery extends PageQuery {
+
+  /**
+   * 入库单号
+   */
+  instockCode?: string;
+
+  /**
+   * 批次码
+   */
+  batchCode?: string;
+
+  /**
+   * 仓库ID
+   */
+  warehouseId?: string | number;
+
+  /**
+   * 库位编码
+   */
+  locationCode?: string;
+
+  /**
+   * 物料编码
+   */
+  materialCode?: string;
+
+  /**
+   * 物料名称
+   */
+  materialName?: string;
+
+  /**
+   * 物料大类
+   */
+  materialCategories?: string;
+
+  /**
+   * 入库时间
+   */
+  createTime?: string;
+
+  /**
+   * erp同步状态
+   */
+  erpSynchronousStatus?: string;
+
+  /**
+   * erp同步数量
+   */
+  erpSynchronousQty?: number;
+
+    /**
+     * 日期范围参数
+     */
+    params?: any;
+}
+
+
+

src/views/wms/baseLocation/index.vue

@@ -0,0 +1,292 @@
+<template>
+  <div class="p-2">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+      <div v-show="showSearch" class="mb-[10px]">
+        <el-card shadow="hover">
+          <el-form ref="queryFormRef" :model="queryParams" :inline="true">
+            <el-form-item label="所属仓库" prop="warehouseId">
+              <el-select v-model="queryParams.warehouseId" placeholder="请选择所属仓库" clearable >
+                <el-option
+                  v-for="item in baseStoreList"
+                  :key="item.warehouseId"
+                  :label="item.warehouseName"
+                  :value="item.warehouseId"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="库位编码" prop="locationCode">
+              <el-input v-model="queryParams.locationCode" placeholder="请输入库位编码" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="排" prop="lineNum">
+              <el-input v-model="queryParams.lineNum" placeholder="请输入排" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="层" prop="layerNum">
+              <el-input v-model="queryParams.layerNum" placeholder="请输入层" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+            </el-form-item>
+          </el-form>
+        </el-card>
+      </div>
+    </transition>
+
+    <el-card shadow="never">
+      <template #header>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['wms:baseLocation:add']">新增</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['wms:baseLocation:edit']">修改</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['wms:baseLocation:remove']">删除</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['wms:baseLocation:export']">导出</el-button>
+          </el-col>
+          <right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true" @queryTable="getList"></right-toolbar>
+        </el-row>
+      </template>
+
+      <el-table v-loading="loading" :data="baseLocationList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="表主键" align="center" prop="locationId" v-if="columns[0].visible"/>
+        <el-table-column label="所属仓库" align="center" prop="warehouseName" v-if="columns[1].visible"/>
+<!--        <el-table-column label="仓库编码" align="center" prop="warehouseCode" v-if="columns[1].visible"/>-->
+        <el-table-column label="库位编码" align="center" prop="locationCode" v-if="columns[2].visible"/>
+        <el-table-column label="排" align="center" prop="lineNum" v-if="columns[3].visible"/>
+        <el-table-column label="层" align="center" prop="layerNum" v-if="columns[4].visible"/>
+        <el-table-column label="位" align="center" prop="locationNum" v-if="columns[5].visible"/>
+        <el-table-column label="创建时间" align="center" prop="createTime" width="180" v-if="columns[8].visible">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="更新时间" align="center" prop="updateTime" width="180" v-if="columns[10].visible">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template #default="scope">
+            <el-tooltip content="修改" placement="top">
+              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['wms:baseLocation:edit']"></el-button>
+            </el-tooltip>
+            <el-tooltip content="删除" placement="top">
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['wms:baseLocation:remove']"></el-button>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+    </el-card>
+    <!-- 添加或修改库位基础信息对话框 -->
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
+      <el-form ref="baseLocationFormRef" :model="form" :rules="rules" label-width="80px">
+<!--        <el-form-item label="表主键" prop="locationId">-->
+<!--          <el-input v-model="form.locationId" placeholder="请输入表主键" />-->
+<!--        </el-form-item>-->
+        <el-form-item label="所属仓库" prop="warehouseId">
+          <el-select v-model="form.warehouseId" placeholder="请选择所属仓库">
+            <el-option
+              v-for="item in baseStoreList"
+              :key="item.warehouseId"
+              :label="item.warehouseName"
+              :value="item.warehouseId"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="库位编码" prop="locationCode">
+          <el-input v-model="form.locationCode" placeholder="请输入库位编码" />
+        </el-form-item>
+        <el-form-item label="排" prop="lineNum">
+          <el-input v-model="form.lineNum" placeholder="请输入排" />
+        </el-form-item>
+        <el-form-item label="层" prop="layerNum">
+          <el-input v-model="form.layerNum" placeholder="请输入层" />
+        </el-form-item>
+        <el-form-item label="位" prop="locationNum">
+          <el-input v-model="form.locationNum" placeholder="请输入位" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="BaseLocation" lang="ts">
+import { listBaseLocation, getBaseLocation, delBaseLocation, addBaseLocation, updateBaseLocation } from '@/api/wms/baseLocation';
+import { BaseLocationVO, BaseLocationQuery, BaseLocationForm } from '@/api/wms/baseLocation/types';
+import {getWorkshopList} from "@/api/mes/baseWorkshopInfo";
+import {getBaseWarehouseList} from "@/api/wms/baseWarehouse";
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+
+const baseLocationList = ref<BaseLocationVO[]>([]);
+const buttonLoading = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+
+const queryFormRef = ref<ElFormInstance>();
+const baseLocationFormRef = ref<ElFormInstance>();
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+let baseStoreList = ref([]);
+/** 查询车间下拉树结构 */
+const getBaseWarehouseListsss = async () => {
+  let res = await getBaseWarehouseList(null);
+  baseStoreList.value = res.data;
+};
+// 列显隐信息
+const columns = ref<FieldOption[]>([
+  { key: 0, label: `表主键`, visible: true },
+  { key: 1, label: `所属仓库`, visible: true },
+  { key: 2, label: `库位编码`, visible: true },
+  { key: 3, label: `排`, visible: true },
+  { key: 4, label: `层`, visible: true },
+  { key: 5, label: `位`, visible: true },
+  { key: 6, label: `租户号`, visible: true },
+  { key: 7, label: `创建人`, visible: true },
+  { key: 8, label: `创建时间`, visible: true },
+  { key: 9, label: `更新人`, visible: true },
+  { key: 10, label: `更新时间`, visible: true },
+  { key: 11, label: `创建部门`, visible: true },
+]);
+
+const initFormData: BaseLocationForm = {
+  locationId: undefined,
+  warehouseId: undefined,
+  locationCode: undefined,
+  lineNum: undefined,
+  layerNum: undefined,
+  locationNum: undefined,
+}
+const data = reactive<PageData<BaseLocationForm, BaseLocationQuery>>({
+  form: {...initFormData},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    warehouseId: undefined,
+    locationCode: undefined,
+    lineNum: undefined,
+    layerNum: undefined,
+    params: {
+    }
+  },
+  rules: {
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询库位基础信息列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listBaseLocation(queryParams.value);
+  baseLocationList.value = res.rows;
+  total.value = res.total;
+  loading.value = false;
+}
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+}
+
+/** 表单重置 */
+const reset = () => {
+  form.value = {...initFormData};
+  baseLocationFormRef.value?.resetFields();
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+}
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: BaseLocationVO[]) => {
+  ids.value = selection.map(item => item.locationId);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  reset();
+  dialog.visible = true;
+  dialog.title = "添加库位基础信息";
+}
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: BaseLocationVO) => {
+  reset();
+  const _locationId = row?.locationId || ids.value[0]
+  const res = await getBaseLocation(_locationId);
+  Object.assign(form.value, res.data);
+  dialog.visible = true;
+  dialog.title = "修改库位基础信息";
+}
+
+/** 提交按钮 */
+const submitForm = () => {
+  baseLocationFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.locationId) {
+        await updateBaseLocation(form.value).finally(() =>  buttonLoading.value = false);
+      } else {
+        await addBaseLocation(form.value).finally(() =>  buttonLoading.value = false);
+      }
+      proxy?.$modal.msgSuccess("操作成功");
+      dialog.visible = false;
+      await getList();
+    }
+  });
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: BaseLocationVO) => {
+  const _locationIds = row?.locationId || ids.value;
+  await proxy?.$modal.confirm('是否确认删除库位基础信息编号为"' + _locationIds + '"的数据项？').finally(() => loading.value = false);
+  await delBaseLocation(_locationIds);
+  proxy?.$modal.msgSuccess("删除成功");
+  await getList();
+}
+
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download('wms/baseLocation/export', {
+    ...queryParams.value
+  }, `baseLocation_${new Date().getTime()}.xlsx`)
+}
+
+onMounted(() => {
+  getBaseWarehouseListsss();
+  getList();
+});
+</script>

src/views/wms/baseWarehouse/index.vue

@@ -0,0 +1,359 @@
+<template>
+  <div class="p-2">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+      <div v-show="showSearch" class="mb-[10px]">
+        <el-card shadow="hover">
+          <el-form ref="queryFormRef" :model="queryParams" :inline="true">
+            <el-form-item label="仓库编码" prop="warehouseCode">
+              <el-input v-model="queryParams.warehouseCode" placeholder="请输入仓库编码" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="仓库名称" prop="warehouseName">
+              <el-input v-model="queryParams.warehouseName" placeholder="请输入仓库名称" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="物料大类" prop="materialCategories">
+              <el-select v-model="queryParams.materialCategories" placeholder="请选择物料大类" clearable >
+                <el-option v-for="dict in material_mategories" :key="dict.value" :label="dict.label" :value="dict.value"/>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="关联车间" prop="workshopId">
+              <el-select v-model="queryParams.workshopId" placeholder="请选择关联车间" clearable >
+<!--                <el-option v-for="dict in ${dictType}" :key="dict.value" :label="dict.label" :value="dict.value"/>-->
+                <el-option
+                  v-for="item in workshopInfoList"
+                  :key="item.workshopId"
+                  :label="item.workshopName"
+                  :value="item.workshopId"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="仓库类型" prop="warehouseType">
+              <el-select v-model="queryParams.warehouseType" placeholder="请选择仓库类型" clearable >
+                <el-option v-for="dict in wms_wharehouse_type" :key="dict.value" :label="dict.label" :value="dict.value"/>
+              </el-select>
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+            </el-form-item>
+          </el-form>
+        </el-card>
+      </div>
+    </transition>
+
+    <el-card shadow="never">
+      <template #header>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['wms:baseWarehouse:add']">新增</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['wms:baseWarehouse:edit']">修改</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['wms:baseWarehouse:remove']">删除</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['wms:baseWarehouse:export']">导出</el-button>
+          </el-col>
+          <right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true" @queryTable="getList"></right-toolbar>
+        </el-row>
+      </template>
+
+      <el-table v-loading="loading" :data="baseWarehouseList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="表主键" align="center" prop="warehouseId" v-if="columns[0].visible"/>
+        <el-table-column label="仓库编码" align="center" prop="warehouseCode" v-if="columns[1].visible"/>
+        <el-table-column label="仓库名称" align="center" prop="warehouseName" v-if="columns[2].visible"/>
+        <el-table-column label="物料大类" align="center" prop="materialCategories" v-if="columns[3].visible">
+          <template #default="scope">
+            <dict-tag :options="material_mategories" :value="scope.row.materialCategories"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="仓库位置" align="center" prop="warehouseLocation" v-if="columns[4].visible"/>
+        <el-table-column label="关联车间" align="center" prop="workshopName" v-if="columns[5].visible"/>
+        <el-table-column label="仓库类型" align="center" prop="warehouseType" v-if="columns[6].visible">
+          <template #default="scope">
+            <dict-tag :options="wms_wharehouse_type" :value="scope.row.warehouseType"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="创建人" align="center" prop="createBy" v-if="columns[8].visible"/>
+        <el-table-column label="创建时间" align="center" prop="createTime" width="180" v-if="columns[9].visible">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="更新人" align="center" prop="updateBy" v-if="columns[10].visible"/>
+        <el-table-column label="更新时间" align="center" prop="updateTime" width="180" v-if="columns[11].visible">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template #default="scope">
+            <el-tooltip content="修改" placement="top">
+              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['wms:baseWarehouse:edit']"></el-button>
+            </el-tooltip>
+            <el-tooltip content="删除" placement="top">
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['wms:baseWarehouse:remove']"></el-button>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+    </el-card>
+    <!-- 添加或修改仓库基础信息对话框 -->
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
+      <el-form ref="baseWarehouseFormRef" :model="form" :rules="rules" label-width="80px">
+<!--        <el-form-item label="表主键" prop="warehouseId">-->
+<!--          <el-input v-model="form.warehouseId" placeholder="请输入表主键" />-->
+<!--        </el-form-item>-->
+        <el-form-item label="仓库编码" prop="warehouseCode">
+          <el-input v-model="form.warehouseCode" placeholder="请输入仓库编码" />
+        </el-form-item>
+        <el-form-item label="仓库名称" prop="warehouseName">
+          <el-input v-model="form.warehouseName" placeholder="请输入仓库名称" />
+        </el-form-item>
+        <el-form-item label="物料大类" prop="materialCategories">
+          <el-select v-model="form.materialCategories" placeholder="请选择物料大类">
+            <el-option
+                v-for="dict in material_mategories"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="仓库位置" prop="warehouseLocation">
+          <el-input v-model="form.warehouseLocation" placeholder="请输入仓库位置" />
+        </el-form-item>
+        <el-form-item label="关联车间" prop="workshopId">
+          <el-select v-model="form.workshopId" placeholder="请选择关联车间">
+
+            <el-option
+              v-for="item in workshopInfoList"
+              :key="item.workshopId"
+              :label="item.workshopName"
+              :value="item.workshopId"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="仓库类型" prop="warehouseType">
+          <el-select v-model="form.warehouseType" placeholder="请选择仓库类型">
+            <el-option
+                v-for="dict in wms_wharehouse_type"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="BaseWarehouse" lang="ts">
+import { listBaseWarehouse, getBaseWarehouse, delBaseWarehouse, addBaseWarehouse, updateBaseWarehouse } from '@/api/wms/baseWarehouse';
+import { BaseWarehouseVO, BaseWarehouseQuery, BaseWarehouseForm } from '@/api/wms/baseWarehouse/types';
+import {getWorkshopList} from "@/api/mes/baseWorkshopInfo";
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { material_mategories, wms_wharehouse_type } = toRefs<any>(proxy?.useDict('material_mategories', 'wms_wharehouse_type'));
+
+const baseWarehouseList = ref<BaseWarehouseVO[]>([]);
+const buttonLoading = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+
+const queryFormRef = ref<ElFormInstance>();
+const baseWarehouseFormRef = ref<ElFormInstance>();
+
+let workshopInfoList = ref([]);
+/** 查询车间下拉树结构 */
+const getWorkshopListSelect = async () => {
+  let res = await getWorkshopList(null);
+  workshopInfoList.value = res.data;
+};
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+// 列显隐信息
+const columns = ref<FieldOption[]>([
+        { key: 0, label: `表主键`, visible: false },
+        { key: 1, label: `仓库编码`, visible: true },
+        { key: 2, label: `仓库名称`, visible: true },
+        { key: 3, label: `物料大类`, visible: true },
+        { key: 4, label: `仓库位置`, visible: true },
+        { key: 5, label: `关联车间`, visible: true },
+        { key: 6, label: `仓库类型`, visible: true },
+        { key: 7, label: `租户号`, visible: false },
+        { key: 8, label: `创建人`, visible: false },
+        { key: 9, label: `创建时间`, visible: true },
+        { key: 10, label: `更新人`, visible: false },
+        { key: 11, label: `更新时间`, visible: true },
+        { key: 12, label: `创建部门`, visible: false },
+]);
+
+const initFormData: BaseWarehouseForm = {
+  warehouseId: undefined,
+  warehouseCode: undefined,
+  warehouseName: undefined,
+  materialCategories: undefined,
+  warehouseLocation: undefined,
+  workshopId: undefined,
+  warehouseType: undefined,
+  createBy: undefined,
+  createTime: undefined,
+  updateBy: undefined,
+  updateTime: undefined,
+}
+const data = reactive<PageData<BaseWarehouseForm, BaseWarehouseQuery>>({
+  form: {...initFormData},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    warehouseCode: undefined,
+    warehouseName: undefined,
+    materialCategories: undefined,
+    workshopId: undefined,
+    warehouseType: undefined,
+    params: {
+    }
+  },
+  rules: {
+    // warehouseId: [
+    //   { required: true, message: "表主键不能为空", trigger: "blur" }
+    // ],
+    warehouseCode: [
+      { required: true, message: "仓库编码不能为空", trigger: "blur" }
+    ],
+    warehouseName: [
+      { required: true, message: "仓库名称不能为空", trigger: "blur" }
+    ],
+    materialCategories: [
+      { required: true, message: "物料大类不能为空", trigger: "change" }
+    ],
+    warehouseLocation: [
+      { required: true, message: "仓库位置不能为空", trigger: "blur" }
+    ],
+    workshopId: [
+      { required: true, message: "关联车间不能为空", trigger: "change" }
+    ],
+    warehouseType: [
+      { required: true, message: "仓库类型不能为空", trigger: "change" }
+    ],
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询仓库基础信息列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listBaseWarehouse(queryParams.value);
+  baseWarehouseList.value = res.rows;
+  total.value = res.total;
+  loading.value = false;
+}
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+}
+
+/** 表单重置 */
+const reset = () => {
+  form.value = {...initFormData};
+  baseWarehouseFormRef.value?.resetFields();
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+}
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: BaseWarehouseVO[]) => {
+  ids.value = selection.map(item => item.warehouseId);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  reset();
+  dialog.visible = true;
+  dialog.title = "添加仓库基础信息";
+}
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: BaseWarehouseVO) => {
+  reset();
+  const _warehouseId = row?.warehouseId || ids.value[0]
+  const res = await getBaseWarehouse(_warehouseId);
+  Object.assign(form.value, res.data);
+  dialog.visible = true;
+  dialog.title = "修改仓库基础信息";
+}
+
+/** 提交按钮 */
+const submitForm = () => {
+  baseWarehouseFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.warehouseId) {
+        await updateBaseWarehouse(form.value).finally(() =>  buttonLoading.value = false);
+      } else {
+        await addBaseWarehouse(form.value).finally(() =>  buttonLoading.value = false);
+      }
+      proxy?.$modal.msgSuccess("操作成功");
+      dialog.visible = false;
+      await getList();
+    }
+  });
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: BaseWarehouseVO) => {
+  const _warehouseIds = row?.warehouseId || ids.value;
+  await proxy?.$modal.confirm('是否确认删除仓库基础信息编号为"' + _warehouseIds + '"的数据项？').finally(() => loading.value = false);
+  await delBaseWarehouse(_warehouseIds);
+  proxy?.$modal.msgSuccess("删除成功");
+  await getList();
+}
+
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download('wms/baseWarehouse/export', {
+    ...queryParams.value
+  }, `baseWarehouse_${new Date().getTime()}.xlsx`)
+}
+
+onMounted(() => {
+  getWorkshopListSelect();
+  getList();
+});
+</script>

src/views/wms/instockRecord/index.vue

@@ -0,0 +1,359 @@
+<template>
+  <div class="p-2">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+      <div v-show="showSearch" class="mb-[10px]">
+        <el-card shadow="hover">
+          <el-form ref="queryFormRef" :model="queryParams" :inline="true">
+            <el-form-item label="批次码" prop="batchCode">
+              <el-input v-model="queryParams.batchCode" placeholder="请输入批次码" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="仓库ID" prop="warehouseId">
+              <el-select v-model="queryParams.warehouseId" placeholder="请选择仓库" clearable >
+<!--                <el-option v-for="dict in ${dictType}" :key="dict.value" :label="dict.label" :value="dict.value"/>-->
+              </el-select>
+            </el-form-item>
+            <el-form-item label="库位编码" prop="locationCode" label-width="120px">
+              <el-input v-model="queryParams.locationCode" placeholder="请输入库位编码" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="物料编码" prop="materialCode" >
+              <el-input v-model="queryParams.materialCode" placeholder="请输入物料编码" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="物料名称" prop="materialName">
+              <el-input v-model="queryParams.materialName" placeholder="请输入物料名称" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="物料大类" prop="materialCategories">
+              <el-select v-model="queryParams.materialCategories" placeholder="请选择物料大类" clearable >
+                <el-option v-for="dict in material_mategories" :key="dict.value" :label="dict.label" :value="dict.value"/>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="erp同步状态" prop="erpSynchronousStatus" label-width="120px">
+              <el-select v-model="queryParams.erpSynchronousStatus" placeholder="请选择erp同步状态" clearable >
+                <el-option v-for="dict in sys_common_status" :key="dict.value" :label="dict.label" :value="dict.value"/>
+              </el-select>
+            </el-form-item>
+<!--            <el-form-item label="erp同步数量" prop="erpSynchronousQty">-->
+<!--              <el-input v-model="queryParams.erpSynchronousQty" placeholder="请输入erp同步数量" clearable @keyup.enter="handleQuery" />-->
+<!--            </el-form-item>-->
+            <el-form-item>
+              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+            </el-form-item>
+          </el-form>
+        </el-card>
+      </div>
+    </transition>
+
+    <el-card shadow="never">
+      <template #header>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['wms:instockRecord:add']">新增</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['wms:instockRecord:edit']">修改</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['wms:instockRecord:remove']">删除</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['wms:instockRecord:export']">导出</el-button>
+          </el-col>
+          <right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true" @queryTable="getList"></right-toolbar>
+        </el-row>
+      </template>
+
+      <el-table v-loading="loading" :data="instockRecordList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="入库单号" align="center" prop="instockCode" v-if="columns[1].visible"/>
+        <el-table-column label="批次码" align="center" prop="batchCode" v-if="columns[2].visible"/>
+        <el-table-column label="物料id" align="center" prop="materialId" v-if="columns[3].visible"/>
+        <el-table-column label="仓库ID" align="center" prop="warehouseId" v-if="columns[4].visible"/>
+        <el-table-column label="库位编码" align="center" prop="locationCode" v-if="columns[5].visible"/>
+        <el-table-column label="物料编码" align="center" prop="materialCode" v-if="columns[6].visible"/>
+        <el-table-column label="物料名称" align="center" prop="materialName" v-if="columns[7].visible"/>
+        <el-table-column label="入库数量" align="center" prop="instockQty" v-if="columns[8].visible"/>
+        <el-table-column label="物料大类" align="center" prop="materialCategories" v-if="columns[9].visible">
+          <template #default="scope">
+            <dict-tag :options="material_mategories" :value="scope.row.materialCategories"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="入库人" align="center" prop="createBy" v-if="columns[10].visible"/>
+        <el-table-column label="创建时间" align="center" prop="createTime" width="180" v-if="columns[11].visible">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="erp同步状态" align="center" prop="erpSynchronousStatus" v-if="columns[12].visible">
+          <template #default="scope">
+            <dict-tag :options="sys_common_status" :value="scope.row.erpSynchronousStatus"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="erp同步数量" align="center" prop="erpSynchronousQty" v-if="columns[13].visible"/>
+        <el-table-column label="同步时间" align="center" prop="updateTime" width="180" v-if="columns[15].visible">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template #default="scope">
+            <el-tooltip content="修改" placement="top">
+              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['wms:instockRecord:edit']"></el-button>
+            </el-tooltip>
+            <el-tooltip content="删除" placement="top">
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['wms:instockRecord:remove']"></el-button>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+    </el-card>
+    <!-- 添加或修改入库记录对话框 -->
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
+      <el-form ref="instockRecordFormRef" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="入库单号" prop="instockCode">
+          <el-input v-model="form.instockCode" placeholder="请输入入库单号" />
+        </el-form-item>
+        <el-form-item label="批次码" prop="batchCode">
+          <el-input v-model="form.batchCode" placeholder="请输入批次码" />
+        </el-form-item>
+        <el-form-item label="物料id" prop="materialId">
+<!--          <el-select v-model="form.materialId" placeholder="请选择物料id">-->
+<!--            <el-option-->
+<!--              v-for="dict in ${dictType}"-->
+<!--              :key="dict.value"-->
+<!--              :label="dict.label"-->
+<!--              :value="parseInt(dict.value)"-->
+<!--            ></el-option>-->
+<!--          </el-select>-->
+        </el-form-item>
+        <el-form-item label="库位编码" prop="locationCode">
+          <el-input v-model="form.locationCode" placeholder="请输入库位编码" />
+        </el-form-item>
+        <el-form-item label="物料编码" prop="materialCode">
+          <el-input v-model="form.materialCode" placeholder="请输入物料编码" />
+        </el-form-item>
+        <el-form-item label="物料名称" prop="materialName">
+          <el-input v-model="form.materialName" placeholder="请输入物料名称" />
+        </el-form-item>
+        <el-form-item label="入库数量" prop="instockQty">
+          <el-input v-model="form.instockQty" placeholder="请输入入库数量" />
+        </el-form-item>
+        <el-form-item label="物料大类" prop="materialCategories">
+          <el-select v-model="form.materialCategories" placeholder="请选择物料大类">
+            <el-option
+              v-for="dict in material_mategories"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="erp同步状态" prop="erpSynchronousStatus">
+          <el-select v-model="form.erpSynchronousStatus" placeholder="请选择erp同步状态">
+            <el-option
+              v-for="dict in sys_common_status"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="erp同步数量" prop="erpSynchronousQty">
+          <el-input v-model="form.erpSynchronousQty" placeholder="请输入erp同步数量" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="InstockRecord" lang="ts">
+import { listInstockRecord, getInstockRecord, delInstockRecord, addInstockRecord, updateInstockRecord } from '@/api/wms/instockRecord';
+import { InstockRecordVO, InstockRecordQuery, InstockRecordForm } from '@/api/wms/instockRecord/types';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { material_mategories, sys_common_status } = toRefs<any>(proxy?.useDict('material_mategories', 'sys_common_status'));
+
+const instockRecordList = ref<InstockRecordVO[]>([]);
+const buttonLoading = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+const dateRangeCreateTime = ref<[DateModelType, DateModelType]>(['', '']);
+
+const queryFormRef = ref<ElFormInstance>();
+const instockRecordFormRef = ref<ElFormInstance>();
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+// 列显隐信息
+const columns = ref<FieldOption[]>([
+  { key: 0, label: `入库记录主键`, visible: true },
+  { key: 1, label: `入库单号`, visible: true },
+  { key: 2, label: `批次码`, visible: true },
+  { key: 3, label: `物料id`, visible: true },
+  { key: 4, label: `仓库ID`, visible: false },
+  { key: 5, label: `库位编码`, visible: true },
+  { key: 6, label: `物料编码`, visible: true },
+  { key: 7, label: `物料名称`, visible: true },
+  { key: 8, label: `入库数量`, visible: true },
+  { key: 9, label: `物料大类`, visible: true },
+  { key: 10, label: `入库人`, visible: true },
+  { key: 11, label: `创建时间`, visible: true },
+  { key: 12, label: `erp同步状态`, visible: true },
+  { key: 13, label: `erp同步数量`, visible: true  },
+  { key: 14, label: `修改人`, visible: true },
+  { key: 15, label: `同步时间`, visible: true },
+  { key: 16, label: `创建部门`, visible: true },
+  { key: 17, label: `租户号`, visible: true },
+]);
+
+const initFormData: InstockRecordForm = {
+  instockCode: undefined,
+  batchCode: undefined,
+  materialId: undefined,
+  locationCode: undefined,
+  materialCode: undefined,
+  materialName: undefined,
+  instockQty: undefined,
+  materialCategories: undefined,
+  erpSynchronousStatus: undefined,
+  erpSynchronousQty: undefined,
+}
+const data = reactive<PageData<InstockRecordForm, InstockRecordQuery>>({
+  form: {...initFormData},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    batchCode: undefined,
+    warehouseId: undefined,
+    locationCode: undefined,
+    materialCode: undefined,
+    materialName: undefined,
+    materialCategories: undefined,
+    erpSynchronousStatus: undefined,
+    erpSynchronousQty: undefined,
+    params: {
+    }
+  },
+  rules: {
+    erpSynchronousStatus: [
+      { required: true, message: "erp同步状态不能为空", trigger: "change" }
+    ],
+    erpSynchronousQty: [
+      { required: true, message: "erp同步数量不能为空", trigger: "blur" }
+    ],
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询入库记录列表 */
+const getList = async () => {
+  loading.value = true;
+  queryParams.value.params = {};
+  proxy?.addDateRange(queryParams.value, dateRangeCreateTime.value, 'CreateTime');
+  const res = await listInstockRecord(queryParams.value);
+  instockRecordList.value = res.rows;
+  total.value = res.total;
+  loading.value = false;
+}
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+}
+
+/** 表单重置 */
+const reset = () => {
+  form.value = {...initFormData};
+  instockRecordFormRef.value?.resetFields();
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  dateRangeCreateTime.value = ['', ''];
+  queryFormRef.value?.resetFields();
+  handleQuery();
+}
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: InstockRecordVO[]) => {
+  ids.value = selection.map(item => item.instockRecordId);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  reset();
+  dialog.visible = true;
+  dialog.title = "添加入库记录";
+}
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: InstockRecordVO) => {
+  reset();
+  const _instockRecordId = row?.instockRecordId || ids.value[0]
+  const res = await getInstockRecord(_instockRecordId);
+  Object.assign(form.value, res.data);
+  dialog.visible = true;
+  dialog.title = "修改入库记录";
+}
+
+/** 提交按钮 */
+const submitForm = () => {
+  instockRecordFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.instockRecordId) {
+        await updateInstockRecord(form.value).finally(() =>  buttonLoading.value = false);
+      } else {
+        await addInstockRecord(form.value).finally(() =>  buttonLoading.value = false);
+      }
+      proxy?.$modal.msgSuccess("操作成功");
+      dialog.visible = false;
+      await getList();
+    }
+  });
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: InstockRecordVO) => {
+  const _instockRecordIds = row?.instockRecordId || ids.value;
+  await proxy?.$modal.confirm('是否确认删除入库记录编号为"' + _instockRecordIds + '"的数据项？').finally(() => loading.value = false);
+  await delInstockRecord(_instockRecordIds);
+  proxy?.$modal.msgSuccess("删除成功");
+  await getList();
+}
+
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download('wms/instockRecord/export', {
+    ...queryParams.value
+  }, `instockRecord_${new Date().getTime()}.xlsx`)
+}
+
+onMounted(() => {
+  getList();
+});
+</script>