diff --git a/src/views/mtm/materials_form_gx.vue b/src/views/mtm/materials_form_gx.vue
index 9990e240..a519a763 100644
--- a/src/views/mtm/materials_form_gx.vue
+++ b/src/views/mtm/materials_form_gx.vue
@@ -113,6 +113,13 @@
 							</el-form-item>
 						</el-col>
 						<!-- 光芯 -->
+						<el-col :md="12" :sm="24" v-if="form.type == 40">
+							<el-form-item label="仓库位号">
+								<el-input
+									v-model="form.bin_number_main"
+								/>
+							</el-form-item>
+						</el-col>
 						<el-col :md="12" :sm="24" v-if="form.type !== 20">
 							<el-form-item label="物料单价">
 								<el-input-number
@@ -127,6 +134,11 @@
 								<el-switch v-model="form.is_hidden" />
 							</el-form-item>
 						</el-col>
+						<el-col :md="12" :sm="24" v-if="form.type == 40">
+							<el-form-item label="是否进入车间库存">
+								<el-switch v-model="form.into_wm" />
+							</el-form-item>
+						</el-col>
 						<el-col :md="12" :sm="24" v-if="form.type==10||form.type==20">
 							<el-form-item label="产品图纸">
 								<sc-upload v-model="form.photo" :modelValue="form.photo" title="产品图纸"></sc-upload>
@@ -252,6 +264,9 @@ export default {
 		},
 		typeChange(val) {
 			this.getMaterial(val);
+			if(this.form.type == 40) {
+				this.form.into_wm = false;
+			}
 		},
 		//提交
 		submit() {
@@ -300,6 +315,7 @@ export default {
 				that.form.is_hidden = data.is_hidden;
 				that.form.unit_price = data.unit_price;
 				that.form.photo = data.photo;
+				that.form.into_wm = data.into_wm;
 				that.form.photo_number = data.photo_number;
 			}else{
 				Object.assign(this.form, data);
diff --git a/src/views/mtm/materials_gx.vue b/src/views/mtm/materials_gx.vue
index ee4b0cfa..b707e949 100644
--- a/src/views/mtm/materials_gx.vue
+++ b/src/views/mtm/materials_gx.vue
@@ -107,6 +107,8 @@
 							width="80"
 						>
 						</el-table-column>
+						<el-table-column label="仓库位号" prop="bin_number_main" v-if="project_code=='gx'">
+						</el-table-column>
 						<el-table-column label="追踪方式" prop="tracking" v-if="project_code=='bxerp'">
 							<template #default="scope">
 								<el-tag v-if="scope.row.tracking == 10">批次</el-tag>