diff --git a/src/api/mes/wm/itemrecptline.js b/src/api/mes/wm/itemrecptline.js
new file mode 100644
index 0000000..670b4cb
--- /dev/null
+++ b/src/api/mes/wm/itemrecptline.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询物料入库单行列表
+export function listItemrecptline(query) {
+  return request({
+    url: '/mes/wm/itemrecptline/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询物料入库单行详细
+export function getItemrecptline(lineId) {
+  return request({
+    url: '/mes/wm/itemrecptline/' + lineId,
+    method: 'get'
+  })
+}
+
+// 新增物料入库单行
+export function addItemrecptline(data) {
+  return request({
+    url: '/mes/wm/itemrecptline',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改物料入库单行
+export function updateItemrecptline(data) {
+  return request({
+    url: '/mes/wm/itemrecptline',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除物料入库单行
+export function delItemrecptline(lineId) {
+  return request({
+    url: '/mes/wm/itemrecptline/' + lineId,
+    method: 'delete'
+  })
+}
diff --git a/src/views/mes/wm/itemrecpt/index.vue b/src/views/mes/wm/itemrecpt/index.vue
index 9d64ab1..f61771c 100644
--- a/src/views/mes/wm/itemrecpt/index.vue
+++ b/src/views/mes/wm/itemrecpt/index.vue
@@ -237,6 +237,10 @@
           </el-col>
         </el-row>
       </el-form>
+      <el-divider v-if="form.recptId !=null" content-position="center">物料信息</el-divider> 
+        <el-card shadow="always" v-if="form.recptId !=null" class="box-card">
+          <Itemrecptline ref=line :recptId="form.recptId" :warehouseId="form.warehouseId" :locationId="form.locationId" :areaId="form.areaId" :optType="optType"></Itemrecptline>
+        </el-card>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="cancel" v-if="optType =='view' || form.status !='PREPARE' ">返回</el-button>
         <el-button type="primary" @click="submitForm" v-else>确 定</el-button>
@@ -252,10 +256,11 @@ import {getTreeList} from "@/api/mes/wm/warehouse"
 import {genCode} from "@/api/system/autocode/rule"
 import VendorSelect from "@/components/vendorSelect/single.vue";
 import IqcSelect from "@/components/iqcSelect/single.vue";
+import Itemrecptline from "./line.vue";
 export default {
   name: "Itemrecpt",
   dicts:['mes_order_status'],
-  components :{VendorSelect,IqcSelect},
+  components :{VendorSelect,IqcSelect,Itemrecptline},
   data() {
     return {
       //自动生成编码
@@ -440,7 +445,6 @@ export default {
         this.warehouseInfo[0] = response.data.warehouseId;    
         this.warehouseInfo[1] = response.data.locationId;    
         this.warehouseInfo[2] = response.data.areaId;    
-        console.log(this.warehouseInfo);
         this.open = true;
         this.title = "修改物料入库单";
         this.optType = "edit";
diff --git a/src/views/mes/wm/itemrecpt/line.vue b/src/views/mes/wm/itemrecpt/line.vue
new file mode 100644
index 0000000..e4448e5
--- /dev/null
+++ b/src/views/mes/wm/itemrecpt/line.vue
@@ -0,0 +1,398 @@
+<template>
+  <div class="app-container">
+    <el-row v-if="optType != 'view'" :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['mes:wm:itemrecptline:add']"
+        >新增</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="['mes:wm:itemrecptline:remove']"
+        >删除</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="itemrecptlineList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="物料编码" align="center" width="120px" prop="itemCode" />
+      <el-table-column label="物料名称" align="center" prop="itemName" :show-overflow-tooltip="true"/>
+      <el-table-column label="规格型号" align="center" prop="specification" :show-overflow-tooltip="true"/>
+      <el-table-column label="单位" align="center" prop="unitOfMeasure" />
+      <el-table-column label="入库数量" align="center" prop="quantityRecived" />
+      <el-table-column label="批次号" align="center" prop="batchCode" />
+      <el-table-column label="仓库" align="center" prop="warehouseName" />
+      <el-table-column label="库区" align="center" prop="locationName" />
+      <el-table-column label="库位" align="center" prop="areaName" />
+      <el-table-column label="有效期" align="center" prop="expireDate" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.expireDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" width="100px" v-if="optType != 'view'" 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="['mes:wm:itemrecptline:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['mes:wm:itemrecptline: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="960px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="物料编码"  prop="itemCode">
+              <el-input v-model="form.itemCode" readonly="readonly" placeholder="请选择物料编码" >
+                <el-button slot="append" @click="handleSelectProduct" icon="el-icon-search"></el-button>
+              </el-input>
+            </el-form-item>
+            <ItemSelect ref="itemSelect" @onSelected="onItemSelected" > </ItemSelect>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="物料名称" prop="itemName">
+              <el-input v-model="form.itemName" readonly="readonly" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="单位" prop="unitOfMeasure">
+              <el-input v-model="form.unitOfMeasure" readonly="readonly" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="入库数量" prop="quantityRecived">
+              <el-input-number :min="0.01" v-model="form.quantityRecived" placeholder="请输入入库数量" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="入库批次号" prop="batchCode">
+              <el-input v-model="form.batchCode" placeholder="请输入入库批次号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="有效期" prop="expireDate">
+              <el-date-picker clearable
+                v-model="form.expireDate"
+                type="date"
+                value-format="yyyy-MM-dd"
+                placeholder="请选择有效期">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="入库仓库">
+              <el-cascader v-model="warehouseInfo"
+                :options="warehouseOptions"
+                :props="warehouseProps"
+                @change="handleWarehouseChanged"
+              >                  
+              </el-cascader>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </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 { listItemrecptline, getItemrecptline, delItemrecptline, addItemrecptline, updateItemrecptline } from "@/api/mes/wm/itemrecptline";
+import ItemSelect  from "@/components/itemSelect/single.vue";
+import {getTreeList} from "@/api/mes/wm/warehouse"
+export default {
+  name: "Itemrecptline",
+  components :{ItemSelect},
+  props:{
+    recptId: null,
+    optType: null,
+    warehouseId: null,
+    locationId: null,
+    areaId: null
+  },
+  data() {
+    return {
+      warehouseInfo:[],
+      warehouseOptions:[],
+      warehouseProps:{
+        multiple: false,
+        value: 'warehouseId',
+        label: 'warehouseName',
+      },
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 物料入库单行表格数据
+      itemrecptlineList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        recptId: this.recptId,
+        itemId: null,
+        itemCode: null,
+        itemName: null,
+        specification: null,
+        unitOfMeasure: null,
+        quantityRecived: null,
+        batchCode: null,
+        warehouseId: null,
+        warehouseCode: null,
+        warehouseName: null,
+        locationId: null,
+        locationCode: null,
+        locationName: null,
+        areaId: null,
+        areaCode: null,
+        areaName: null,
+        expireDate: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        itemId: [
+          { required: true, message: "产品物料ID不能为空", trigger: "blur" }
+        ],
+        quantityRecived: [
+          { required: true, message: "入库数量不能为空", trigger: "blur" }
+        ],
+        warehouseId:[
+          { required: true, message: "请选择入库的仓库" }
+        ]
+      }
+    };
+  },
+  created() {
+    this.getList();
+    this.getWarehouseList();
+  },
+  methods: {
+    /** 查询物料入库单行列表 */
+    getList() {
+      this.loading = true;
+      listItemrecptline(this.queryParams).then(response => {
+        this.itemrecptlineList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    getWarehouseList(){
+      getTreeList().then( response =>{        
+        this.warehouseOptions = response.data;
+        this.warehouseOptions.map(w =>{
+          debugger;
+          let wstr = JSON.stringify(w.children).replace(/warehouseId/g,'wId').replace(/locationId/g, 'warehouseId').replace(/locationName/g,'warehouseName');  
+          w.children =  JSON.parse(wstr); 
+
+          w.children.map(l =>{
+                  let lstr =JSON.stringify(l.children).replace(/areaId/g, 'warehouseId').replace(/areaName/g,'warehouseName').replace(/locationId/g,'lId');                  
+                  l.children = JSON.parse(lstr);
+          });
+            
+          let ww = w;
+        });
+        debugger;
+        let data = this.warehouseOptions;
+      });
+    },
+    //选择仓库、库区、库位
+    handleWarehouseChanged(obj){
+      if(obj !=null){
+        this.form.warehouseId = obj[0];
+        this.form.locationId = obj[1];
+        this.form.areaId = obj[2];
+      }
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        lineId: null,
+        recptId: this.recptId,
+        itemId: null,
+        itemCode: null,
+        itemName: null,
+        specification: null,
+        unitOfMeasure: null,
+        quantityRecived: 1,
+        batchCode: null,
+        warehouseId: this.warehouseId,
+        warehouseCode: null,
+        warehouseName: null,
+        locationId: this.locationId,
+        locationCode: null,
+        locationName: null,
+        areaId: this.areaId,
+        areaCode: null,
+        areaName: null,
+        expireDate: null,
+        remark: null,
+        attr1: null,
+        attr2: null,
+        attr3: null,
+        attr4: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: 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.lineId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.warehouseInfo = [];
+      if(this.warehouseId != null){
+        this.warehouseInfo[0] = this.warehouseId;
+        this.warehouseInfo[1] = this.locationId;
+        this.warehouseInfo[2] = this.areaId;
+      }
+      this.open = true;
+      this.title = "添加物料入库单行";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const lineId = row.lineId || this.ids
+      getItemrecptline(lineId).then(response => {
+        this.form = response.data;
+        this.warehouseInfo[0] = response.data.warehouseId;    
+        this.warehouseInfo[1] = response.data.locationId;    
+        this.warehouseInfo[2] = response.data.areaId;    
+        this.open = true;
+        this.title = "修改物料入库单行";
+      });
+    },
+    handleSelectProduct(){
+      this.$refs.itemSelect.showFlag = true;
+    },
+    //物料选择弹出框
+    onItemSelected(obj){
+        debugger;
+        if(obj != undefined && obj != null){
+          this.form.itemId = obj.itemId;
+          this.form.itemCode = obj.itemCode;
+          this.form.itemName = obj.itemName;
+          this.form.specification = obj.specification;
+          this.form.unitOfMeasure = obj.unitOfMeasure;  
+        }
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.lineId != null) {
+            updateItemrecptline(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addItemrecptline(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const lineIds = row.lineId || this.ids;
+      this.$modal.confirm('是否确认删除物料入库单行编号为"' + lineIds + '"的数据项？').then(function() {
+        return delItemrecptline(lineIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('wm/itemrecptline/export', {
+        ...this.queryParams
+      }, `itemrecptline_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>