diff --git a/src/api/materialManagement/productionMaterial/mminventory.js b/src/api/materialManagement/productionMaterial/mminventory.js
index 6402ce9..99517fe 100644
--- a/src/api/materialManagement/productionMaterial/mminventory.js
+++ b/src/api/materialManagement/productionMaterial/mminventory.js
@@ -55,3 +55,60 @@ export function delMmInventory(pid) {
         method: 'POST'
     })
 }
+
+/**
+ * 获取物料编码下拉列表
+ */ 
+export function getMaterialOption(query) {
+    return request({
+        url: 'mes/productionMaterial/MmInventory/GetMaterialOption/',
+        method: 'post',
+        data: query
+    })
+}
+
+/**
+ * 获取入库类型列表
+ */ 
+export function getTransactionOption(query) {
+    return request({
+        url: 'mes/productionMaterial/MmInventory/GetTransactionOption/',
+        method: 'post',
+        data: query
+    })
+}
+
+/**
+ * 新增入库单
+ * @param data
+ */
+export function createInboundReceipt(data) {
+    return request({
+        url: 'mes/productionMaterial/MmInventory/CreateInboundReceipt',
+        method: 'post',
+        data: data
+    })
+}
+
+/**
+ * 获取库位编码下拉列表
+ */ 
+export function getLocationOption(query) {
+    return request({
+        url: 'mes/productionMaterial/MmInventory/GetLocationOption/',
+        method: 'post',
+        data: query
+    })
+}
+
+/**
+ * 新增出库单
+ * @param data
+ */
+export function createOutboundReceipt(data) {
+    return request({
+        url: 'mes/productionMaterial/MmInventory/CreateOutboundReceipt',
+        method: 'post',
+        data: data
+    })
+}
diff --git a/src/i18n/lang/en.json b/src/i18n/lang/en.json
index 2126ae1..0460090 100644
--- a/src/i18n/lang/en.json
+++ b/src/i18n/lang/en.json
@@ -1,189 +1,191 @@
 {
-  "menu": {
-    "home": "Home",
-    "dashboard": "Dashboard",
-    "system": "System",
-    "monitoring": "Monitoring",
-    "systemTools": "Tools",
-    "externalOpen": "External open",
-    "icon": "Icon",
-    "systemMenu": "Menu",
-    "systemRole": "Role",
-    "systemUser": "User",
-    "systemDept": "Dept",
-    "systemDic": "Dict",
-    "systemPost": "Post",
-    "systemParam": "Config",
-    "systemLog": "Log",
-    "operLog": "Oper log",
-    "loginLog": "Login log",
-    "systemNotice": "Notice",
-    "systemLang": "Language set",
-    "timedTask": "Timed task",
-    "serviceMonitor": "Service monitoring",
-    "codeGeneration": "Code generation",
-    "systemInterface": "System interface",
-    "sendEmail": "Email",
-    "systemArticle": "Article",
-    "articleList": "Article list",
-    "formBuild": "Form building",
-    "officialWebsite": "Official website",
-    "fileStorage": "File storage",
-    "personalCenter": "Personal",
-    "menuPermi": "Menu permissions",
-    "assignUsers": "Authorized user",
-    "cacheMonitor": "Cache monitoring"
-  },
-  "tagsView": {
-    "refresh": "refresh",
-    "close": "close",
-    "closeOther": "close other",
-    "closeLeft": "close left",
-    "closeRight": "close right",
-    "closeAll": "close all",
-    "fullscreen": "fullscreen",
-    "closeFullscreen": "close fullscreen"
-  },
-  "layout": {
-    "tip1": "If you feel good, welcome to ⭐ Star ⭐ Collect it so that the author can continue to be free. Thank you!",
-    "rewardUser": "Reward the author with a cup of coffee to express encouragement",
-    "contactUs": "contact us",
-    "donationSupport": "donation support",
-    "officialWebsite": "Official website",
-    "qqGroup": "QQ Group",
-    "changeLog": "change log",
-    "currentVersion": "current version",
-    "codeSourceAddress": "source address",
-    "fullscreen": "fullscreen",
-    "sizeSelect": "size",
-    "personalCenter": "Personal center",
-    "layoutSetting": "layout setting",
-    "logOut": "Login out",
-    "themeStyleSet": "theme style settings",
-    "themeColor": "theme color",
-    "sysLayoutSet": "system layout settings",
-    "open": "open",
-    "fixed": "fixed",
-    "show": "show",
-    "dynamicTitle": "dynamic title",
-    "darkMode": "dark",
-    "lightMode": "light",
-    "saveConfig": "save",
-    "resetConfig": "reset",
-    "logOutConfirm": "Are you sure you want to exit the current login?",
-    "large": "Large",
-    "default": "Default",
-    "small": "Small",
-    "myWorkbench": "My workbench",
-    "onlineUsers": "Online user",
-    "message": "Message",
-    "amount": "Amount",
-    "order": "Order",
-    "modifyInformation": "Modify information",
-    "technicalSelection": "Technical selection",
-    "frontendTechnology": "Front-end technology",
-    "backendTechnology": "Backend technology",
-    "backstageManagement": "Backstage management",
-    "bottomBar": "Footer",
-    "identity": "Identity",
-    "content1": "The code is completely free and open source, easy to read and understand, and the interface is simple and beautiful, giving you one more choice and reference for your project.",
-    "topNav": "top nav",
-    "commonFuncs": "Common Functions",
-    "openWatermark": "Open Watermark",
-    "workTime": "Today's working times(min)",
-    "onlineClientNum": "Number of online devices",
-    "tagsView": "tabs",
-    "tagsPersist": "tabs Persist"
-  },
-  "common": {
-    "ok": "Ok",
-    "cancel": "Cancel",
-    "tips": "tips",
-    "english": "English",
-    "chinese": "Chinese",
-    "traditionalChinese": "TraditionalChinese",
-    "name": "Name",
-    "content": "Content",
-    "addTime": "AddTime",
-    "nickName": "NickName",
-    "time": "Time",
-    "yes": "Yes",
-    "no": "No",
-    "yesterday": "yesterday",
-    "thisWeek": "this week",
-    "lastWeek": "last week",
-    "thisMonth": "this month",
-    "lastMonth": "last month",
-    "today": "today",
-    "female": "Female",
-    "male": "male",
-    "sex": "gender",
-    "systemTips": "system hint",
-    "default": "default",
-    "hidden": "hide",
-    "show": "show",
-    "system": "system",
-    "abnormal": "abnormal",
-    "unknow": "unknown",
-    "normal": "normal",
-    "disable": "deactivate"
-  },
-  "btn": {
-    "add": "Add",
-    "delete": "Delete",
-    "edit": "Edit",
-    "search": "Search",
-    "reset": "Reset",
-    "preview": "Preview",
-    "import": "Import",
-    "export": "Export",
-    "synchronize": "Synchronize",
-    "generateCode": "GenerateCode",
-    "start": "Start",
-    "stop": "Stop",
-    "run": "Run",
-    "runOnce": "RunOnce",
-    "log": "Log",
-    "expand": "Expand",
-    "collapse": "Collapse",
-    "details": "Details",
-    "submit": "Submit",
-    "cancel": "Cancel",
-    "more": "More",
-    "save": "Save",
-    "close": "Close",
-    "authorize": "Authorize",
-    "multi": "Multi",
-    "upload": "Upload",
-    "view": "To view",
-    "copy": "Copy",
-    "operate": "Operate",
-    "clean": "Clean",
-	"next": "Next",
-	"back": "Back"
-  },
-  "language": "Language",
-  "languageKey": "LanguageKey",
-  "showWay": "Show Way",
-  "table": "Table",
-  "user": {
-    "phoneNumber": "cellphone number",
-    "registerTime": "Date created",
-    "basicInfo": "basic information",
-    "department": "Department",
-    "personalInfo": "Personal information",
-    "role": "own role",
-    "userEmail": "User mailbox",
-    "userName": "user name",
-    "changePwd": "change Password",
-    "confirmPwd": "Confirm Password",
-    "newPwd": "new password",
-    "oldPwd": "Old Password",
-    "nickName": "User's Nickname"
-  },
-  "steps": {
-  	"000": "Basic",
-  	"001": "Complement",
-  	"002": "Other"
-  }
+    "menu": {
+        "home": "Home",
+        "dashboard": "Dashboard",
+        "system": "System",
+        "monitoring": "Monitoring",
+        "systemTools": "Tools",
+        "externalOpen": "External open",
+        "icon": "Icon",
+        "systemMenu": "Menu",
+        "systemRole": "Role",
+        "systemUser": "User",
+        "systemDept": "Dept",
+        "systemDic": "Dict",
+        "systemPost": "Post",
+        "systemParam": "Config",
+        "systemLog": "Log",
+        "operLog": "Oper log",
+        "loginLog": "Login log",
+        "systemNotice": "Notice",
+        "systemLang": "Language set",
+        "timedTask": "Timed task",
+        "serviceMonitor": "Service monitoring",
+        "codeGeneration": "Code generation",
+        "systemInterface": "System interface",
+        "sendEmail": "Email",
+        "systemArticle": "Article",
+        "articleList": "Article list",
+        "formBuild": "Form building",
+        "officialWebsite": "Official website",
+        "fileStorage": "File storage",
+        "personalCenter": "Personal",
+        "menuPermi": "Menu permissions",
+        "assignUsers": "Authorized user",
+        "cacheMonitor": "Cache monitoring"
+    },
+    "tagsView": {
+        "refresh": "refresh",
+        "close": "close",
+        "closeOther": "close other",
+        "closeLeft": "close left",
+        "closeRight": "close right",
+        "closeAll": "close all",
+        "fullscreen": "fullscreen",
+        "closeFullscreen": "close fullscreen"
+    },
+    "layout": {
+        "tip1": "If you feel good, welcome to ⭐ Star ⭐ Collect it so that the author can continue to be free. Thank you!",
+        "rewardUser": "Reward the author with a cup of coffee to express encouragement",
+        "contactUs": "contact us",
+        "donationSupport": "donation support",
+        "officialWebsite": "Official website",
+        "qqGroup": "QQ Group",
+        "changeLog": "change log",
+        "currentVersion": "current version",
+        "codeSourceAddress": "source address",
+        "fullscreen": "fullscreen",
+        "sizeSelect": "size",
+        "personalCenter": "Personal center",
+        "layoutSetting": "layout setting",
+        "logOut": "Login out",
+        "themeStyleSet": "theme style settings",
+        "themeColor": "theme color",
+        "sysLayoutSet": "system layout settings",
+        "open": "open",
+        "fixed": "fixed",
+        "show": "show",
+        "dynamicTitle": "dynamic title",
+        "darkMode": "dark",
+        "lightMode": "light",
+        "saveConfig": "save",
+        "resetConfig": "reset",
+        "logOutConfirm": "Are you sure you want to exit the current login?",
+        "large": "Large",
+        "default": "Default",
+        "small": "Small",
+        "myWorkbench": "My workbench",
+        "onlineUsers": "Online user",
+        "message": "Message",
+        "amount": "Amount",
+        "order": "Order",
+        "modifyInformation": "Modify information",
+        "technicalSelection": "Technical selection",
+        "frontendTechnology": "Front-end technology",
+        "backendTechnology": "Backend technology",
+        "backstageManagement": "Backstage management",
+        "bottomBar": "Footer",
+        "identity": "Identity",
+        "content1": "The code is completely free and open source, easy to read and understand, and the interface is simple and beautiful, giving you one more choice and reference for your project.",
+        "topNav": "top nav",
+        "commonFuncs": "Common Functions",
+        "openWatermark": "Open Watermark",
+        "workTime": "Today's working times(min)",
+        "onlineClientNum": "Number of online devices",
+        "tagsView": "tabs",
+        "tagsPersist": "tabs Persist"
+    },
+    "common": {
+        "ok": "Ok",
+        "cancel": "Cancel",
+        "tips": "tips",
+        "english": "English",
+        "chinese": "Chinese",
+        "traditionalChinese": "TraditionalChinese",
+        "name": "Name",
+        "content": "Content",
+        "addTime": "AddTime",
+        "nickName": "NickName",
+        "time": "Time",
+        "yes": "Yes",
+        "no": "No",
+        "yesterday": "yesterday",
+        "thisWeek": "this week",
+        "lastWeek": "last week",
+        "thisMonth": "this month",
+        "lastMonth": "last month",
+        "today": "today",
+        "female": "Female",
+        "male": "male",
+        "sex": "gender",
+        "systemTips": "system hint",
+        "default": "default",
+        "hidden": "hide",
+        "show": "show",
+        "system": "system",
+        "abnormal": "abnormal",
+        "unknow": "unknown",
+        "normal": "normal",
+        "disable": "deactivate"
+    },
+    "btn": {
+        "add": "Add",
+        "delete": "Delete",
+        "edit": "Edit",
+        "search": "Search",
+        "reset": "Reset",
+        "preview": "Preview",
+        "import": "Import",
+        "export": "Export",
+        "synchronize": "Synchronize",
+        "generateCode": "GenerateCode",
+        "start": "Start",
+        "stop": "Stop",
+        "run": "Run",
+        "runOnce": "RunOnce",
+        "log": "Log",
+        "expand": "Expand",
+        "collapse": "Collapse",
+        "details": "Details",
+        "submit": "Submit",
+        "cancel": "Cancel",
+        "more": "More",
+        "save": "Save",
+        "close": "Close",
+        "authorize": "Authorize",
+        "multi": "Multi",
+        "upload": "Upload",
+        "view": "To view",
+        "copy": "Copy",
+        "operate": "Operate",
+        "clean": "Clean",
+        "next": "Next",
+        "back": "Back",
+        "storage": "Storage",
+        "outStorage": "Out Storage"
+    },
+    "language": "Language",
+    "languageKey": "LanguageKey",
+    "showWay": "Show Way",
+    "table": "Table",
+    "user": {
+        "phoneNumber": "cellphone number",
+        "registerTime": "Date created",
+        "basicInfo": "basic information",
+        "department": "Department",
+        "personalInfo": "Personal information",
+        "role": "own role",
+        "userEmail": "User mailbox",
+        "userName": "user name",
+        "changePwd": "change Password",
+        "confirmPwd": "Confirm Password",
+        "newPwd": "new password",
+        "oldPwd": "Old Password",
+        "nickName": "User's Nickname"
+    },
+    "steps": {
+        "000": "Basic",
+        "001": "Complement",
+        "002": "Other"
+    }
 }
