From 1302d172fc659b7a7f806c994604213599177eba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E6=AD=A3=E6=98=93?= <zhaozhengyi1b@126.com>
Date: Mon, 29 Apr 2024 16:59:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=93=E5=BA=93-=E6=A0=B7=E5=BC=8F=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=EF=BC=8C=E5=87=BA=E5=BA=93=E8=AE=B0=E5=BD=95=EF=BC=8C?=
 =?UTF-8?q?=E5=87=BA=E5=BA=93=E5=8D=95=EF=BC=8C=E6=89=B9=E9=87=8F=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8B=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wmsManagement/wmGoodsNowProduction.js |  15 +-
 src/api/wmsManagement/wmOutOrder.js           |  11 +-
 src/style/base.styl                           |  23 +
 .../wmsManagement/WmGoodsNowProduction.vue    |   1 +
 .../wmsManagement/WmGoodsOutProduction.vue    | 734 ++++++++----------
 src/views/wmsManagement/WmOutOrder.vue        |  12 +-
 src/views/wmsManagement/WmpatchSearch.vue     |   5 +-
 .../TheBatchOutProductionDialog.vue           |  17 +-
 .../TheChouseMaterial/TheChouseMaterial.vue   |   6 +-
 .../components/TheOutboundPlan/index.vue      |  41 +-
 .../出库记录根据出库单/index.vue              | 185 +++++
 .../出库记录根据批次号/index.vue              |   7 +-
 .../出库记录根据零件号/index.vue              |   6 +-
 13 files changed, 612 insertions(+), 451 deletions(-)
 create mode 100644 src/views/wmsManagement/components/TheWmBatchSearch/出库记录根据出库单/index.vue

diff --git a/src/api/wmsManagement/wmGoodsNowProduction.js b/src/api/wmsManagement/wmGoodsNowProduction.js
index 9a6a77f..92b8dd0 100644
--- a/src/api/wmsManagement/wmGoodsNowProduction.js
+++ b/src/api/wmsManagement/wmGoodsNowProduction.js
@@ -80,4 +80,17 @@ export function updateactualInventoryQuantity(query) {
     method: 'get',
     params: query,
   })
-}
\ No newline at end of file
+}
+
+
+/**
+* 成品库当前货物表分页查询(字典形式)
+* @param {查询条件} query
+*/
+export function dictWmGoodsNowProduction(query) {
+  return request({
+    url: '/mes/wm/WmGoodsNowProduction/dict',
+    method: 'get',
+    params: query,
+  })
+}
diff --git a/src/api/wmsManagement/wmOutOrder.js b/src/api/wmsManagement/wmOutOrder.js
index d6dd6ff..fd5414d 100644
--- a/src/api/wmsManagement/wmOutOrder.js
+++ b/src/api/wmsManagement/wmOutOrder.js
@@ -111,7 +111,16 @@ export function persistenceOrderplan(params) {
 	})
 }
 
-
+/**
+ * 获取出库单的持久化存储出库计划并计算计划批次当前已出库数量
+ */
+export function getOutOrderPlanAndOutProductionNum(params) {
+	return request({
+		url: '/mes/wm/WmOutOrder/getOutOrderPlanAndOutProductionNum',
+		method: 'get',
+		params
+	})
+}
 
 
 
diff --git a/src/style/base.styl b/src/style/base.styl
index 425c6af..7772ffa 100644
--- a/src/style/base.styl
+++ b/src/style/base.styl
@@ -143,3 +143,26 @@
 
 .large-tip
   font-size 16px
