修改wms 包材出库新增

src/api/kanban/equipment.js

@@ -54,3 +54,11 @@ export function equipmentStability(data) {
 		params: data
 	});
 }
+//看板刷新时间
+export function getDeviceRefreshTime(data) {
+	return request({
+		url: '/device/deviceInterface/getDeviceRefreshTime',
+		method: 'get',
+		params: data
+	});
+}

src/api/wms/outorder.js

@@ -42,3 +42,27 @@ export function delOutorder(ID) {
 		method: 'delete'
 	});
 }
+// 仓库列表
+export function getlistCK(data) {
+	return request({
+		url: '/wms/order/listCK',
+		method: 'post',
+		data: data
+	});
+}
+// 列表
+export function PurchaseOrderOutboundPda(data) {
+	return request({
+		url: '/wms/order/PurchaseOrderOutboundPda',
+		method: 'post',
+		data: data
+	});
+}
+// 新增
+export function addPurchaseOrderOutbound(data) {
+	return request({
+		url: '/wms/order/addPurchaseOrderOutbound',
+		method: 'post',
+		data: data
+	});
+}

src/views/wms/outorder/index.vue

@@ -3,28 +3,16 @@
 		<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
 
 			<el-form-item label="出库单号" prop="produceCode">
-				<el-input
+				<el-input v-model="queryParams.produceCode" placeholder="请输入出库单号" clearable
-					v-model="queryParams.produceCode"
+					@keyup.enter.native="handleQuery" />
-					placeholder="请输入出库单号"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
 			</el-form-item>
 			<el-form-item label="型号编码" prop="materialCode">
-				<el-input
+				<el-input v-model="queryParams.materialCode" placeholder="请输入型号编码" clearable
-					v-model="queryParams.materialCode"
+					@keyup.enter.native="handleQuery" />
-					placeholder="请输入型号编码"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
 			</el-form-item>
 			<el-form-item label="型号名称" prop="materialDesc">
-				<el-input
+				<el-input v-model="queryParams.materialDesc" placeholder="请输入型号名称" clearable
-					v-model="queryParams.materialDesc"
+					@keyup.enter.native="handleQuery" />
-					placeholder="请输入型号名称"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
 			</el-form-item>
 
 			<el-form-item>
@@ -35,60 +23,34 @@
 
 		<el-row :gutter="10" class="mb8">
 			<el-col :span="1.5">
-				<el-button
+				<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-					type="primary"
+					v-hasPermi="['wms:outorder:add']">新增</el-button>
-					plain
-					icon="el-icon-plus"
-					size="mini"
-					@click="handleAdd"
-					v-hasPermi="['wms:outorder:add']"
-				>新增</el-button>
 			</el-col>
-			<el-col :span="1.5">
+			<!-- <el-col :span="1.5">
-				<el-button
+				<el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
-					type="success"
+					v-hasPermi="['wms:outorder:edit']">修改</el-button>
-					plain
-					icon="el-icon-edit"
-					size="mini"
-					:disabled="single"
-					@click="handleUpdate"
-					v-hasPermi="['wms:outorder:edit']"
-				>修改</el-button>
 			</el-col>
 			<el-col :span="1.5">
-				<el-button
+				<el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
-					type="danger"
+					v-hasPermi="['wms:outorder:remove']">删除</el-button>
-					plain
+			</el-col> -->
-					icon="el-icon-delete"
-					size="mini"
-					:disabled="multiple"
-					@click="handleDelete"
-					v-hasPermi="['wms:outorder:remove']"
-				>删除</el-button>
-			</el-col>
 			<el-col :span="1.5">
-				<el-button
+				<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
-					type="warning"
+					v-hasPermi="['wms:outorder:export']">导出</el-button>
-					plain
-					icon="el-icon-download"
-					size="mini"
-					@click="handleExport"
-					v-hasPermi="['wms:outorder:export']"
-				>导出</el-button>
 			</el-col>
 			<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
 		</el-row>
 
 		<el-table v-loading="loading" :data="outorderList" @selection-change="handleSelectionChange">
 			<el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="序号" type="index"   :index='indexMethod'> </el-table-column>