diff --git a/src/i18n/lang/zh-cn.json b/src/i18n/lang/zh-cn.json
index c7db4d3..d40e7e6 100644
--- a/src/i18n/lang/zh-cn.json
+++ b/src/i18n/lang/zh-cn.json
@@ -160,7 +160,9 @@
 		"operate": "操作",
 		"clean": "清空",
 		"next": "下一步",
-		"back": "返回"
+		"back": "返回",
+		"storage": "填入库单",
+		"outStorage": "填出库单"
 	},
 	"user": {
 		"personalInfo": "个人信息",
diff --git a/src/i18n/lang/zh-tw.json b/src/i18n/lang/zh-tw.json
index 5b13766..d820280 100644
--- a/src/i18n/lang/zh-tw.json
+++ b/src/i18n/lang/zh-tw.json
@@ -160,7 +160,9 @@
 		"multi": "批量",
 		"clean": "清空",
 		"next": "下一步",
-		"back": "返回"
+		"back": "返回",
+		"storage": "入库",
+		"outStorage": "出库"
 	},
 	"language": "語言",
 	"languageKey": "語言key",
diff --git a/src/views/materialManagement/productionMaterial/MmInventory.vue b/src/views/materialManagement/productionMaterial/MmInventory.vue
index 0960df7..df64093 100644
--- a/src/views/materialManagement/productionMaterial/MmInventory.vue
+++ b/src/views/materialManagement/productionMaterial/MmInventory.vue
@@ -21,8 +21,11 @@
         <!-- 工具区域 -->
         <el-row :gutter="15" class="mb10">
             <el-col :span="1.5">
