diff --git a/package.json b/package.json
index 9abca90..e9a928f 100644
--- a/package.json
+++ b/package.json
@@ -48,7 +48,7 @@
     "js-beautify": "1.13.0",
     "js-cookie": "3.0.1",
     "jsencrypt": "3.0.0-rc.1",
-    "less": "^4.2.0",
+    "less": "^3.0.0",
     "less-loader": "5.0.0",
     "nprogress": "0.2.0",
     "quill": "1.3.7",
diff --git a/src/api/report/materialReport.js b/src/api/report/materialReport.js
new file mode 100644
index 0000000..e6cae96
--- /dev/null
+++ b/src/api/report/materialReport.js
@@ -0,0 +1,10 @@
+import request from '@/utils/request'
+
+// 查询物料报表
+export function listMaterialReport(query) {
+  return request({
+    url: '/report/productionReport/materialReportList',
+    method: 'get',
+    params: query
+  })
+}
diff --git a/src/views/report/materialReport/index.vue b/src/views/report/materialReport/index.vue
new file mode 100644
index 0000000..6f9daf1
--- /dev/null
+++ b/src/views/report/materialReport/index.vue
@@ -0,0 +1,255 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+      <el-form-item label="产线" prop="productLineCode">
+        <el-select v-model="queryParams.productLineName" placeholder="请选择产线" clearable>
+          <el-option
+            v-for="item in productLineList"
+            :key="item.productLineName"
+            :label="item.productLineName"
+            :value="item.productLineName"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      
+<!--      <el-form-item label="物料编码" prop="productCode">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.productCode"-->
+<!--          placeholder="请输入物料编码"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+      
+      <el-form-item label="过点时间">
+        <el-date-picker
+          v-model="daterangeBeginTime"
+          style="width: 340px"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          type="datetimerange"
+          range-separator="-"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"
+        ></el-date-picker>
+      </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="info"
+          plain
+          size="mini"
+        >绑定数：{{ totalSum }}
+        </el-button>
+      </el-col> -->
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+        >导出</el-button>
+      </el-col>
+      <div style="float: right">
+        <span style="font-weight: 700; padding-right: 20px">{{ this.customData }}</span>
+        <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+      </div>
+    </el-row>
+
+    <el-table v-loading="loading" :data="materialReportList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" v-if="false"/>
+      <el-table-column label="产线名称" align="center" prop="PRODUCT_LINE_NAME" width="100"/>
+      <el-table-column label="物料编号" align="center" prop="MATERIAL_CODE" width="200"/>
+      <el-table-column label="物料名称" align="center" prop="MATERIAL_NAME" width="300"/>
+      <el-table-column label="条码绑定" align="center" prop="MES_SN_BINDING_COUNT"  width="150"/>
+      <el-table-column label="下线扫描" align="center" prop="FINISHED_PRODUCT_SCAN_COUNT" width="150"/>
+      <el-table-column label="质检分垛扫描" align="center" prop="FINISHED_PRODUCT_PILING_COUNT" width="150"/>
+      <!-- <el-table-column label="壳胆绑定时间" align="center" prop="RECORD_TIME1" width="180" >
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.RECORD_TIME1, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="产品SN码" align="center" prop="PRODUCT_CODE" width="200"/>
+      <el-table-column label="产品SN码绑定时间" align="center" prop="RECORD_TIME2" width="180" >
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.RECORD_TIME2, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+        </template>
+      </el-table-column> -->
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+
+  </div>
+</template>
+
+<script>
+import { listMaterialReport } from "@/api/report/materialReport";
+import { findProductLineList } from '@//api/base/productLine'
+import { parseTime } from '@//utils/ruoyi'
+import { getCustomData } from '@//api/base/customData'
+export default {
+  name: "MaterialReport",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 物料集合
+      materialReportList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      totalSum: 0,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        productLineName: '二线',
+        orderCode:null,
+        boxCode:null,
+        boxName:null,
+        linerCode:null,
+        linerName:null,
+        recordTime1:null,
+        recordTime2:null,
+        productCode:null,
+        recordBeginTime:null,
+        recordEndTime:null
+      },
+      // 更新时间时间范围
+      daterangeBeginTime: [],
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      },
+      columns: [
+        { key: 0, label: `主键标识`, visible: false },
+        { key: 1, label: `工厂`, visible: true },
+        { key: 2, label: `公司条码`, visible: true },
+        { key: 3, label: `工单号`, visible: true },
+        { key: 4, label: `销售订单号`, visible: false },
+        { key: 5, label: `销售行号`, visible: false },
+        { key: 6, label: `物料编码`, visible: true },
+        { key: 7, label: `产品型号`, visible: false },
+        { key: 8, label: `物料描述`, visible: true },
+        { key: 9, label: `产品类型`, visible: true },
+        { key: 10, label: `验证组合`, visible: true },
+        { key: 11, label: `标签特征`, visible: true },
+        { key: 12, label: `产品条码编码`, visible: true },
+        { key: 13, label: `主型号`, visible: true },
+        { key: 14, label: `版本号`, visible: true },
+        { key: 15, label: `用途位`, visible: true },
+        { key: 16, label: `流通特性`, visible: true },
+        { key: 17, label: `生成日期`, visible: true },
+        { key: 18, label: `扫描时间`, visible: true },
+        { key: 19, label: `箱体码`, visible: true },
+        { key: 20, label: `产线`, visible: true },
+      ],
+      // 产线选项
+      productLineList: [],
+      //自定义数据
+      customData: null
+    };
+  },
+  created() {
+    findProductLineList({ productLineType: 1 }).then(response => {
+      this.productLineList = response.data
+    })
+    getCustomData(394).then(response => {
+      this.customData = response.data.customData
+    })
+    const nowDate = parseTime(new Date(), '{y}-{m}-{d}')
+    this.daterangeBeginTime[0] = nowDate + ' 00:00:00'
+    this.daterangeBeginTime[1] = nowDate + ' 23:59:59'
+    this.getList();
+  },
+  methods: {
+    /** 查询扫描下线记录报表列表 */
+    getList() {
+      this.loading = true;
+      if (null != this.daterangeBeginTime && '' != this.daterangeBeginTime) {
+        this.queryParams.recordBeginTime = this.daterangeBeginTime[0]
+        this.queryParams.recordEndTime = this.daterangeBeginTime[1]
+      } else {
+        this.queryParams.recordBeginTime = null
+        this.queryParams.recordEndTime = null
+      }
+      listMaterialReport(this.queryParams).then(response => {
+        this.materialReportList = response.rows;
+        this.total = response.total;
+        this.totalSum = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        objId: null,
+        orderCode:null,
+        boxCode:null,
+        boxName:null,
+        linerCode:null,
+        linerName:null,
+        recordTime1:null,
+        recordTime2:null,
+        productCode:null,
+        productLineCode: null,
+        recordBeginTime:null,
+        recordEndTime: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.objId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('report/productionReport/materialReportList/export', {
+        ...this.queryParams
+      }, `productOffLine_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>
diff --git a/vue.config.js b/vue.config.js
index 2327a41..e1ec055 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -35,10 +35,10 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://10.41.11.243:6061`,
+        // target: `http://10.41.11.243:6061`,
         // target: `http://10.100.72.10:8080`,
         // target: `http://192.168.1.118:6061`,
-        // target: `http://localhost:6061`,
+        target: `http://localhost:6061`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''