+			<el-table-column label="序号" type="index" :index='indexMethod'> </el-table-column>
 			<el-table-column label="工厂编码" align="center" prop="siteCode" v-if="false" />
 			<el-table-column label="ID" align="center" prop="ID" v-if="false" />
 			<el-table-column label="出库单号" align="center" prop="produceCode" />
 			<el-table-column label="型号编码" align="center" prop="materialCode" />
 			<el-table-column label="型号名称" align="center" prop="materialDesc" />
-      <el-table-column label="批次号" align="center" prop="userDefined1" />
+			<el-table-column label="批次号" align="center" prop="userDefined1" />
-			<el-table-column label="计划日期" align="center" prop="planDate" width="180"v-if="false" >
+			<el-table-column label="计划日期" align="center" prop="planDate" width="180" v-if="false">
 				<template slot-scope="scope">
 					<span>{{ parseTime(scope.row.planDate, '{y}-{m}-{d}') }}</span>
 				</template>
@@ -98,7 +60,7 @@
 			<el-table-column label="出库数量" align="center" prop="outNumber" />
 			<el-table-column label="托盘号" align="center" prop="userDefined2" />
 			<el-table-column label="库位" align="center" prop="locCode" />
-			<el-table-column label="库位名称" align="center" prop="locDesc"v-if="false" />
+			<el-table-column label="库位名称" align="center" prop="locDesc" v-if="false" />
 			<el-table-column label="产线名称" align="center" prop="productionLineDesc" v-if="false" />
 			<el-table-column label="产线" align="center" prop="productionLineCode" />
 			<el-table-column label="状态" align="center" prop="orderStatus" />
@@ -110,78 +72,60 @@
 					<span>{{ parseTime(scope.row.createDate, '{y}-{m}-{d}') }}</span>
 				</template>
 			</el-table-column>
-
+			<!-- 
 			<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
 				<template slot-scope="scope">
-					<el-button
+					<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-						size="mini"
+						v-hasPermi="['wms:outorder:edit']">修改</el-button>
-						type="text"
+					<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-						icon="el-icon-edit"
+						v-hasPermi="['wms:outorder:remove']">删除</el-button>
-						@click="handleUpdate(scope.row)"
-						v-hasPermi="['wms:outorder:edit']"
-					>修改</el-button>
-					<el-button
-						size="mini"
-						type="text"
-						icon="el-icon-delete"
-						@click="handleDelete(scope.row)"
-						v-hasPermi="['wms:outorder:remove']"
-					>删除</el-button>
 				</template>
-			</el-table-column>
+			</el-table-column> -->
 		</el-table>
 
-		<pagination
+		<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-			v-show="total>0"
+			@pagination="getList" />
-			:total="total"
-			:page.sync="queryParams.pageNum"
-			:limit.sync="queryParams.pageSize"
-			@pagination="getList"
-		/>
 
 		<!-- 添加或修改包材出库单对话框 -->
-		<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+		<el-dialog :title="title" :visible.sync="open" width="1200px" append-to-body>
-			<el-form ref="form" :model="form" :rules="rules" label-width="80px">
+			<el-form ref="queryParams1" :model="queryParams1" :inline="true" :rules="rulesadd" label-width="130px">
-				<el-form-item label="工厂编码" prop="siteCode">
+				<el-form-item label="领料单号" prop="produceCode">
-					<el-input v-model="form.siteCode" placeholder="请输入工厂编码" />
+					<el-input style="width: 230px" @keyup.enter.native="handlequeryform" v-model="queryParams1.produceCode"
-				</el-form-item>
+						placeholder="请输入领料单号" />
-				<el-form-item label="出库单号" prop="produceCode">
-					<el-input v-model="form.produceCode" placeholder="请输入生成订单" />
-				</el-form-item>
-				<el-form-item label="型号编码" prop="materialCode">
-					<el-input v-model="form.materialCode" placeholder="请输入型号编码" />
-				</el-form-item>
-				<el-form-item label="型号名称" prop="materialDesc">
-					<el-input v-model="form.materialDesc" placeholder="请输入型号名称" />
-				</el-form-item>
-				<el-form-item label="计划日期" prop="planDate">
-					<el-date-picker clearable
-						v-model="form.planDate"
-						type="date"
-						value-format="yyyy-MM-dd"
-						placeholder="请选择计划日期">
-					</el-date-picker>
-				</el-form-item>
-				<el-form-item label="计划数量" prop="planNumber">
-					<el-input v-model="form.planNumber" placeholder="请输入计划数量" />
-				</el-form-item>
-				<el-form-item label="单位" prop="Unit">
-					<el-input v-model="form.Unit" placeholder="请输入单位" />
 				</el-form-item>
