Merge remote-tracking branch 'origin/master'

src/api/wms/baseLocation/index.ts

@@ -74,4 +74,4 @@ export function getBaseLocationList (query) {
         method: 'get',
         params: query
     });
-};
+}

src/api/wms/outstockRecord/index.ts

@@ -0,0 +1,77 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { OutstockRecordVO, OutstockRecordForm, OutstockRecordQuery } from '@/api/wms/outstockRecord/types';
+
+/**
+ * 查询出库记录列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listOutstockRecord = (query?: OutstockRecordQuery): AxiosPromise<OutstockRecordVO[]> => {
+  return request({
+    url: '/wms/outstockRecord/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询出库记录详细
+ * @param outstockRecordId
+ */
+export const getOutstockRecord = (outstockRecordId: string | number): AxiosPromise<OutstockRecordVO> => {
+  return request({
+    url: '/wms/outstockRecord/' + outstockRecordId,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增出库记录
+ * @param data
+ */
+export const addOutstockRecord = (data: OutstockRecordForm) => {
+  return request({
+    url: '/wms/outstockRecord',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改出库记录
+ * @param data
+ */
+export const updateOutstockRecord = (data: OutstockRecordForm) => {
+  return request({
+    url: '/wms/outstockRecord',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除出库记录
+ * @param outstockRecordId
+ */
+export const delOutstockRecord = (outstockRecordId: string | number | Array<string | number>) => {
+  return request({
+    url: '/wms/outstockRecord/' + outstockRecordId,
+    method: 'delete'
+  });
+};
+
+
+/**
+ * 下拉框查询出库记录列表
+ * @param query
+ * @returns {*}
+ */
+export function getOutstockRecordList (query) {
+    return request({
+        url: '/wms/outstockRecord/getOutstockRecordList',
+        method: 'get',
+        params: query
+    });
+};

src/api/wms/outstockRecord/types.ts

@@ -0,0 +1,151 @@
+export interface OutstockRecordVO {
+  /**
+   * 出库记录主键
+   */
+  outstockRecordId: string | number;
+
+  /**
+   * 出库单号
+   */
+  outstockCode: string;
+
+  /**
+   * 出库单 主键
+   */
+  outstockId: string | number;
+
+  /**
+   * 批次码
+   */
+  batchCode: string;
+
+  /**
+   * 物料id
+   */
+  materialId: string | number;
+
+  /**
+   * 库位编码
+   */
+  locationCode: string;
+
+  /**
+   * 出库数量
+   */
+  outstockQty: number;
+
+  /**
+   * 物料大类
+   */
+  materialCategories: string;
+
+  /**
+   * 出库人
+   */
+  createBy: string;
+
+  /**
+   * 提交时间
+   */
+  createTime: string;
+
+  /**
+   * erp同步状态
+   */
+  erpSynchronousStatus: string;
+
+  /**
+   * erp同步数量
+   */
+  erpSynchronousQty: number;
+
+}
+
+export interface OutstockRecordForm extends BaseEntity {
+  /**
+   * 出库记录主键
+   */
+  outstockRecordId?: string | number;
+
+  /**
+   * 出库单号
+   */
+  outstockCode?: string;
+
+  /**
+   * 出库单 主键
+   */
+  outstockId?: string | number;
+
+  /**
+   * 批次码
+   */
+  batchCode?: string;
+
+  /**
+   * 物料id
+   */
+  materialId?: string | number;
+
+  /**
+   * 库位编码
+   */
+  locationCode?: string;
+
+  /**
+   * 出库数量
+   */
+  outstockQty?: number;
+
+  /**
+   * 物料大类
+   */
+  materialCategories?: string;
+
+  /**
+   * 出库人
+   */
+  createBy?: string;
+
+  /**
+   * erp同步状态
+   */
+  erpSynchronousStatus?: string;
+
+  /**
+   * erp同步数量
+   */
+  erpSynchronousQty?: number;
+
+}
+
+export interface OutstockRecordQuery extends PageQuery {
+
+  /**
+   * 出库单号
+   */
+  outstockCode?: string;
+
+  /**
+   * 库位编码
+   */
+  locationCode?: string;
+
+  /**
+   * 物料大类
+   */
+  materialCategories?: string;
+
+  /**
+   * erp同步状态
+   */
+  erpSynchronousStatus?: string;
+
+    /**
+     * 日期范围参数
+     */
+    params?: any;
+}
+
+
+

src/views/wms/baseLocation/index.vue

@@ -55,7 +55,7 @@
         <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="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"/>
@@ -155,7 +155,7 @@ const getBaseWarehouseListsss = async () => {
 };
 // 列显隐信息
 const columns = ref<FieldOption[]>([
-  { key: 0, label: `表主键`, visible: true },
+  { key: 0, label: `表主键`, visible: false },
   { key: 1, label: `所属仓库`, visible: true },
   { key: 2, label: `库位编码`, visible: true },
   { key: 3, label: `排`, visible: true },

src/views/wms/outstockRecord/index.vue

@@ -0,0 +1,323 @@
+<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="outstockCode">
+              <el-input v-model="queryParams.outstockCode" placeholder="请输入出库单号" clearable @keyup.enter="handleQuery" />
+            </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="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">-->
+<!--              <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>
+              <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:outstockRecord:add']">新增</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['wms:outstockRecord:edit']">修改</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['wms:outstockRecord:remove']">删除</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['wms:outstockRecord: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="outstockRecordList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="出库记录主键" align="center" prop="outstockRecordId" v-if="columns[0].visible"/>
+        <el-table-column label="出库单号" align="center" prop="outstockCode" v-if="columns[1].visible"/>
+<!--        <el-table-column label="出库单 主键" align="center" prop="outstockId" v-if="columns[2].visible"/>-->
+        <el-table-column label="批次码" align="center" prop="batchCode" v-if="columns[3].visible"/>
+        <el-table-column label="物料编码" align="center" prop="materialCode" v-if="columns[4].visible"/>
+        <el-table-column label="物料名称" align="center" prop="materialName" v-if="columns[4].visible"/>
+        <el-table-column label="物料规格" align="center" prop="materialSpec" 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="outstockQty" v-if="columns[6].visible"/>
+        <el-table-column label="单位" align="center" prop="materialUnit" v-if="columns[4].visible"/>
+        <el-table-column label="物料大类" align="center" prop="materialCategories" v-if="columns[7].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[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="erp同步状态" align="center" prop="erpSynchronousStatus" v-if="columns[10].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[11].visible"/>
+        <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:outstockRecord:edit']"></el-button>
+            </el-tooltip>
+            <el-tooltip content="删除" placement="top">
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['wms:outstockRecord: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="outstockRecordFormRef" :model="form" :rules="rules" label-width="80px">
+<!--        <el-form-item label="出库记录主键" prop="outstockRecordId">-->
+<!--          <el-input v-model="form.outstockRecordId" placeholder="请输入出库记录主键" />-->
+<!--        </el-form-item>-->
+        <el-form-item label="出库单号" prop="outstockCode">
+          <el-input v-model="form.outstockCode" placeholder="请输入出库单号" />
+        </el-form-item>
+<!--        <el-form-item label="出库单 主键" prop="outstockId">-->
+<!--          <el-input v-model="form.outstockId" 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-input v-model="form.materialId" placeholder="请输入物料id" />
+        </el-form-item>
+        <el-form-item label="库位编码" prop="locationCode">
+          <el-input v-model="form.locationCode" placeholder="请输入库位编码" />
+        </el-form-item>
+        <el-form-item label="出库数量" prop="outstockQty">
+          <el-input v-model="form.outstockQty" 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="createBy">
+          <el-input v-model="form.createBy" placeholder="请输入出库人" />
+        </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="OutstockRecord" lang="ts">
+import { listOutstockRecord, getOutstockRecord, delOutstockRecord, addOutstockRecord, updateOutstockRecord } from '@/api/wms/outstockRecord';
+import { OutstockRecordVO, OutstockRecordQuery, OutstockRecordForm } from '@/api/wms/outstockRecord/types';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { sys_common_status, mes_material_categories, material_mategories } = toRefs<any>(proxy?.useDict('sys_common_status', 'mes_material_categories','material_mategories'));
+
+const outstockRecordList = ref<OutstockRecordVO[]>([]);
+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 outstockRecordFormRef = ref<ElFormInstance>();
+
+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: `物料id`, 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: `erp同步状态`, visible: true },
+        { key: 11, label: `erp同步数量`, visible: true },
+        // { key: 12, label: `${comment}`, visible: true },
+        // { key: 13, label: `${comment}`, visible: true },
+        // { key: 14, label: `${comment}`, visible: true },
+        // { key: 15, label: `${comment}`, visible: true },
+]);
+
+const initFormData: OutstockRecordForm = {
+  outstockRecordId: undefined,
+  outstockCode: undefined,
+  outstockId: undefined,
+  batchCode: undefined,
+  materialId: undefined,
+  locationCode: undefined,
+  outstockQty: undefined,
+  materialCategories: undefined,
+  createBy: undefined,
+  erpSynchronousStatus: undefined,
+  erpSynchronousQty: undefined,
+}
+const data = reactive<PageData<OutstockRecordForm, OutstockRecordQuery>>({
+  form: {...initFormData},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    outstockCode: undefined,
+    locationCode: undefined,
+    materialCategories: undefined,
+    erpSynchronousStatus: undefined,
+    params: {
+    }
+  },
+  rules: {
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询出库记录列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listOutstockRecord(queryParams.value);
+  outstockRecordList.value = res.rows;
+  total.value = res.total;
+  loading.value = false;
+}
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+}
+
+/** 表单重置 */
+const reset = () => {
+  form.value = {...initFormData};
+  outstockRecordFormRef.value?.resetFields();
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+}
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: OutstockRecordVO[]) => {
+  ids.value = selection.map(item => item.outstockRecordId);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  reset();
+  dialog.visible = true;
+  dialog.title = "添加出库记录";
+}
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: OutstockRecordVO) => {
+  reset();
+  const _outstockRecordId = row?.outstockRecordId || ids.value[0]
+  const res = await getOutstockRecord(_outstockRecordId);
+  Object.assign(form.value, res.data);
+  dialog.visible = true;
+  dialog.title = "修改出库记录";
+}
+
+/** 提交按钮 */
+const submitForm = () => {
+  outstockRecordFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.outstockRecordId) {
+        await updateOutstockRecord(form.value).finally(() =>  buttonLoading.value = false);
+      } else {
+        await addOutstockRecord(form.value).finally(() =>  buttonLoading.value = false);
+      }
+      proxy?.$modal.msgSuccess("操作成功");
+      dialog.visible = false;
+      await getList();
+    }
+  });
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: OutstockRecordVO) => {
+  const _outstockRecordIds = row?.outstockRecordId || ids.value;
+  await proxy?.$modal.confirm('是否确认删除出库记录编号为"' + _outstockRecordIds + '"的数据项？').finally(() => loading.value = false);
+  await delOutstockRecord(_outstockRecordIds);
+  proxy?.$modal.msgSuccess("删除成功");
+  await getList();
+}
+
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download('wms/outstockRecord/export', {
+    ...queryParams.value
+  }, `outstockRecord_${new Date().getTime()}.xlsx`)
+}
+
+onMounted(() => {
+  getList();
+});
+</script>