diff --git a/mes-ui/mes-ui-admin-vue3/src/views/biz/storage/StorageForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/biz/storage/StorageForm.vue
index 97554704..4577dbec 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/biz/storage/StorageForm.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/biz/storage/StorageForm.vue
@@ -1,5 +1,5 @@
 <template>
-  <!-- 退料 -->
+  <!-- 入库 -->
   <el-card class="hl-card" style="position: relative">
     <template #header>
       <span v-text="dialogTitle"></span>
@@ -25,14 +25,14 @@
           <el-col :span="8">
             <el-row>
               <el-col :span="24">
-                <el-form-item prop="name" label="退料单号">
+                <el-form-item prop="name" label="入库单号">
                   <el-input v-model="formData.stockNo" disabled placeholder="系统自动生成" />
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row>
               <el-col :span="24">
-                <el-form-item prop="stockInType" label="退料类型">
+                <el-form-item prop="stockInType" label="入库类型">
                   <el-select
                     v-model="formData.stockInType"
                     clearable
@@ -224,7 +224,7 @@
                     </template>
                   </el-table-column>
                   <el-table-column prop="storageOkQty" min-width="160" align="center">
-                    <template #header> <span class="hl-table_header">*</span>本次退料数量</template>
+                    <template #header> <span class="hl-table_header">*</span>本次入库数量</template>
                     <template #default="scope">
                       <el-form-item
                         :prop="`${scope.$index}.storageOkQty`"