-				
+				<el-form-item label="仓库编码" prop="warehouseNo">
-				<el-form-item label="库位编号" prop="locCode">
+					<el-select v-model="queryParams1.warehouseNo" placeholder="请选择仓库编码" @change="forceUpdate()" clearable
-					<el-input v-model="form.locCode" placeholder="请输入库位编号" />
+						filterable style="width: 230px">
-				</el-form-item>
+						<el-option v-for="item in Optionlistck" :key="item.stationNo" :label="item.stationname"
-				
+							:value="item.stationNo"></el-option>
-				<el-form-item label="产线名称" prop="productionLineDesc">
+					</el-select>
-					<el-input v-model="form.productionLineDesc" placeholder="请输入产线名称" />
-				</el-form-item>
-				
-				<el-form-item label="批次号" prop="userDefined1">
-					<el-input v-model="form.userDefined1" placeholder="请输入批次号" />
 				</el-form-item>
 
 			</el-form>
+			<el-row :gutter="10" class="mb8">
+				<el-col :span="1.5">
+					<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handlequeryform">查询</el-button>
+				</el-col>
+				<!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> -->
+			</el-row>
+			<el-table :data="addoutorderList" @selection-change="handleSelectionChange1">
+				<el-table-column type="selection" width="55" align="center" :index="indexMethod" />
+				<el-table-column label="序号" type="index"> </el-table-column>
+				<el-table-column label="物料描述" align="center" prop="materialDesc" />
+				<el-table-column label="物料编号" align="center" prop="materialCode" />
+				<el-table-column label="单位" align="center" prop="unit" />
+				<el-table-column label="数量" align="center" prop="planNumber" />
+				<el-table-column label="包装线" align="center" prop="stationNo" width="180">
+					<template slot-scope="scope">
+						<el-select v-model="scope.row.stationNo" placeholder="请选择包装线" @change="change1(scope.row)" clearable
+							filterable>
+							<el-option v-for="item in Packagingline" :key="item.stationNo" :label="item.stationname"
+								:value="item.stationNo">
+							</el-option>
+						</el-select>
+					</template>
+				</el-table-column>
+			</el-table>
 			<div slot="footer" class="dialog-footer">
 				<el-button type="primary" @click="submitForm">确 定</el-button>
 				<el-button @click="cancel">取 消</el-button>
@@ -191,7 +135,7 @@
 </template>
 
 <script>
