From 378b35add2ce6732ebf39939732ae83a67200515 Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Sat, 21 Feb 2026 17:52:05 +0800
Subject: [PATCH] =?UTF-8?q?update=20add=E6=9C=BA=E5=8F=B0=E6=96=99?=
 =?UTF-8?q?=E7=BD=90=E7=B1=BB=E5=9E=8B=E3=80=81=E6=9C=BA=E5=8F=B0=E6=96=99?=
 =?UTF-8?q?=E7=BD=90=E6=98=8E=E7=BB=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/mes/machineTankDetail/index.ts    |  77 +++++
 src/api/mes/machineTankDetail/types.ts    | 236 ++++++++++++++
 src/api/mes/machineTankType/index.ts      |  77 +++++
 src/api/mes/machineTankType/types.ts      |  91 ++++++
 src/views/mes/machineTankDetail/index.vue | 363 ++++++++++++++++++++++
 src/views/mes/machineTankType/index.vue   | 317 +++++++++++++++++++
 6 files changed, 1161 insertions(+)
 create mode 100644 src/api/mes/machineTankDetail/index.ts
 create mode 100644 src/api/mes/machineTankDetail/types.ts
 create mode 100644 src/api/mes/machineTankType/index.ts
 create mode 100644 src/api/mes/machineTankType/types.ts
 create mode 100644 src/views/mes/machineTankDetail/index.vue
 create mode 100644 src/views/mes/machineTankType/index.vue

