From 359a21d5636dc842e06dbbf2eedd1aefd5f92f04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=9E=E6=99=93=E7=A3=8A?= <pangxiaolei@kehaida.com>
Date: Wed, 30 Aug 2023 11:33:45 +0800
Subject: [PATCH] =?UTF-8?q?wms-=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/odsRawOrderIn.js            |  44 ++
 src/api/wms/wmsRawOrderInSn.js          |  44 ++
 src/views/wms/embryo/index.vue          |  77 +---
 src/views/wms/odsRawOrderIn/index.vue   | 562 ++++++++++++++++++++++++
 src/views/wms/outorder/index.vue        |  13 +-
 src/views/wms/wmsEmbryoin/index.vue     |  46 +-
 src/views/wms/wmsRawOrderInSn/index.vue | 440 +++++++++++++++++++
 7 files changed, 1113 insertions(+), 113 deletions(-)
 create mode 100644 src/api/wms/odsRawOrderIn.js
 create mode 100644 src/api/wms/wmsRawOrderInSn.js
 create mode 100644 src/views/wms/odsRawOrderIn/index.vue
 create mode 100644 src/views/wms/wmsRawOrderInSn/index.vue

diff --git a/src/api/wms/odsRawOrderIn.js b/src/api/wms/odsRawOrderIn.js
new file mode 100644
index 00000000..d81a5bc3
--- /dev/null
+++ b/src/api/wms/odsRawOrderIn.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询包材到货单列表
+export function listOdsRawOrderIn(query) {
+	return request({
+		url: '/wms/odsRawOrderIn/list',
+		method: 'get',
+		params: query
+	});
+}
+
+// 查询包材到货单详细
+export function getOdsRawOrderIn(rawOrderInId) {
+	return request({
+		url: '/wms/odsRawOrderIn/' + rawOrderInId,
+		method: 'get'
+		});
+}
+
+// 新增包材到货单
+export function addOdsRawOrderIn(data) {
+	return request({
+		url: '/wms/odsRawOrderIn',
+		method: 'post',
+		data: data
+	});
+}
+
+// 修改包材到货单
+export function updateOdsRawOrderIn(data) {
+	return request({
+		url: '/wms/odsRawOrderIn',
+		method: 'put',
+		data: data
+	});
+}
+
+// 删除包材到货单
+export function delOdsRawOrderIn(rawOrderInId) {
+	return request({
+		url: '/wms/odsRawOrderIn/' + rawOrderInId,
+		method: 'delete'
+	});
+}
diff --git a/src/api/wms/wmsRawOrderInSn.js b/src/api/wms/wmsRawOrderInSn.js
new file mode 100644
index 00000000..c83ae61c
--- /dev/null
+++ b/src/api/wms/wmsRawOrderInSn.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询原材料收货明细列表
+export function listWmsRawOrderInSn(query) {
+	return request({
+		url: '/wms/wmsRawOrderInSn/list',
+		method: 'get',
+		params: query
+	});
+}
+
+// 查询原材料收货明细详细
+export function getWmsRawOrderInSn(rawOrderInSnId) {
+	return request({
+		url: '/wms/wmsRawOrderInSn/' + rawOrderInSnId,
+		method: 'get'
+		});
+}
+
+// 新增原材料收货明细
+export function addWmsRawOrderInSn(data) {
+	return request({
+		url: '/wms/wmsRawOrderInSn',
+		method: 'post',
+		data: data
+	});
+}
+
+// 修改原材料收货明细
+export function updateWmsRawOrderInSn(data) {
+	return request({
+		url: '/wms/wmsRawOrderInSn',
+		method: 'put',
+		data: data
+	});
+}
+
+// 删除原材料收货明细
+export function delWmsRawOrderInSn(rawOrderInSnId) {
+	return request({
+		url: '/wms/wmsRawOrderInSn/' + rawOrderInSnId,
+		method: 'delete'
+	});
+}
diff --git a/src/views/wms/embryo/index.vue b/src/views/wms/embryo/index.vue
index 57cad4b5..9e8f5c3e 100644
--- a/src/views/wms/embryo/index.vue
+++ b/src/views/wms/embryo/index.vue
@@ -87,19 +87,20 @@
 			<el-table-column label="出库单号" align="center" prop="orderCode" />
 			<el-table-column label="型号编码" align="center" prop="materialCode" />
 			<el-table-column label="型号名称" align="center" prop="materialDesc" />
-			<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>
 			</el-table-column>
-			<el-table-column label="计划数量" align="center" prop="planNumber" />
+		
 			<el-table-column label="单位" align="center" prop="Unit"  v-if="false" />
-			<el-table-column label="已出库数量" align="center" prop="realityNumber" />
-			<el-table-column label="订单状态" align="center" prop="orderStatus" />
+			<el-table-column label="出库数量" align="center" prop="realityNumber" />
+			<el-table-column label="状态" align="center" prop="orderStatus" />
 			<el-table-column label="批次号" align="center" prop="userDefined1" />
+			<el-table-column label="库位" align="center" prop="locCode" />
 			<el-table-column label="产线" align="center" prop="productionLineDesc" />
 			<el-table-column label="产线编号" align="center" prop="productionLineCode"  v-if="false" />
-			<el-table-column label="库位" align="center" prop="locCode" />
+			
 
 			<el-table-column label="备注" align="center" prop="Remark" />
 			<el-table-column label="创建人" align="center" prop="createBy" />
@@ -181,73 +182,11 @@
 				<el-form-item label="库位" prop="locCode">
 					<el-input v-model="form.locCode" placeholder="请输入库位" />
 				</el-form-item>