-                <el-button type="primary" v-hasPermi="['mminventory:add']" plain icon="plus" @click="handleAdd">
-                    {{ $t('btn.add') }}
+                <el-button type="primary" v-hasPermi="['mminventory:storage']" plain icon="plus" @click="handleStorage">
+                    {{ $t('btn.storage') }}
+                </el-button>
+                <el-button type="primary" v-hasPermi="['mminventory:outStorage']" plain icon="plus" @click="handleOutStorage">
+                    {{ $t('btn.outStorage') }}
                 </el-button>
             </el-col>
             <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
@@ -70,7 +73,8 @@
         </el-table>
         <pagination :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
 
-        <el-dialog :title="title" :lock-scroll="false" v-model="open">
+        <!-- 入库单dialog -->
+        <el-dialog :title="title" :lock-scroll="false" v-model="openStorage">
             <el-form ref="formRef" :model="form" :rules="rules" label-width="100px">
                 <el-row :gutter="20">
                     <el-col :lg="12" v-if="opertype != 1">
@@ -81,7 +85,52 @@
 
                     <el-col :lg="12">
                         <el-form-item label="物料编码" prop="materialCode">
-                            <el-input v-model="form.materialCode" placeholder="请输入物料编码" />
+                            <el-select v-model="form.materialCode" filterable placeholder="请选择">
+                                <el-option v-for="item in options" :key="item.materialCode" :label="item.materialCode" :value="item.materialCode"> </el-option>
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+
+                    <!-- <el-col :lg="12">
+                        <el-form-item label="仓库编码" prop="warehouseCode">
+                            <el-input v-model="form.warehouseCode" placeholder="请输入仓库编码" />
+                        </el-form-item>
+                    </el-col> -->
+                    <el-col :lg="12">
+                        <el-form-item label="物料分类编码" prop="categoryCode">
+                            <el-input v-model="form.categoryCode" placeholder="请输入物料分类编码" />
+                        </el-form-item>
+                    </el-col>
+
+                    <el-col :lg="12">
+                        <el-form-item label="物料名称" prop="materialName">
+                            <el-input v-model="form.materialName" placeholder="请输入物料名称" />
+                        </el-form-item>
+                    </el-col>
+
+                    <el-col :lg="12">
+                        <el-form-item label="规格型号" prop="specificationModel">
+                            <el-input v-model="form.specificationModel" placeholder="请输入规格型号" />
+                        </el-form-item>
+                    </el-col>
+
+                    <el-col :lg="12">
+                        <el-form-item label="入库类型" prop="transactionType">
+                            <el-select v-model="form.transactionType" filterable placeholder="请选择">
+                                <el-option v-for="item in transactionOptions" :key="item.value" :label="item.label" :value="item.value"> </el-option>
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+
+                    <el-col :lg="12">
+                        <el-form-item label="入库数量" prop="quantity">
+                            <el-input v-model="form.quantity" placeholder="请输入入库数量" />
+                        </el-form-item>
+                    </el-col>
+
+                    <el-col :lg="12">
+                        <el-form-item label="入库单号" prop="inboundNo">
+                            <el-input v-model="form.inboundNo" placeholder="请输入入库单号" />
                         </el-form-item>
                     </el-col>
 