diff --git a/src/api/mes/machineTankDetail/index.ts b/src/api/mes/machineTankDetail/index.ts
new file mode 100644
index 0000000..dcead7d
--- /dev/null
+++ b/src/api/mes/machineTankDetail/index.ts
@@ -0,0 +1,77 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { MachineTankDetailVO, MachineTankDetailForm, MachineTankDetailQuery } from '@/api/mes/machineTankDetail/types';
+
+/**
+ * 查询机台料罐明细列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listMachineTankDetail = (query?: MachineTankDetailQuery): AxiosPromise<MachineTankDetailVO[]> => {
+  return request({
+    url: '/mes/machineTankDetail/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询机台料罐明细详细
+ * @param tankDetailId
+ */
+export const getMachineTankDetail = (tankDetailId: string | number): AxiosPromise<MachineTankDetailVO> => {
+  return request({
+    url: '/mes/machineTankDetail/' + tankDetailId,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增机台料罐明细
+ * @param data
+ */
+export const addMachineTankDetail = (data: MachineTankDetailForm) => {
+  return request({
+    url: '/mes/machineTankDetail',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改机台料罐明细
+ * @param data
+ */
+export const updateMachineTankDetail = (data: MachineTankDetailForm) => {
+  return request({
+    url: '/mes/machineTankDetail',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除机台料罐明细
+ * @param tankDetailId
+ */
+export const delMachineTankDetail = (tankDetailId: string | number | Array<string | number>) => {
+  return request({
+    url: '/mes/machineTankDetail/' + tankDetailId,
+    method: 'delete'
+  });
+};
+
+
+/**
+ * 下拉框查询机台料罐明细列表
+ * @param query
+ * @returns {*}
+ */
+export function getProdMachineTankDetailList (query) {
+    return request({
+        url: '/mes/machineTankDetail/getProdMachineTankDetailList',
+        method: 'get',
+        params: query
+    });
+};
diff --git a/src/api/mes/machineTankDetail/types.ts b/src/api/mes/machineTankDetail/types.ts
new file mode 100644
index 0000000..0962bb9
--- /dev/null
+++ b/src/api/mes/machineTankDetail/types.ts
@@ -0,0 +1,236 @@
+export interface MachineTankDetailVO {
+  /**
+   * 料罐明细ID
+   */
+  tankDetailId: string | number;
+
+  /**
+   * 机台ID
+   */
+  machineId: string | number;
+
+  /**
+   * 料罐类型
+   */
+  tankTypeId: string | number;
+
+  /**
+   * 仓位序号
+   */
+  wareNum: number;
+
+  /**
+   * 物料ID
+   */
+  materialId: string | number;
+
+  /**
+   * 料仓优先级
+   */
+  materPriority: number;
+
+  /**
+   * $column.columnComment
+   */
+  materUsed: string;
+
+  /**
+   * $column.columnComment
+   */
+  mkindCode: string;
+
+  /**
+   * 称重编号
+   */
+  weighNum: string;
+
+  /**
+   * 最小称重限额
+   */
+  weighLimitMin: number;
+
+  /**
+   * 最大称重限额
+   */
+  weighLimitMax: number;
+
+  /**
+   * 状态(0正常1停用)
+   */
+  status: string;
+
+  /**
+   * 备注
+   */
+  remark: string;
+
+  /**
+   * 仓库ID
+   */
+  workshopId: string | number;
+
+  /**
+   * 工位ID
+   */
+  stationId: string | number;
+
+}
+
+export interface MachineTankDetailForm extends BaseEntity {
+  /**
+   * 料罐明细ID
+   */
+  tankDetailId?: string | number;
+
+  /**
+   * 机台ID
+   */
+  machineId?: string | number;
+
+  /**
+   * 料罐类型
+   */
+  tankTypeId?: string | number;
+
+  /**
+   * 仓位序号
+   */
+  wareNum?: number;
+
+  /**
+   * 物料ID
+   */
+  materialId?: string | number;
+
+  /**
+   * 料仓优先级
+   */
+  materPriority?: number;
+
+  /**
+   * $column.columnComment
+   */
+  materUsed?: string;
+
+  /**
+   * $column.columnComment
+   */
+  mkindCode?: string;
+
+  /**
+   * 称重编号
+   */
+  weighNum?: string;
+
+  /**
+   * 最小称重限额
+   */
+  weighLimitMin?: number;
+
+  /**
+   * 最大称重限额
+   */
+  weighLimitMax?: number;
+
+  /**
+   * 状态(0正常1停用)
+   */
+  status?: string;
+
+  /**
+   * 备注
+   */
+  remark?: string;
+
+  /**
+   * 仓库ID
+   */
+  workshopId?: string | number;
+
+  /**
+   * 工位ID
+   */
+  stationId?: string | number;
+
+}
+
+export interface MachineTankDetailQuery extends PageQuery {
+
+  /**
+   * 料罐明细ID
+   */
+  tankDetailId?: string | number;
+
+  /**
+   * 机台ID
+   */
+  machineId?: string | number;
+
+  /**
+   * 料罐类型
+   */
+  tankTypeId?: string | number;
+
+  /**
+   * 仓位序号
+   */
+  wareNum?: number;
+
+  /**
+   * 物料ID
+   */
+  materialId?: string | number;
+
+  /**
+   * 料仓优先级
+   */
+  materPriority?: number;
+
+  /**
+   * $column.columnComment
+   */
+  materUsed?: string;
+
+  /**
+   * $column.columnComment
+   */
+  mkindCode?: string;
+
+  /**
+   * 称重编号
+   */
+  weighNum?: string;
+
+  /**
+   * 最小称重限额
+   */
+  weighLimitMin?: number;
+
+  /**
+   * 最大称重限额
+   */
+  weighLimitMax?: number;
+
+  /**
+   * 状态(0正常1停用)
+   */
+  status?: string;
+
+  /**
+   * 仓库ID
+   */
+  workshopId?: string | number;
+
+  /**
+   * 工位ID
+   */
+  stationId?: string | number;
+
+    /**
+     * 日期范围参数
+     */
+    params?: any;
+}
+
+
+
diff --git a/src/api/mes/machineTankType/index.ts b/src/api/mes/machineTankType/index.ts
new file mode 100644
index 0000000..f919822
--- /dev/null
+++ b/src/api/mes/machineTankType/index.ts
@@ -0,0 +1,77 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { MachineTankTypeVO, MachineTankTypeForm, MachineTankTypeQuery } from '@/api/mes/machineTankType/types';
+
+/**
+ * 查询机台料罐类型列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listMachineTankType = (query?: MachineTankTypeQuery): AxiosPromise<MachineTankTypeVO[]> => {
+  return request({
+    url: '/mes/machineTankType/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询机台料罐类型详细
+ * @param tankTypeId
+ */
+export const getMachineTankType = (tankTypeId: string | number): AxiosPromise<MachineTankTypeVO> => {
+  return request({
+    url: '/mes/machineTankType/' + tankTypeId,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增机台料罐类型
+ * @param data
+ */
+export const addMachineTankType = (data: MachineTankTypeForm) => {
+  return request({
+    url: '/mes/machineTankType',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改机台料罐类型
+ * @param data
+ */
+export const updateMachineTankType = (data: MachineTankTypeForm) => {
+  return request({
+    url: '/mes/machineTankType',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除机台料罐类型
+ * @param tankTypeId
+ */
+export const delMachineTankType = (tankTypeId: string | number | Array<string | number>) => {
+  return request({
+    url: '/mes/machineTankType/' + tankTypeId,
+    method: 'delete'
+  });
+};
+
+
+/**
+ * 下拉框查询机台料罐类型列表
+ * @param query
+ * @returns {*}
+ */
+export function getProdMachineTankTypeList (query) {
+    return request({
+        url: '/mes/machineTankType/getProdMachineTankTypeList',
+        method: 'get',
+        params: query
+    });
+};
diff --git a/src/api/mes/machineTankType/types.ts b/src/api/mes/machineTankType/types.ts
new file mode 100644
index 0000000..79a4ea9
--- /dev/null
+++ b/src/api/mes/machineTankType/types.ts
@@ -0,0 +1,91 @@
+export interface MachineTankTypeVO {
+  /**
+   * 类型ID
+   */
+  tankTypeId: string | number;
+
+  /**
+   * 机台ID
+   */
+  machineId: string | number;
+
+  /**
+   * 机台名称（关联查询）
+   */
+  machineName?: string;
+
+  /**
+   * 罐类型
+   */
+  tankType: string;
+
+  /**
+   * 罐数量
+   */
+  tankCount: number;
+
+  /**
+   * 备注
+   */
+  remark: string;
+
+}
+
+export interface MachineTankTypeForm extends BaseEntity {
+  /**
+   * 类型ID
+   */
+  tankTypeId?: string | number;
+
+  /**
+   * 机台ID
+   */
+  machineId?: string | number;
+
+  /**
+   * 罐类型
+   */
+  tankType?: string;
+
+  /**
+   * 罐数量
+   */
+  tankCount?: number;
+
+  /**
+   * 备注
+   */
+  remark?: string;
+
+}
+
+export interface MachineTankTypeQuery extends PageQuery {
+
+  /**
+   * 类型ID
+   */
+  tankTypeId?: string | number;
+
+  /**
+   * 机台ID
+   */
+  machineId?: string | number;
+
+  /**
+   * 罐类型
+   */
+  tankType?: string;
+
+  /**
+   * 罐数量
+   */
+  tankCount?: number;
+
+    /**
+     * 日期范围参数
+     */
+    params?: any;
+}
+
+
+
diff --git a/src/views/mes/machineTankDetail/index.vue b/src/views/mes/machineTankDetail/index.vue
new file mode 100644
index 0000000..41c9a6c
--- /dev/null
+++ b/src/views/mes/machineTankDetail/index.vue
@@ -0,0 +1,363 @@
+<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='tankTypeId'>
+              <el-input v-model='queryParams.tankTypeId' placeholder='请输入料罐类型' clearable
+                        @keyup.enter='handleQuery' />
+            </el-form-item>
+            <el-form-item label='状态(0正常1停用)' prop='status'>
+              <el-select v-model='queryParams.status' placeholder='请选择状态(0正常1停用)' clearable>
+                <el-option v-for='dict in sys_show_hide' :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="['mes:machineTankDetail:add']">
+              新增
+            </el-button>
+          </el-col>
+          <el-col :span='1.5'>
+            <el-button type='success' plain icon='Edit' :disabled='single' @click='handleUpdate()'
+                       v-hasPermi="['mes:machineTankDetail:edit']">修改
+            </el-button>
+          </el-col>
+          <el-col :span='1.5'>
+            <el-button type='danger' plain icon='Delete' :disabled='multiple' @click='handleDelete()'
+                       v-hasPermi="['mes:machineTankDetail:remove']">删除
+            </el-button>
+          </el-col>
+          <el-col :span='1.5'>
+            <el-button type='warning' plain icon='Download' @click='handleExport'
+                       v-hasPermi="['mes:machineTankDetail: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='machineTankDetailList' @selection-change='handleSelectionChange'>
+        <el-table-column type='selection' width='55' align='center' />
+        <el-table-column label='料罐明细ID' align='center' prop='tankDetailId' v-if='columns[0].visible' />
+        <el-table-column label='机台名称' align='center' prop='machineId' v-if='columns[2].visible' />
+        <el-table-column label='料罐类型' align='center' prop='tankTypeId' v-if='columns[3].visible' />
+        <el-table-column label='仓位序号' align='center' prop='wareNum' v-if='columns[4].visible' />
+        <el-table-column label='物料ID' align='center' prop='materialId' v-if='columns[5].visible' />
+        <el-table-column label='料仓优先级' align='center' prop='materPriority' v-if='columns[6].visible' />
+        <el-table-column label='${comment}' align='center' prop='materUsed' v-if='columns[7].visible' />
+        <el-table-column label='${comment}' align='center' prop='mkindCode' v-if='columns[8].visible' />
+        <el-table-column label='称重编号' align='center' prop='weighNum' v-if='columns[9].visible' />
+        <el-table-column label='最小称重限额' align='center' prop='weighLimitMin' v-if='columns[10].visible' />
+        <el-table-column label='最大称重限额' align='center' prop='weighLimitMax' v-if='columns[11].visible' />
+        <el-table-column label='状态(0正常1停用)' align='center' prop='status' v-if='columns[12].visible'>
+          <template #default='scope'>
+            <dict-tag :options='sys_show_hide' :value='scope.row.status' />
+          </template>
+        </el-table-column>
+        <el-table-column label='备注' align='center' prop='remark' v-if='columns[13].visible' />
+        <el-table-column label='仓库ID' align='center' prop='workshopId' v-if='columns[19].visible' />
+        <el-table-column label='工位ID' align='center' prop='stationId' v-if='columns[20].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="['mes:machineTankDetail:edit']"></el-button>
+            </el-tooltip>
+            <el-tooltip content='删除' placement='top'>
+              <el-button link type='primary' icon='Delete' @click='handleDelete(scope.row)'
+                         v-hasPermi="['mes:machineTankDetail: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='machineTankDetailFormRef' :model='form' :rules='rules' label-width='120px'>
+        <el-form-item label='料罐明细ID' prop='tankDetailId'>
+          <el-input v-model='form.tankDetailId' placeholder='请输入料罐明细ID' />
+        </el-form-item>
+        <el-form-item label='机台名称' prop='machineId'>
+          <el-input v-model='form.machineId' placeholder='请输入机台名称' />
+        </el-form-item>
+        <el-form-item label='料罐类型' prop='tankTypeId'>
+          <el-input v-model='form.tankTypeId' placeholder='请输入料罐类型' />
+        </el-form-item>
+        <el-form-item label='仓位序号' prop='wareNum'>
+          <el-input v-model='form.wareNum' 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='materPriority'>
+          <el-input v-model='form.materPriority' placeholder='请输入料仓优先级' />
+        </el-form-item>
+        <el-form-item label='${comment}' prop='materUsed'>
+          <el-input v-model='form.materUsed' placeholder='请输入${comment}' />
+        </el-form-item>
+        <el-form-item label='${comment}' prop='mkindCode'>
+          <el-input v-model='form.mkindCode' placeholder='请输入${comment}' />
+        </el-form-item>
+        <el-form-item label='称重编号' prop='weighNum'>
+          <el-input v-model='form.weighNum' placeholder='请输入称重编号' />
+        </el-form-item>
+        <el-form-item label='最小称重限额' prop='weighLimitMin'>
+          <el-input v-model='form.weighLimitMin' placeholder='请输入最小称重限额' />
+        </el-form-item>
+        <el-form-item label='最大称重限额' prop='weighLimitMax'>
+          <el-input v-model='form.weighLimitMax' placeholder='请输入最大称重限额' />
+        </el-form-item>
+        <el-form-item label='状态(0正常1停用)' prop='status'>
+          <el-radio-group v-model='form.status'>
+            <el-radio
+              v-for='dict in sys_show_hide'
+              :key='dict.value'
+              :value='dict.value'
+            >{{ dict.label }}
+            </el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label='备注' prop='remark'>
+          <el-input v-model='form.remark' placeholder='请输入备注' />
+        </el-form-item>
+        <el-form-item label='仓库ID' prop='workshopId'>
+          <el-input v-model='form.workshopId' placeholder='请输入仓库ID' />
+        </el-form-item>
+        <el-form-item label='工位ID' prop='stationId'>
+          <el-input v-model='form.stationId' placeholder='请输入工位ID' />
+        </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='MachineTankDetail' lang='ts'>
+import {
+  listMachineTankDetail,
+  getMachineTankDetail,
+  delMachineTankDetail,
+  addMachineTankDetail,
+  updateMachineTankDetail
+} from '@/api/mes/machineTankDetail';
+import { MachineTankDetailVO, MachineTankDetailQuery, MachineTankDetailForm } from '@/api/mes/machineTankDetail/types';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { sys_show_hide } = toRefs<any>(proxy?.useDict('sys_show_hide'));
+
+const machineTankDetailList = ref<MachineTankDetailVO[]>([]);
+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 machineTankDetailFormRef = ref<ElFormInstance>();
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+// 列显隐信息
+const columns = ref<FieldOption[]>([
+  { key: 0, label: `料罐明细ID`, 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: `物料ID`, visible: true },
+  { key: 6, label: `料仓优先级`, visible: true },
+  { key: 7, label: `comment`, visible: true },
+  { key: 8, label: `comment`, visible: true },
+  { key: 9, label: `称重编号`, visible: true },
+  { key: 10, label: `最小称重限额`, visible: true },
+  { key: 11, label: `最大称重限额`, visible: true },
+  { key: 12, label: `状态(0正常1停用)`, visible: true },
+  { key: 13, label: `备注`, visible: true },
+  { key: 14, label: `创建部门`, visible: true },
+  { key: 15, label: `创建者`, visible: true },
+  { key: 16, label: `创建时间`, visible: true },
+  { key: 17, label: `更新者`, visible: true },
+  { key: 18, label: `更新时间`, visible: true },
+  { key: 19, label: `仓库ID`, visible: true },
+  { key: 20, label: `工位ID`, visible: true },
+  { key: 21, label: `删除标志`, visible: true }
+]);
+
+const initFormData: MachineTankDetailForm = {
+  tankDetailId: undefined,
+  machineId: undefined,
+  tankTypeId: undefined,
+  wareNum: undefined,
+  materialId: undefined,
+  materPriority: undefined,
+  materUsed: undefined,
+  mkindCode: undefined,
+  weighNum: undefined,
+  weighLimitMin: undefined,
+  weighLimitMax: undefined,
+  status: undefined,
+  remark: undefined,
+  workshopId: undefined,
+  stationId: undefined
+};
+const data = reactive<PageData<MachineTankDetailForm, MachineTankDetailQuery>>({
+  form: { ...initFormData },
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    tankDetailId: undefined,
+    machineId: undefined,
+    tankTypeId: undefined,
+    wareNum: undefined,
+    materialId: undefined,
+    materPriority: undefined,
+    materUsed: undefined,
+    mkindCode: undefined,
+    weighNum: undefined,
+    weighLimitMin: undefined,
+    weighLimitMax: undefined,
+    status: undefined,
+    workshopId: undefined,
+    stationId: undefined,
+    params: {}
+  },
+  rules: {
+    machineId: [
+      { required: true, message: '机台名称不能为空', trigger: 'blur' }
+    ],
+    tankTypeId: [
+      { required: true, message: '料罐类型不能为空', trigger: 'blur' }
+    ],
+    wareNum: [
+      { required: true, message: '仓位序号不能为空', trigger: 'blur' }
+    ],
+    materialId: [
+      { required: true, message: '物料ID不能为空', trigger: 'blur' }
+    ]
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询机台料罐明细列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listMachineTankDetail(queryParams.value);
+  machineTankDetailList.value = res.rows;
+  total.value = res.total;
+  loading.value = false;
+};
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+};
+
+/** 表单重置 */
+const reset = () => {
+  form.value = { ...initFormData };
+  machineTankDetailFormRef.value?.resetFields();
+};
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+};
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+};
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: MachineTankDetailVO[]) => {
+  ids.value = selection.map(item => item.tankDetailId);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+};
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  reset();
+  dialog.visible = true;
+  dialog.title = '添加机台料罐明细';
+};
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: MachineTankDetailVO) => {
+  reset();
+  const _tankDetailId = row?.tankDetailId || ids.value[0];
+  const res = await getMachineTankDetail(_tankDetailId);
+  Object.assign(form.value, res.data);
+  dialog.visible = true;
+  dialog.title = '修改机台料罐明细';
+};
+
+/** 提交按钮 */
+const submitForm = () => {
+  machineTankDetailFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.tankDetailId) {
+        await updateMachineTankDetail(form.value).finally(() => buttonLoading.value = false);
+      } else {
+        await addMachineTankDetail(form.value).finally(() => buttonLoading.value = false);
+      }
+      proxy?.$modal.msgSuccess('操作成功');
+      dialog.visible = false;
+      await getList();
+    }
+  });
+};
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: MachineTankDetailVO) => {
+  const _tankDetailIds = row?.tankDetailId || ids.value;
+  await proxy?.$modal.confirm('是否确认删除机台料罐明细编号为"' + _tankDetailIds + '"的数据项？').finally(() => loading.value = false);
+  await delMachineTankDetail(_tankDetailIds);
+  proxy?.$modal.msgSuccess('删除成功');
+  await getList();
+};
+
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download('mes/machineTankDetail/export', {
+    ...queryParams.value
+  }, `machineTankDetail_${new Date().getTime()}.xlsx`);
+};
+
+onMounted(() => {
+  getList();
+});
+</script>
diff --git a/src/views/mes/machineTankType/index.vue b/src/views/mes/machineTankType/index.vue
new file mode 100644
index 0000000..f7991bd
--- /dev/null
+++ b/src/views/mes/machineTankType/index.vue
@@ -0,0 +1,317 @@
+<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='tankType'>
+              <el-select v-model='queryParams.tankType' placeholder='请选择罐类型' clearable>
+                <el-option v-for='dict in tank_type' :key='dict.value' :label='dict.label' :value='dict.value' />
+              </el-select>
+            </el-form-item>
+            <el-form-item label='机台' prop='machineId'>
+              <el-select v-model='queryParams.machineId' placeholder='请选择机台' clearable>
+                <el-option
+                  v-for='item in machineOptions'
+                  :key='item.machineId'
+                  :label='item.machineName || item.machineCode'
+                  :value='item.machineId'
+                />
+              </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="['mes:machineTankType:add']">
+              新增
+            </el-button>
+          </el-col>
+          <el-col :span='1.5'>
+            <el-button type='success' plain icon='Edit' :disabled='single' @click='handleUpdate()'
+                       v-hasPermi="['mes:machineTankType:edit']">修改
+            </el-button>
+          </el-col>
+          <el-col :span='1.5'>
+            <el-button type='danger' plain icon='Delete' :disabled='multiple' @click='handleDelete()'
+                       v-hasPermi="['mes:machineTankType:remove']">删除
+            </el-button>
+          </el-col>
+          <el-col :span='1.5'>
+            <el-button type='warning' plain icon='Download' @click='handleExport'
+                       v-hasPermi="['mes:machineTankType: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='machineTankTypeList' @selection-change='handleSelectionChange'>
+        <el-table-column type='selection' width='55' align='center' />
+        <el-table-column label='类型ID' align='center' prop='tankTypeId' v-if='columns[0].visible' />
+        <el-table-column label='机台名称' align='center' prop='machineName' min-width='120' v-if='columns[2].visible'>
+          <template #default='scope'>
+            {{ scope.row.machineName || scope.row.machineId || '-' }}
+          </template>
+        </el-table-column>
+        <el-table-column label='罐类型' align='center' prop='tankType' v-if='columns[3].visible'>
+          <template #default='scope'>
+            <dict-tag :options='tank_type' :value='scope.row.tankType' />
+          </template>
+        </el-table-column>
+        <el-table-column label='罐数量' align='center' prop='tankCount' v-if='columns[4].visible' />
+        <el-table-column label='备注' align='center' prop='remark' v-if='columns[5].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="['mes:machineTankType:edit']"></el-button>
+            </el-tooltip>
+            <el-tooltip content='删除' placement='top'>
+              <el-button link type='primary' icon='Delete' @click='handleDelete(scope.row)'
+                         v-hasPermi="['mes:machineTankType: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='machineTankTypeFormRef' :model='form' :rules='rules' label-width='120px'>
+        <el-form-item label='机台' prop='machineId'>
+          <el-select v-model='form.machineId' placeholder='请选择机台' clearable style='width: 100%'>
+            <el-option
+              v-for='item in machineOptions'
+              :key='item.machineId'
+              :label='item.machineName || item.machineCode'
+              :value='item.machineId'
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label='罐类型' prop='tankType'>
+          <el-select v-model='form.tankType' placeholder='请选择罐类型'>
+            <el-option
+              v-for='dict in tank_type'
+              :key='dict.value'
+              :label='dict.label'
+              :value='dict.value'
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label='罐数量' prop='tankCount'>
+          <el-input v-model='form.tankCount' placeholder='请输入罐数量' />
+        </el-form-item>
+        <el-form-item label='备注' prop='remark'>
+          <el-input type='textarea' v-model='form.remark' 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='MachineTankType' lang='ts'>
+import {
+  listMachineTankType,
+  getMachineTankType,
+  delMachineTankType,
+  addMachineTankType,
+  updateMachineTankType
+} from '@/api/mes/machineTankType';
+import { getProdBaseMachineInfoList } from '@/api/mes/prodBaseMachineInfo';
+import { MachineTankTypeVO, MachineTankTypeQuery, MachineTankTypeForm } from '@/api/mes/machineTankType/types';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { tank_type } = toRefs<any>(proxy?.useDict('tank_type'));
+
+const machineTankTypeList = ref<MachineTankTypeVO[]>([]);
+const machineOptions = ref<any[]>([]);
+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 machineTankTypeFormRef = ref<ElFormInstance>();
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+// 列显隐信息
+const columns = ref<FieldOption[]>([
+  { key: 0, label: `类型ID`, 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: true },
+  { key: 8, label: `创建时间`, visible: true },
+  { key: 9, label: `更新人`, visible: true },
+  { key: 10, label: `更新时间`, visible: true },
+  { key: 11, label: `删除标志`, visible: true }
+]);
+
+const initFormData: MachineTankTypeForm = {
+  tankTypeId: undefined,
+  machineId: undefined,
+  tankType: undefined,
+  tankCount: undefined,
+  remark: undefined
+};
+const data = reactive<PageData<MachineTankTypeForm, MachineTankTypeQuery>>({
+  form: { ...initFormData },
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    tankTypeId: undefined,
+    machineId: undefined,
+    tankType: undefined,
+    tankCount: undefined,
+    params: {}
+  },
+  rules: {
+    machineId: [
+      { required: true, message: '请选择机台', trigger: 'change' }
+    ],
+    tankType: [
+      { required: true, message: '罐类型不能为空', trigger: 'change' }
+    ],
+    tankCount: [
+      { required: true, message: '罐数量不能为空', trigger: 'blur' }
+    ]
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 加载机台下拉列表 */
+const getMachineOptions = async () => {
+  try {
+    const res = await getProdBaseMachineInfoList({});
+    machineOptions.value = res.data || [];
+  } catch {
+    machineOptions.value = [];
+  }
+};
+
+/** 查询机台料罐类型列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listMachineTankType(queryParams.value);
+  machineTankTypeList.value = res.rows;
+  total.value = res.total;
+  loading.value = false;
+};
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+};
+
+/** 表单重置 */
+const reset = () => {
+  form.value = { ...initFormData };
+  machineTankTypeFormRef.value?.resetFields();
+};
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+};
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+};
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: MachineTankTypeVO[]) => {
+  ids.value = selection.map(item => item.tankTypeId);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+};
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  reset();
+  dialog.visible = true;
+  dialog.title = '添加机台料罐类型';
+};
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: MachineTankTypeVO) => {
+  reset();
+  const _tankTypeId = row?.tankTypeId || ids.value[0];
+  const res = await getMachineTankType(_tankTypeId);
+  Object.assign(form.value, res.data);
+  dialog.visible = true;
+  dialog.title = '修改机台料罐类型';
+};
+
+/** 提交按钮 */
+const submitForm = () => {
+  machineTankTypeFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.tankTypeId) {
+        await updateMachineTankType(form.value).finally(() => buttonLoading.value = false);
+      } else {
+        await addMachineTankType(form.value).finally(() => buttonLoading.value = false);
+      }
+      proxy?.$modal.msgSuccess('操作成功');
+      dialog.visible = false;
+      await getList();
+    }
+  });
+};
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: MachineTankTypeVO) => {
+  const _tankTypeIds = row?.tankTypeId || ids.value;
+  await proxy?.$modal.confirm('是否确认删除机台料罐类型编号为"' + _tankTypeIds + '"的数据项？').finally(() => loading.value = false);
+  await delMachineTankType(_tankTypeIds);
+  proxy?.$modal.msgSuccess('删除成功');
+  await getList();
+};
+
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download('mes/machineTankType/export', {
+    ...queryParams.value
+  }, `machineTankType_${new Date().getTime()}.xlsx`);
+};
+
+onMounted(() => {
+  getMachineOptions();
+  getList();
+});
+</script>