-				<el-form-item label="用户自定义属性2" prop="userDefined2">
-					<el-input v-model="form.userDefined2" placeholder="请输入用户自定义属性2" />
-				</el-form-item>
-				<el-form-item label="用户自定义属性3" prop="userDefined3">
-					<el-input v-model="form.userDefined3" placeholder="请输入用户自定义属性3" />
-				</el-form-item>
-				<el-form-item label="用户自定义属性4" prop="userDefined4">
-					<el-input v-model="form.userDefined4" placeholder="请输入用户自定义属性4" />
-				</el-form-item>
-				<el-form-item label="用户自定义属性5" prop="userDefined5">
-					<el-input v-model="form.userDefined5" placeholder="请输入用户自定义属性5" />
-				</el-form-item>
-				<el-form-item label="用户自定义属性6" prop="userDefined6">
-					<el-input v-model="form.userDefined6" placeholder="请输入用户自定义属性6" />
-				</el-form-item>
-				<el-form-item label="用户自定义属性7" prop="userDefined7">
-					<el-input v-model="form.userDefined7" placeholder="请输入用户自定义属性7" />
-				</el-form-item>
-				<el-form-item label="用户自定义属性8" prop="userDefined8">
-					<el-input v-model="form.userDefined8" placeholder="请输入用户自定义属性8" />
-				</el-form-item>
-				<el-form-item label="用户自定义属性9" prop="userDefined9">
-					<el-input v-model="form.userDefined9" placeholder="请输入用户自定义属性9" />
-				</el-form-item>
-				<el-form-item label="用户自定义属性10" prop="userDefined10">
-					<el-input v-model="form.userDefined10" placeholder="请输入用户自定义属性10" />
-				</el-form-item>
-				<el-form-item label="用户自定义属性11" prop="userDefined11">
-					<el-input v-model="form.userDefined11" placeholder="请输入用户自定义属性11" />
-				</el-form-item>
-				<el-form-item label="供应商编码" prop="supplierCode">
-					<el-input v-model="form.supplierCode" placeholder="请输入供应商编码" />
-				</el-form-item>
-				<el-form-item label="供应商名称" prop="supplierName">
-					<el-input v-model="form.supplierName" placeholder="请输入供应商名称" />
-				</el-form-item>
+				
 				<el-form-item label="备注" prop="Remark">
 					<el-input v-model="form.Remark" placeholder="请输入备注" />
 				</el-form-item>
-				<el-form-item label="创建时间" prop="createDate">
-					<el-date-picker clearable
-						v-model="form.createDate"
-						type="date"
-						value-format="yyyy-MM-dd"
-						placeholder="请选择创建时间">
-					</el-date-picker>
-				</el-form-item>
-				<el-form-item label="最后更新人" prop="lastUpdateBy">
-					<el-input v-model="form.lastUpdateBy" placeholder="请输入最后更新人" />
-				</el-form-item>
-				<el-form-item label="最后更新时间" prop="lastUpdateDate">
-					<el-date-picker clearable
-						v-model="form.lastUpdateDate"
-						type="date"
-						value-format="yyyy-MM-dd"
-						placeholder="请选择最后更新时间">
-					</el-date-picker>
-				</el-form-item>
-				<el-form-item label="可用标识" prop="Active">
-					<el-input v-model="form.Active" placeholder="请输入可用标识" />
-				</el-form-item>
-				<el-form-item label="企业主键" prop="enterpriseId">
-					<el-input v-model="form.enterpriseId" placeholder="请输入企业主键" />
-				</el-form-item>
-				<el-form-item label="企业编码" prop="enterpriseCode">
-					<el-input v-model="form.enterpriseCode" placeholder="请输入企业编码" />
-				</el-form-item>
+				
 			</el-form>
 			<div slot="footer" class="dialog-footer">
 				<el-button type="primary" @click="submitForm">确 定</el-button>