@@ -91,21 +140,12 @@
                         </el-form-item>
                     </el-col>
 
-                    <el-col :lg="12">
-                        <el-form-item label="仓库名称" prop="warehouseName">
-                            <el-input v-model="form.warehouseName" placeholder="请输入仓库名称" />
-                        </el-form-item>
-                    </el-col>
-
                     <el-col :lg="12">
                         <el-form-item label="库位编码" prop="locationCode">
-                            <el-input v-model="form.locationCode" placeholder="请输入库位编码" />
-                        </el-form-item>
-                    </el-col>
-
-                    <el-col :lg="12">
-                        <el-form-item label="库位名称" prop="locationName">
-                            <el-input v-model="form.locationName" placeholder="请输入库位名称" />
+                            <el-select v-model="form.locationCode" filterable placeholder="请选择">
+                                <el-option v-for="item in locationOptions" :key="item.locationCode" :label="item.locationCode" :value="item.locationCode">
+                                </el-option>
+                            </el-select>
                         </el-form-item>
                     </el-col>
 
@@ -127,7 +167,7 @@
                         </el-form-item>
                     </el-col>
 
-                    <el-col :lg="12">
+                    <!-- <el-col :lg="12">
                         <el-form-item label="生产日期" prop="productionDate">
                             <el-date-picker v-model="form.productionDate" type="datetime" placeholder="选择日期时间" value-format="YYYY-MM-DD HH:mm:ss">
                             </el-date-picker>
