diff --git a/.env.local b/.env.local
index 2167ba7a..5bdf058c 100644
--- a/.env.local
+++ b/.env.local
@@ -8,7 +8,7 @@ VITE_DEV=true
 # 线上环境
 # VITE_BASE_URL='https://besure.ngsk.tech:7001' 
 # 本地联调
-VITE_BASE_URL='http://192.168.5.107:48081' 
+VITE_BASE_URL='http://localhost:48081' 
 # VITE_BASE_URL='http://192.168.5.135:48081' 
 
 
diff --git a/src/views/mes/feedingrecord/index.vue b/src/views/mes/feedingrecord/index.vue
index 0f5d6563..99529200 100644
--- a/src/views/mes/feedingrecord/index.vue
+++ b/src/views/mes/feedingrecord/index.vue
@@ -111,11 +111,11 @@
       <el-table-column label="数量" align="center" prop="weight" />
       <el-table-column label="记录人" align="center" prop="userName" />
       <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="状态" align="center" prop="recordStatus">
+      <!-- <el-table-column label="状态" align="center" prop="recordStatus">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.MES_FEEDING_RECORD_STATUS" :value="scope.row.recordStatus" />
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column
         label="投料时间"
         align="center"
@@ -126,7 +126,7 @@
 
       <el-table-column label="操作" align="center" width="200px">
         <template #default="scope">
-          <el-button
+          <!-- <el-button
             link
             type="primary"
             @click="openForm('update', scope.row.id)"
@@ -134,7 +134,7 @@
             v-if="scope.row.recordStatus=='1'"
           >
             编辑
-          </el-button>
+          </el-button> -->
           <el-button
             link
             type="danger"
diff --git a/src/views/mes/plan/components/PlanDetail.vue b/src/views/mes/plan/components/PlanDetail.vue
index 2081ad65..5b7a61a8 100644
--- a/src/views/mes/plan/components/PlanDetail.vue
+++ b/src/views/mes/plan/components/PlanDetail.vue
@@ -176,12 +176,11 @@ const formRef = ref() // 表单 Ref
 /** 打开弹窗 */
 const open = async (id?: number) => {
   dialogVisible.value = true
-  // dialogTitle.value = t('action.' + type)
+  dialogTitle.value = t('action.' + '详情')
   // formType.value = type
   editDisable.value = false
   resetForm()
   formData.value = await PlanApi.getPlan(id)
-  console.log()
 }
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 
diff --git a/src/views/mes/plan/index.vue b/src/views/mes/plan/index.vue
index 4d62170c..075ce24a 100644
--- a/src/views/mes/plan/index.vue
+++ b/src/views/mes/plan/index.vue
@@ -236,8 +236,7 @@
           <el-button
             link
             type="primary"
-            v-hasPermi="['mes:plan:update']"
-            @click="handleZjStatus(scope.row.code, scope.row.id)"
+            @click="openZjProductForm(scope.row.productId,'pre',6,scope.row.id,scope.row.isZj)"
             v-if="scope.row.status === 6"
           >
             检验
@@ -324,6 +323,9 @@
 
     <!-- 详情弹窗 -->
   <PlanDetail ref="detailRef" />
+
+      <!-- 产品质检弹出 -->
+  <ZjProductRecord ref="zjProductRecordFormRef" @success="getList" />
 </template>
 
 <script setup lang="ts">
@@ -342,6 +344,7 @@ import Baogong from "./components/Baogong.vue";
 import ItemRequisitionDetailList from "@/views/mes/itemrequisition/components/ItemRequisitionDetailList.vue";
 import ZjProductPreList from "@/views/mes/zjproduct/components/ZjProductPreList.vue";
 import BaogongRecordList from "@/views/mes/baogongrecord/components/BaogongRecordList.vue";
+import ZjProductRecord from "@/views/mes/zjproductrecord/components/ZjProductRecordForm.vue";
 
 const productList = ref<ProductVO[]>([]) // 产品列表
 const taskList = ref<TaskVO[]>([]) // 列表
@@ -482,6 +485,13 @@ const openBaogongForm = (planCode: string, planId: number) => {
   baogongFormRef.value.open(planCode, planId)
 }
 