diff --git a/src/views/wms/odsRawOrderIn/index.vue b/src/views/wms/odsRawOrderIn/index.vue
new file mode 100644
index 00000000..56f225d5
--- /dev/null
+++ b/src/views/wms/odsRawOrderIn/index.vue
@@ -0,0 +1,562 @@
+<template>
+	<div class="app-container">
+		<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" >
+			
+			<el-form-item label="到货单号" prop="dnNo">
+				<el-input
+					v-model="queryParams.dnNo"
+					placeholder="请输入到货单号"
+					clearable
+					@keyup.enter.native="handleQuery"
+				/>
+			</el-form-item>
+			<el-form-item label="采购单号" prop="poNo" width="180">
+				<el-input
+					v-model="queryParams.poNo"
+					placeholder="请输入采购订单号"
+					clearable
+					@keyup.enter.native="handleQuery"
+				/>
+			</el-form-item>
+			
+			<el-form-item label="物料编码" prop="materialCode">
+				<el-input
+					v-model="queryParams.materialCode"
+					placeholder="请输入物料号"
+					clearable
+					@keyup.enter.native="handleQuery"
+				/>
+			</el-form-item>
+			<el-form-item label="物料描述" prop="materialDesc">
+				<el-input
+					v-model="queryParams.materialDesc"
+					placeholder="请输入物料描述"
+					clearable
+					@keyup.enter.native="handleQuery"
+				/>
+			</el-form-item>
+			
+			<el-form-item label="供应商编码" prop="supplyCode" width="180">
+				<el-input
+					v-model="queryParams.supplyCode"
+					placeholder="请输入供应商编码"
+					clearable
+					@keyup.enter.native="handleQuery"
+				/>
+			</el-form-item>
+			
+			<el-form-item>
+				<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>
+
+		<el-row :gutter="10" class="mb8">
+			<el-col :span="1.5">
+				<el-button
+					type="primary"
+					plain
+					icon="el-icon-plus"
+					size="mini"
+					@click="handleAdd"
+					v-hasPermi="['wms:odsRawOrderIn:add']"
+				>新增</el-button>
+			</el-col>
+			<el-col :span="1.5">
+				<el-button
+					type="success"
+					plain
+					icon="el-icon-edit"
+					size="mini"
+					:disabled="single"
+					@click="handleUpdate"
+					v-hasPermi="['wms:odsRawOrderIn:edit']"
+				>修改</el-button>
+			</el-col>
+			<el-col :span="1.5">
+				<el-button
+					type="danger"
+					plain
+					icon="el-icon-delete"
+					size="mini"
+					:disabled="multiple"
+					@click="handleDelete"
+					v-hasPermi="['wms:odsRawOrderIn:remove']"
+				>删除</el-button>
+			</el-col>
+			<el-col :span="1.5">
+				<el-button
+					type="warning"
+					plain
+					icon="el-icon-download"
+					size="mini"
+					@click="handleExport"
+					v-hasPermi="['wms:odsRawOrderIn:export']"
+				>导出</el-button>
+			</el-col>
+			<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+		</el-row>
+
+		<el-table v-loading="loading" :data="odsRawOrderInList" @selection-change="handleSelectionChange">
+			<el-table-column type="selection" width="55" align="center" />
+			<el-table-column label="到货单号" align="center" prop="dnNo" />
+			<el-table-column label="采购订单号" align="center" prop="poNo" width="180"/>
+			<el-table-column label="采购行号" align="center" prop="poLine" />
+			<el-table-column label="物料号" align="center" prop="materialCode" />
+			<el-table-column label="物料描述" align="center" prop="materialDesc" />
+			<el-table-column label="单位" align="center" prop="unit" />
+			<el-table-column label="供应商编码" align="center" prop="supplyCode" width="180"/>
+			<el-table-column label="订单数量" align="center" prop="requestAmount" />
+			<el-table-column label="收货数量" align="center" prop="receiptAmount" />
+			<el-table-column label="备品数量" align="center" prop="shelvesAmount" />
+			<el-table-column label="单据状态" align="center" prop="orderStatus" />
+			
+			<el-table-column label="质检状态" align="center" prop="qualityStatus" />
+			<el-table-column label="收货人" align="center" prop="receiptOperator" />
+			<el-table-column label="收货时间" align="center" prop="receiptTime" width="180">
+				<template slot-scope="scope">
+					<span>{{ parseTime(scope.row.receiptTime, '{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
+						size="mini"
+						type="text"
+						icon="el-icon-edit"
+						@click="handleUpdate(scope.row)"
+						v-hasPermi="['wms:odsRawOrderIn:edit']"
+					>修改</el-button>
+					<el-button
+						size="mini"
+						type="text"
+						icon="el-icon-delete"
+						@click="handleDelete(scope.row)"
+						v-hasPermi="['wms:odsRawOrderIn:remove']"
+					>删除</el-button>
+				</template>
+			</el-table-column>
+		</el-table>
+		
+		<pagination
+			v-show="total>0"
+			: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-form ref="form" :model="form" :rules="rules" label-width="80px">
+				<el-form-item label="工厂编码" prop="factoryCode">
+					<el-input v-model="form.factoryCode" placeholder="请输入工厂编码" />
+				</el-form-item>
+				<el-form-item label="仓库编码" prop="whCode">
+					<el-input v-model="form.whCode" placeholder="请输入仓库编码" />
+				</el-form-item>
+				<el-form-item label="库区编码" prop="waCode">
+					<el-input v-model="form.waCode" placeholder="请输入库区编码" />
+				</el-form-item>
+				<el-form-item label="库位编码" prop="wlCode">
+					<el-input v-model="form.wlCode" placeholder="请输入库位编码" />
+				</el-form-item>
+				<el-form-item label="入库单号" prop="orderNo">
+					<el-input v-model="form.orderNo" placeholder="请输入入库单号" />
+				</el-form-item>
+				<el-form-item label="DN单号" prop="dnNo">
+					<el-input v-model="form.dnNo" placeholder="请输入DN单号" />
+				</el-form-item>
+				<el-form-item label="采购订单号" prop="poNo">
+					<el-input v-model="form.poNo" placeholder="请输入采购订单号" />
+				</el-form-item>
+				<el-form-item label="采购订单行号" prop="poLine">
+					<el-input v-model="form.poLine" 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="unit">
+					<el-input v-model="form.unit" placeholder="请输入单位" />
+				</el-form-item>
+				<el-form-item label="采购组" prop="buyerGroup">
+					<el-input v-model="form.buyerGroup" placeholder="请输入采购组" />
+				</el-form-item>
+				<el-form-item label="供应商编码" prop="supplyCode">
+					<el-input v-model="form.supplyCode" placeholder="请输入供应商编码" />
+				</el-form-item>
+				<el-form-item label="工厂" prop="sapFactoryCode">
+					<el-input v-model="form.sapFactoryCode" placeholder="请输入工厂" />
+				</el-form-item>
+				<el-form-item label="交货地点" prop="sendSpot">
+					<el-input v-model="form.sendSpot" placeholder="请输入交货地点" />
+				</el-form-item>
+				<el-form-item label="需求数量" prop="requestAmount">
+					<el-input v-model="form.requestAmount" placeholder="请输入需求数量" />
+				</el-form-item>
+				<el-form-item label="收货数量" prop="receiptAmount">
+					<el-input v-model="form.receiptAmount" placeholder="请输入收货数量" />
+				</el-form-item>
+				<el-form-item label="备品数量" prop="shelvesAmount">
+					<el-input v-model="form.shelvesAmount" placeholder="请输入备品数量" />
+				</el-form-item>
+				<el-form-item label="库存地点" prop="location">
+					<el-input v-model="form.location" placeholder="请输入库存地点" />
+				</el-form-item>
+				<el-form-item label="需求时间" prop="requestTime">
+					<el-date-picker clearable
+						v-model="form.requestTime"
+						type="date"
+						value-format="yyyy-MM-dd"
+						placeholder="请选择需求时间">
+					</el-date-picker>
+				</el-form-item>
+				<el-form-item label="收货人" prop="receiptOperator">
+					<el-input v-model="form.receiptOperator" placeholder="请输入收货操作人" />
+				</el-form-item>
+				<el-form-item label="收货时间" prop="receiptTime">
+					<el-date-picker clearable
+						v-model="form.receiptTime"
+						type="date"
+						value-format="yyyy-MM-dd"
+						placeholder="请选择收货时间">
+					</el-date-picker>
+				</el-form-item>
+				<el-form-item label="上架操作人" prop="shelvesOperator">
+					<el-input v-model="form.shelvesOperator" placeholder="请输入上架操作人" />
+				</el-form-item>
+				<el-form-item label="退货数量" prop="returnAmount">
+					<el-input v-model="form.returnAmount" placeholder="请输入退货数量" />
+				</el-form-item>
+				<el-form-item label="退料人" prop="returnName">
+					<el-input v-model="form.returnName" placeholder="请输入退料人" />
+				</el-form-item>
+				<el-form-item label="退货过账时间" prop="returnTime">
+					<el-date-picker clearable
+						v-model="form.returnTime"
+						type="date"
+						value-format="yyyy-MM-dd"
+						placeholder="请选择退货过账时间">
+					</el-date-picker>
+				</el-form-item>
+				<el-form-item label="上架时间" prop="shelvesTime">
+					<el-date-picker clearable
+						v-model="form.shelvesTime"
+						type="date"
+						value-format="yyyy-MM-dd"
+						placeholder="请选择上架时间">
+					</el-date-picker>
+				</el-form-item>
+				<el-form-item label="退货过账信息" prop="returnMessage">
+					<el-input v-model="form.returnMessage" placeholder="请输入退货过账信息" />
+				</el-form-item>
+				<el-form-item label="收货过账时间" prop="accountingTime">
+					<el-date-picker clearable
+						v-model="form.accountingTime"
+						type="date"
+						value-format="yyyy-MM-dd"
+						placeholder="请选择收货过账时间">
+					</el-date-picker>
+				</el-form-item>
+				<el-form-item label="收货过账信息" prop="accountingMessage">
+					<el-input v-model="form.accountingMessage" placeholder="请输入收货过账信息" />
+				</el-form-item>
+				<el-form-item label="备用" prop="userDefined1">
+					<el-input v-model="form.userDefined1" placeholder="请输入备用" />
+				</el-form-item>
+				<el-form-item label="备用" prop="userDefined2">
+					<el-input v-model="form.userDefined2" placeholder="请输入备用" />
+				</el-form-item>
+				<el-form-item label="备用" prop="userDefined3">
+					<el-input v-model="form.userDefined3" placeholder="请输入备用" />
+				</el-form-item>
+				<el-form-item label="备用" prop="userDefined4">
+					<el-input v-model="form.userDefined4" placeholder="请输入备用" />
+				</el-form-item>
+				<el-form-item label="备用" prop="userDefined5">
+					<el-input v-model="form.userDefined5" placeholder="请输入备用" />
+				</el-form-item>
+				<el-form-item label="备用" prop="userDefined6">
+					<el-input v-model="form.userDefined6" placeholder="请输入备用" />
+				</el-form-item>
+				<el-form-item label="备用" prop="userDefined7">
+					<el-input v-model="form.userDefined7" placeholder="请输入备用" />
+				</el-form-item>
+				<el-form-item label="备用" prop="userDefined8">
+					<el-input v-model="form.userDefined8" placeholder="请输入备用" />
+				</el-form-item>
+				<el-form-item label="备用9" prop="userDefined9">
+					<el-input v-model="form.userDefined9" placeholder="请输入备用9" />
+				</el-form-item>
+				<el-form-item label="备用10" prop="userDefined10">
+					<el-input v-model="form.userDefined10" placeholder="请输入备用10" />
+				</el-form-item>
+				<el-form-item label="创建时间" prop="gmtCreate">
+					<el-date-picker clearable
+						v-model="form.gmtCreate"
+						type="date"
+						value-format="yyyy-MM-dd"
+						placeholder="请选择创建时间">
+					</el-date-picker>
+				</el-form-item>
+				<el-form-item label="最后更新人" prop="lastModifiedBy">
+					<el-input v-model="form.lastModifiedBy" placeholder="请输入最后更新人" />
+				</el-form-item>
+				<el-form-item label="最后更新时间" prop="gmtModified">
+					<el-date-picker clearable
+						v-model="form.gmtModified"
+						type="date"
+						value-format="yyyy-MM-dd"
+						placeholder="请选择最后更新时间">
+					</el-date-picker>
+				</el-form-item>
+				<el-form-item label="有效标记" prop="activeFlag">
+					<el-input v-model="form.activeFlag" placeholder="请输入有效标记" />
+				</el-form-item>
+			</el-form>
+			<div slot="footer" class="dialog-footer">
+				<el-button type="primary" @click="submitForm">确 定</el-button>
+				<el-button @click="cancel">取 消</el-button>
+			</div>
+		</el-dialog>
+	</div>
+</template>
+
+<script>
+import { listOdsRawOrderIn, getOdsRawOrderIn, delOdsRawOrderIn, addOdsRawOrderIn, updateOdsRawOrderIn } from "@/api/wms/odsRawOrderIn";
+
+export default {
+	name: "OdsRawOrderIn",
+	data() {
+		return {
+			// 遮罩层
+			loading: true,
+			// 选中数组
+			ids: [],
+			// 非单个禁用
+			single: true,
+			// 非多个禁用
+			multiple: true,
+			// 显示搜索条件
+			showSearch: true,
+			// 总条数
+			total: 0,
+			// 包材到货单表格数据
+			odsRawOrderInList: [],
+			// 弹出层标题
+			title: "",
+			// 是否显示弹出层
+			open: false,
+			// 查询参数
+			queryParams: {
+				pageNum: 1,
+				pageSize: 10,
+				factoryCode: null,
+				whCode: null,
+				waCode: null,
+				wlCode: null,
+				orderInType: null,
+				orderNo: null,
+				dnNo: null,
+				poNo: null,
+				poLine: null,
+				poType: null,
+				materialCode: null,
+				materialDesc: null,
+				unit: null,
+				buyerGroup: null,
+				supplyCode: null,
+				sapFactoryCode: null,
+				sendSpot: null,
+				requestAmount: null,
+				receiptAmount: null,
+				shelvesAmount: null,
+				location: null,
+				requestTime: null,
+				qualityStatus: null,
+				orderStatus: null,
+				receiptOperator: null,
+				receiptTime: null,
+				shelvesOperator: null,
+				returnAmount: null,
+				returnName: null,
+				returnTime: null,
+				returnStatus: null,
+				shelvesTime: null,
+				returnMessage: null,
+				accountingStatus: null,
+				accountingTime: null,
+				accountingMessage: null,
+				userDefined1: null,
+				userDefined2: null,
+				userDefined3: null,
+				userDefined4: null,
+				userDefined5: null,
+				userDefined6: null,
+				userDefined7: null,
+				userDefined8: null,
+				userDefined9: null,
+				userDefined10: null,
+				gmtCreate: null,
+				lastModifiedBy: null,
+				gmtModified: null,
+				activeFlag: null
+			},
+			// 表单参数
+			form: {},
+			// 表单校验
+			rules: {
+			}
+		};
+	},
+	created() {
+		this.getList();
+	},
+	methods: {
+		/** 查询包材到货单列表 */
+		getList() {
+			this.loading = true;
+			listOdsRawOrderIn(this.queryParams).then(response => {
+				this.odsRawOrderInList = response.rows;
+				this.total = response.total;
+				this.loading = false;
+			});
+		},
+		// 取消按钮
+		cancel() {
+			this.open = false;
+			this.reset();
+		},
+		// 表单重置
+		reset() {
+			this.form = {
+				rawOrderInId: null,
+				factoryCode: null,
+				whCode: null,
+				waCode: null,
+				wlCode: null,
+				orderInType: null,
+				orderNo: null,
+				dnNo: null,
+				poNo: null,
+				poLine: null,
+				poType: null,
+				materialCode: null,
+				materialDesc: null,
+				unit: null,
+				buyerGroup: null,
+				supplyCode: null,
+				sapFactoryCode: null,
+				sendSpot: null,
+				requestAmount: null,
+				receiptAmount: null,
+				shelvesAmount: null,
+				location: null,
+				requestTime: null,
+				qualityStatus: null,
+				orderStatus: null,
+				receiptOperator: null,
+				receiptTime: null,
+				shelvesOperator: null,
+				returnAmount: null,
+				returnName: null,
+				returnTime: null,
+				returnStatus: null,
+				shelvesTime: null,
+				returnMessage: null,
+				accountingStatus: null,
+				accountingTime: null,
+				accountingMessage: null,
+				userDefined1: null,
+				userDefined2: null,
+				userDefined3: null,
+				userDefined4: null,
+				userDefined5: null,
+				userDefined6: null,
+				userDefined7: null,
+				userDefined8: null,
+				userDefined9: null,
+				userDefined10: null,
+				createBy: null,
+				gmtCreate: null,
+				lastModifiedBy: null,
+				gmtModified: null,
+				activeFlag: null
+			};
+			this.resetForm("form");
+		},
+		/** 搜索按钮操作 */
+		handleQuery() {
+			this.queryParams.pageNum = 1;
+			this.getList();
+		},
+		/** 重置按钮操作 */
+		resetQuery() {
+			this.resetForm("queryForm");
+			this.handleQuery();
+		},
+		// 多选框选中数据
+		handleSelectionChange(selection) {
+			this.ids = selection.map(item => item.rawOrderInId)
+			this.single = selection.length!==1
+			this.multiple = !selection.length
+		},
+		/** 新增按钮操作 */
+		handleAdd() {
+			this.reset();
+			this.open = true;
+			this.title = "添加包材到货单";
+		},
+		/** 修改按钮操作 */
+		handleUpdate(row) {
+			this.reset();
+			const rawOrderInId = row.rawOrderInId || this.ids
+			getOdsRawOrderIn(rawOrderInId).then(response => {
+				this.form = response.data;
+				this.open = true;
+				this.title = "修改包材到货单";
+			});
+		},
+		/** 提交按钮 */
+		submitForm() {
+			this.$refs["form"].validate(valid => {
+				if (valid) {
+					if (this.form.rawOrderInId != null) {
+						updateOdsRawOrderIn(this.form).then(response => {
+							this.$modal.msgSuccess("修改成功");
+							this.open = false;
+							this.getList();
+						});
+					} else {
+						addOdsRawOrderIn(this.form).then(response => {
+							this.$modal.msgSuccess("新增成功");
+							this.open = false;
+							this.getList();
+						});
+					}
+				}
+			});
+		},
+		/** 删除按钮操作 */
+		handleDelete(row) {
+			const rawOrderInIds = row.rawOrderInId || this.ids;
+			this.$modal.confirm('是否确认删除包材到货单编号为"' + rawOrderInIds + '"的数据项？').then(function() {
+				return delOdsRawOrderIn(rawOrderInIds);
+			}).then(() => {
+				this.getList();
+				this.$modal.msgSuccess("删除成功");
+			}).catch(() => {});
+		},
+		/** 导出按钮操作 */
+		handleExport() {
+			this.download('wms/odsRawOrderIn/export', {
+				...this.queryParams
+			}, `odsRawOrderIn_${new Date().getTime()}.xlsx`)
+		}
+	}
+};
+</script>
diff --git a/src/views/wms/outorder/index.vue b/src/views/wms/outorder/index.vue
index 9b6c9473..77145b70 100644
--- a/src/views/wms/outorder/index.vue
+++ b/src/views/wms/outorder/index.vue
@@ -84,7 +84,7 @@
       <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="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" />
@@ -93,18 +93,19 @@
 					<span>{{ parseTime(scope.row.planDate, '{y}-{m}-{d}') }}</span>
 				</template>
 			</el-table-column>
-			<el-table-column label="计划数量" align="center" prop="planNumber" />
+			
 			<el-table-column label="单位" align="center" prop="Unit" v-if="false" />
-			<el-table-column label="已出库数量" align="center" prop="outNumber" />
+			<el-table-column label="出库数量" align="center" prop="outNumber" />
+			<el-table-column label="托盘号" align="center" prop="palletCode" />
 			<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="productionLineDesc" v-if="false" />
 			<el-table-column label="产线" align="center" prop="productionLineCode" />
-			<el-table-column label="订单状态" align="center" prop="orderStatus" />
+			<el-table-column label="状态" align="center" prop="orderStatus" />
 
 
-			<el-table-column label="创建人" align="center" prop="createBy" />
-			<el-table-column label="创建时间" align="center" prop="createDate" width="180">
+			<el-table-column label="操作人" align="center" prop="createBy" />
+			<el-table-column label="操作时间" align="center" prop="createDate" width="180">
 				<template slot-scope="scope">
 					<span>{{ parseTime(scope.row.createDate, '{y}-{m}-{d}') }}</span>
 				</template>
diff --git a/src/views/wms/wmsEmbryoin/index.vue b/src/views/wms/wmsEmbryoin/index.vue
index 7be8836e..9ce96122 100644
--- a/src/views/wms/wmsEmbryoin/index.vue
+++ b/src/views/wms/wmsEmbryoin/index.vue
@@ -38,7 +38,7 @@
 		</el-form>
 
 		<el-row :gutter="10" class="mb8">
-			<el-col :span="1.5">
+			<!-- <el-col :span="1.5">
 				<el-button
 					type="primary"
 					plain
@@ -69,7 +69,7 @@
 					@click="handleDelete"
 					v-hasPermi="['wms:wmsEmbryoin:remove']"
 				>删除</el-button>
-			</el-col>
+			</el-col> -->
 			<el-col :span="1.5">
 				<el-button
 					type="warning"
@@ -86,35 +86,22 @@
 		<el-table v-loading="loading" :data="wmsEmbryoinList" @selection-change="handleSelectionChange">
 			<el-table-column type="selection" width="55" align="center" />
 			<el-table-column label="工厂编码" align="center" prop="siteCode" />
-			<el-table-column label="ID" align="center" prop="ID" />
 			<el-table-column label="入库单号" align="center" prop="orderCode" />
 			<el-table-column label="型号编码" align="center" prop="materialCode" />
 			<el-table-column label="型号名称" align="center" prop="materialDesc" />
-			<el-table-column label="计划日期" align="center" prop="planDate" width="180">
+			<el-table-column label="日期" align="center" prop="planDate" width="180">
 				<template slot-scope="scope">
 					<span>{{ parseTime(scope.row.planDate, '{y}-{m}-{d}') }}</span>
 				</template>
 			</el-table-column>
-			<el-table-column label="计划数量" align="center" prop="planNumber" />
 			<el-table-column label="单位" align="center" prop="Unit" />
-			<el-table-column label="已出库数量" align="center" prop="realityNumber" />
-			<el-table-column label="订单状态" align="center" prop="orderStatus" />
+			<el-table-column label="数量" align="center" prop="realityNumber" />
+			<el-table-column label="状态" align="center" prop="orderStatus" />
 			<el-table-column label="批次号" align="center" prop="userDefined1" />
 			<el-table-column label="产线名称" align="center" prop="productionLineDesc" />
 			<el-table-column label="产线编号" align="center" prop="productionLineCode" />
 			<el-table-column label="库位" align="center" prop="locCode" />
-			<el-table-column label="用户自定义属性2" align="center" prop="userDefined2" />
-			<el-table-column label="用户自定义属性3" align="center" prop="userDefined3" />
-			<el-table-column label="用户自定义属性4" align="center" prop="userDefined4" />
-			<el-table-column label="用户自定义属性5" align="center" prop="userDefined5" />
-			<el-table-column label="用户自定义属性6" align="center" prop="userDefined6" />
-			<el-table-column label="用户自定义属性7" align="center" prop="userDefined7" />
-			<el-table-column label="用户自定义属性8" align="center" prop="userDefined8" />
-			<el-table-column label="用户自定义属性9" align="center" prop="userDefined9" />
-			<el-table-column label="用户自定义属性10" align="center" prop="userDefined10" />
-			<el-table-column label="用户自定义属性11" align="center" prop="userDefined11" />
-			<el-table-column label="供应商编码" align="center" prop="supplierCode" />
-			<el-table-column label="供应商名称" align="center" prop="supplierName" />
+			
 			<el-table-column label="备注" align="center" prop="Remark" />
 			<el-table-column label="创建人" align="center" prop="createBy" />
 			<el-table-column label="创建时间" align="center" prop="createDate" width="180">
@@ -128,26 +115,9 @@
 					<span>{{ parseTime(scope.row.lastUpdateDate, '{y}-{m}-{d}') }}</span>
 				</template>
 			</el-table-column>
-			<el-table-column label="可用标识" align="center" prop="Active" />
-			<el-table-column label="企业主键" align="center" prop="enterpriseId" />
-			<el-table-column label="企业编码" align="center" prop="enterpriseCode" />
+			
 			<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-				<template slot-scope="scope">
-					<el-button
-						size="mini"
-						type="text"
-						icon="el-icon-edit"
-						@click="handleUpdate(scope.row)"
-						v-hasPermi="['wms:wmsEmbryoin:edit']"
-					>修改</el-button>
-					<el-button
-						size="mini"
-						type="text"
-						icon="el-icon-delete"
-						@click="handleDelete(scope.row)"
-						v-hasPermi="['wms:wmsEmbryoin:remove']"
-					>删除</el-button>
-				</template>
+				
 			</el-table-column>
 		</el-table>
 
diff --git a/src/views/wms/wmsRawOrderInSn/index.vue b/src/views/wms/wmsRawOrderInSn/index.vue
new file mode 100644
index 00000000..dd50620b
--- /dev/null
+++ b/src/views/wms/wmsRawOrderInSn/index.vue
@@ -0,0 +1,440 @@
+<template>
+	<div class="app-container">
+		<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" >
+			
+			<el-form-item label="库位编码" prop="wlCode">
+				<el-input
+					v-model="queryParams.wlCode"
+					placeholder="请输入库位编码"
+					clearable
+					@keyup.enter.native="handleQuery"
+				/>
+			</el-form-item>
+			<el-form-item label="到货单号" prop="orderNo">
+				<el-input
+					v-model="queryParams.orderNo"
+					placeholder="请输入到货单号"
+					clearable
+					@keyup.enter.native="handleQuery"
+				/>
+			</el-form-item>
+			<el-form-item label="采购单号" prop="poNo">
+				<el-input
+					v-model="queryParams.poNo"
+					placeholder="请输入采购订单号"
+					clearable
+					@keyup.enter.native="handleQuery"
+				/>
+			</el-form-item>
+			
+			<el-form-item label="物料号" prop="materialCode">
+				<el-input
+					v-model="queryParams.materialCode"
+					placeholder="请输入物料号"
+					clearable
+					@keyup.enter.native="handleQuery"
+				/>
+			</el-form-item>
+			<el-form-item label="物料描述" prop="materialDesc">
+				<el-input
+					v-model="queryParams.materialDesc"
+					placeholder="请输入物料描述"
+					clearable
+					@keyup.enter.native="handleQuery"
+				/>
+			</el-form-item>
+			<el-form-item label="托盘号" prop="sn">
+				<el-input
+					v-model="queryParams.sn"
+					placeholder="请输入托盘号"
+					clearable
+					@keyup.enter.native="handleQuery"
+				/>
+			</el-form-item>
+			
+			<el-form-item>
+				<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>
+
+		<el-row :gutter="10" class="mb8">
+			<!-- <el-col :span="1.5">
+				<el-button
+					type="primary"
+					plain
+					icon="el-icon-plus"
+					size="mini"
+					@click="handleAdd"
+					v-hasPermi="['wms:wmsRawOrderInSn:add']"
+				>新增</el-button>
+			</el-col>
+			<el-col :span="1.5">
+				<el-button
+					type="success"
+					plain
+					icon="el-icon-edit"
+					size="mini"
+					:disabled="single"
+					@click="handleUpdate"
+					v-hasPermi="['wms:wmsRawOrderInSn:edit']"
+				>修改</el-button>
+			</el-col>
+			<el-col :span="1.5">
+				<el-button
+					type="danger"
+					plain
+					icon="el-icon-delete"
+					size="mini"
+					:disabled="multiple"
+					@click="handleDelete"
+					v-hasPermi="['wms:wmsRawOrderInSn:remove']"
+				>删除</el-button>
+			</el-col> -->
+			<el-col :span="1.5">
+				<el-button
+					type="warning"
+					plain
+					icon="el-icon-download"
+					size="mini"
+					@click="handleExport"
+					v-hasPermi="['wms:wmsRawOrderInSn:export']"
+				>导出</el-button>
+			</el-col>
+			<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+		</el-row>
+
+		<el-table v-loading="loading" :data="wmsRawOrderInSnList" @selection-change="handleSelectionChange">
+			<el-table-column type="selection" width="55" align="center" />
+			
+			<el-table-column label="仓库编码" align="center" prop="whCode" />
+			
+			<el-table-column label="库位编码" align="center" prop="wlCode" />
+			<el-table-column label="到货单号" align="center" prop="orderNo" />
+			<el-table-column label="采购单号" align="center" prop="poNo" />
+			<el-table-column label="采购行号" align="center" prop="poLine" />
+			<el-table-column label="物料号" align="center" prop="materialCode" />
+			<el-table-column label="物料描述" align="center" prop="materialDesc" />
+			<el-table-column label="托盘号" align="center" prop="sn" />
+			<el-table-column label="数量" align="center" prop="amount" />
+			
+			<el-table-column label="创建时间" align="center" prop="gmtCreate" width="180">
+				<template slot-scope="scope">
+					<span>{{ parseTime(scope.row.gmtCreate, '{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
+						size="mini"
+						type="text"
+						icon="el-icon-edit"
+						@click="handleUpdate(scope.row)"
+						v-hasPermi="['wms:wmsRawOrderInSn:edit']"
+					>修改</el-button>
+					<el-button
+						size="mini"
+						type="text"
+						icon="el-icon-delete"
+						@click="handleDelete(scope.row)"
+						v-hasPermi="['wms:wmsRawOrderInSn:remove']"
+					>删除</el-button>
+				</template>
+			</el-table-column>
+		</el-table>
+		
+		<pagination
+			v-show="total>0"
+			: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-form ref="form" :model="form" :rules="rules" label-width="80px">
+				<el-form-item label="仓库编码" prop="whCode">
+					<el-input v-model="form.whCode" placeholder="请输入仓库编码" />
+				</el-form-item>
+				<el-form-item label="库区编码" prop="waCode">
+					<el-input v-model="form.waCode" placeholder="请输入库区编码" />
+				</el-form-item>
+				<el-form-item label="库位编码" prop="wlCode">
+					<el-input v-model="form.wlCode" placeholder="请输入库位编码" />
+				</el-form-item>
+				<el-form-item label="入库单号" prop="orderNo">
+					<el-input v-model="form.orderNo" placeholder="请输入入库单号" />
+				</el-form-item>
+				<el-form-item label="采购订单号" prop="poNo">
+					<el-input v-model="form.poNo" placeholder="请输入采购订单号" />
+				</el-form-item>
+				<el-form-item label="采购订单行项目" prop="poLine">
+					<el-input v-model="form.poLine" 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="sn">
+					<el-input v-model="form.sn" placeholder="请输入托盘号" />
+				</el-form-item>
+				<el-form-item label="数量" prop="amount">
+					<el-input v-model="form.amount" placeholder="请输入数量" />
+				</el-form-item>
+				<el-form-item label="备用1" prop="userDefined1">
+					<el-input v-model="form.userDefined1" placeholder="请输入备用1" />
+				</el-form-item>
+				<el-form-item label="备用2" prop="userDefined2">
+					<el-input v-model="form.userDefined2" placeholder="请输入备用2" />
+				</el-form-item>
+				<el-form-item label="备用3" prop="userDefined3">
+					<el-input v-model="form.userDefined3" placeholder="请输入备用3" />
+				</el-form-item>
+				<el-form-item label="备用4" prop="userDefined4">
+					<el-input v-model="form.userDefined4" placeholder="请输入备用4" />
+				</el-form-item>
+				<el-form-item label="备用5" prop="userDefined5">
+					<el-input v-model="form.userDefined5" placeholder="请输入备用5" />
+				</el-form-item>
+				<el-form-item label="备用6" prop="userDefined6">
+					<el-input v-model="form.userDefined6" placeholder="请输入备用6" />
+				</el-form-item>
+				<el-form-item label="备用7" prop="userDefined7">
+					<el-input v-model="form.userDefined7" placeholder="请输入备用7" />
+				</el-form-item>
+				<el-form-item label="备用8" prop="userDefined8">
+					<el-input v-model="form.userDefined8" placeholder="请输入备用8" />
+				</el-form-item>
+				<el-form-item label="备用9" prop="userDefined9">
+					<el-input v-model="form.userDefined9" placeholder="请输入备用9" />
+				</el-form-item>
+				<el-form-item label="备用10" prop="userDefined10">
+					<el-input v-model="form.userDefined10" placeholder="请输入备用10" />
+				</el-form-item>
+				<el-form-item label="创建时间" prop="gmtCreate">
+					<el-date-picker clearable
+						v-model="form.gmtCreate"
+						type="date"
+						value-format="yyyy-MM-dd"
+						placeholder="请选择创建时间">
+					</el-date-picker>
+				</el-form-item>
+				<el-form-item label="最后更新人" prop="lastModifiedBy">
+					<el-input v-model="form.lastModifiedBy" placeholder="请输入最后更新人" />
+				</el-form-item>
+				<el-form-item label="最后更新时间" prop="gmtModified">
+					<el-date-picker clearable
+						v-model="form.gmtModified"
+						type="date"
+						value-format="yyyy-MM-dd"
+						placeholder="请选择最后更新时间">
+					</el-date-picker>
+				</el-form-item>
+				<el-form-item label="有效标记" prop="activeFlag">
+					<el-input v-model="form.activeFlag" placeholder="请输入有效标记" />
+				</el-form-item>
+				<el-form-item label="${comment}" prop="factoryCode">
+					<el-input v-model="form.factoryCode" placeholder="请输入${comment}" />
+				</el-form-item>
+				<el-form-item label="${comment}" prop="sapFactoryCode">
+					<el-input v-model="form.sapFactoryCode" placeholder="请输入${comment}" />
+				</el-form-item>
+			</el-form>
+			<div slot="footer" class="dialog-footer">
+				<el-button type="primary" @click="submitForm">确 定</el-button>
+				<el-button @click="cancel">取 消</el-button>
+			</div>
+		</el-dialog>
+	</div>
+</template>
+
+<script>
+import { listWmsRawOrderInSn, getWmsRawOrderInSn, delWmsRawOrderInSn, addWmsRawOrderInSn, updateWmsRawOrderInSn } from "@/api/wms/wmsRawOrderInSn";
+
+export default {
+	name: "WmsRawOrderInSn",
+	data() {
+		return {
+			// 遮罩层
+			loading: true,
+			// 选中数组
+			ids: [],
+			// 非单个禁用
+			single: true,
+			// 非多个禁用
+			multiple: true,
+			// 显示搜索条件
+			showSearch: true,
+			// 总条数
+			total: 0,
+			// 原材料收货明细表格数据
+			wmsRawOrderInSnList: [],
+			// 弹出层标题
+			title: "",
+			// 是否显示弹出层
+			open: false,
+			// 查询参数
+			queryParams: {
+				pageNum: 1,
+				pageSize: 10,
+				whCode: null,
+				waCode: null,
+				wlCode: null,
+				orderNo: null,
+				poNo: null,
+				poLine: null,
+				materialCode: null,
+				materialDesc: null,
+				sn: null,
+				amount: null,
+				userDefined1: null,
+				userDefined2: null,
+				userDefined3: null,
+				userDefined4: null,
+				userDefined5: null,
+				userDefined6: null,
+				userDefined7: null,
+				userDefined8: null,
+				userDefined9: null,
+				userDefined10: null,
+				gmtCreate: null,
+				lastModifiedBy: null,
+				gmtModified: null,
+				activeFlag: null,
+				factoryCode: null,
+				sapFactoryCode: null
+			},
+			// 表单参数
+			form: {},
+			// 表单校验
+			rules: {
+			}
+		};
+	},
+	created() {
+		this.getList();
+	},
+	methods: {
+		/** 查询原材料收货明细列表 */
+		getList() {
+			this.loading = true;
+			listWmsRawOrderInSn(this.queryParams).then(response => {
+				this.wmsRawOrderInSnList = response.rows;
+				this.total = response.total;
+				this.loading = false;
+			});
+		},
+		// 取消按钮
+		cancel() {
+			this.open = false;
+			this.reset();
+		},
+		// 表单重置
+		reset() {
+			this.form = {
+				rawOrderInSnId: null,
+				whCode: null,
+				waCode: null,
+				wlCode: null,
+				orderNo: null,
+				poNo: null,
+				poLine: null,
+				materialCode: null,
+				materialDesc: null,
+				sn: null,
+				amount: null,
+				userDefined1: null,
+				userDefined2: null,
+				userDefined3: null,
+				userDefined4: null,
+				userDefined5: null,
+				userDefined6: null,
+				userDefined7: null,
+				userDefined8: null,
+				userDefined9: null,
+				userDefined10: null,
+				createBy: null,
+				gmtCreate: null,
+				lastModifiedBy: null,
+				gmtModified: null,
+				activeFlag: null,
+				factoryCode: null,
+				sapFactoryCode: null
+			};
+			this.resetForm("form");
+		},
+		/** 搜索按钮操作 */
+		handleQuery() {
+			this.queryParams.pageNum = 1;
+			this.getList();
+		},
+		/** 重置按钮操作 */
+		resetQuery() {
+			this.resetForm("queryForm");
+			this.handleQuery();
+		},
+		// 多选框选中数据
+		handleSelectionChange(selection) {
+			this.ids = selection.map(item => item.rawOrderInSnId)
+			this.single = selection.length!==1
+			this.multiple = !selection.length
+		},
+		/** 新增按钮操作 */
+		handleAdd() {
+			this.reset();
+			this.open = true;
+			this.title = "添加原材料收货明细";
+		},
+		/** 修改按钮操作 */
+		handleUpdate(row) {
+			this.reset();
+			const rawOrderInSnId = row.rawOrderInSnId || this.ids
+			getWmsRawOrderInSn(rawOrderInSnId).then(response => {
+				this.form = response.data;
+				this.open = true;
+				this.title = "修改原材料收货明细";
+			});
+		},
+		/** 提交按钮 */
+		submitForm() {
+			this.$refs["form"].validate(valid => {
+				if (valid) {
+					if (this.form.rawOrderInSnId != null) {
+						updateWmsRawOrderInSn(this.form).then(response => {
+							this.$modal.msgSuccess("修改成功");
+							this.open = false;
+							this.getList();
+						});
+					} else {
+						addWmsRawOrderInSn(this.form).then(response => {
+							this.$modal.msgSuccess("新增成功");
+							this.open = false;
+							this.getList();
+						});
+					}
+				}
+			});
+		},
+		/** 删除按钮操作 */
+		handleDelete(row) {
+			const rawOrderInSnIds = row.rawOrderInSnId || this.ids;
+			this.$modal.confirm('是否确认删除原材料收货明细编号为"' + rawOrderInSnIds + '"的数据项？').then(function() {
+				return delWmsRawOrderInSn(rawOrderInSnIds);
+			}).then(() => {
+				this.getList();
+				this.$modal.msgSuccess("删除成功");
+			}).catch(() => {});
+		},
+		/** 导出按钮操作 */
+		handleExport() {
+			this.download('wms/wmsRawOrderInSn/export', {
+				...this.queryParams
+			}, `wmsRawOrderInSn_${new Date().getTime()}.xlsx`)
+		}
+	}
+};
+</script>