@@ -146,7 +186,7 @@
                             <el-date-picker v-model="form.lastUpdatedTime" type="datetime" placeholder="选择日期时间" value-format="YYYY-MM-DD HH:mm:ss">
                             </el-date-picker>
                         </el-form-item>
-                    </el-col>
+                    </el-col> -->
 
                     <el-col :lg="12">
                         <el-form-item label="创建时间" prop="createdTime">
@@ -158,14 +198,148 @@
             </el-form>
             <template #footer v-if="opertype != 3">
                 <el-button text @click="cancel">{{ $t('btn.cancel') }}</el-button>
-                <el-button type="primary" @click="submitForm">{{ $t('btn.submit') }}</el-button>
+                <el-button type="primary" @click="submitFormStorage">{{ $t('btn.submit') }}</el-button>
+            </template>
+        </el-dialog>
+        <!-- 出库单dialog -->
+        <el-dialog :title="title" :lock-scroll="false" v-model="openOutStorage">
+            <el-form ref="formRef" :model="form" :rules="rulesOut" label-width="100px">
+                <el-row :gutter="20">
+                    <el-col :lg="12" v-if="opertype != 1">
+                        <el-form-item label="主键ID" prop="id">
+                            <el-input-number v-model.number="form.id" controls-position="right" placeholder="请输入主键ID" :disabled="true" />
+                        </el-form-item>
+                    </el-col>
+
+                    <el-col :lg="12">
+                        <el-form-item label="物料编码" prop="materialCode">
+                            <el-select v-model="form.materialCode" filterable placeholder="请选择">
+                                <el-option v-for="item in options" :key="item.materialCode" :label="item.materialCode" :value="item.materialCode"> </el-option>
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+
+                    <el-col :lg="12">
+                        <el-form-item label="物料分类编码" prop="categoryCode">
+                            <el-input v-model="form.categoryCode" placeholder="请输入物料分类编码" />
+                        </el-form-item>
+                    </el-col>
+
+                    <el-col :lg="12">
+                        <el-form-item label="物料名称" prop="materialName">
+                            <el-input v-model="form.materialName" placeholder="请输入物料名称" />
+                        </el-form-item>
+                    </el-col>
+
+                    <el-col :lg="12">
+                        <el-form-item label="规格型号" prop="specificationModel">
+                            <el-input v-model="form.specificationModel" placeholder="请输入规格型号" />
+                        </el-form-item>
+                    </el-col>
+
+                    <el-col :lg="12">
+                        <el-form-item label="出库类型" prop="transactionType">
+                            <el-select v-model="form.transactionType" filterable placeholder="请选择">
+                                <el-option v-for="item in transactionOptions" :key="item.value" :label="item.label" :value="item.value"> </el-option>
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+
+                    <el-col :lg="12">
+                        <el-form-item label="出库数量" prop="quantity">
+                            <el-input v-model="form.quantity" placeholder="请输入入库数量" />
+                        </el-form-item>
+                    </el-col>
+
+                    <el-col :lg="12">
+                        <el-form-item label="出库单号" prop="outboundNo">
+                            <el-input v-model="form.outboundNo" placeholder="请输入出库单号" />
+                        </el-form-item>
+                    </el-col>
+
+                    <el-col :lg="12">
+                        <el-form-item label="仓库编码" prop="warehouseCode">
+                            <el-input v-model="form.warehouseCode" placeholder="请输入仓库编码" />
+                        </el-form-item>
+                    </el-col>
+
+                    <el-col :lg="12">
+                        <el-form-item label="库位编码" prop="locationCode">
+                            <el-select v-model="form.locationCode" filterable placeholder="请选择">
+                                <el-option v-for="item in locationOptions" :key="item.locationCode" :label="item.locationCode" :value="item.locationCode">
+                                </el-option>
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+
+                    <el-col :lg="12">
+                        <el-form-item label="批次号" prop="batchNo">
+                            <el-input v-model="form.batchNo" placeholder="请输入批次号" />
+                        </el-form-item>
+                    </el-col>
+
+                    <el-col :lg="12">
+                        <el-form-item label="当前库存量" prop="currentQty">
+                            <el-input v-model="form.currentQty" placeholder="请输入当前库存量" />
+                        </el-form-item>
+                    </el-col>
+
+                    <el-col :lg="12">
+                        <el-form-item label="计量单位" prop="unit">
+                            <el-input v-model="form.unit" placeholder="请输入计量单位" />
+                        </el-form-item>
+                    </el-col>
+
+                    <!-- <el-col :lg="12">
+                        <el-form-item label="生产日期" prop="productionDate">
+                            <el-date-picker v-model="form.productionDate" type="datetime" placeholder="选择日期时间" value-format="YYYY-MM-DD HH:mm:ss">
+                            </el-date-picker>
+                        </el-form-item>
+                    </el-col>
+
+                    <el-col :lg="12">
+                        <el-form-item label="有效期至" prop="expiryDate">
+                            <el-date-picker v-model="form.expiryDate" type="datetime" placeholder="选择日期时间" value-format="YYYY-MM-DD HH:mm:ss">
+                            </el-date-picker>
+                        </el-form-item>
+                    </el-col>
+
+                    <el-col :lg="12">
+                        <el-form-item label="最后更新时间" prop="lastUpdatedTime">
+                            <el-date-picker v-model="form.lastUpdatedTime" type="datetime" placeholder="选择日期时间" value-format="YYYY-MM-DD HH:mm:ss">
+                            </el-date-picker>
+                        </el-form-item>
+                    </el-col> -->
+
+                    <el-col :lg="12">
+                        <el-form-item label="创建时间" prop="createdTime">
+                            <el-date-picker v-model="form.createdTime" type="datetime" placeholder="选择日期时间" value-format="YYYY-MM-DD HH:mm:ss">
+                            </el-date-picker>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+            </el-form>
+            <template #footer v-if="opertype != 3">
+                <el-button text @click="cancel">{{ $t('btn.cancel') }}</el-button>
+                <el-button type="primary" @click="submitFormOutStorage">{{ $t('btn.submit') }}</el-button>
             </template>
         </el-dialog>
     </div>
 </template>
 
 <script setup name="mminventory">