+/** 质检 */
+const zjProductRecordFormRef = ref()
+const openZjProductForm = (productId: number,type:string, status:number,id: number, isZj: number) => {
+  zjProductRecordFormRef.value.open(productId,type,status,id,isZj)
+}
+
+
 /** 开工 */
 const handleStatus = async (planCode:string, id: number,
                            type:string, status:number, tip:string, isZj: number) => {
diff --git a/src/views/mes/zjproductrecord/ZjProductRecordForm.vue b/src/views/mes/zjproductrecord/ZjProductRecordForm.vue
new file mode 100644
index 00000000..a7814783
--- /dev/null
+++ b/src/views/mes/zjproductrecord/ZjProductRecordForm.vue
@@ -0,0 +1,131 @@
+<template>
+  <Dialog :title="dialogTitle" v-model="dialogVisible">
+    <el-form
+      ref="formRef"
+      :model="formData"
+      :rules="formRules"
+      label-width="100px"
+      v-loading="formLoading"
+    >
+      <el-form-item label="工序" prop="type">
+        <el-select v-model="formData.type" placeholder="请选择工序">
+          <el-option label="请选择字典生成" value="" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="名称" prop="name">
+        <el-input v-model="formData.name" placeholder="请输入名称" />
+      </el-form-item>
+      <el-form-item label="单位" prop="unit">
+        <el-input v-model="formData.unit" placeholder="请输入单位" />
+      </el-form-item>
+      <el-form-item label="上限值" prop="upperVal">
+        <el-input v-model="formData.upperVal" placeholder="请输入上限值" />
+      </el-form-item>
+      <el-form-item label="下限值" prop="lowerVal">
+        <el-input v-model="formData.lowerVal" placeholder="请输入下限值" />
+      </el-form-item>
+      <el-form-item label="关联产品id" prop="productId">
+        <el-input v-model="formData.productId" placeholder="请输入关联产品id" />
+      </el-form-item>
+      <el-form-item label="备注" prop="remark">
+        <el-input v-model="formData.remark" placeholder="请输入备注" />
+      </el-form-item>
+      <el-form-item label="关联计划id" prop="planId">
+        <el-input v-model="formData.planId" placeholder="请输入关联计划id" />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script setup lang="ts">
+import { ZjProductRecordApi, ZjProductRecordVO } from '@/api/mes/zjproductrecord'
+
+/** 试产质检记录 表单 */
+defineOptions({ name: 'ZjProductRecordForm' })
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formData = ref({
+  id: undefined,
+  type: undefined,
+  name: undefined,
+  unit: undefined,
+  upperVal: undefined,
+  lowerVal: undefined,
+  productId: undefined,
+  remark: undefined,
+  planId: undefined
+})
+const formRules = reactive({
+  type: [{ required: true, message: '工序不能为空', trigger: 'change' }],
+  name: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  productId: [{ required: true, message: '关联产品id不能为空', trigger: 'blur' }]
+})
+const formRef = ref() // 表单 Ref
+
+/** 打开弹窗 */
+const open = async (type: string, id?: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      formData.value = await ZjProductRecordApi.getZjProductRecord(id)
+    } finally {
+      formLoading.value = false
+    }
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  await formRef.value.validate()
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = formData.value as unknown as ZjProductRecordVO
+    if (formType.value === 'create') {
+      await ZjProductRecordApi.createZjProductRecord(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await ZjProductRecordApi.updateZjProductRecord(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    type: undefined,
+    name: undefined,
+    unit: undefined,
+    upperVal: undefined,
+    lowerVal: undefined,
+    productId: undefined,
+    remark: undefined,
+    planId: undefined
+  }
+  formRef.value?.resetFields()
+}
+</script>
\ No newline at end of file
diff --git a/src/views/mes/zjproductrecord/components/ZjProductRecordForm.vue b/src/views/mes/zjproductrecord/components/ZjProductRecordForm.vue
new file mode 100644
index 00000000..d8383524
--- /dev/null
+++ b/src/views/mes/zjproductrecord/components/ZjProductRecordForm.vue
@@ -0,0 +1,144 @@
+<template>
+  <Dialog :title="dialogTitle" v-model="dialogVisible" width="1200px">
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+      <el-table-column label="工序" align="center" prop="type" >
+      <template #default="scope">
+          <dict-tag :type="DICT_TYPE.MES_ORG_TYPE" :value="scope.row.type" />
+        </template>
+      </el-table-column>  
+      <el-table-column label="名称" align="center" prop="name" />
+      <el-table-column label="单位" align="center" prop="unit" />
+      <el-table-column label="上限值" align="center" prop="upperVal" />
+      <el-table-column label="下限值" align="center" prop="lowerVal" />
+      <el-table-column label="实际值" align="center" prop="realVal" >
+         <template #default="{ row }">
+        <el-input :disabled = "planisZj === 1" v-model="row.realVal" placeholder="请输入实际值" />
+          </template>
+        </el-table-column>
+      <el-table-column label="备注" align="center" prop="remark" >
+        <template #default="{ row }">
+         <!-- <el-form-item :prop="`${$index}.remark`"> -->
+        <el-input :disabled = "planisZj === 1" v-model="row.remark" placeholder="请输入备注" />
+        <!-- </el-form-item> -->
+          </template>
+        </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <!-- <Pagination
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    /> -->
+  </ContentWrap>
+  <template #footer>
+      <el-button v-if = "planisZj === 0" @click="submitForm" type="primary" :disabled="formLoading" >确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+
+<script setup lang="ts">
+import { ZjProductRecordApi, ZjProductRecordVO } from '@/api/mes/zjproductrecord'
+import {DICT_TYPE} from '@/utils/dict'
+import { PlanApi } from '@/api/mes/plan'
+
+/** 试产质检记录 列表 */
+defineOptions({ name: 'ZjProductRecord' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const loading = ref(false) // 列表的加载中
+const list = ref<ZjProductRecordVO[]>([]) // 列表的数据
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const total = ref(0) // 列表的总页数
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 100,
+  type: undefined,
+  name: undefined,
+  unit: undefined,
+  upperVal: undefined,
+  lowerVal: undefined,
+  productId: undefined,
+  realVal: undefined,
+  remark: undefined,
+  createTime: [],
+  planId: undefined
+})
+
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await ZjProductRecordApi.getZjProductRecordPage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+const planId = ref('')
+const planType = ref('')
+const planStatus = ref(0)
+const planisZj = ref(0)
+
+/** 打开弹窗 */
+const open = async (productId?: number,type?:string, status?:number,id?:number,isZj?:number) => {
+  planType.value = type
+  planStatus.value = status
+  planId.value = id
+  planisZj.value = isZj
+  dialogVisible.value = true
+  dialogTitle.value = t('质检')
+  loading.value = true
+    console.log('hhhh')
+  try {
+    queryParams.productId = productId
+    const data = await ZjProductRecordApi.getZjProductRecordPage(queryParams)
+    console.log('rrr')
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  // await formRef.value.validate()
+  // 提交请求
+  formLoading.value = true
+  try {
+    await ZjProductRecordApi.updateZjProductRecordBatch(list.value)
+    // 发起
+    const data ={
+      id: planId.value,
+      code: planType.value,
+      status: planStatus.value // 状态
+    }
+    await PlanApi.updatePlanZjStatus(data) 
+    message.success(t('common.createSuccess'))
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+/** 初始化 **/
+// onMounted(() => {
+//   getList()
+// })
+</script>
\ No newline at end of file
diff --git a/src/views/mes/zjproductrecord/index.vue b/src/views/mes/zjproductrecord/index.vue
new file mode 100644
index 00000000..b0dc8663
--- /dev/null
+++ b/src/views/mes/zjproductrecord/index.vue
@@ -0,0 +1,265 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form
+      class="-mb-15px"
+      :model="queryParams"
+      ref="queryFormRef"
+      :inline="true"
+      label-width="68px"
+    >
+      <el-form-item label="工序" prop="type">
+        <el-select
+          v-model="queryParams.type"
+          placeholder="请选择工序"
+          clearable
+          class="!w-240px"
+        >
+          <el-option label="请选择字典生成" value="" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="名称" prop="name">
+        <el-input
+          v-model="queryParams.name"
+          placeholder="请输入名称"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="单位" prop="unit">
+        <el-input
+          v-model="queryParams.unit"
+          placeholder="请输入单位"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="上限值" prop="upperVal">
+        <el-input
+          v-model="queryParams.upperVal"
+          placeholder="请输入上限值"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="下限值" prop="lowerVal">
+        <el-input
+          v-model="queryParams.lowerVal"
+          placeholder="请输入下限值"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="关联产品id" prop="productId">
+        <el-input
+          v-model="queryParams.productId"
+          placeholder="请输入关联产品id"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="备注" prop="remark">
+        <el-input
+          v-model="queryParams.remark"
+          placeholder="请输入备注"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="创建时间" prop="createTime">
+        <el-date-picker
+          v-model="queryParams.createTime"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          type="daterange"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+          class="!w-220px"
+        />
+      </el-form-item>
+      <el-form-item label="关联计划id" prop="planId">
+        <el-input
+          v-model="queryParams.planId"
+          placeholder="请输入关联计划id"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
+        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
+        <el-button
+          type="primary"
+          plain
+          @click="openForm('create')"
+          v-hasPermi="['mes:zj-product-record:create']"
+        >
+          <Icon icon="ep:plus" class="mr-5px" /> 新增
+        </el-button>
+        <el-button
+          type="success"
+          plain
+          @click="handleExport"
+          :loading="exportLoading"
+          v-hasPermi="['mes:zj-product-record:export']"
+        >
+          <Icon icon="ep:download" class="mr-5px" /> 导出
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+      <el-table-column label="ID" align="center" prop="id" />
+      <el-table-column label="工序" align="center" prop="type" />
+      <el-table-column label="名称" align="center" prop="name" />
+      <el-table-column label="单位" align="center" prop="unit" />
+      <el-table-column label="上限值" align="center" prop="upperVal" />
+      <el-table-column label="下限值" align="center" prop="lowerVal" />
+      <el-table-column label="关联产品id" align="center" prop="productId" />
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column
+        label="创建时间"
+        align="center"
+        prop="createTime"
+        :formatter="dateFormatter"
+        width="180px"
+      />
+      <el-table-column label="关联计划id" align="center" prop="planId" />
+      <el-table-column label="操作" align="center" min-width="120px">
+        <template #default="scope">
+          <el-button
+            link
+            type="primary"
+            @click="openForm('update', scope.row.id)"
+            v-hasPermi="['mes:zj-product-record:update']"
+          >
+            编辑
+          </el-button>
+          <el-button
+            link
+            type="danger"
+            @click="handleDelete(scope.row.id)"
+            v-hasPermi="['mes:zj-product-record:delete']"
+          >
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <ZjProductRecordForm ref="formRef" @success="getList" />
+</template>
+
+<script setup lang="ts">
+import { dateFormatter } from '@/utils/formatTime'
+import download from '@/utils/download'
+import { ZjProductRecordApi, ZjProductRecordVO } from '@/api/mes/zjproductrecord'
+import ZjProductRecordForm from './ZjProductRecordForm.vue'
+
+/** 试产质检记录 列表 */
+defineOptions({ name: 'ZjProductRecord' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const loading = ref(true) // 列表的加载中
+const list = ref<ZjProductRecordVO[]>([]) // 列表的数据
+const total = ref(0) // 列表的总页数
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  type: undefined,
+  name: undefined,
+  unit: undefined,
+  upperVal: undefined,
+  lowerVal: undefined,
+  productId: undefined,
+  remark: undefined,
+  createTime: [],
+  planId: undefined
+})
+const queryFormRef = ref() // 搜索的表单
+const exportLoading = ref(false) // 导出的加载中
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await ZjProductRecordApi.getZjProductRecordPage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = (type: string, id?: number) => {
+  formRef.value.open(type, id)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await ZjProductRecordApi.deleteZjProductRecord(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ZjProductRecordApi.exportZjProductRecord(queryParams)
+    download.excel(data, '试产质检记录.xls')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+</script>
\ No newline at end of file