From 93f32354aa5ae18d6f3eb5047baaaa44616738c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E6=AD=A3=E6=98=93?= <zhaozhengyi1b@126.com>
Date: Tue, 23 Apr 2024 18:43:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=93=E5=BA=93-=E6=89=B9=E9=87=8F=E5=87=BA?=
 =?UTF-8?q?=E5=BA=93=E5=8A=9F=E8=83=BD=E5=AE=9E=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wmsManagement/wmGoodsOutProduction.js |  12 +
 .../wmsManagement/WmGoodsOutProduction.vue    |  25 +-
 .../TheBatchOutProductionDialog.vue           | 255 ++++++++++++++++++
 3 files changed, 289 insertions(+), 3 deletions(-)
 create mode 100644 src/views/wmsManagement/components/TheBatchOutProductionDialog/TheBatchOutProductionDialog.vue

diff --git a/src/api/wmsManagement/wmGoodsOutProduction.js b/src/api/wmsManagement/wmGoodsOutProduction.js
index 8820296..c414fc8 100644
--- a/src/api/wmsManagement/wmGoodsOutProduction.js
+++ b/src/api/wmsManagement/wmGoodsOutProduction.js
@@ -55,3 +55,15 @@ export function delWmGoodsOutProduction(pid) {
     method: 'delete'
   })
 }
+
+/**
+* 批次出库
+* @param data
+*/
+export function doPatchOutProduction(data) {
+  return request({
+    url: '/mes/wm/WmGoodsOutProduction/doPatchOutProduction',
+    method: 'post',
+    data: data,
+  })
+}
diff --git a/src/views/wmsManagement/WmGoodsOutProduction.vue b/src/views/wmsManagement/WmGoodsOutProduction.vue
index 0cc467a..138646f 100644
--- a/src/views/wmsManagement/WmGoodsOutProduction.vue
+++ b/src/views/wmsManagement/WmGoodsOutProduction.vue
@@ -45,19 +45,28 @@
 				<el-button
 					type="primary"
 					v-hasPermi="['wmsManagement:wmgoodsoutproduction:add']"
-					plain
+					
 					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-col>
 			<el-col :span="1.5">
 				<el-button
 					type="success"
 					:disabled="single"
 					v-hasPermi="['wmsManagement:wmgoodsoutproduction:edit']"
-					plain
+					
 					icon="el-icon-edit"
 					size="mini"
 					@click="handleUpdate"
@@ -69,7 +78,7 @@
 					type="danger"
 					:disabled="multiple"
 					v-hasPermi="['wmsManagement:wmgoodsoutproduction:delete']"
-					plain
+					
 					icon="el-icon-delete"
 					size="mini"
 					@click="handleDelete"
@@ -238,6 +247,7 @@
 				<el-button type="primary" @click="submitForm">确 定</el-button>
 			</div>
 		</el-dialog>
+		<TheBatchOutProductionDialog :visible.sync="TheBatchOutProductionDialogShow" @refresh="getList()"></TheBatchOutProductionDialog>
 	</div>
 </template>
 <script>
@@ -250,8 +260,12 @@ import {
 } 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',