+
+
+// Element table 表格样式
+/* 修改表格边框颜色 */
+.el-table .el-table__body td, .el-table .el-table__header th {
+  border-color: #d3dce6; /* 你想要的边框颜色 */
+}
+ 
+/* 修改表格背景色 */
+.el-table .el-table__body tr.el-table__row:not(.el-table__row--striped) td {
+  background-color: #F2F6FC; /* 你想要的背景色 */
+}
+ 
+/* 修改表格行高亮颜色 */
+.el-table .el-table__body tr.el-table__row:hover td {
+  background-color: #dde5ee; /* 你想要的高亮颜色 */
+}
+ 
+/* 修改表头字体颜色和背景色 */
+.el-table .el-table__header th {
+  color: #303133; /* 你想要的表头字体颜色 */
+  background-color: #C0C4CC; /* 你想要的表头背景色 */
+}
\ No newline at end of file
diff --git a/src/views/wmsManagement/WmGoodsNowProduction.vue b/src/views/wmsManagement/WmGoodsNowProduction.vue
index 45c79b0..9e0c5c9 100644
--- a/src/views/wmsManagement/WmGoodsNowProduction.vue
+++ b/src/views/wmsManagement/WmGoodsNowProduction.vue
@@ -189,6 +189,7 @@ import {
 	delWmGoodsNowProduction,
 	updateWmGoodsNowProduction,
 	getWmGoodsNowProduction,
+	dictWmGoodsNowProduction
 } from '@/api/wmsManagement/wmGoodsNowProduction.js'
 
 export default {
diff --git a/src/views/wmsManagement/WmGoodsOutProduction.vue b/src/views/wmsManagement/WmGoodsOutProduction.vue
index 7d9696f..cd258e7 100644
--- a/src/views/wmsManagement/WmGoodsOutProduction.vue
+++ b/src/views/wmsManagement/WmGoodsOutProduction.vue
@@ -9,16 +9,7 @@
 <template>
 	<div class="app-container">
 		<!-- :model属性用于表单验证使用 比如下面的el-form-item 的 prop属性用于对表单值进行验证操作 -->
-		<el-form
-			:model="queryParams"
-			size="small"
-			label-position="right"
-			inline
-			ref="queryForm"
-			:label-width="labelWidth"
-			v-show="showSearch"
-			@submit.native.prevent
-		>
+		<el-form :model="queryParams" size="small" label-position="right" inline ref="queryForm" :label-width="labelWidth" v-show="showSearch" @submit.native.prevent>
 			<el-form-item label="出库单号" prop="fkOutOrderId">
 				<el-input v-model="queryParams.fkOutOrderId" placeholder="请输入出库单号" />
 			</el-form-item>
@@ -42,62 +33,22 @@
 		<!-- 工具区域 -->
 		<el-row :gutter="10" class="mb8">
 			<el-col :span="1.5">
-				<el-button
-					type="primary"
-					v-hasPermi="['wmsManagement:wmgoodsoutproduction:add']"
-					
-					icon="el-icon-plus"
-					size="mini"
-					@click="handleAdd"
-					>手动添加出库记录</el-button
-				>
+				<el-button type="primary" v-hasPermi="['wmsManagement:wmgoodsoutproduction:add']" icon="el-icon-plus" size="mini" @click="handleAdd">手动添加出库记录</el-button>
 			</el-col>
 			<el-col :span="1.5">
-				<el-button
-					type="warning"
-					icon="el-icon-plus"
-					size="mini"
-					@click="handleBatchOut"
-					>按批次添加出库记录</el-button
-				>
+				<el-button type="warning" v-hasPermi="['wmsManagement:wmgoodsoutproduction:add']" icon="el-icon-plus" size="mini" @click="handleBatchOut">按批次添加出库记录</el-button>
 			</el-col>
 			<el-col :span="1.5">
-				<el-button
-					type="success"
-					:disabled="single"
-					v-hasPermi="['wmsManagement:wmgoodsoutproduction:edit']"
-					
-					icon="el-icon-edit"
-					size="mini"
-					@click="handleUpdate"
-					>修改</el-button
-				>
+				<el-button type="success" :disabled="single" v-hasPermi="['wmsManagement:wmgoodsoutproduction:edit']" icon="el-icon-edit" size="mini" @click="handleUpdate">修改</el-button>
 			</el-col>
 			<el-col :span="1.5">
-				<el-button
-					type="danger"
-					:disabled="multiple"
-					v-hasPermi="['wmsManagement:wmgoodsoutproduction:delete']"
-					
-					icon="el-icon-delete"
-					size="mini"
-					@click="handleDelete"
-					>删除</el-button
-				>
+				<el-button type="danger" :disabled="multiple" v-hasPermi="['wmsManagement:wmgoodsoutproduction:delete']" icon="el-icon-delete" size="mini" @click="handleDelete">删除</el-button>
 			</el-col>
 			<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
 		</el-row>
 
 		<!-- 数据区域 -->
-		<el-table
-			:data="dataList"
-			v-loading="loading"
-			ref="table"
-			border
-			highlight-current-row
-			@sort-change="sortChange"
-			@selection-change="handleSelectionChange"
-		>
+		<el-table :data="dataList" v-loading="loading" ref="table" border highlight-current-row @sort-change="sortChange" @selection-change="handleSelectionChange">
 			<el-table-column type="selection" width="50" align="center" />
 			<el-table-column prop="fkOutOrderId" label="出库单号" align="center" :show-overflow-tooltip="true" />
 			<el-table-column prop="packageCodeClient" label="批次号" align="center" :show-overflow-tooltip="true" />
@@ -112,85 +63,38 @@
 
 			<el-table-column label="操作" align="center" width="140">
 				<template slot-scope="scope">
-					<el-button
-						size="mini"
-						v-hasPermi="['business:wmgoodsoutproduction:edit']"
-						type="success"
-						icon="el-icon-edit"
-						title="编辑"
-						@click="handleUpdate(scope.row)"
-					></el-button>
-					<el-button
-						size="mini"
-						v-hasPermi="['business:wmgoodsoutproduction:delete']"
-						type="danger"
-						icon="el-icon-delete"
-						title="删除"
-						@click="handleDelete(scope.row)"
-					></el-button>
+					<el-button size="mini" v-hasPermi="['business:wmgoodsoutproduction:edit']" type="success" icon="el-icon-edit" title="编辑" @click="handleUpdate(scope.row)"></el-button>
+					<el-button size="mini" v-hasPermi="['business:wmgoodsoutproduction:delete']" type="danger" icon="el-icon-delete" title="删除" @click="handleDelete(scope.row)"></el-button>
 				</template>
 			</el-table-column>
 		</el-table>
-		<pagination
-			class="mt10"
-			background
-			:total="total"
-			:page.sync="queryParams.pageNum"
-			:limit.sync="queryParams.pageSize"
-			@pagination="getList"
-		/>
+		<pagination class="mt10" background :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
 
 		<!-- 添加或修改出库货物记录表对话框 -->
-		<el-dialog :title="title" :lock-scroll="false" :visible.sync="open" :close-on-click-modal="false">
+		<el-dialog :title="title" :lock-scroll="false" :visible.sync="open" :close-on-click-modal="false" width="60%">
 			<el-form ref="form" :model="form" :rules="rules" :label-width="formLabelWidth">
 				<el-row :gutter="20">
 					<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="请输入出库单号"
-								:remote-method="handlerOutOrderRemoteMethod"
-							>
-								<el-option
-									v-for="(item, index) in outOrderOptions"
-									:key="index"
-									:label="item.shipmentNum"
-									:value="item.shipmentNum"
-								>
+							<el-select v-loading="loading1" v-if="opertype === 1" v-model="form.fkOutOrderId" filterable remote reserve-keyword placeholder="请输入出库单号" :remote-method="handlerOutOrderRemoteMethod">
+								<el-option v-for="(item, index) in outOrderOptions" :key="index" :label="item.shipmentNum" :value="item.shipmentNum">
 								</el-option>
 							</el-select>
 							<el-input v-if="opertype === 2" :disabled="opertype === 2" v-model="form.fkOutOrderId" placeholder="请输入出库单号" />
 						</el-form-item>
 					</el-col>
 
-					<el-col :lg="12">
-						<el-form-item label="批次号" prop="packageCodeClient">
-							<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-col :lg="24">
+						<el-form-item label="选择箱">
+							<el-select style="width: 600px;" 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.label" :value="item.value">
 								</el-option>
 							</el-select>
-							<el-input v-if="opertype === 2" v-model="form.packageCodeClient" placeholder="请输入批次号" />
+						</el-form-item>
+					</el-col>
+					<el-col :lg="12">
+						<el-form-item label="批次号" prop="packageCodeClient">
+							<el-input v-model="form.packageCodeClient" placeholder="请输入批次号" />
 						</el-form-item>
 					</el-col>
 					<el-col :lg="12">
@@ -204,7 +108,13 @@
 							<el-input v-model="form.partnumber" placeholder="请输入零件号" />
 						</el-form-item>
 					</el-col>
-
+					
+					<el-col :lg="12">
+						<el-form-item label="备注" prop="remark">
+							<el-input v-model="form.remark" placeholder="请输入备注" />
+						</el-form-item>
+					</el-col>
+					
 					<el-col :lg="12">
 						<el-form-item label="原库存" prop="goodsNumLogic">
 							<el-input v-model.number="form.goodsNumLogic" placeholder="请输入原库存" />
@@ -222,7 +132,7 @@
 							{{ (form.goodsNumLogic - form.goodsNumAction) }}
 						</el-form-item>
 					</el-col>
-
+					
 					<el-col :lg="12">
 						<el-form-item label="入库时间" prop="entryWarehouseTime">
 							<el-date-picker v-model="form.entryWarehouseTime" type="datetime" placeholder="选择日期时间"></el-date-picker>
@@ -235,15 +145,11 @@
 						</el-form-item>
 					</el-col>
 
-					<el-col :lg="12">
-						<el-form-item label="备注" prop="remark">
-							<el-input v-model="form.remark" placeholder="请输入备注" />
-						</el-form-item>
-					</el-col>
+					
 				</el-row>
 			</el-form>
 			<div slot="footer" class="dialog-footer">
-				<el-button type="text" @click="cancel">取 消</el-button>
+				<el-button type="info" @click="cancel">取 消</el-button>
 				<el-button type="primary" @click="submitForm">确 定</el-button>
 			</div>
 		</el-dialog>
@@ -251,295 +157,311 @@
 	</div>
 </template>
 <script>
-import {
-	listWmGoodsOutProduction,
-	addWmGoodsOutProduction,
-	delWmGoodsOutProduction,
-	updateWmGoodsOutProduction,
-	getWmGoodsOutProduction,
-} from '@/api/wmsManagement/wmGoodsOutProduction.js'
-import { listWmGoodsNowProduction } from '@/api/wmsManagement/wmGoodsNowProduction.js'
-import { listWmOutOrder } from '@/api/wmsManagement/wmOutOrder.js'
-import TheBatchOutProductionDialog from './components/TheBatchOutProductionDialog/TheBatchOutProductionDialog.vue'
-export default {
-	name: 'wmgoodsoutproduction',
-	components:{
-		TheBatchOutProductionDialog
-	},
-	data() {
-		return {
-			labelWidth: '100px',
-			formLabelWidth: '100px',
-			// 选中id数组
-			ids: [],
-			// 非单个禁用
-			single: true,
-			// 非多个禁用
-			multiple: true,
-			// 遮罩层
-			loading: false,
-			// 显示搜索条件
-			showSearch: true,
-			// 查询参数
-			queryParams: {
-				pageNum: 1,
-				pageSize: 10,
-				sort: undefined,
-				sortType: undefined,
-			},
-			// 弹出层标题
-			title: '',
-			// 操作类型 1、add 2、edit
-			opertype: 0,
-			// 是否显示弹出层
-			open: false,
-			TheBatchOutProductionDialogShow:false,
-			// 表单参数
-			form: {},
-			PackageCodeSelect: {},
-			columns: [
-				{ index: 0, key: 'id', label: `雪花id`, checked: true },
-				{ index: 1, key: 'fkNowProductionId', label: `成品库当前货物表主键`, checked: true },
-				{ index: 2, key: 'fkOutOrderId', label: `出库单号`, checked: true },
-				{ index: 3, key: 'packageCode', label: `箱子编号（MES）`, checked: true },
-				{ index: 4, key: 'packageCodeClient', label: `箱子编号（客户）`, checked: true },
-				{ index: 5, key: 'packageCodeOriginal', label: `箱子编号（原始码）`, checked: true },
-				{ index: 6, key: 'locationCode', label: `库位编号`, checked: true },
-				{ index: 7, key: 'partnumber', label: `零件号`, checked: true },
-				{ index: 8, key: 'goodsNumLogic', label: `箱子中货物数量（理论）`, checked: true },
-				{ index: 9, key: 'goodsNumAction', label: `箱子中货物数量（实际）`, checked: false },
-				{ index: 10, key: 'entryWarehouseTime', label: `入库时间`, checked: false },
-				{ index: 11, key: 'outTime', label: `出库时间`, checked: false },
-				{ index: 12, key: 'remark', label: `备注`, checked: false },
-				{ index: 13, key: 'updatedBy', label: `更新人`, checked: false },
-				{ index: 14, key: 'updatedTime', label: `更新时间`, checked: false },
-				{ index: 15, key: 'createdBy', label: `创建人`, checked: false },
-				{ index: 16, key: 'createdTime', label: `创建时间`, checked: false },
-			],
-			// 数据列表
-			dataList: [],
-			// 总记录数
-			total: 0,
-			// 提交按钮是否显示
-			btnSubmitVisible: true,
-			// 表单校验
-			rules: {
-				fkOutOrderId: [{ required: true, message: '出库单号不能为空', trigger: 'blur' }],
-				partnumber: [{ required: true, message: '零件号不能为空', trigger: 'blur' }],
-				packageCodeClient: [{ required: true, message: '批次号不能为空', trigger: 'blur' }],
-				locationCode: [{ required: true, message: '库位编号不能为空', trigger: 'blur' }],
-			},
-			// 出库单列表
-			loading1: false,
-			outOrderOptions: [],
-			// 仓库货物列表
-			loading2: false,
-			PackageCodeOptions: [],
-		}
-	},
-	created() {
-		// 列表数据查询
-		this.getList()
-
-		var dictParams = []
-	},
-	methods: {
-		// 查询数据
-		getList() {
-			this.loading = true
-			listWmGoodsOutProduction(this.queryParams).then((res) => {
-				if (res.code == 200) {
-					// this.dataList = res.data.result
-					// this.total = res.data.totalNum
-					this.dataList = res.data.item1
-					this.total = res.data.item2
-					this.loading = false
-				}
-			})
+	import {
+		listWmGoodsOutProduction,
+		addWmGoodsOutProduction,
+		delWmGoodsOutProduction,
+		updateWmGoodsOutProduction,
+		getWmGoodsOutProduction,
+	} from '@/api/wmsManagement/wmGoodsOutProduction.js'
+	import { listWmGoodsNowProduction,dictWmGoodsNowProduction } from '@/api/wmsManagement/wmGoodsNowProduction.js'
+	import { listWmOutOrder } from '@/api/wmsManagement/wmOutOrder.js'
+	import TheBatchOutProductionDialog from './components/TheBatchOutProductionDialog/TheBatchOutProductionDialog.vue'
+	export default {
+		name: 'wmgoodsoutproduction',
+		components: {
+			TheBatchOutProductionDialog
 		},
-		// 取消按钮
-		cancel() {
-			this.open = false
-			this.reset()
-		},
-		// 重置数据表单
-		reset() {
-			this.form = {
-				id: undefined,
-				fkNowProductionId: undefined,
-				fkOutOrderId: undefined,
-				packageCode: undefined,
-				packageCodeClient: undefined,
-				packageCodeOriginal: undefined,
-				locationCode: undefined,
-				partnumber: undefined,
-				goodsNumLogic: undefined,
-				goodsNumAction: undefined,
-				entryWarehouseTime: undefined,
-				outTime: undefined,
-				remark: undefined,
-				updatedBy: undefined,
-				updatedTime: undefined,
-				createdBy: undefined,
-				createdTime: undefined,
+		data() {
+			return {
+				labelWidth: '100px',
+				formLabelWidth: '100px',
+				// 选中id数组
+				ids: [],
+				// 非单个禁用
+				single: true,
+				// 非多个禁用
+				multiple: true,
+				// 遮罩层
+				loading: false,
+				// 显示搜索条件
+				showSearch: true,
+				// 查询参数
+				queryParams: {
+					pageNum: 1,
+					pageSize: 10,
+					sort: undefined,
+					sortType: undefined,
+				},
+				// 弹出层标题
+				title: '',
+				// 操作类型 1、add 2、edit
+				opertype: 0,
+				// 是否显示弹出层
+				open: false,
+				TheBatchOutProductionDialogShow: false,
+				// 表单参数
+				form: {},
+				PackageCodeSelect: {},
+				columns: [
+					{ index: 0, key: 'id', label: `雪花id`, checked: true },
+					{ index: 1, key: 'fkNowProductionId', label: `成品库当前货物表主键`, checked: true },
+					{ index: 2, key: 'fkOutOrderId', label: `出库单号`, checked: true },
+					{ index: 3, key: 'packageCode', label: `箱子编号（MES）`, checked: true },
+					{ index: 4, key: 'packageCodeClient', label: `箱子编号（客户）`, checked: true },
+					{ index: 5, key: 'packageCodeOriginal', label: `箱子编号（原始码）`, checked: true },
+					{ index: 6, key: 'locationCode', label: `库位编号`, checked: true },
+					{ index: 7, key: 'partnumber', label: `零件号`, checked: true },
+					{ index: 8, key: 'goodsNumLogic', label: `箱子中货物数量（理论）`, checked: true },
+					{ index: 9, key: 'goodsNumAction', label: `箱子中货物数量（实际）`, checked: false },
+					{ index: 10, key: 'entryWarehouseTime', label: `入库时间`, checked: false },
+					{ index: 11, key: 'outTime', label: `出库时间`, checked: false },
+					{ index: 12, key: 'remark', label: `备注`, checked: false },
+					{ index: 13, key: 'updatedBy', label: `更新人`, checked: false },
+					{ index: 14, key: 'updatedTime', label: `更新时间`, checked: false },
+					{ index: 15, key: 'createdBy', label: `创建人`, checked: false },
+					{ index: 16, key: 'createdTime', label: `创建时间`, checked: false },
+				],
+				// 数据列表
+				dataList: [],
+				// 总记录数
+				total: 0,
+				// 提交按钮是否显示
+				btnSubmitVisible: true,
+				// 表单校验
+				rules: {
+					fkOutOrderId: [{ required: true, message: '出库单号不能为空', trigger: 'blur' }],
+					partnumber: [{ required: true, message: '零件号不能为空', trigger: 'blur' }],
+					packageCodeClient: [{ required: true, message: '批次号不能为空', trigger: 'blur' }],
+					locationCode: [{ required: true, message: '库位编号不能为空', trigger: 'blur' }],
+				},
+				// 出库单列表
+				loading1: false,
+				outOrderOptions: [],
+				// 仓库货物列表
+				loading2: false,
+				PackageCodeOptions: [],
 			}
-			this.resetForm('form')
 		},
-		// 重置查询操作
-		resetQuery() {
-			this.timeRange = []
-			this.resetForm('queryForm')
-			this.handleQuery()
-		},
-		// 多选框选中数据
-		handleSelectionChange(selection) {
-			this.ids = selection.map((item) => item.id)
-			this.single = selection.length != 1
-			this.multiple = !selection.length
-		},
-		// 自定义排序
-		sortChange(column) {
-			if (column.prop == null || column.order == null) {
-				this.queryParams.sort = undefined
-				this.queryParams.sortType = undefined
-			} else {
-				this.queryParams.sort = column.prop
-				this.queryParams.sortType = column.order
-			}
-
-			this.handleQuery()
-		},
-		/** 搜索按钮操作 */
-		handleQuery() {
-			this.queryParams.pageNum = 1
+		created() {
+			// 列表数据查询
 			this.getList()
-		},
-		/** 新增按钮操作 */
-		handleAdd() {
-			this.reset()
-			this.open = true
-			this.title = '手动添加出库记录'
-			this.opertype = 1
-		},
-		// 批量出库
-		handleBatchOut(){
-			this.TheBatchOutProductionDialogShow = true;
-		},
-		/** 删除按钮操作 */
-		handleDelete(row) {
-			const Ids = row.id || this.ids
 
-			this.$confirm('是否确认删除数据项？')
-				.then(function () {
-					return delWmGoodsOutProduction(Ids)
-				})
-				.then(() => {
-					//this.handleQuery()
-					this.getList()
-					this.msgSuccess('删除成功')
-				})
-				.catch(() => {})
+			var dictParams = []
 		},
-		/** 修改按钮操作 */
-		handleUpdate(row) {
-			this.reset()
-			const id = row.id || this.ids
-			getWmGoodsOutProduction(id).then((res) => {
-				const { code, data } = res
-				if (code == 200) {
-					this.open = true
-					this.title = '修改数据'
-					this.opertype = 2
-
-					this.form = {
-						...data,
-					}
-				}
-			})
-		},
-		/** 提交按钮 */
-		submitForm: function () {
-			console.log(JSON.stringify(this.form))
-			this.$refs['form'].validate((valid) => {
-				if (valid) {
-					if (this.form.id != undefined && this.opertype === 2) {
-						updateWmGoodsOutProduction(this.form)
-							.then((res) => {
-								this.msgSuccess('修改成功')
-								this.open = false
-								this.getList()
-							})
-							.catch((err) => {
-								//TODO 错误逻辑
-							})
-					} else {
-						addWmGoodsOutProduction(this.form)
-							.then((res) => {
-								this.msgSuccess('新增成功')
-								this.open = false
-								this.getList()
-							})
-							.catch((err) => {
-								//TODO 错误逻辑
-							})
-					}
-				}
-			})
-		},
-		// 远程搜索工单号
-		handlerOutOrderRemoteMethod(query) {
-			if (query !== '') {
-				const data = {
-					pageNum: 1,
-					pageSize: 30,
-					shipmentNum: query,
-				}
-				this.loading1 = true
-				setTimeout(() => {
-					this.loading1 = false
-				}, 30000)
-				listWmOutOrder(data).then((res) => {
+		methods: {
+			// 查询数据
+			getList() {
+				this.loading = true
+				listWmGoodsOutProduction(this.queryParams).then((res) => {
 					if (res.code == 200) {
-						this.outOrderOptions = res.data.result
+						// this.dataList = res.data.result
+						// this.total = res.data.totalNum
+						this.dataList = res.data.item1
+						this.total = res.data.item2
+						this.loading = false
+					}
+				})
+			},
+			// 取消按钮
+			cancel() {
+				this.open = false
+				this.reset()
+			},
+			// 重置数据表单
+			reset() {
+				this.form = {
+					id: undefined,
+					fkNowProductionId: undefined,
+					fkOutOrderId: undefined,
+					packageCode: undefined,
+					packageCodeClient: undefined,
+					packageCodeOriginal: undefined,
+					locationCode: undefined,
+					partnumber: undefined,
+					goodsNumLogic: undefined,
+					goodsNumAction: undefined,
+					entryWarehouseTime: undefined,
+					outTime: undefined,
+					remark: undefined,
+					updatedBy: undefined,
+					updatedTime: undefined,
+					createdBy: undefined,
+					createdTime: undefined,
+				}
+				this.outOrderOptions = [];
+				this.PackageCodeSelect = '';
+				this.PackageCodeOptions = [];
+				this.resetForm('form')
+			},
+			// 重置查询操作
+			resetQuery() {
+				this.timeRange = []
+				this.resetForm('queryForm')
+				this.handleQuery()
+			},
+			// 多选框选中数据
+			handleSelectionChange(selection) {
+				this.ids = selection.map((item) => item.id)
+				this.single = selection.length != 1
+				this.multiple = !selection.length
+			},
+			// 自定义排序
+			sortChange(column) {
+				if (column.prop == null || column.order == null) {
+					this.queryParams.sort = undefined
+					this.queryParams.sortType = undefined
+				} else {
+					this.queryParams.sort = column.prop
+					this.queryParams.sortType = column.order
+				}
+
+				this.handleQuery()
+			},
+			/** 搜索按钮操作 */
+			handleQuery() {
+				this.queryParams.pageNum = 1
+				this.getList()
+			},
+			/** 新增按钮操作 */
+			handleAdd() {
+				this.reset()
+				this.open = true
+				this.title = '手动添加出库记录'
+				this.opertype = 1
+			},
+			// 批量出库
+			handleBatchOut() {
+				this.TheBatchOutProductionDialogShow = true;
+			},
+			/** 删除按钮操作 */
+			handleDelete(row) {
+				const Ids = row.id || this.ids
+
+				this.$confirm('是否确认删除数据项？')
+					.then(function () {
+						return delWmGoodsOutProduction(Ids)
+					})
+					.then(() => {
+						//this.handleQuery()
+						this.getList()
+						this.msgSuccess('删除成功')
+					})
+					.catch(() => {})
+			},
+			/** 修改按钮操作 */
+			handleUpdate(row) {
+				this.reset()
+				const id = row.id || this.ids
+				getWmGoodsOutProduction(id).then((res) => {
+					const { code, data } = res
+					if (code == 200) {
+						this.open = true
+						this.title = '修改数据'
+						this.opertype = 2
+
+						this.form = {
+							...data,
+						}
+					}
+				})
+			},
+			/** 提交按钮 */
+			submitForm: function () {
+				console.log(JSON.stringify(this.form))
+				this.$refs['form'].validate((valid) => {
+					if (valid) {
+						if (this.form.id != undefined && this.opertype === 2) {
+							updateWmGoodsOutProduction(this.form)
+								.then((res) => {
+									this.msgSuccess('修改成功')
+									this.open = false
+									this.getList()
+								})
+								.catch((err) => {
+									//TODO 错误逻辑
+								})
+						} else {
+							addWmGoodsOutProduction(this.form)
+								.then((res) => {
+									console.log(res);
+									this.msgSuccess('新增成功')
+									
+									this.reset();
+									// this.open = false
+									this.getList()
+								})
+								.catch((err) => {
+									//TODO 错误逻辑
+									console.log(err);
+								})
+						}
+					}
+				})
+			},
+			// 远程搜索工单号
+			handlerOutOrderRemoteMethod(query) {
+				if (query !== '') {
+					const data = {
+						pageNum: 1,
+						pageSize: 30,
+						shipmentNum: query,
+						type: 1,
+						status: 1
+					}
+					this.loading1 = true
+					setTimeout(() => {
 						this.loading1 = false
-					}
-				})
-			} else {
-				this.outOrderOptions = []
-			}
-		},
-		handlerPackageCodeRemoteMethod(query) {
-			if (query !== '') {
-				const data = {
-					pageNum: 1,
-					pageSize: 30,
-					packageCodeClient: query,
+					}, 30000)
+					listWmOutOrder(data).then((res) => {
+						if (res.code == 200) {
+							this.outOrderOptions = res.data.result
+							this.loading1 = false
+						}
+						else{
+							this.loading1 = false
+						}
+					})
+				} else {
+					this.outOrderOptions = []
 				}
-				this.loading2 = true
-				setTimeout(() => {
-					this.loading2 = false
-				}, 30000)
-				listWmGoodsNowProduction(data).then((res) => {
-					if (res.code == 200) {
-						this.PackageCodeOptions = res.data.result
-						this.loading2 = false
+			},
+			// 远程搜索箱
+			handlerPackageCodeRemoteMethod(query) {
+				if (query !== '') {
+					const data = {
+						pageNum: 1,
+						pageSize: 30,
+						query: query,
 					}
-				})
-			} else {
-				this.PackageCodeOptions = []
-			}
+					this.loading2 = true
+					setTimeout(() => {
+						this.loading2 = false
+					}, 30000)
+					dictWmGoodsNowProduction(data).then((res) => {
+						if (res.code == 200) {
+							this.PackageCodeOptions = res.data.result
+							this.loading2 = false
+						}else{
+							this.loading2 = false
+						}
+					})
+					
+				} else {
+					this.PackageCodeOptions = []
+				}
+			},
+			PackageCodeChange(select) {
+				console.log('select', select)
+				this.form.fkNowProductionId = select.id
+				this.form.partnumber = select.partnumber
+				// 原仓库库存
+				this.form.goodsNumLogic = select.goodsNumAction
+				this.form.locationCode = select.locationCode
+				// 出库数量
+				this.form.goodsNumAction = select.goodsNumAction
+				this.form.packageCodeClient = select.packageCodeClient
+			},
 		},
-		PackageCodeChange(select) {
-			console.log('select', select)
-			this.form.fkNowProductionId = select.id
-			this.form.partnumber = select.partnumber
-			// 原仓库库存
-			this.form.goodsNumLogic = select.goodsNumAction
-			this.form.locationCode = select.locationCode
-			// 出库数量
-			this.form.goodsNumAction = select.goodsNumAction
-			this.form.packageCodeClient = select.packageCodeClient
-		},
-	},
-}
-</script>
+	}
+</script>
\ No newline at end of file
diff --git a/src/views/wmsManagement/WmOutOrder.vue b/src/views/wmsManagement/WmOutOrder.vue
index 21839fb..6305fcc 100644
--- a/src/views/wmsManagement/WmOutOrder.vue
+++ b/src/views/wmsManagement/WmOutOrder.vue
@@ -25,7 +25,7 @@
 			<el-form-item label="客户代码" prop="customNo">
 				<el-input v-model="queryParams.customNo" placeholder="请输入客户代码" />
 			</el-form-item>
-			<el-form-item>
+			<el-form-item label=" ">
 				<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
 				<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
 			</el-form-item>
@@ -47,9 +47,9 @@
 		<!-- 数据区域 -->
 		<el-table :data="dataList" v-loading="loading" ref="table" border highlight-current-row @sort-change="sortChange" @selection-change="handleSelectionChange">
 			<el-table-column type="selection" width="50" align="center" />
-			<el-table-column prop="shipmentNum" label="出库单号" align="center" :show-overflow-tooltip="true" />
+			<el-table-column prop="shipmentNum" label="出库单号" align="center" :show-overflow-tooltip="true" min-width="120" />
 			<el-table-column prop="customNo" label="客户代码" align="center" :show-overflow-tooltip="true" />
-			<el-table-column prop="customName" label="客户名称" align="center" :show-overflow-tooltip="true" />
+			<el-table-column prop="customName" label="客户名称" align="center" :show-overflow-tooltip="true" min-width="240" />
 			<el-table-column prop="customAddress" label="客户地址" align="center" :show-overflow-tooltip="true" />
 			<el-table-column prop="remarks" label="备注" align="center" :show-overflow-tooltip="true" />
 			<el-table-column prop="type" label="出库状态" align="center">
@@ -65,7 +65,7 @@
 					<el-tag type="info" v-if="scope.row.status === 0">停用</el-tag>
 				</template>
 			</el-table-column>
-			<el-table-column prop="year" label="年周日" align="center">
+			<el-table-column prop="year" label="年月日" align="center" min-width="100">
 				<template slot-scope="scope">
 					<span v-if="scope.row.year">{{ scope.row.year + '-' + scope.row.week + '-' + scope.row.date }}</span>
 				</template>
@@ -78,7 +78,7 @@
 					<el-button size="mini" v-hasPermi="['business:wmoutorder:print']" type="primary" icon="el-icon-printer" title="打印" :disabled="scope.row.status === 3" @click="handlePrint(scope.row)"></el-button>
 					<el-button size="mini" v-hasPermi="['business:wmoutorder:edit']" type="success" icon="el-icon-edit" title="编辑" @click="handleUpdate(scope.row)"></el-button>
 					<el-button size="mini" v-hasPermi="['business:wmoutorder:delete']" type="danger" icon="el-icon-delete" title="删除" @click="handleDelete(scope.row)"></el-button>
-					<el-button size="mini" type="warning" @click="handlePlan(scope.row)">出库计划</el-button>
+					<el-button size="mini" type="warning" @click="handlePlan(scope.row)">出库详情</el-button>
 				</template>
 			</el-table-column>
 		</el-table>
@@ -109,7 +109,7 @@
 				<el-row :gutter="20">
 					<el-col :lg="12">
 						<el-form-item label="客户选择" prop="customId">
-							<el-select :disabled="form.type === 2" v-model="selectCustomInfo" filterable placeholder="请选择一个客户" @change="handleCustomSelectChange">
+							<el-select :disabled="form.type === 2" v-model="selectCustomInfo" filterable placeholder="请选择一个客户" @change="handleCustomSelectChange" value-key="customNo">
 								<el-option v-for="(item, index) in customOptions" :key="index" :label="item.customNo + '-' + item.customName" :value="item">
 								</el-option>
 							</el-select>
diff --git a/src/views/wmsManagement/WmpatchSearch.vue b/src/views/wmsManagement/WmpatchSearch.vue
index b232e6b..a52ad34 100644
--- a/src/views/wmsManagement/WmpatchSearch.vue
+++ b/src/views/wmsManagement/WmpatchSearch.vue
@@ -6,6 +6,7 @@
 			<el-tab-pane label="入库记录根据零件号" name="3"><TAB3 v-if="activeName === '3'"></TAB3></el-tab-pane>
 			<el-tab-pane label="出库记录根据批次号" name="4"><TAB4 v-if="activeName === '4'"></TAB4></el-tab-pane>
 			<el-tab-pane label="出库记录根据零件号" name="5"><TAB5 v-if="activeName === '5'"></TAB5></el-tab-pane>
+			<el-tab-pane label="出库记录根据出库单" name="6"><TAB6 v-if="activeName === '6'"></TAB6></el-tab-pane>
 		</el-tabs>
 	</div>
 </template>
@@ -16,6 +17,7 @@
 	import TAB3 from './components/TheWmBatchSearch/入库记录根据零件号/index.vue';
 	import TAB4 from './components/TheWmBatchSearch/出库记录根据批次号/index.vue';
 	import TAB5 from './components/TheWmBatchSearch/出库记录根据零件号/index.vue';
+	import TAB6 from './components/TheWmBatchSearch/出库记录根据出库单/index.vue';
 	export default {
 		name: 'WmpatchSearch',
 		components: {
@@ -23,7 +25,8 @@
 			TAB2,
 			TAB3,
 			TAB4,
-			TAB5
+			TAB5,
+			TAB6
 		},
 		data() {
 			return {
diff --git a/src/views/wmsManagement/components/TheBatchOutProductionDialog/TheBatchOutProductionDialog.vue b/src/views/wmsManagement/components/TheBatchOutProductionDialog/TheBatchOutProductionDialog.vue
index ef4d29b..8e7baaa 100644
--- a/src/views/wmsManagement/components/TheBatchOutProductionDialog/TheBatchOutProductionDialog.vue
+++ b/src/views/wmsManagement/components/TheBatchOutProductionDialog/TheBatchOutProductionDialog.vue
@@ -1,6 +1,6 @@
 <template>
 	<div>
-		<el-dialog v-bind="$attrs" v-on="$listeners" @open="onOpen" @close="onClose" title="批次出库" width="80%">
+		<el-dialog v-bind="$attrs" v-on="$listeners" @open="onOpen" @close="onClose" title="批次出库" width="80%" :close-on-click-modal="false">
 			<el-form ref="elForm" :model="formData" size="medium" label-width="100px">
 				<el-row type="flex" justify="start" align="top" :gutter="15">
 					<el-form-item label="出库单" prop="fkOutOrderId">
@@ -42,7 +42,7 @@
 			</el-table>
 			<pagination class="mt10" background :total="total" :page.sync="formData.pageNum" :limit.sync="formData.pageSize" @pagination="getList" />
 			<div slot="footer">
-				<el-button @click="close">取消</el-button>
+				<el-button type="info" @click="close">取消</el-button>
 				<el-button type="primary" @click="handelConfirm" :disabled="dataList.length===0">按所勾选出库</el-button>
 			</div>
 		</el-dialog>
@@ -99,6 +99,15 @@
 				this.outOrderOptions = [];
 				this.PackageCodeOptions = [];
 			},
+			// 不关闭弹窗
+			endAction(){
+				this.$refs['elForm'].resetFields()
+				this.$emit("refresh");
+				this.dataList = [];
+				this.total = 0;
+				this.outOrderOptions = [];
+				this.PackageCodeOptions = [];
+			},
 			handelConfirm() {
 				this.$refs['elForm'].validate(valid => {
 					if (!valid) return
@@ -205,7 +214,7 @@
 				doPatchOutProduction(data).then((res) => {
 					if (res.code === 200 || res.data === "ok") {
 						this.$message.success("批量操作成功！")
-						this.close();
+						this.endAction();
 					} else {
 						this.$message.error(res.msg)
 					}
@@ -241,7 +250,7 @@
 				doPatchOutProduction(data).then((res) => {
 					if (res.code === 200 || res.data === "ok") {
 						this.$message.success("批量操作成功！")
-						this.close();
+						this.endAction();
 					} else {
 						this.$message.error(res.msg)
 					}
diff --git a/src/views/wmsManagement/components/TheChouseMaterial/TheChouseMaterial.vue b/src/views/wmsManagement/components/TheChouseMaterial/TheChouseMaterial.vue
index dfd1d46..e66b3b2 100644
--- a/src/views/wmsManagement/components/TheChouseMaterial/TheChouseMaterial.vue
+++ b/src/views/wmsManagement/components/TheChouseMaterial/TheChouseMaterial.vue
@@ -1,10 +1,10 @@
 <template>
 	<div>
-		<el-dialog v-bind="$attrs" v-on="$listeners" @open="onOpen" @close="onClose" title="物料选择">
+		<el-dialog v-bind="$attrs" v-on="$listeners" @open="onOpen" @close="onClose" title="物料选择" width="80%" :close-on-click-modal="false">
 			<el-form ref="elForm" :model="formData" :rules="rules" size="mini" label-width="80px">
 				<el-row type="flex" justify="start" align="top" :gutter="10">
 					<el-form-item label="物料号" prop="partnumber">
-						<el-input v-model="formData.partnumber" placeholder="请输入物料号" clearable :style="{ width: '100%' }"> </el-input>
+						<el-input v-model="formData.partnumber" placeholder="请输入物料号(零件号)" clearable :style="{ width: '100%' }"> </el-input>
 					</el-form-item>
 					<el-form-item label="U8编码" prop="u8InventoryCode">
 						<el-input v-model="formData.u8InventoryCode" placeholder="请输入U8编码" clearable :style="{ width: '100%' }"></el-input>
@@ -15,7 +15,7 @@
 				</el-row>
 				<el-row type="flex" justify="start" align="top" :gutter="10">
 					<el-form-item label="" prop="search">
-						<el-button type="primary" icon="el-icon-search" size="medium" @click="getList">搜索</el-button>
+						<el-button type="primary" icon="el-icon-search" size="mini" @click="getList">搜索</el-button>
 						
 					</el-form-item>
 				</el-row>
diff --git a/src/views/wmsManagement/components/TheOutboundPlan/index.vue b/src/views/wmsManagement/components/TheOutboundPlan/index.vue
index 791ce81..24b5864 100644
--- a/src/views/wmsManagement/components/TheOutboundPlan/index.vue
+++ b/src/views/wmsManagement/components/TheOutboundPlan/index.vue
@@ -1,35 +1,29 @@
 <template>
 	<div>
-		<el-dialog v-bind="$attrs" v-on="$listeners" @open="onOpen" @close="onClose" :title="title" width="800px">
+		<el-dialog v-bind="$attrs" v-on="$listeners" @open="onOpen" @close="onClose" :title="title" width="80%" :close-on-click-modal="false">
 			<el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="100px"> </el-form>
 			<!-- 出库计划列表 -->
 			<div>
 				<!-- 数据区域 -->
 				<el-table :data="dataList" v-loading="loading" ref="table" border highlight-current-row max-height="400px">
-					<el-table-column prop="patchcode" label="批次号" align="center" :show-overflow-tooltip="true" />
-					<el-table-column prop="materialCode" label="物料号" align="center" :show-overflow-tooltip="true" />
+					<el-table-column prop="packageCode" label="批次号" align="center" :show-overflow-tooltip="true" min-width="140" />
+					<el-table-column prop="partnumber" label="物料号(零件号)" align="center" :show-overflow-tooltip="true" min-width="140" />
+					<el-table-column prop="description" label="描述" align="center" :show-overflow-tooltip="true" min-width="160" />
 					<el-table-column prop="warehouseCode" label="所属仓库" align="center" :show-overflow-tooltip="true" />
-					<el-table-column prop="packageNum" label="批次箱数" align="center" :show-overflow-tooltip="true" />
-					<el-table-column prop="partnumberNum" label="批次零件数" align="center" :show-overflow-tooltip="true" />
-					<el-table-column prop="requireNum" label="需求零件数" align="center" :show-overflow-tooltip="true" />
-					<el-table-column prop="patchtime" label="批次时间" align="center" :show-overflow-tooltip="true" />
-					<el-table-column prop="outorder" label="出库顺序" align="center">
+					<el-table-column prop="requireNum" label="零件总需求" align="center" :show-overflow-tooltip="true" />
+					<el-table-column prop="outPackageNum" label="已出箱" align="center" :show-overflow-tooltip="true" />
+					<el-table-column prop="outPartnumberNum" label="已出零件" align="center" :show-overflow-tooltip="true" />
+					<el-table-column prop="packagePlanNum" label="计划箱" align="center" :show-overflow-tooltip="true" />
+					<el-table-column prop="partnumberPlanNum" label="计划零件" align="center" :show-overflow-tooltip="true" />
+					<el-table-column prop="packageNum" label="仓库箱" align="center" :show-overflow-tooltip="true" />
+					<el-table-column prop="partnumberNum" label="仓库零件" align="center" :show-overflow-tooltip="true" />
+					<el-table-column prop="isOver" label="是否出完" align="center">
 						<template slot-scope="scope">
-							<el-input v-model.number="scope.row.outorder" placeholder="请输入出库顺序" />
-						</template>
-					</el-table-column>
-					<el-table-column label="操作" align="center" fixed="right" width="80">
-						<template slot-scope="scope">
-							<el-button
-								size="mini"
-								v-hasPermi="['business:wmoutorder:edit']"
-								type="success"
-								icon="el-icon-edit"
-								title="保存"
-								@click="handleUpdate(scope.row)"
-							></el-button>
+							<el-tag v-if="scope.row.isOver" type="success" effect="dark">已出完</el-tag>
+							<el-tag v-else type="info" effect="dark">未出完</el-tag>
 						</template>
 					</el-table-column>
+					<el-table-column prop="outOrder" label="计划顺序" align="center" :show-overflow-tooltip="true" />
 				</el-table>
 				<!-- <pagination
 					class="mt10"
@@ -63,7 +57,7 @@ export default {
 				pageSize: 10,
 			},
 			// 弹出层标题
-			title: '出库计划',
+			title: '出库详情',
 			// 数据列表
 			dataList: [],
 			// 总记录数
@@ -98,8 +92,9 @@ export default {
 			setTimeout(() => {
 				this.loading = false
 			}, 30000)
-			WmOutOrderApi.generateOutorderplan({ shipment_num: this.planKey }).then((res) => {
+			WmOutOrderApi.getOutOrderPlanAndOutProductionNum({ shipment_num: this.planKey }).then((res) => {
 				if (res.code === 200) {
+					console.log(res);
 					this.dataList = res.data
 					// 计划出库批次清单
 					this.loading = false
diff --git a/src/views/wmsManagement/components/TheWmBatchSearch/出库记录根据出库单/index.vue b/src/views/wmsManagement/components/TheWmBatchSearch/出库记录根据出库单/index.vue
new file mode 100644
index 0000000..cd1d55b
--- /dev/null
+++ b/src/views/wmsManagement/components/TheWmBatchSearch/出库记录根据出库单/index.vue
@@ -0,0 +1,185 @@
+<template>
+	<div class="app-container">
+		<el-form :model="queryParams" size="small" label-position="right" inline ref="queryForm" :label-width="labelWidth" v-show="showSearch" @submit.native.prevent>
+			<el-form-item label="出库单" prop="shipmentNum">
+				<el-input v-model="queryParams.shipmentNum" placeholder="请输入出库单号" :clearable="true" />
+			</el-form-item>
+			<el-form-item label=" ">
+				<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+				<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+			</el-form-item>
+		</el-form>
+
+		<vxe-table border :header-cell-style="headerCellStyle" :row-style="rowClassStyle" keep-source resizable ref="xTable" :loading="loading" max-height="800" :row-config="{isHover: true}" :tree-config="{ 
+		transform: true, 
+		rowField: 'packageCodeClient_son', 
+		parentField: 'packageCodeClient_short_parent',
+		lazy: true, 
+		hasChild: 'hasChild', 
+		loadMethod: loadChildrenMethod }" :edit-config="{ trigger: 'manual', mode: 'row' }" :data="dataList">
+			<vxe-column field="shipmentNum" title="出库单号" tree-node min-width="100"></vxe-column>
+			<vxe-column field="partnumber" title="零件号" min-width="100"></vxe-column>
+			<vxe-column field="description" title="描述" min-width="120"></vxe-column>
+			<vxe-column field="packageCode" title="批次号" min-width="180"></vxe-column>
+			<vxe-column field="locationCode" title="库位编码"></vxe-column>
+			<vxe-column field="packageNum" title="箱数"></vxe-column>
+			<vxe-column field="goodsNumAction" title="已出">
+			</vxe-column>
+			<!-- <vxe-column field="goodsNumAction" title="库存" :edit-render="{}">
+				<template #edit="{ row }">
+					<vxe-input v-model="row.goodsNumAction" type="text"></vxe-input>
+				</template>
+			</vxe-column>
+			<vxe-column title="操作" width="160">
+				<template #default="{ row }">
+					<template v-if="$refs.xTable.isActiveByRow(row)">
+						<vxe-button @click="saveRowEvent(row)">保存</vxe-button>
+						<vxe-button @click="cancelRowEvent(row)">取消</vxe-button>
+					</template>
+					<template v-else>
+						<vxe-button @click="editRowEvent(row)">编辑</vxe-button>
+					</template>
+				</template>
+			</vxe-column> -->
+			<vxe-column field="outTime" title="出库时间" min-width="120"></vxe-column>
+			<vxe-column field="remark" title="备注"></vxe-column>
+		</vxe-table>
+		<pagination class="mt10" background :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
+	</div>
+</template>
+
+<script>
+	import * as WmGoodsBatchApi from '@/api/wmsManagement/wmGoodsBatchSearch.js'
+	export default {
+		name: 'PatchSearch6',
+		data() {
+			return {
+				labelWidth: '100px',
+				formLabelWidth: '100px',
+				// 遮罩层
+				loading: false,
+				// 显示搜索条件
+				showSearch: true,
+				// 查询参数
+				queryParams: {
+					partnumber: '',
+					packageCode: '',
+					// 出库单号
+					shipmentNum:'',
+					pageNum: 1,
+					pageSize: 10,
+					// 查询类别:1-树父节点 2-树子节点
+					type: 1,
+					// 聚合模型类别:1-根据批次号 2-根据零件号 3-根据出库单
+					model: 3,
+					// 查询类别:1-入库 2-出库
+					category: 2
+				},
+				dataList: [],
+				total: 0,
+			}
+		},
+		mounted() {
+			this.getList()
+		},
+		methods: {
+			// 查询数据
+			getList() {
+				this.loading = true
+				setTimeout(() => {
+					this.loading = false
+				}, 30000)
+				let data = this.queryParams;
+				WmGoodsBatchApi.GetBatchTreeTableData(data).then(res => {
+					if (res.code === 200) {
+						this.total = res.data.totalNum;
+						this.dataList = res.data.result;
+						this.loading = false
+					} else {
+						this.loading = false
+					}
+				})
+			},
+			loadChildrenMethod({ row }) {
+				return new Promise(resolve => {
+					const data = {
+						type: 2,
+						model: 3,
+						category: 2,
+						shipmentNum: row.packageCodeClient_son,
+					}
+					WmGoodsBatchApi.GetBatchTreeTableData(data).then(res => {
+						if (res.code === 200) {
+							resolve(res.data.result);
+						}
+					})
+				})
+			},
+			//todo 处理搜索请求
+			handleQuery() {
+				this.queryParams.pageNum = 1
+				this.getList()
+			},
+			resetQuery() {
+				this.queryParams.partnumber = ''
+				this.queryParams.packageCode = ''
+			},
+			//todo 修改库存
+			editRowEvent(row) {
+				const $table = this.$refs.xTable
+				$table.setActiveRow(row)
+			},
+			saveRowEvent(row) {
+				const $table = this.$refs.xTable
+				$table
+					.clearActived()
+					.then(() => {
+						this.loading = true
+						//提交修改
+						const query = { id: row.id, stack_num: row.goodsNumAction }
+						return updateactualInventoryQuantity(query)
+					})
+					.then((res) => {
+						if (res.code == 200 && res.data > 0) {
+							this.$notify.success('修改成功')
+							this.getList()
+						}
+					})
+			},
+			cancelRowEvent(row) {
+				const $table = this.$refs.xTable
+				$table.clearActived().then(() => {
+					// 还原行数据
+					$table.revertData(row)
+					//this.getList()
+				})
+			},
+			// 表格头部颜色配置
+			headerCellStyle({ column }) {
+				const data = {
+					backgroundColor: '#C0C4CC',
+					color: '#303133'
+				}
+				return data
+			},
+			rowClassStyle({ row, column, rowIndex }) {
+				let data = {
+					backgroundColor: '#F2F6FC',
+					color: '#303133'
+				}
+				if (rowIndex % 2 > 0) {
+					data.backgroundColor = '#EBEEF5'
+				}
+				// if( row.description === '此零件号不在物料清单内！'){
+				// 	data.backgroundColor = '#F56C6C';
+				// 	data.color = '#FFFFFF'
+				// }
+
+				return data
+			},
+		},
+	}
+</script>
+
+<style scoped>
+</style>
\ No newline at end of file
diff --git a/src/views/wmsManagement/components/TheWmBatchSearch/出库记录根据批次号/index.vue b/src/views/wmsManagement/components/TheWmBatchSearch/出库记录根据批次号/index.vue
index 018f9a5..98f63c5 100644
--- a/src/views/wmsManagement/components/TheWmBatchSearch/出库记录根据批次号/index.vue
+++ b/src/views/wmsManagement/components/TheWmBatchSearch/出库记录根据批次号/index.vue
@@ -4,9 +4,6 @@
 			<el-form-item label="短批次号" prop="packageCodeClient">
 				<el-input v-model="queryParams.packageCode" placeholder="请输入批次号" :clearable="true" />
 			</el-form-item>
-			<el-form-item label="零件号" prop="partnumber">
-				<el-input v-model="queryParams.partnumber" placeholder="请输入零件号" :clearable="true" />
-			</el-form-item>
 			<el-form-item label=" ">
 				<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
 				<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -25,7 +22,7 @@
 			<vxe-column field="description" title="描述" min-width="120"></vxe-column>
 			<vxe-column field="locationCode" title="库位编码"></vxe-column>
 			<vxe-column field="packageNum" title="箱数"></vxe-column>
-			<vxe-column field="goodsNumAction" title="库存">
+			<vxe-column field="goodsNumAction" title="已出">
 			</vxe-column>
 			<!-- <vxe-column field="goodsNumAction" title="库存" :edit-render="{}">
 				<template #edit="{ row }">
@@ -66,6 +63,8 @@
 				queryParams: {
 					partnumber: '',
 					packageCode: '',
+					// 出库单号
+					shipmentNum:'',
 					pageNum: 1,
 					pageSize: 10,
 					// 查询类别:1-树父节点 2-树子节点
diff --git a/src/views/wmsManagement/components/TheWmBatchSearch/出库记录根据零件号/index.vue b/src/views/wmsManagement/components/TheWmBatchSearch/出库记录根据零件号/index.vue
index 7133ba8..685e04b 100644
--- a/src/views/wmsManagement/components/TheWmBatchSearch/出库记录根据零件号/index.vue
+++ b/src/views/wmsManagement/components/TheWmBatchSearch/出库记录根据零件号/index.vue
@@ -25,7 +25,7 @@
 			<vxe-column field="packageCode" title="批次号" min-width="180"></vxe-column>
 			<vxe-column field="locationCode" title="库位编码"></vxe-column>
 			<vxe-column field="packageNum" title="箱数"></vxe-column>
-			<vxe-column field="goodsNumAction" title="库存">
+			<vxe-column field="goodsNumAction" title="已出">
 			</vxe-column>
 			<!-- <vxe-column field="goodsNumAction" title="库存" :edit-render="{}">
 				<template #edit="{ row }">
@@ -66,6 +66,8 @@
 				queryParams: {
 					partnumber: '',
 					packageCode: '',
+					// 出库单号
+					shipmentNum:'',
 					pageNum: 1,
 					pageSize: 10,
 					// 查询类别:1-树父节点 2-树子节点
@@ -154,7 +156,7 @@
 					//this.getList()
 				})
 			},
-			// 表格颜色配置
+			// 表格头部颜色配置
 			headerCellStyle({ column }) {
 				const data = {
 					backgroundColor: '#C0C4CC',