-import { listMmInventory, addMmInventory, delMmInventory, updateMmInventory, getMmInventory } from '@/api/materialManagement/productionMaterial/mminventory.js'
+import {
+    listMmInventory,
+    addMmInventory,
+    delMmInventory,
+    updateMmInventory,
+    getMmInventory,
+    getMaterialOption,
+    getTransactionOption,
+    createInboundReceipt,
+    getLocationOption,
+    createOutboundReceipt,
+} from '@/api/materialManagement/productionMaterial/mminventory.js'
 const { proxy } = getCurrentInstance()
 const ids = ref([])
 const loading = ref(false)
@@ -176,7 +350,9 @@ const queryParams = reactive({
     sort: '',
     sortType: 'asc',
     materialCode: '',
-    warehouseName: ''
+    warehouseName: '',
+    locationCode: '',
+    transactionType: ''
 })
 const columns = ref([
     { visible: true, align: 'center', type: '', prop: 'id', label: '主键ID' },
@@ -243,24 +419,38 @@ const formRef = ref()
 const title = ref('')
 // 操作类型 1、add 2、edit 3、view
 const opertype = ref(0)
-const open = ref(false)
+const openStorage = ref(false)
+const openOutStorage = ref(false)
 const state = reactive({
     single: true,
     multiple: true,
     form: {},
     rules: {
         materialCode: [{ required: true, message: '物料编码不能为空', trigger: 'blur' }],
+        transactionType: [{ required: true, message: '入库类型不能为空', trigger: 'blur' }],
+        quantity: [{ required: true, message: '入库数量不能为空', trigger: 'blur' }],
         warehouseCode: [{ required: true, message: '仓库编码不能为空', trigger: 'blur' }],
-        locationCode: [{ required: true, message: '库位编码不能为空', trigger: 'blur' }]
+        inboundNo: [{ required: true, message: '入库单号不能为空', trigger: 'blur' }],
     },
-    options: {}
+    rulesOut: {
+        materialCode: [{ required: true, message: '物料编码不能为空', trigger: 'blur' }],
+        transactionType: [{ required: true, message: '入库类型不能为空', trigger: 'blur' }],
+        quantity: [{ required: true, message: '入库数量不能为空', trigger: 'blur' }],
+        warehouseCode: [{ required: true, message: '仓库编码不能为空', trigger: 'blur' }],
+        outboundNo: [{ required: true, message: '出库单号不能为空', trigger: 'blur' }],
+    },
+    options: {},
+    transactionOptions: {},
+    warehouseOptions: {},
+    locationOptions: []
 })
 
-const { form, rules, options, single, multiple } = toRefs(state)
+const { form, rules, rulesOut, options, transactionOptions, warehouseOptions, locationOptions, single, multiple } = toRefs(state)
 
 // 关闭dialog
 function cancel() {
-    open.value = false
+    openStorage.value = false
+    openOutStorage.value = false
     reset()
 }
 
@@ -284,12 +474,25 @@ function reset() {
     proxy.resetForm('formRef')
 }
 
-// 添加按钮操作
-function handleAdd() {
+// 填入库单操作
+function handleStorage() {
     reset()
-    open.value = true
-    title.value = '添加库存表'
+    openStorage.value = true
+    title.value = '填写入库单信息'
     opertype.value = 1
+    getMaterialCodeList()
+    getTypeOfWarehousingList()
+    getLocationOptionList()
+}
+// 出库操作
+function handleOutStorage() {
+    reset()
+    openOutStorage.value = true
+    title.value = '填写出库单信息'
+    opertype.value = 1
+    getMaterialCodeList()
+    getTypeOfWarehousingList()
+    getLocationOptionList()
 }
 // 修改按钮操作
 function handleUpdate(row) {
@@ -298,7 +501,7 @@ function handleUpdate(row) {
     getMmInventory(id).then((res) => {
         const { code, data } = res
         if (code == 200) {
-            open.value = true
+            openOutStorage.value = true
             title.value = '修改库存表'
             opertype.value = 2
 
@@ -310,19 +513,40 @@ function handleUpdate(row) {
 }
 
 // 添加&修改 表单提交
-function submitForm() {
+function submitFormStorage() {
+    console.log(form.value, "==========================")
     proxy.$refs['formRef'].validate((valid) => {
         if (valid) {
             if (form.value.id != undefined && opertype.value === 2) {
-                updateMmInventory(form.value).then((res) => {
+                reateInboundReceipt(form.value).then((res) => {
                     proxy.$modal.msgSuccess('修改成功')
-                    open.value = false
+                    openStorage.value = false
                     getList()
                 })
             } else {
-                addMmInventory(form.value).then((res) => {
+                createInboundReceipt(form.value).then((res) => {
                     proxy.$modal.msgSuccess('新增成功')
-                    open.value = false
+                    openStorage.value = false
+                    getList()
+                })
+            }
+        }
+    })
+}
+
+function submitFormOutStorage() {
+    proxy.$refs['formRef'].validate((valid) => {
+        if (valid) {
+            if (form.value.id != undefined && opertype.value === 2) {
+                reateInboundReceipt(form.value).then((res) => {
+                    proxy.$modal.msgSuccess('修改成功')
+                    openOutStorage.value = false
+                    getList()
+                })
+            } else {
+                createOutboundReceipt(form.value).then((res) => {
+                    proxy.$modal.msgSuccess('新增成功')
+                    openOutStorage.value = false
                     getList()
                 })
             }
@@ -349,5 +573,47 @@ function handleDelete(row) {
         })
 }
 
+// 物料编码列表
+function getMaterialCodeList() {
+    try {
+        getMaterialOption('materialCode').then((res) => {
+            const { code, data } = res
+            if (code == 200) {
+                state.options = data
+            }
+        })
+    } catch (error) {
+        proxy.$modal.msgError(error.message)
+    }
+}
+
+// 获取入库类型列表
+function getTypeOfWarehousingList() {
+    try {
+        getTransactionOption('typeOfWarehousing').then((res) => {
+            const { code, data } = res
+            if (code == 200) {
+                state.transactionOptions = data
+            }
+        })
+    } catch (error) {
+        proxy.$modal.msgError(error.message)
+    }
+}
+
+// 获取库位编码列表
+function getLocationOptionList() {
+    try {
+        getLocationOption('warehouseCode').then((res) => {
+            const { code, data } = res
+            if (code == 200) {
+                state.locationOptions = data
+            }
+        })
+    } catch (error) {
+        proxy.$modal.msgError(error.message)
+    }
+}
+
 handleQuery()
 </script>
diff --git a/src/views/materialManagement/productionMaterial/MmMaterial.vue b/src/views/materialManagement/productionMaterial/MmMaterial.vue
index 52b284f..0c5671f 100644
--- a/src/views/materialManagement/productionMaterial/MmMaterial.vue
+++ b/src/views/materialManagement/productionMaterial/MmMaterial.vue
@@ -162,11 +162,10 @@
                     </el-col>
 
                     <el-col :lg="12">
-                        <el-form-item label="状态(停用/启用)" prop="status">
+                        <el-form-item label="状态" prop="status">
                             <el-radio-group v-model="form.status">
-                                <el-radio v-for="item in options.statusOptions" :key="item.dictValue" :value="item.dictValue">
-                                    {{ item.dictLabel }}
-                                </el-radio>
+                                <el-radio :label="1">停用</el-radio>
+                                <el-radio :label="2">启用</el-radio>
                             </el-radio-group>
                         </el-form-item>
                     </el-col>
@@ -294,7 +293,9 @@ const open = ref(false)
 const state = reactive({
     single: true,
     multiple: true,
-    form: {},
+    form: {
+        status: 2
+    },
     rules: {
         materialCode: [{ required: true, message: '物料编码不能为空', trigger: 'blur' }],
         materialName: [{ required: true, message: '物料名称不能为空', trigger: 'blur' }]