@@ -279,6 +293,7 @@ export default {
 			opertype: 0,
 			// 是否显示弹出层
 			open: false,
+			TheBatchOutProductionDialogShow:false,
 			// 表单参数
 			form: {},
 			PackageCodeSelect: {},
@@ -406,6 +421,10 @@ export default {
 			this.title = '手动添加出库记录'
 			this.opertype = 1
 		},
+		// 批量出库
+		handleBatchOut(){
+			this.TheBatchOutProductionDialogShow = true;
+		},
 		/** 删除按钮操作 */
 		handleDelete(row) {
 			const Ids = row.id || this.ids
diff --git a/src/views/wmsManagement/components/TheBatchOutProductionDialog/TheBatchOutProductionDialog.vue b/src/views/wmsManagement/components/TheBatchOutProductionDialog/TheBatchOutProductionDialog.vue
new file mode 100644
index 0000000..ef4d29b
--- /dev/null
+++ b/src/views/wmsManagement/components/TheBatchOutProductionDialog/TheBatchOutProductionDialog.vue
@@ -0,0 +1,255 @@
+<template>
+	<div>
+		<el-dialog v-bind="$attrs" v-on="$listeners" @open="onOpen" @close="onClose" title="批次出库" width="80%">
+			<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">
+						<el-select v-loading="loading1" v-model="formData.fkOutOrderId" clearable :style="{width: '100%'}" 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-form-item>
+					<el-form-item label="零件号" prop="partnumber">
+						<el-input v-model="formData.partnumber" placeholder="请输入零件号" />
+					</el-form-item>
+					<el-form-item label="批次号" prop="packageCodeClient">
+						<el-select allow-create v-loading="loading2" v-model="formData.packageCodeClient" clearable :style="{width: '100%'}" 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" :value="item">
+							</el-option>
+						</el-select>
+					</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-row>
+			</el-form>
+			<!-- 工具区域 -->
+			<el-row :gutter="10" class="mb8">
+				<el-col :span="1.5">
+					<el-button type="primary" plain icon="el-icon-s-unfold" size="mini" @click="handleBatchOut">按输入的批次号将该批次全部出库</el-button>
+				</el-col>
+			</el-row>
+			<el-table :data="dataList" v-loading="loading" ref="table" border highlight-current-row @selection-change="handleSelectionChange">
+				<el-table-column type="selection" width="50" align="center" />
+				<el-table-column prop="partnumber" label="零件号" align="center" :show-overflow-tooltip="true" />
+				<el-table-column prop="description" label="描述" align="center" :show-overflow-tooltip="true" />
+				<el-table-column prop="packageCodeClient" label="批次号" align="center" :show-overflow-tooltip="true"  width="300"/>
+				<el-table-column prop="locationCode" label="库位编号" align="center" :show-overflow-tooltip="true" />
+				<el-table-column prop="goodsNumAction" label="实际库存" align="center" />
+				<el-table-column prop="entryWarehouseTime" label="入库时间" align="center" :show-overflow-tooltip="true" />
+				<el-table-column prop="remark" label="备注" align="center" :show-overflow-tooltip="true" />
+			</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="primary" @click="handelConfirm" :disabled="dataList.length===0">按所勾选出库</el-button>
+			</div>
+		</el-dialog>
+	</div>
+</template>
+<script>
+	import {
+		listWmGoodsNowProduction
+	} from '@/api/wmsManagement/wmGoodsNowProduction.js'
+	import {
+		doPatchOutProduction
+	} from '@/api/wmsManagement/wmGoodsOutProduction.js'
+	import { listWmOutOrder } from '@/api/wmsManagement/wmOutOrder.js'
+	export default {
+		inheritAttrs: false,
+		components: {},
+		props: [],
+		data() {
+			return {
+				loading: false,
+				formData: {
+					fkOutOrderId: "",
+					partnumber: "",
+					packageCodeClient: "",
+					pageNum: 1,
+					pageSize: 10,
+				},
+				// 数据列表
+				dataList: [],
+				// 总记录数
+				total: 0,
+				loading1: false,
+				outOrderOptions: [],
+				loading2: false,
+				PackageCodeOptions: [],
+				// 多选id
+				selectIds: []
+			}
+		},
+		computed: {},
+		watch: {},
+		created() {},
+		mounted() {},
+		methods: {
+			onOpen() {},
+			onClose() {
+				this.$refs['elForm'].resetFields()
+			},
+			close() {
+				this.$emit('update:visible', false)
+				this.$emit("refresh");
+				this.dataList = [];
+				this.total = 0;
+				this.outOrderOptions = [];
+				this.PackageCodeOptions = [];
+			},
+			handelConfirm() {
+				this.$refs['elForm'].validate(valid => {
+					if (!valid) return
+					this.handleSelectOut();
+				})
+			},
+			// 重置查询操作
+			resetQuery() {
+				this.resetForm('elForm')
+				this.handleQuery()
+			},
+			/** 搜索按钮操作 */
+			handleQuery() {
+				this.formData.pageNum = 1
+				this.getList()
+			},
+			// 查询数据
+			getList() {
+				this.loading = true
+				listWmGoodsNowProduction(this.formData).then((res) => {
+					if (res.code == 200) {
+						this.dataList = res.data.result
+						this.total = res.data.totalNum
+						this.loading = false
+					}
+				})
+			},
+			// 多选框选中数据
+			handleSelectionChange(selection) {
+				this.selectIds = selection.map((item) => item.id)
+			},
+			// 远程搜索工单号
+			handlerOutOrderRemoteMethod(query) {
+				if (query !== '') {
+					const data = {
+						pageNum: 1,
+						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) {
+				if (select.packageCodeClient) {
+					this.formData.packageCodeClient = select.packageCodeClient
+				} else {
+					this.formData.packageCodeClient = select
+				}
+
+			},
+			// 按所选出库
+			handleSelectOut() {
+				const fkOutOrderId = this.formData.fkOutOrderId;
+				if (fkOutOrderId === "" || fkOutOrderId === null) {
+					this.$confirm("工单号未填写，是否继续？继续则执行无工单号出库！", "操作提醒").then(() => {
+						this.doSelectOut();
+					}).catch(() => {
+						return;
+					})
+				} else {
+					this.doSelectOut();
+				}
+			},
+			doSelectOut() {
+				const fkOutOrderId = this.formData.fkOutOrderId;
+				const data = {
+					ids: this.selectIds,
+					fkOutOrderId,
+					type: 1
+				}
+				doPatchOutProduction(data).then((res) => {
+					if (res.code === 200 || res.data === "ok") {
+						this.$message.success("批量操作成功！")
+						this.close();
+					} else {
+						this.$message.error(res.msg)
+					}
+				})
+			},
+			// 全部出库
+			handleBatchOut() {
+				const packageCodeClient = this.formData.packageCodeClient;
+				const fkOutOrderId = this.formData.fkOutOrderId;
+				if (packageCodeClient === "" || packageCodeClient === null) {
+					this.$message.error("批次号未填写！请填写批次号！");
+					return;
+				}
+				if (fkOutOrderId === "" || fkOutOrderId === null) {
+					this.$confirm("工单号未填写，是否继续？继续则执行无工单号出库！", "操作提醒").then(() => {
+						this.doBatchOut();
+					}).catch(() => {
+						return;
+					})
+				} else {
+					this.doBatchOut();
+				}
+			},
+			//全部出库执行
+			doBatchOut() {
+				const packageCodeClient = this.formData.packageCodeClient;
+				const fkOutOrderId = this.formData.fkOutOrderId;
+				const data = {
+					packageCodeClient,
+					fkOutOrderId,
+					type: 2
+				}
+				doPatchOutProduction(data).then((res) => {
+					if (res.code === 200 || res.data === "ok") {
+						this.$message.success("批量操作成功！")
+						this.close();
+					} else {
+						this.$message.error(res.msg)
+					}
+				})
+
+			}
+		}
+	}
+</script>
+<style>
+</style>
\ No newline at end of file