-import { listOutorder, getOutorder, delOutorder, addOutorder, updateOutorder } from "@/api/wms/outorder";
+import { listOutorder, getOutorder, delOutorder, addOutorder, updateOutorder, getlistCK, addPurchaseOrderOutbound, PurchaseOrderOutboundPda } from "@/api/wms/outorder";
 
 export default {
 	name: "Outorder",
@@ -253,18 +197,64 @@ export default {
 				enterpriseId: null,
 				enterpriseCode: null
 			},
+			queryParams1: {
+				pageNum: 1,
+				pageSize: 10,
+				produceCode: '',
+				warehouseNo: '',
+			},
 			// 表单参数
 			form: {},
 			// 表单校验
 			rules: {
-			}
+			},
+			formadd: {},
+			rulesadd: {
+				produceCode: [
+					{ required: true, message: "领料单号不能为空", trigger: "blur" }
+				],
+				warehouseNo: [
+					{ required: true, message: "仓库编码不能为空", trigger: "blur" }
+				],
+			},
+			Optionlistck: [],
+			Packagingline: [
+				{
+					stationNo: 'LJ1',
+					stationname: '榄菊1',
+				},
+				{
+					stationNo: 'LJ2',
+					stationname: '榄菊2',
+				},
+				{
+					stationNo: 'LJ3',
+					stationname: '榄菊3',
+				},
+				{
+					stationNo: 'LJ4',
+					stationname: '榄菊4',
+				},
+				{
+					stationNo: 'LJ5',
+					stationname: '榄菊5',
+				},
+
+			],
+			selectedRows: [],
+			stationNo: '',
+			addoutorderList:[],
 		};
 	},
 	created() {
 		this.getList();
+		this.getselect()
 	},
 	methods: {
 		/** 查询包材出库单列表 */
+		indexMethod(index) {
+			return index + 1;
+		},
 		getList() {
 			this.loading = true;
 			listOutorder(this.queryParams).then(response => {
@@ -273,10 +263,36 @@ export default {
 				this.loading = false;
 			});
 		},
+		getList1() {
+			this.loading = true;
+			PurchaseOrderOutboundPda(this.queryParams1).then(response => {
+				this.addoutorderList = response.rows;
+				// this.total = response.total;
+				// this.loading = false;
+			});
+		},
+		getselect() {
+			getlistCK().then(response => {
+				console.log(response)
+			});
+		},
+		handleSelectionChange1(selection) {
+			this.ids = selection.map(item => item.ID)
+			this.single = selection.length !== 1
+			this.multiple = !selection.length
+			this.selectedRows = selection;
+		},
+		change1(selection) {
+			console.log(selection)
+		},
+		forceUpdate(selection) {
+			console.log(selection)
+		},
 		// 取消按钮
 		cancel() {
 			this.open = false;
 			this.reset();
+			this.queryForm = {}
 		},
 		// 表单重置
 		reset() {
@@ -323,6 +339,11 @@ export default {
 			this.queryParams.pageNum = 1;
 			this.getList();
 		},
+
+		handlequeryform() {
+			this.queryParams1.pageNum = 1;
+			this.getList1();
+		},
 		/** 重置按钮操作 */
 		resetQuery() {
 			this.resetForm("queryForm");
@@ -331,14 +352,17 @@ export default {
 		// 多选框选中数据
 		handleSelectionChange(selection) {
 			this.ids = selection.map(item => item.ID)
-			this.single = selection.length!==1
+			this.single = selection.length !== 1
 			this.multiple = !selection.length
+
 		},
 		/** 新增按钮操作 */
 		handleAdd() {
 			this.reset();
 			this.open = true;
 			this.title = "添加包材出库单";
+			this.queryParams1 = {}
+			this.addoutorderList = []
 		},
 		/** 修改按钮操作 */
 		handleUpdate(row) {
@@ -352,19 +376,36 @@ export default {
 		},
 		/** 提交按钮 */
 		submitForm() {
-			this.$refs["form"].validate(valid => {
+			const _this = this
+			this.$refs["queryParams1"].validate(valid => {
 				if (valid) {
+					console.log(_this.selectedRows)
+					if (_this.selectedRows.length <= 0) {
+						_this.$modal.msgError("请选择");
+						return
+					}
+					var bull = _this.selectedRows.some((item) => {
+						// console.log(item.stationNo ==  undefined || item.stationNo == '',item.stationNo)
+						return  item.stationNo ==  undefined || item.stationNo == ''
+					})
+					if (bull) {
+						_this.$modal.msgError("请选择包装线");
+						return
+					}
 					if (this.form.ID != null) {
-						updateOutorder(this.form).then(response => {
+						// updateOutorder(this.form).then(response => {
-							this.$modal.msgSuccess("修改成功");
+						// 	this.$modal.msgSuccess("修改成功");
-							this.open = false;
+						// 	this.open = false;
-							this.getList();
+						// 	this.getList();
-						});
+						// });
 					} else {
-						addOutorder(this.form).then(response => {
+						addPurchaseOrderOutbound(_this.selectedRows).then(response => {
-							this.$modal.msgSuccess("新增成功");
+							if (response.data) {
-							this.open = false;
+								this.$modal.msgSuccess("新增成功");
-							this.getList();
+								this.open = false;
+								this.getList();
+							}
+
 						});
 					}
 				}
@@ -373,12 +414,12 @@ export default {
 		/** 删除按钮操作 */
 		handleDelete(row) {
 			const IDs = row.ID || this.ids;
-			this.$modal.confirm('是否确认删除包材出库单编号为"' + IDs + '"的数据项？').then(function() {
+			this.$modal.confirm('是否确认删除包材出库单编号为"' + IDs + '"的数据项？').then(function () {
 				return delOutorder(IDs);
 			}).then(() => {
 				this.getList();
 				this.$modal.msgSuccess("删除成功");
-			}).catch(() => {});
+			}).catch(() => { });
 		},
 		/** 导出按钮操作 */
 		handleExport() {