@@ -526,7 +526,7 @@ const formData = ref({
 const formRules = reactive({
   // name: [{ required: true, message: '模具类型不能为空', trigger: 'blur' }],
   status: [{ required: true, message: '启用状态不能为空', trigger: 'blur' }],
-  stockInType: [{ required: true, message: '退料类型不能为空', trigger: 'blur' }],
+  stockInType: [{ required: true, message: '入库类型不能为空', trigger: 'blur' }],
   whId: [{ required: true, message: '接收仓库不能为空', trigger: 'blur' }]
 })
 const formRef = ref() // 表单 Ref
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/biz/storage/StorageOut.vue b/mes-ui/mes-ui-admin-vue3/src/views/biz/storage/StorageOut.vue
index e2569e7f..018d8ef6 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/biz/storage/StorageOut.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/biz/storage/StorageOut.vue
@@ -27,7 +27,7 @@
             <el-row>
               <el-col :span="24">
                 <el-form-item prop="name" label="出库单号">
-                  <el-input v-model="formData.stockNo" disabled placeholder="系统自动生成" />
+                  <el-input v-model="formData.stockNo"  class="!w-400px" disabled placeholder="系统自动生成" />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -37,7 +37,7 @@
                   <el-select
                     v-model="formData.stockInType"
                     clearable
-                    style="width: 100%"
+                    class="!w-400px"
                     @change="handleStockType"
                     disabled
                   >
@@ -57,7 +57,7 @@
                   <el-select
                     :disabled="!formData.projectOrderCode || activetype !== 'create'"
                     v-model="formData.materialMode"
-                    style="width: 100%"
+                     class="!w-400px"
                   >
                     <el-option
                       v-for="dict in getIntDictOptions(DICT_TYPE.BIZ_STORAGE_OUT_MODE)"
@@ -107,6 +107,23 @@
                   </el-input>
                 </el-form-item>
               </el-col>
+              <el-col :span="24">
+                <el-form-item prop="materialMode" label="领料车间">
+                  <WorkshopSelect v-model="formData.workshopId" :disabled=" activetype !== 'create'" class="!w-400px" @update:newValue="handleSelectedWorkshop" />
+                  <!-- <el-select
+                    :disabled=" activetype !== 'create'"
+                    v-model="formData.materialMode"
+                     class="!w-400px"
+                  >
+                    <el-option
+                      v-for="dict in getIntDictOptions(DICT_TYPE.BIZ_STORAGE_OUT_MODE)"
+                      :key="dict.value"
+                      :label="dict.label"
+                      :value="dict.value"
+                    />
+                  </el-select> -->
+                </el-form-item>
+              </el-col>
             </el-row>
           </el-col>
           <el-col :span="8">
@@ -709,6 +726,7 @@ import projects from './subproject.vue'
 import taskdispatchselect from './taskdispatchselect.vue'
 import { useCommonStore } from '@/store/modules/common'
 import { id } from 'node_modules/element-plus/es/locale'
+import WorkshopSelect from '@/views/biz/hlvuestyle/workshopSelect.vue'
 
 const reload: any = inject('reload')
 const commonStore = useCommonStore()
@@ -1262,6 +1280,11 @@ const handleSelectedProcedure = async (row: any, newValue: any) => {
     row.procedureId = undefined
   }
 }
+//接收车间传递的数据
+const handleSelectedWorkshop = (newValue: any) => {
+  formData.value.workshopId = newValue?.id
+  // formData.value.workshopName = newValue?.name
+}
 </script>
 <style>
 a {
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/biz/storage/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/biz/storage/index.vue
index 2564e7b9..001cf859 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/biz/storage/index.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/biz/storage/index.vue
@@ -1,6 +1,6 @@
 <template>
   <el-card class="hl-card">
-    <template #header> <span>退料申请</span></template>
+    <template #header> <span>入库申请</span></template>
     <ContentWrap class="borderxx">
       <!-- 搜索工作栏 -->
       <el-form
@@ -10,10 +10,10 @@
         :inline="true"
         label-width="108px"
       >
-        <el-form-item label="退料单号" prop="stockNo">
+        <el-form-item label="入库单号" prop="stockNo">
           <el-input
             v-model="queryParams.stockNo"
-            placeholder="退料单号"
+            placeholder="入库单号"
             clearable
             @keyup.enter="handleQuery"
             class="!w-240px"
@@ -102,14 +102,14 @@
       >
         <!-- <el-table-column label="主键id" align="center" prop="id" /> -->
         <el-table-column type="index" width="100" fixed label="序号" align="center" />
-        <el-table-column label="退料单号" align="center" prop="stockNo" min-width="210" fixed>
+        <el-table-column label="入库单号" align="center" prop="stockNo" min-width="210" fixed>
           <template #default="scope">
             <el-button text type="primary" @click="openDetail('review', scope.row.id)">
               {{ scope.row.stockNo }}
             </el-button>
           </template>
         </el-table-column>
-        <el-table-column label="退料类型" align="center" prop="stockInType" min-width="120">
+        <el-table-column label="入库类型" align="center" prop="stockInType" min-width="120">
           <template #default="scope">
             <dict-tag :type="DICT_TYPE.BIZ_STORAGE_IN_TYPE" :value="scope.row.stockInType" />
           </template>
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/biz/storage/indexAudit.vue b/mes-ui/mes-ui-admin-vue3/src/views/biz/storage/indexAudit.vue
index 92fe2ceb..2c19711d 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/biz/storage/indexAudit.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/biz/storage/indexAudit.vue
@@ -1,6 +1,6 @@
 <template>
   <el-card class="hl-card">
-    <template #header> <span>退料审核</span></template>
+    <template #header> <span>入库审核</span></template>
     <ContentWrap class="borderxx">
       <!-- 搜索工作栏 -->
       <el-form
@@ -10,10 +10,10 @@
         :inline="true"
         label-width="108px"
       >
-        <el-form-item label="退料单号" prop="stockNo">
+        <el-form-item label="入库单号" prop="stockNo">
           <el-input
             v-model="queryParams.stockNo"
-            placeholder="退料单号"
+            placeholder="入库单号"
             clearable
             @keyup.enter="handleQuery"
             class="!w-240px"
@@ -102,14 +102,14 @@
       >
         <!-- <el-table-column label="主键id" align="center" prop="id" /> -->
         <el-table-column type="index" width="100" fixed label="序号" align="center" />
-        <el-table-column label="退料单号" align="center" prop="stockNo" min-width="210" fixed>
+        <el-table-column label="入库单号" align="center" prop="stockNo" min-width="210" fixed>
           <template #default="scope">
             <el-button text type="primary" @click="openDetail('review', scope.row.id)">
               {{ scope.row.stockNo }}
             </el-button>
           </template>
         </el-table-column>
-        <el-table-column label="退料类型" align="center" prop="stockInType" min-width="120">
+        <el-table-column label="入库类型" align="center" prop="stockInType" min-width="120">
           <template #default="scope">
             <dict-tag :type="DICT_TYPE.BIZ_STORAGE_IN_TYPE" :value="scope.row.stockInType" />
           </template>
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/biz/storage/outdex.vue b/mes-ui/mes-ui-admin-vue3/src/views/biz/storage/outdex.vue
index 9cbcbe69..f1d47b83 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/biz/storage/outdex.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/biz/storage/outdex.vue
@@ -1,7 +1,7 @@
 <template>
   <el-card class="hl-card">
     <template #header>
-      <span>领料申请</span>
+      <span>入库申请</span>
     </template>
     <ContentWrap class="borderxx">
       <!-- 搜索工作栏 -->
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/biz/storage/outdexAudit.vue b/mes-ui/mes-ui-admin-vue3/src/views/biz/storage/outdexAudit.vue
index 90484865..12c24ac6 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/biz/storage/outdexAudit.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/biz/storage/outdexAudit.vue
@@ -1,7 +1,7 @@
 <template>
   <el-card class="hl-card">
     <template #header>
-      <span>领料审核</span>
+      <span>入库审核</span>
     </template>
     <ContentWrap class="borderxx">
       <!-- 搜索工作栏 -->