diff --git a/src/views/wmsManagement/WmGoodsOutProduction.vue b/src/views/wmsManagement/WmGoodsOutProduction.vue
index f8c0d6f..22614b7 100644
--- a/src/views/wmsManagement/WmGoodsOutProduction.vue
+++ b/src/views/wmsManagement/WmGoodsOutProduction.vue
@@ -138,12 +138,13 @@
 					<el-col :lg="12">
 						<el-form-item label="出库单号" prop="fkOutOrderId">
 							<el-select
+								v-loading="loading1"
 								v-if="opertype === 1"
 								v-model="form.fkOutOrderId"
 								filterable
 								remote
 								reserve-keyword
-								placeholder="请输入关键词"
+								placeholder="请输入出库单号"
 								:remote-method="handlerOutOrderRemoteMethod"
 							>
 								<el-option
@@ -160,7 +161,27 @@
 
 					<el-col :lg="12">
 						<el-form-item label="批次号" prop="packageCodeClient">
-							<el-input v-model="form.packageCodeClient" placeholder="请输入箱子编号（客户）" />
+							<el-select
+								v-loading="loading2"
+								v-if="opertype === 1"
+								v-model="PackageCodeSelect"
+								filterable
+								remote
+								reserve-keyword
+								placeholder="请输入批次号"
+								:remote-method="handlerPackageCodeRemoteMethod"
+								value-key="packageCodeClient"
+								@change="PackageCodeChange"
+							>
+								<el-option
+									v-for="(item, index) in PackageCodeOptions"
+									:key="index"
+									:label="item.packageCodeClient + ' ' + item.partnumber"
+									:value="item"
+								>
+								</el-option>
+							</el-select>
+							<el-input v-if="opertype === 2" v-model="form.packageCodeClient" placeholder="请输入批次号" />
 						</el-form-item>
 					</el-col>
 					<el-col :lg="12">
@@ -221,6 +242,7 @@ import {
 	updateWmGoodsOutProduction,
 	getWmGoodsOutProduction,
 } from '@/api/wmsManagement/wmGoodsOutProduction.js'
+import { listWmGoodsNowProduction } from '@/api/wmsManagement/wmGoodsNowProduction.js'
 import { listWmOutOrder } from '@/api/wmsManagement/wmOutOrder.js'
 export default {
 	name: 'wmgoodsoutproduction',
@@ -253,6 +275,7 @@ export default {
 			open: false,
 			// 表单参数
 			form: {},
+			PackageCodeSelect: {},
 			columns: [
 				{ index: 0, key: 'id', label: `雪花id`, checked: true },
 				{ index: 1, key: 'fkNowProductionId', label: `成品库当前货物表主键`, checked: true },
@@ -280,13 +303,17 @@ export default {
 			btnSubmitVisible: true,
 			// 表单校验
 			rules: {
-				// fkOutOrderId: [{ required: true, message: '出库单号不能为空', trigger: 'blur' }],
+				fkOutOrderId: [{ required: true, message: '出库单号不能为空', trigger: 'blur' }],
 				partnumber: [{ required: true, message: '零件号不能为空', trigger: 'blur' }],
-				// packageCodeClient: [{ required: true, message: '批次号不能为空', trigger: 'blur' }],
+				packageCodeClient: [{ required: true, message: '批次号不能为空', trigger: 'blur' }],
 				locationCode: [{ required: true, message: '库位编号不能为空', trigger: 'blur' }],
 			},
 			// 出库单列表
+			loading1: false,
 			outOrderOptions: [],
+			// 仓库货物列表
+			loading2: false,
+			PackageCodeOptions: [],
 		}
 	},
 	created() {
@@ -368,7 +395,7 @@ export default {
 		handleAdd() {
 			this.reset()
 			this.open = true
-			this.title = '添加'
+			this.title = '手动添加出库记录'
 			this.opertype = 1
 		},
 		/** 删除按钮操作 */
@@ -404,9 +431,10 @@ export default {
 		},
 		/** 提交按钮 */
 		submitForm: function () {
+			console.log(JSON.stringify(this.form))
 			this.$refs['form'].validate((valid) => {
 				if (valid) {
-					console.log(JSON.stringify(this.form))
+					
 
 					if (this.form.id != undefined && this.opertype === 2) {
 						updateWmGoodsOutProduction(this.form)
@@ -440,15 +468,49 @@ export default {
 					pageSize: 30,
 					shipmentNum: query,
 				}
+				this.loading1 = true
+				setTimeout(() => {
+					this.loading1 = false
+				}, 30000)
 				listWmOutOrder(data).then((res) => {
 					if (res.code == 200) {
 						this.outOrderOptions = res.data.result
+						this.loading1 = false
 					}
 				})
 			} else {
 				this.outOrderOptions = []
 			}
 		},
+		handlerPackageCodeRemoteMethod(query) {
+			if (query !== '') {
+				const data = {
+					pageNum: 1,
+					pageSize: 30,
+					packageCodeClient: query,
+				}
+				this.loading2 = true
+				setTimeout(() => {
+					this.loading2 = false
+				}, 30000)
+				listWmGoodsNowProduction(data).then((res) => {
+					if (res.code == 200) {
+						this.PackageCodeOptions = res.data.result
+						this.loading2 = false
+					}
+				})
+			} else {
+				this.PackageCodeOptions = []
+			}
+		},
+		PackageCodeChange(select){
+			console.log(select);
+			this.form.partnumber = select.partnumber;
+			this.form.goodsNumLogic = select.goodsNumLogic;
+			this.form.locationCode = select.locationCode;
+			this.form.goodsNumAction = select.goodsNumAction;
+			this.form.packageCodeClient = select.packageCodeClient
+		}
 	},
 }
 </script>