diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/modules/quartz/task/Test.java b/mes/hd/nladmin-system/src/main/java/org/nl/modules/quartz/task/Test.java
index eab6287..9646a18 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/modules/quartz/task/Test.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/modules/quartz/task/Test.java
@@ -15,12 +15,10 @@
  */
 package org.nl.modules.quartz.task;
 
-import com.alibaba.fastjson.JSONArray;
+import cn.hutool.core.util.IdUtil;
 import com.alibaba.fastjson.JSONObject;
 import lombok.extern.slf4j.Slf4j;
-import org.nl.modules.mnt.websocket.MsgType;
-import org.nl.modules.mnt.websocket.SocketMsg;
-import org.nl.modules.mnt.websocket.WebSocketServer;
+import org.nl.wql.core.bean.WQLObject;
 import org.springframework.stereotype.Component;
 
 /**
@@ -32,33 +30,4 @@ import org.springframework.stereotype.Component;
 @Component
 public class Test {
 
-    public void run(){
-
-        try {
-            log.info("run 执行成功");
-            JSONObject json = new JSONObject();
-            JSONArray device = new JSONArray();
-            JSONObject jo = new JSONObject();
-            jo.put("name","A1");
-            JSONObject jo2 = new JSONObject();
-            jo2.put("name","B1");
-            JSONObject jo3 = new JSONObject();
-            jo3.put("name","C1");
-            device.add(jo);
-            device.add(jo2);
-            device.add(jo3);
-            json.put("device",device);
-            json.put("print","0");
-            json.put("cpbh","A111111");
-            json.put("cpmc","123456");
-            SocketMsg deviceInfo = new SocketMsg(json, MsgType.INFO);
-            WebSocketServer.sendInfo(deviceInfo, "test_data");
-
-        } catch (Exception e) {
-
-        }
-
-
-    }
-
 }
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/StoragevehicleinfoServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/StoragevehicleinfoServiceImpl.java
index 26a1ed2..7fe53c5 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/StoragevehicleinfoServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/StoragevehicleinfoServiceImpl.java
@@ -97,23 +97,11 @@ public class StoragevehicleinfoServiceImpl implements StoragevehicleinfoService
         String code = "";
         switch (storagevehicle_type) {
             case "00":
-                code = "VEHICCLE_CODE_XMTPT";
+                code = "VEHICCLE_CODE_MTP";
                 break;
             case "01":
-                code = "VEHICCLE_CODE_CDMTP";
-                break;
-            case "02":
-                code = "VEHICCLE_CODE_TLD";
-                break;
-            case "03":
                 code = "VEHICCLE_CODE_TTP";
                 break;
-            case "04":
-                code = "VEHICCLE_CODE_XMTPC";
-                break;
-            case "05":
-                code = "VEHICCLE_CODE_LX";
-                break;
         }
         JSONArray resultCodeArr = new JSONArray();
         int num = MapUtil.getInt(map, "num");
@@ -202,23 +190,11 @@ public class StoragevehicleinfoServiceImpl implements StoragevehicleinfoService
         String term = "";
         switch (code) {
             case "00":
-                term = "VEHICCLE_CODE_XMTPT";
+                term = "VEHICCLE_CODE_MTP";
                 break;
             case "01":
-                term = "VEHICCLE_CODE_CDMTP";
-                break;
-            case "02":
-                term = "VEHICCLE_CODE_TLD";
-                break;
-            case "03":
                 term = "VEHICCLE_CODE_TTP";
                 break;
-            case "04":
-                term = "VEHICCLE_CODE_XMTPC";
-                break;
-            case "05":
-                term = "VEHICCLE_CODE_LX";
-                break;
         }
 
         HashMap<String, String> map = new HashMap<>();
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/stivt.xls b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/stivt.xls
index f835f85..973f614 100644
Binary files a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/stivt.xls and b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/stivt.xls differ
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/QSCH_BASE_POINT.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/QSCH_BASE_POINT.wql
index 302f9ca..271c8ee 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/QSCH_BASE_POINT.wql
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/QSCH_BASE_POINT.wql
@@ -70,6 +70,7 @@
                     point.inv_code,
                     point.is_used,
                     point.is_delete,
+                    point.vehicle_qty,
                     point.create_name,
                     point.create_time,
                     point.update_optname,
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/sch.xls b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/sch.xls
index b634bb4..2112871 100644
Binary files a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/sch.xls and b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/sch.xls differ
diff --git a/mes/hd/nladmin-system/src/test/java/org/nl/Test3.java b/mes/hd/nladmin-system/src/test/java/org/nl/Test3.java
index 961adb5..4120e86 100644
--- a/mes/hd/nladmin-system/src/test/java/org/nl/Test3.java
+++ b/mes/hd/nladmin-system/src/test/java/org/nl/Test3.java
@@ -11,6 +11,7 @@ import com.alibaba.fastjson.JSONObject;
 import org.junit.Test;
 import org.nl.exception.BadRequestException;
 import org.nl.modules.system.util.CodeUtil;
+import org.nl.utils.SecurityUtils;
 import org.nl.wql.WQL;
 import org.nl.wql.core.bean.WQLObject;
 
@@ -1219,6 +1220,47 @@ public class Test3 extends BaseTest {
         System.out.println(date);
     }
 
+    @Test
+    public void createPoint() {
+        //  1-2 46 ; 3-9 50 ; 10-11 35 ; 12-13 37
+        WQLObject tab = WQLObject.getWQLObject("ST_IVT_StructAttr");
+
+        for (int i = 12; i <=13; i++) {
+            String code1 = "";
+            if (i<10) {
+                code1 = "0"+ String.valueOf(i);
+            } else {
+                code1 = String.valueOf(i);
+            }
+            for (int j = 1; j <= 37; j++) {
+                String code = "";
+                if (j<10) {
+                    code = "0"+ String.valueOf(j);
+                } else {
+                    code = String.valueOf(j);
+                }
+                JSONObject json = new JSONObject();
+                json.put("struct_id", IdUtil.getSnowflake(1,1).nextId());
+                json.put("struct_code", code1+"01"+ code);
+                json.put("struct_name", String.valueOf(i) + "排" + "1 层" + String.valueOf(j) + "列");
+                json.put("simple_name",json.getString("struct_name"));
+                json.put("sect_id", "1556544422710218752");
+                json.put("sect_code","YSQ01");
+                json.put("sect_name","二楼养生区A");
+                json.put("stor_id","1528627964823080960");
+                json.put("stor_code","F103");
+                json.put("stor_name","永裕仓库");
+                json.put("stor_type","01");
+                json.put("create_id","1");
+                json.put("create_name","管理员");
+                json.put("create_time", DateUtil.now());
+                json.put("material_height_type", "1");
+                tab.insert(json);
+            }
+        }
+        System.out.println("创建成功");
+    }
+
 
 
 }
diff --git a/mes/qd/src/views/wms/basedata/master/businesstypematerial/index.vue b/mes/qd/src/views/wms/basedata/master/businesstypematerial/index.vue
deleted file mode 100644
index 99aff20..0000000
--- a/mes/qd/src/views/wms/basedata/master/businesstypematerial/index.vue
+++ /dev/null
@@ -1,211 +0,0 @@
-<template>
-  <div class="app-container">
-    <!--工具栏-->
-    <div class="head-container">
-      <div v-if="crud.props.searchToggle">
-        <!-- 搜索 -->
-        <el-form
-          :inline="true"
-          class="demo-form-inline"
-          label-position="right"
-          label-width="120px"
-          label-suffix=":"
-        >
-
-          <el-form-item label="单据类型编号">
-            <el-input
-              v-model="query.inv_type_code"
-              clearable
-              size="mini"
-              placeholder="请输入单据类型编码、名称"
-              style="width: 230px;"
-              class="filter-item"
-              @keyup.enter.native="crud.toQuery"
-            />
-          </el-form-item>
-          <rrOperation />
-        </el-form>
-      </div>
-      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
-      <crudOperation :permission="permission" />
-      <!--表单组件-->
-      <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="500px">
-        <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="120px">
-          <el-form-item label="业务类型编码:" prop="business_type_code">
-            <el-select
-              v-model="form.business_type_code"
-              clearable
-              size="mini"
-              placeholder="请选择"
-              class="filter-item"
-              style="width: 250px;"
-            >
-              <el-option
-                v-for="item in typeCodeList"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="业务类型名称:" prop="business_type_name">
-            <el-input v-model="form.business_type_name" style="width: 250px;" />
-          </el-form-item>
-          <el-form-item label="单据类型编码:" prop="inv_type_code">
-            <el-input v-model="form.inv_type_code" style="width: 250px;" />
-          </el-form-item>
-          <el-form-item label="单据类型名称:" prop="inv_type_name">
-            <el-input v-model="form.inv_type_name" style="width: 250px;" />
-          </el-form-item>
-          <el-form-item label="物料分类标识:" prop="material_type_id">
-            <el-input v-model="form.material_type_id" style="width: 250px;" />
-          </el-form-item>
-          <el-form-item label="是否启用:" prop="is_used">
-            <el-radio v-model="form.is_used" label="0">否</el-radio>
-            <el-radio v-model="form.is_used" label="1">是</el-radio>
-          </el-form-item>
-          <el-form-item label="说明:">
-            <el-input v-model="form.remark" type="textarea" style="width: 250px;" />
-          </el-form-item>
-        </el-form>
-        <div slot="footer" class="dialog-footer">
-          <el-button type="text" @click="crud.cancelCU">取消</el-button>
-          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
-        </div>
-      </el-dialog>
-      <!--表格渲染-->
-      <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
-        <el-table-column type="selection" width="55" />
-        <el-table-column v-if="false" prop="business_id" label="业务明细标识" />
-        <el-table-column prop="business_type_name" label="业务类型名称" />
-        <el-table-column prop="inv_type_code" label="单据类型编码" />
-        <el-table-column prop="inv_type_name" label="单据类型名称" />
-        <el-table-column prop="material_type_code" label="物料分类编码" />
-        <el-table-column prop="remark" label="说明" />
-        <el-table-column label="是否启用" align="center" prop="is_used">
-          <template slot-scope="scope">
-            <el-switch
-              v-model="scope.row.is_used"
-              active-color="#409EFF"
-              inactive-color="#F56C6C"
-              active-value="1"
-              inactive-value="0"
-              @change="changeEnabled(scope.row, scope.row.is_used)"
-            />
-          </template>
-        </el-table-column>
-        <el-table-column prop="create_name" label="创建人姓名" />
-        <el-table-column prop="create_time" label="创建时间" width="150px" />
-        <el-table-column prop="update_optname" label="修改者" />
-        <el-table-column prop="update_time" label="修改时间" width="150px" />
-        <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
-          <template slot-scope="scope">
-            <udOperation
-              :data="scope.row"
-              :permission="permission"
-            />
-          </template>
-        </el-table-column>
-      </el-table>
-      <!--分页组件-->
-      <pagination />
-    </div>
-  </div>
-</template>
-
-<script>
-import crudBusinesstypematerial from '@/api/wms/basedata/master/businesstypematerial'
-import CRUD, { presenter, header, form, crud } from '@crud/crud'
-import rrOperation from '@crud/RR.operation'
-import crudOperation from '@crud/CRUD.operation'
-import udOperation from '@crud/UD.operation'
-import pagination from '@crud/Pagination'
-
-const defaultForm = { business_id: null, business_type_code: null, business_type_name: null, inv_type_code: null, inv_type_name: null, material_type_id: null, material_type_code: null, remark: null, is_used: '1', create_id: null, create_name: null, create_time: null, update_optid: null, update_optname: null, update_time: null, is_delete: null, ext_id: null }
-export default {
-  name: 'Businesstypematerial',
-  dicts: ['is_used'],
-  components: { pagination, crudOperation, rrOperation, udOperation },
-  mixins: [presenter(), header(), form(defaultForm), crud()],
-  cruds() {
-    return CRUD({
-      title: '业务单据类型物料对应',
-      url: 'api/businesstypematerial',
-      idField: 'business_id',
-      sort: 'business_id,desc',
-      crudMethod: { ...crudBusinesstypematerial },
-      optShow: {
-        add: true,
-        edit: false,
-        del: false,
-        download: false,
-        reset: true
-      }
-    })
-  },
-  data() {
-    return {
-      permission: {
-      },
-      typeCodeList: [],
-      rules: {
-        business_type_name: [
-          { required: true, message: '业务类型名称不能为空', trigger: 'blur' }
-        ],
-        business_type_code: [
-          { required: true, message: '业务类型不能为空', trigger: 'blur' }
-        ],
-        inv_type_code: [
-          { required: true, message: '单据类型编码不能为空', trigger: 'blur' }
-        ],
-        inv_type_name: [
-          { required: true, message: '单据类型名称不能为空', trigger: 'blur' }
-        ],
-        material_type_id: [
-          { required: true, message: '物料分类标识不能为空', trigger: 'blur' }
-        ]
-      }}
-  },
-  created() {
-    crudBusinesstypematerial.getTypeCode().then(res => {
-      this.typeCodeList = res
-    })
-  },
-  methods: {
-    // 钩子：在获取表格数据之前执行，false 则代表不获取数据
-    [CRUD.HOOK.beforeRefresh]() {
-      return true
-    },
-    changeEnabled(data, val) {
-      this.$confirm('此操作将 "' + this.dict.label.is_used[val] + '" ' + data.business_type_name + ', 是否继续？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        crudBusinesstypematerial.edit(data).then(res => {
-          this.crud.notify(this.dict.label.is_used[val] + '成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
-        }).catch(() => {
-          if (data.is_used === '0') {
-            data.is_used = '1'
-            return
-          }
-          if (data.is_used === '1') {
-            data.is_used = '0'
-          }
-        })
-      }).catch(() => {
-        if (data.is_used === '0') {
-          data.is_used = '1'
-          return
-        }
-        if (data.is_used === '1') {
-          data.is_used = '0'
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style scoped>
-
-</style>
diff --git a/mes/qd/src/views/wms/basedata/master/materialParameters/index.vue b/mes/qd/src/views/wms/basedata/master/materialParameters/index.vue
deleted file mode 100644
index edc7ec6..0000000
--- a/mes/qd/src/views/wms/basedata/master/materialParameters/index.vue
+++ /dev/null
@@ -1,275 +0,0 @@
-<template>
-  <div class="app-container">
-    <!--工具栏-->
-    <div class="head-container">
-      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
-      <div v-if="crud.props.searchToggle">
-        <!-- 搜索 -->
-        <el-row>
-          <el-col :span="8">
-            <el-row>
-              <el-col :span="7">
-                <span style="line-height:36px;text-align: center">物料类别：</span>
-              </el-col>
-              <el-col :span="12">
-                <treeselect
-                  v-model="query.material_type_id"
-                  :load-options="loadClass"
-                  :options="classes"
-                  style="width: 200px;"
-                  placeholder="请选择"
-                />
-              </el-col>
-            </el-row>
-          </el-col>
-          <el-col :span="8">
-            模糊查询：
-            <el-input
-              v-model="query.material_code"
-              clearable
-              style="width: 200px"
-              size="mini"
-              placeholder="输入物料编码或名称"
-              prefix-icon="el-icon-search"
-              class="filter-item"
-            />
-          </el-col>
-          <el-col :span="8">
-            <rrOperation />
-          </el-col>
-        </el-row>
-      </div>
-      <crudOperation :permission="permission" />
-      <!--表格渲染-->
-      <el-table
-        ref="table"
-        v-loading="crud.loading"
-        :data="crud.data"
-        size="mini"
-        style="width: 100%;"
-        @selection-change="crud.selectionChangeHandler"
-      >
-        <!--        <el-table-column type="selection" width="55" />-->
-        <el-table-column label="操作" width="100px" align="center" fixed="right">
-          <template slot-scope="scope">
-            <el-button
-              slot="right"
-              type="primary"
-              icon="el-icon-edit"
-              size="mini"
-              @click="materialSet(scope.row)"
-            />
-          </template>
-        </el-table-column>
-        <el-table-column v-if="false" prop="material_id" label="material_id" />
-        <el-table-column prop="material_code" label="物料编码" width="160" />
-        <el-table-column prop="material_name" label="物料名称" width="200" />
-        <el-table-column prop="unit_name" label="单位" />
-        <el-table-column prop="class_name" label="物料类别" width="140px" />
-        <el-table-column prop="is_need_plan_name" label="是否参与需求计划计算" width="150px" />
-        <el-table-column prop="stock_is_need_move" label="原料是否配粉移库" width="150px" :formatter="stockIsNeedMove" />
-        <el-table-column prop="stock_standard_weight" label="原料标准桶重" width="100px" :formatter="crud.formatNum3" />
-        <el-table-column prop="stock_is_report_name" label="原料是否生成理化报告" width="150px" />
-        <el-table-column prop="wc_seqno" label="原料碳化钨顺序号" width="120px" />
-        <el-table-column prop="old_mark" label="原牌号" />
-        <el-table-column prop="product_mode_name" label="生产方式" />
-        <el-table-column prop="is_auto_open_name" label="是否允许自动开单" width="120px" />
-        <el-table-column prop="waste_limit_down" label="软废添加比列下限" width="120px" />
-        <el-table-column prop="waste_limit_up" label="软废添加比列上限" width="120px" />
-        <el-table-column prop="standard_weight_pft" label="工令标准桶重" width="100px" :formatter="crud.formatNum3" />
-        <el-table-column prop="report_time" label="产品理化时间" width="100px" />
-        <el-table-column prop="produc_is_report_name" label="产品是否生成理化报告" width="150px" />
-        <el-table-column prop="product_is_need_move" label="产品是否配粉移库" width="150px" :formatter="productIsNeedMove" />
-        <el-table-column prop="is_again_put_name" label="是否二次投料" width="100px" />
-        <el-table-column prop="produc_standard_weight" label="产品标准桶重" width="100px" :formatter="crud.formatNum3" />
-        <el-table-column prop="product_series_name" label="产品系列" />
-        <el-table-column prop="c_balance" label="碳平衡" />
-        <el-table-column prop="ball_time" label="球磨时间" />
-        <el-table-column prop="ball_speed" label="球磨转速" />
-        <el-table-column prop="product_ball_time" label="产品球磨时间" width="100px" />
-        <el-table-column prop="weight_lost_down" label="重损上限" />
-        <el-table-column prop="weight_lost_up" label="重损上限" />
-        <el-table-column prop="net_rate" label="纯粉系数" />
-        <el-table-column v-if="false" prop="is_used" label="是否启用" />
-        <el-table-column prop="update_optname" label="修改人" />
-        <el-table-column prop="update_time" label="修改时间" width="150px" />
-      </el-table>
-      <!--分页组件-->
-      <pagination />
-    </div>
-
-    <el-dialog
-      :title="dialogTitle"
-      :fullscreen="fullscreen"
-      :visible.sync="viewDialogVisible"
-      width="30%"
-    >
-      <!--  组件-->
-      <component
-        :is="currentComponent"
-        ref="materialDialog"
-        :material_id="material_id"
-        :dialog-visible="viewDialogVisible"
-      />
-      <span slot="footer" class="dialog-footer">
-        <el-button @click="viewDialogVisible = false">取 消</el-button>
-        <el-button type="primary" @click="save">确 定</el-button>
-      </span>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import crudMaterialparameters from '@/api/wms/basedata/master/materialparameters'
-import crudClassstandard from '@/api/wms/basedata/master/classstandard'
-import Treeselect, { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect'
-import '@riophae/vue-treeselect/dist/vue-treeselect.css'
-import CRUD, { crud, header, presenter } from '@crud/crud'
-import rrOperation from '@crud/RR.operation'
-import crudOperation from '@crud/CRUD.operation'
-import udOperation from '@crud/UD.operation'
-import pagination from '@crud/Pagination'
-import CpDialog from './view/CpDialog'
-import YflDialog from './view/YflDialog'
-import crudMaterialbase from '@/api/wms/basedata/master/materialbase'
-
-export default {
-  name: 'MaterialParameters',
-  components: { pagination, crudOperation, rrOperation, udOperation, YflDialog, CpDialog, Treeselect },
-  mixins: [presenter(), header(), crud()],
-  cruds() {
-    return CRUD({
-      title: '物料参数设置',
-      url: 'api/MaterialParameters',
-      idField: 'material_id',
-      sort: 'material_id,desc',
-      crudMethod: { ...crudMaterialparameters },
-      optShow: {
-        add: false,
-        edit: false,
-        del: false,
-        download: false,
-        reset: true
-      }
-    })
-  },
-  data() {
-    return {
-      classes: [],
-      class_idStr: null,
-      materOpt_code: '06',
-      viewDialogVisible: false,
-      fullscreen: false,
-      material_id: '',
-      currentComponent: '',
-      openParam: {},
-      dialogTitle: null,
-
-      permission: {}
-    }
-  },
-  created() {
-    const param = {
-      'materOpt_code': this.materOpt_code
-    }
-    crudMaterialbase.getMaterOptType(param).then(res => {
-      this.class_idStr = res.class_idStr
-      this.crud.query.class_idStr = this.class_idStr
-      this.crud.toQuery()
-      this.queryClassId()
-    })
-  },
-  methods: {
-    // 钩子：在获取表格数据之前执行，false 则代表不获取数据
-    [CRUD.HOOK.beforeRefresh]() {
-      return true
-    },
-    stockIsNeedMove(row, clou) {
-      if (row.stock_is_need_move === '0') return '否'
-      if (row.stock_is_need_move === '1') return '是'
-    },
-    productIsNeedMove(row, clou) {
-      if (row.product_is_need_move === '0') return '否'
-      if (row.product_is_need_move === '1') return '是'
-    },
-    queryClassId() {
-      const param = {
-        'class_idStr': this.class_idStr
-      }
-      crudClassstandard.queryClassById(param).then(res => {
-        this.classes = res.content.map(obj => {
-          if (obj.hasChildren) {
-            obj.children = null
-          }
-          return obj
-        })
-      })
-    },
-    handleClose(done) {
-      this.$confirm('确认关闭？')
-        .then(_ => {
-          done()
-        })
-        .catch(_ => {
-        })
-    },
-    materialSet(obj) {
-      this.material_id = obj.material_id
-      const data = {
-        'material_type_id': obj.material_type_id,
-        'materOpt_code': '01'
-      }
-      const _that = this
-      crudMaterialbase.isAlongMaterType(data).then(res => {
-        // 非半成品
-        if (!res) {
-          _that.currentComponent = 'YflDialog'
-          _that.viewDialogVisible = true
-          _that.dialogTitle = '物料参数设置-原辅料'
-          _that.fullscreen = true
-        } else {
-          _that.currentComponent = 'CpDialog'
-          this.viewDialogVisible = true
-          _that.dialogTitle = '物料参数设置-半成品'
-          _that.fullscreen = true
-        }
-      }).catch(err => {
-        console.log(err.response.data.message)
-      })
-    },
-    save() {
-      const data = this.$refs.materialDialog.formData
-      this.$refs.materialDialog.$refs.form.validate((valid) => {
-        if (valid) {
-          crudMaterialparameters.save(data).then(res => {
-            this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
-            this.crud.toQuery()
-            this.viewDialogVisible = false
-          }).catch(err => {
-            console.log(err.response.data.message)
-          })
-        }
-      })
-    },
-    loadClass({ action, parentNode, callback }) {
-      if (action === LOAD_CHILDREN_OPTIONS) {
-        crudClassstandard.getClass({ pid: parentNode.id }).then(res => {
-          parentNode.children = res.content.map(function(obj) {
-            if (obj.hasChildren) {
-              obj.children = null
-            }
-            return obj
-          })
-          setTimeout(() => {
-            callback()
-          }, 100)
-        })
-      }
-    }
-  }
-}
-</script>
-
-<style scoped>
-
-</style>
diff --git a/mes/qd/src/views/wms/basedata/master/materialParameters/view/CpDialog.vue b/mes/qd/src/views/wms/basedata/master/materialParameters/view/CpDialog.vue
deleted file mode 100644
index 032f423..0000000
--- a/mes/qd/src/views/wms/basedata/master/materialParameters/view/CpDialog.vue
+++ /dev/null
@@ -1,341 +0,0 @@
-<template>
-  <div>
-    <el-form ref="form" :model="formData" :rules="prules" size="mini" label-width="140px">
-      <el-row>
-        <el-col :span="8">
-          <el-form-item label="产品标识" prop="material_id">
-            <el-input v-model="formData.material_id" disabled style="width: 200px;" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="产品编码">
-            <el-input v-model="formData.material_code" disabled style="width: 200px;" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="产品名称" prop="material_name">
-            <el-input v-model="formData.material_name" disabled style="width: 200px;" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="8">
-          <el-form-item label="物料分类编码">
-            <el-input v-model="formData.class_code" disabled style="width: 200px;" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="物料分类名称">
-            <el-input v-model="formData.class_name" disabled style="width: 200px;" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="计量单位">
-            <el-input v-model="formData.unit_name" disabled style="width: 200px;" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-
-        <el-col :span="8">
-          <el-form-item label="高度类型" prop="material_height_type">
-            <el-select
-              v-model="formData.material_height_type"
-              clearable
-              size="mini"
-              placeholder="请选择"
-              class="filter-item"
-              style="width: 200px;"
-            >
-              <el-option
-                v-for="item in dict.material_height_type"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="是否启用">
-            <el-radio v-model="formData.is_used" label="0">否</el-radio>
-            <el-radio v-model="formData.is_used" label="1">是</el-radio>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-divider />
-      <el-row>
-        <el-col :span="8">
-          <el-form-item label="软废添加比列下限" prop="waste_limit_down">
-            <el-input-number v-model="formData.waste_limit_down" :precision="2" :step="0.01" :max="100" :controls="false" placeholder="%" style="width: 200px;" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="软废添加比列上限" prop="waste_limit_up">
-            <el-input-number v-model="formData.waste_limit_up" :precision="2" :step="0.01" :max="100" :controls="false" placeholder="%" style="width: 200px;" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="配粉桶标准重量" prop="standard_weight_pft">
-            <el-input-number v-model="formData.standard_weight_pft" :precision="3" :step="1" :max="1000" :controls="false" placeholder="kg" style="width: 200px;" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="8">
-          <el-form-item label="产品理化时间" prop="report_time">
-            <el-input-number v-model="formData.report_time" :precision="2" :step="0.1" :max="1000" :controls="false" placeholder="小时" style="width: 200px;" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="标准桶重" prop="standard_weight">
-            <el-input-number v-model="formData.standard_weight" :precision="3" :step="1" :max="1000" :controls="false" placeholder="kg" style="width: 200px;" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="产品系列">
-            <el-select
-              v-model="formData.product_series"
-              clearable
-              size="mini"
-              placeholder="请选择"
-              class="filter-item"
-              style="width: 200px;"
-            >
-              <el-option
-                v-for="item in dict.product_series"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="8">
-          <el-form-item label="碳平衡" prop="c_balance">
-            <el-input-number v-model="formData.c_balance" :precision="2" :step="0.01" :max="100" :controls="false" placeholder="%" style="width: 200px;" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="球磨时间" prop="ball_time">
-            <el-input-number v-model="formData.ball_time" :precision="2" :step="0.1" :max="1000" :controls="false" placeholder="小时" style="width: 200px;" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="球磨转速" prop="ball_speed">
-            <el-input-number v-model="formData.ball_speed" :precision="2" :step="0.1" :controls="false" placeholder="每分钟" style="width: 200px;" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="8">
-          <el-form-item label="对应球磨机产品编号">
-            <el-input v-model="formData.product_ball_code" style="width: 200px;" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="原牌号">
-            <el-input v-model="formData.old_mark" style="width: 200px;" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="生产方式">
-            <el-select
-              v-model="formData.product_mode"
-              clearable
-              size="mini"
-              placeholder="请选择"
-              class="filter-item"
-              style="width: 200px;"
-            >
-              <el-option
-                v-for="item in dict.product_mode"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="8">
-          <el-form-item label="产品排产球磨时间">
-            <el-select
-              v-model="formData.product_ball_time"
-              clearable
-              size="mini"
-              placeholder="小时"
-              class="filter-item"
-              style="width: 200px;"
-            >
-              <el-option
-                v-for="item in dict.product_ball_time"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="重损上限" prop="weight_lost_up">
-            <el-input-number v-model="formData.weight_lost_up" :precision="2" :step="0.1" :controls="false" style="width: 200px;" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="重损下限" prop="weight_lost_down">
-            <el-input-number v-model="formData.weight_lost_down" :precision="2" :step="0.1" :controls="false" style="width: 200px;" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="8">
-          <el-form-item label="纯粉系数" prop="net_rate">
-            <el-input-number v-model="formData.net_rate" :precision="2" :step="0.1" :controls="false" style="width: 200px;" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="是否配粉移库" prop="is_need_move">
-            <el-radio v-model="formData.is_need_move" label="0">否</el-radio>
-            <el-radio v-model="formData.is_need_move" label="1">是</el-radio>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="是否允许自动开单" prop="is_auto_open">
-            <el-radio v-model="formData.is_auto_open" label="0">否</el-radio>
-            <el-radio v-model="formData.is_auto_open" label="1">是</el-radio>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="8">
-          <el-form-item label="是否二次投料" prop="is_again_put">
-            <el-radio v-model="formData.is_again_put" label="0">否</el-radio>
-            <el-radio v-model="formData.is_again_put" label="1">是</el-radio>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="是否生成理化报告" prop="is_report">
-            <el-radio v-model="formData.is_report" label="0">否</el-radio>
-            <el-radio v-model="formData.is_report" label="1">是</el-radio>
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-  </div>
-</template>
-
-<script>
-import { crud } from '@crud/crud'
-import crudMaterialparameters from '@/api/wms/basedata/master/materialparameters'
-
-export default {
-  name: 'YflDialog',
-  dicts: ['material_height_type', 'product_series', 'product_mode', 'product_ball_time'],
-  mixins: [crud()],
-  props: {
-    materialId: {
-      type: String
-    },
-    dialogVisible: {
-      type: Boolean
-    }
-  },
-  data() {
-    var numberOne = (rule, value, callback) => {
-      const numReg = /^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/
-      const numRe = new RegExp(numReg)
-      if (!numRe.test(value)) {
-        callback(new Error('只能输入数字'))
-      } else {
-        callback()
-      }
-    }
-    return {
-      formData: {},
-      prules: {
-        is_auto_open: [
-          { required: true, message: '不能为空', trigger: 'blur' }
-        ],
-        is_need_move: [
-          { required: true, message: '不能为空', trigger: 'blur' }
-        ],
-        net_rate: [
-          { required: true, message: '不能为空', trigger: 'blur' }
-        ],
-        standard_weight: [
-          { required: true, message: '不能为空', trigger: 'blur' },
-          { validator: numberOne }
-        ],
-        is_report: [
-          { required: true, message: '不能为空', trigger: 'blur' }
-        ],
-        waste_limit_down: [
-          { required: true, message: '不能为空', trigger: 'blur' },
-          { validator: numberOne }
-        ],
-        waste_limit_up: [
-          { required: true, message: '不能为空', trigger: 'blur' },
-          { validator: numberOne }
-        ],
-        standard_weight_pft: [
-          { required: true, message: '不能为空', trigger: 'blur' },
-          { validator: numberOne }
-        ],
-        report_time: [
-          { required: true, message: '不能为空', trigger: 'blur' },
-          { validator: numberOne }
-        ],
-        is_again_put: [
-          { required: true, message: '不能为空', trigger: 'blur' }
-        ],
-        c_balance: [
-          { required: true, message: '不能为空', trigger: 'blur' },
-          { validator: numberOne }
-        ],
-        ball_time: [
-          { required: true, message: '不能为空', trigger: 'blur' },
-          { validator: numberOne }
-        ],
-        ball_speed: [
-          { required: true, message: '不能为空', trigger: 'blur' },
-          { validator: numberOne }
-        ],
-        product_ball_time: [
-          { required: true, message: '不能为空', trigger: 'blur' },
-          { validator: numberOne }
-        ],
-        weight_lost_up: [
-          { validator: numberOne }
-        ],
-        weight_lost_down: [
-          { validator: numberOne }
-        ]
-      }
-    }
-  },
-  watch: {
-    dialogVisible: {
-      handler(newValue, oldValue) {
-        if (this.dialogVisible) {
-          this.initData()
-        }
-      }
-    }
-  },
-  created() {
-    this.initData()
-  },
-  methods: {
-    initData() {
-      const param = {
-        'material_id': this.$attrs.material_id
-      }
-      crudMaterialparameters.queryMaterialParam(param).then(res => {
-        this.formData = res
-      }).catch(err => {
-        console.log(err.response.data.message)
-      })
-    }
-  }
-}
-</script>
diff --git a/mes/qd/src/views/wms/basedata/master/materialParameters/view/YflDialog.vue b/mes/qd/src/views/wms/basedata/master/materialParameters/view/YflDialog.vue
deleted file mode 100644
index 0eba25d..0000000
--- a/mes/qd/src/views/wms/basedata/master/materialParameters/view/YflDialog.vue
+++ /dev/null
@@ -1,177 +0,0 @@
-<template>
-  <div>
-    <el-form ref="form" :model="formData" size="mini" :rules="srules" label-width="140px">
-      <el-row>
-        <el-col :span="8">
-          <el-form-item label="物料标识">
-            <el-input v-model="formData.material_id" disabled style="width: 200px;" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="物料编码">
-            <el-input v-model="formData.material_code" disabled style="width: 200px;" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="物料名称">
-            <el-input v-model="formData.material_name" disabled style="width: 200px;" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="8">
-          <el-form-item label="物料分类编码">
-            <el-input v-model="formData.class_code" disabled style="width: 200px;" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="物料分类名称">
-            <el-input v-model="formData.class_name" disabled style="width: 200px;" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="计量单位">
-            <el-input v-model="formData.unit_name" disabled style="width: 200px;" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-
-        <el-col :span="8">
-          <el-form-item label="高度类型" prop="material_height_type">
-            <el-select
-              v-model="formData.material_height_type"
-              clearable
-              size="mini"
-              placeholder="请选择"
-              class="filter-item"
-              style="width: 200px;"
-            >
-              <el-option
-                v-for="item in dict.material_height_type"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="是否启用" prop="is_used">
-            <el-radio v-model="formData.is_used" label="0">否</el-radio>
-            <el-radio v-model="formData.is_used" label="1">是</el-radio>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-divider />
-      <el-row>
-        <el-col :span="8">
-          <el-form-item label="标准桶重" prop="standard_weight">
-            <el-input-number v-model="formData.standard_weight" :precision="3" :step="1" :max="1000" :controls="false" placeholder="kg" style="width: 200px;" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="原料碳化钨顺序号" prop="wc_seqno">
-            <el-input v-model="formData.wc_seqno" style="width: 200px;" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="原料报表顺序号" prop="report_seqno">
-            <el-input v-model="formData.report_seqno" style="width: 200px;" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="8">
-          <el-form-item label="参与需求计划计算" prop="is_need_plan">
-            <el-radio v-model="formData.is_need_plan" label="0">否</el-radio>
-            <el-radio v-model="formData.is_need_plan" label="1">是</el-radio>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="是否生成理化报告" prop="is_report">
-            <el-radio v-model="formData.is_report" label="0">否</el-radio>
-            <el-radio v-model="formData.is_report" label="1">是</el-radio>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="是否配粉移库" prop="is_need_move">
-            <el-radio v-model="formData.is_need_move" label="0">否</el-radio>
-            <el-radio v-model="formData.is_need_move" label="1">是</el-radio>
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-  </div>
-</template>
-
-<script>
-import { crud } from '@crud/crud'
-import crudMaterialparameters from '@/api/wms/basedata/master/materialparameters'
-
-export default {
-  name: 'YflDialog',
-  dicts: ['material_height_type', 'product_series', 'product_mode', 'product_ball_time'],
-  mixins: [crud()],
-  props: {
-    materialId: {
-      type: String
-    },
-    dialogVisible: {
-      type: Boolean
-    }
-  },
-  data() {
-    var numberOne = (rule, value, callback) => {
-      const numReg = /^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/
-      const numRe = new RegExp(numReg)
-      if (!numRe.test(value)) {
-        callback(new Error('只能输入数字'))
-      } else {
-        callback()
-      }
-    }
-    return {
-      formData: {},
-      srules: {
-        is_need_move: [
-          { required: true, message: '不能为空', trigger: 'blur' }
-        ],
-        standard_weight: [
-          { required: true, message: '不能为空', trigger: 'blur' },
-          { validator: numberOne }
-        ],
-        is_need_plan: [
-          { required: true, message: '不能为空', trigger: 'blur' }
-        ],
-        is_report: [
-          { required: true, message: '不能为空', trigger: 'blur' }
-        ]
-      }
-    }
-  },
-  watch: {
-    dialogVisible: {
-      handler(newValue, oldValue) {
-        if (this.dialogVisible) {
-          this.initData()
-        }
-      }
-    }
-  },
-  created() {
-    this.initData()
-  },
-  methods: {
-    initData() {
-      const param = {
-        'material_id': this.$attrs.material_id
-      }
-      crudMaterialparameters.queryMaterialParam(param).then(res => {
-        this.formData = res
-      }).catch(err => {
-        console.log(err.response.data.message)
-      })
-    }
-  }
-}
-</script>
diff --git a/mes/qd/src/views/wms/bigScreen/shopInfo/index.vue b/mes/qd/src/views/wms/bigScreen/shopInfo/index.vue
deleted file mode 100644
index 90c77a3..0000000
--- a/mes/qd/src/views/wms/bigScreen/shopInfo/index.vue
+++ /dev/null
@@ -1,184 +0,0 @@
-<template>
-  <div class="app-container">
-    <!--工具栏-->
-    <div class="head-container">
-      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
-      <crudOperation :permission="permission" />
-      <!--表单组件-->
-      <el-dialog width="800px" :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title">
-        <el-form :inline="true" ref="form" :model="form" :rules="rules" size="mini" label-width="150px">
-          <el-form-item label="今日计划量(吨)" prop="production_plan2">
-            <el-input v-model="form.production_plan2" style="width: 200px;" />
-          </el-form-item>
-          <el-form-item label="今日入库数(吨)" prop="today_in2">
-            <el-input v-model="form.today_in2" style="width: 200px;" />
-          </el-form-item>
-          <el-form-item label="今日入库数(pcs)" prop="today_in1">
-            <el-input v-model="form.today_in1" style="width: 200px;" />
-          </el-form-item>
-          <el-form-item label="车间原材料数(吨)" prop="materials_num">
-            <el-input v-model="form.materials_num" style="width: 200px;" />
-          </el-form-item>
-          <el-form-item label="今日出库数(吨)" prop="today_out2">
-            <el-input v-model="form.today_out2" style="width: 200px;" />
-          </el-form-item>
-          <el-form-item label="今日出库数(pcs)" prop="today_out1">
-            <el-input v-model="form.today_out1" style="width: 200px;" />
-          </el-form-item>
-          <el-form-item label="昨日入库数(吨)" prop="yesterday_in2">
-            <el-input v-model="form.yesterday_in2" style="width: 200px;" />
-          </el-form-item>
-          <el-form-item label="昨日入库数(pcs)">
-            <el-input v-model="form.yesterday_in1" style="width: 200px;" />
-          </el-form-item>
-          <el-form-item label="昨日出库数(吨)">
-            <el-input v-model="form.yesterday_out2" style="width: 200px;" />
-          </el-form-item>
-          <el-form-item label="昨日出库数(pcs)">
-            <el-input v-model="form.yesterday_out1" style="width: 200px;" />
-          </el-form-item>
-          <el-form-item label="车间人数">
-            <el-input v-model="form.person_num" style="width: 200px;" />
-          </el-form-item>
-          <el-form-item label="车间成品数(吨)" prop="product_num2">
-            <el-input v-model="form.product_num2" style="width: 200px;" />
-          </el-form-item>
-          <el-form-item label="车间成品数(pcs)">
-            <el-input v-model="form.product_num1" style="width: 200px;" />
-          </el-form-item>
-          <el-form-item label="车间在制品数(吨)" prop="processed_num2">
-            <el-input v-model="form.processed_num2" style="width: 200px;" />
-          </el-form-item>
-          <el-form-item label="车间在制品数(pcs)">
-            <el-input v-model="form.processed_num1" style="width: 200px;" />
-          </el-form-item>
-          <el-form-item label="车间工艺路线数">
-            <el-input v-model="form.route_num" style="width: 200px;" />
-          </el-form-item>
-          <el-form-item label="车间设备数">
-            <el-input v-model="form.device_num" style="width: 200px;" />
-          </el-form-item>
-          <el-form-item label="今日生产量(吨)">
-            <el-input v-model="form.production_today2" style="width: 200px;" />
-          </el-form-item>
-        </el-form>
-        <div slot="footer" class="dialog-footer">
-          <el-button type="text" @click="crud.cancelCU">取消</el-button>
-          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
-        </div>
-      </el-dialog>
-      <!--表格渲染-->
-      <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
-        <el-table-column type="selection" width="55" />
-        <el-table-column prop="production_plan1" label="今日计划量(pcs)" />
-        <el-table-column prop="production_plan2" label="今日计划量(吨)" />
-        <el-table-column prop="today_in2" label="今日入库数(吨)" />
-        <el-table-column prop="today_in1" label="今日入库数(pcs)" />
-        <el-table-column prop="materials_num" label="车间原材料数(吨)" />
-        <el-table-column prop="today_out2" label="今日出库数(吨)" />
-        <el-table-column prop="today_out1" label="今日出库数(pcs)" />
-        <el-table-column prop="yesterday_in2" label="昨日入库数(吨)" />
-        <el-table-column prop="yesterday_in1" label="昨日入库数(pcs)" />
-        <el-table-column prop="yesterday_out2" label="昨日出库数(吨)" />
-        <el-table-column prop="yesterday_out1" label="昨日出库数(pcs)" />
-        <el-table-column prop="person_num" label="车间人数" />
-        <el-table-column prop="product_num2" label="车间成品数(吨)" />
-        <el-table-column prop="product_num1" label="车间成品数(pcs)" />
-        <el-table-column prop="processed_num2" label="车间在制品数(吨)" />
-        <el-table-column prop="processed_num1" label="车间在制品数(pcs)" />
-        <el-table-column prop="route_num" label="车间工艺路线数" />
-        <el-table-column prop="device_num" label="车间设备数" />
-        <el-table-column prop="production_today1" label="今日生产量(pcs)" />
-        <el-table-column prop="production_today2" label="今日生产量(吨)" />
-        <el-table-column prop="completion_rate" label="完成率" />
-        <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
-          <template slot-scope="scope">
-            <udOperation
-              :data="scope.row"
-              :permission="permission"
-            />
-          </template>
-        </el-table-column>
-      </el-table>
-      <!--分页组件-->
-    </div>
-  </div>
-</template>
-
-<script>
-import crudBigScreen from '@/api/wms/bigScreen/bigScreen'
-import CRUD, { crud, form, header, presenter } from '@crud/crud'
-import crudOperation from '@crud/CRUD.operation'
-import udOperation from '@crud/UD.operation'
-
-const defaultForm = { addType: 'shopInfo', shop_id: null, production_plan1: null, production_plan2: null, today_in2: null, today_in1: null, materials_num: null, today_out2: null, today_out1: null, yesterday_in2: null, yesterday_in1: null, yesterday_out2: null, yesterday_out1: null, person_num: null, product_num2: null, product_num1: null, processed_num2: null, processed_num1: null, route_num: null, device_num: null, production_today1: null, production_today2: null, completion_rate: null, b_date: null }
-export default {
-  name: 'Shopinfo',
-  components: { crudOperation, udOperation },
-  mixins: [presenter(), header(), form(defaultForm), crud()],
-  cruds() {
-    return CRUD({
-      title: '车间信息',
-      url: 'api/bigScreenScreen/queryInfo',
-      idField: 'shop_id',
-      sort: 'shop_id,desc',
-      crudMethod: { ...crudBigScreen },
-      query: {
-        queryType: 'shopInfo'
-      },
-      optShow: {
-        add: true,
-        edit: false,
-        del: false,
-        download: false,
-        reset: false
-      }
-    })
-  },
-  data() {
-    return {
-      permission: {
-      },
-      rules: {
-        production_plan2: [
-          { required: true, message: '今日计划量(吨)不能为空', trigger: 'blur' }
-        ],
-        today_in2: [
-          { required: true, message: '今日入库数(吨)不能为空', trigger: 'blur' }
-        ],
-        today_in1: [
-          { required: true, message: '今日入库数(pcs)不能为空', trigger: 'blur' }
-        ],
-        materials_num: [
-          { required: true, message: '车间原材料数(吨)不能为空', trigger: 'blur' }
-        ],
-        today_out2: [
-          { required: true, message: '今日出库数(吨)不能为空', trigger: 'blur' }
-        ],
-        today_out1: [
-          { required: true, message: '今日出库数(pcs)不能为空', trigger: 'blur' }
-        ],
-        yesterday_in2: [
-          { required: true, message: '昨日入库数(吨)不能为空', trigger: 'blur' }
-        ],
-        product_num2: [
-          { required: true, message: '车间成品数(吨)不能为空', trigger: 'blur' }
-        ],
-        processed_num2: [
-          { required: true, message: '车间在制品数(吨)不能为空', trigger: 'blur' }
-        ]
-      }
-    }
-  },
-  methods: {
-    // 钩子：在获取表格数据之前执行，false 则代表不获取数据
-    [CRUD.HOOK.beforeRefresh]() {
-      return true
-    }
-  }
-}
-</script>
-
-<style scoped>
-
-</style>
diff --git a/mes/qd/src/views/wms/bigScreen/stock/index.vue b/mes/qd/src/views/wms/bigScreen/stock/index.vue
deleted file mode 100644
index 3ed31c8..0000000
--- a/mes/qd/src/views/wms/bigScreen/stock/index.vue
+++ /dev/null
@@ -1,103 +0,0 @@
-<template>
-  <div class="app-container">
-    <!--工具栏-->
-    <div class="head-container">
-      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
-      <crudOperation :permission="permission" />
-      <!--表单组件-->
-      <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="500px">
-        <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
-          <el-form-item label="不足的">
-            <el-input v-model="form.not_enough" style="width: 370px;" />
-          </el-form-item>
-          <el-form-item label="库容量">
-            <el-input v-model="form.storagecapacity_weight" style="width: 370px;" />
-          </el-form-item>
-          <el-form-item label="库存量">
-            <el-input v-model="form.repertory" style="width: 370px;" />
-          </el-form-item>
-          <el-form-item label="足够的">
-            <el-input v-model="form.enough" style="width: 370px;" />
-          </el-form-item>
-        </el-form>
-        <div slot="footer" class="dialog-footer">
-          <el-button type="text" @click="crud.cancelCU">取消</el-button>
-          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
-        </div>
-      </el-dialog>
-      <!--表格渲染-->
-      <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
-        <el-table-column type="selection" width="55" />
-        <el-table-column prop="date" label="日期" />
-        <el-table-column prop="not_enough" label="不足的" />
-        <el-table-column prop="storagecapacity_weight" label="库容量" />
-        <el-table-column prop="repertory" label="库存量" />
-        <el-table-column prop="enough" label="足够的" />
-        <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
-          <template slot-scope="scope">
-            <udOperation
-              :data="scope.row"
-              :permission="permission"
-            />
-          </template>
-        </el-table-column>
-      </el-table>
-      <!--分页组件-->
-    </div>
-  </div>
-</template>
-
-<script>
-import crudBigScreen from '@/api/wms/bigScreen/bigScreen'
-import CRUD, {crud, form, header, presenter} from '@crud/crud'
-import rrOperation from '@crud/RR.operation'
-import crudOperation from '@crud/CRUD.operation'
-import udOperation from '@crud/UD.operation'
-
-const defaultForm = { addType: 'stock', id: null, date: null, not_enough: null, storagecapacity_weight: null, repertory: null, enough: null }
-export default {
-  name: 'Stock',
-  components: { crudOperation, rrOperation, udOperation },
-  mixins: [presenter(), header(), form(defaultForm), crud()],
-  cruds() {
-    return CRUD({
-      title: 'kucun',
-      url: 'api/bigScreenScreen/queryInfo',
-      idField: 'id',
-      sort: 'id,desc',
-      crudMethod: { ...crudBigScreen },
-      query: {
-        queryType: 'stock'
-      },
-      optShow: {
-        add: true,
-        edit: false,
-        del: false,
-        download: false,
-        reset: false
-      }
-    })
-  },
-  data() {
-    return {
-      permission: {
-      },
-      rules: {
-        id: [
-          { required: true, message: '标识不能为空', trigger: 'blur' }
-        ]
-      }
-    }
-  },
-  methods: {
-    // 钩子：在获取表格数据之前执行，false 则代表不获取数据
-    [CRUD.HOOK.beforeRefresh]() {
-      return true
-    }
-  }
-}
-</script>
-
-<style scoped>
-
-</style>
diff --git a/mes/qd/src/views/wms/bigScreen/supply/index.vue b/mes/qd/src/views/wms/bigScreen/supply/index.vue
deleted file mode 100644
index b170356..0000000
--- a/mes/qd/src/views/wms/bigScreen/supply/index.vue
+++ /dev/null
@@ -1,103 +0,0 @@
-<template>
-  <div class="app-container">
-    <!--工具栏-->
-    <div class="head-container">
-      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
-      <crudOperation :permission="permission" />
-      <!--表单组件-->
-      <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="500px">
-        <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
-          <el-form-item label="不足的">
-            <el-input v-model="form.not_enough" style="width: 370px;" />
-          </el-form-item>
-          <el-form-item label="供">
-            <el-input v-model="form.planinventory_weight" style="width: 370px;" />
-          </el-form-item>
-          <el-form-item label="需">
-            <el-input v-model="form.need_num" style="width: 370px;" />
-          </el-form-item>
-          <el-form-item label="足够的">
-            <el-input v-model="form.enough" style="width: 370px;" />
-          </el-form-item>
-        </el-form>
-        <div slot="footer" class="dialog-footer">
-          <el-button type="text" @click="crud.cancelCU">取消</el-button>
-          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
-        </div>
-      </el-dialog>
-      <!--表格渲染-->
-      <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
-        <el-table-column type="selection" width="55" />
-        <el-table-column prop="date" label="日期" />
-        <el-table-column prop="not_enough" label="不足的" />
-        <el-table-column prop="planinventory_weight" label="供" />
-        <el-table-column prop="need_num" label="需" />
-        <el-table-column prop="enough" label="足够的" />
-        <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
-          <template slot-scope="scope">
-            <udOperation
-              :data="scope.row"
-              :permission="permission"
-            />
-          </template>
-        </el-table-column>
-      </el-table>
-      <!--分页组件-->
-    </div>
-  </div>
-</template>
-
-<script>
-import crudBigScreen from '@/api/wms/bigScreen/bigScreen'
-import CRUD, { crud, form, header, presenter } from '@crud/crud'
-import rrOperation from '@crud/RR.operation'
-import crudOperation from '@crud/CRUD.operation'
-import udOperation from '@crud/UD.operation'
-
-const defaultForm = { addType: 'supply', id: null, date: null, not_enough: null, planinventory_weight: null, need_num: null, enough: null }
-export default {
-  name: 'Supply',
-  components: { crudOperation, rrOperation, udOperation },
-  mixins: [presenter(), header(), form(defaultForm), crud()],
-  cruds() {
-    return CRUD({
-      title: 'ceshi',
-      url: 'api/bigScreenScreen/queryInfo',
-      idField: 'id',
-      sort: 'id,desc',
-      crudMethod: { ...crudBigScreen },
-      query: {
-        queryType: 'supply'
-      },
-      optShow: {
-        add: true,
-        edit: false,
-        del: false,
-        download: false,
-        reset: false
-      }
-    })
-  },
-  data() {
-    return {
-      permission: {
-      },
-      rules: {
-        id: [
-          { required: true, message: '标识不能为空', trigger: 'blur' }
-        ]
-      }
-    }
-  },
-  methods: {
-    // 钩子：在获取表格数据之前执行，false 则代表不获取数据
-    [CRUD.HOOK.beforeRefresh]() {
-      return true
-    }
-  }
-}
-</script>
-
-<style scoped>
-
-</style>
diff --git a/mes/qd/src/views/wms/bigScreen/todayAndPlanNum/index.vue b/mes/qd/src/views/wms/bigScreen/todayAndPlanNum/index.vue
deleted file mode 100644
index e854263..0000000
--- a/mes/qd/src/views/wms/bigScreen/todayAndPlanNum/index.vue
+++ /dev/null
@@ -1,106 +0,0 @@
-<template>
-  <div class="app-container">
-    <!--工具栏-->
-    <div class="head-container">
-      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
-      <crudOperation :permission="permission" />
-      <!--表单组件-->
-      <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="400px">
-        <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="120px">
-          <el-form-item label="产品名称" prop="name_today">
-            <el-input v-model="form.name_today" style="width: 200px;" />
-          </el-form-item>
-          <el-form-item label="今日产量" prop="num_today">
-            <el-input v-model="form.num_today" style="width: 200px;" />
-          </el-form-item>
-          <el-form-item label="计划数量" prop="num_plan">
-            <el-input v-model="form.num_plan" style="width: 200px;" />
-          </el-form-item>
-        </el-form>
-        <div slot="footer" class="dialog-footer">
-          <el-button type="text" @click="crud.cancelCU">取消</el-button>
-          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
-        </div>
-      </el-dialog>
-      <!--表格渲染-->
-      <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
-        <el-table-column type="selection" width="55" />
-        <el-table-column prop="num_today" label="今日产量" />
-        <el-table-column prop="name_today" label="今日产品名称" />
-        <el-table-column prop="num_plan" label="计划数量" />
-        <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
-          <template slot-scope="scope">
-            <udOperation
-              :data="scope.row"
-              :permission="permission"
-            />
-          </template>
-        </el-table-column>
-      </el-table>
-      <!--分页组件-->
-    </div>
-  </div>
-</template>
-
-<script>
-import crudBigScreen from '@/api/wms/bigScreen/bigScreen'
-import CRUD, {crud, form, header, presenter} from '@crud/crud'
-import rrOperation from '@crud/RR.operation'
-import crudOperation from '@crud/CRUD.operation'
-import udOperation from '@crud/UD.operation'
-
-const defaultForm = { addType: 'todayAndPlanNum', pro_id: null, num_today: null, name_today: null, num_plan: null }
-export default {
-  name: 'Todayandplannum',
-  components: { crudOperation, rrOperation, udOperation },
-  mixins: [presenter(), header(), form(defaultForm), crud()],
-  cruds() {
-    return CRUD({
-      title: '今日产量和计划产量',
-      url: 'api/bigScreenScreen/queryInfo',
-      idField: 'pro_id',
-      sort: 'pro_id,desc',
-      crudMethod: { ...crudBigScreen },
-      query: {
-        queryType: 'todayAndPlanNum'
-      },
-      optShow: {
-        add: true,
-        edit: false,
-        del: false,
-        download: false,
-        reset: false
-      }})
-  },
-  data() {
-    return {
-      permission: {
-      },
-      rules: {
-        pro_id: [
-          { required: true, message: '标识不能为空', trigger: 'blur' }
-        ],
-        num_today: [
-          { required: true, message: '今日产量不能为空', trigger: 'blur' }
-        ],
-        name_today: [
-          { required: true, message: '今日产品名称不能为空', trigger: 'blur' }
-        ],
-        num_plan: [
-          { required: true, message: '计划数量不能为空', trigger: 'blur' }
-        ]
-      }
-    }
-  },
-  methods: {
-    // 钩子：在获取表格数据之前执行，false 则代表不获取数据
-    [CRUD.HOOK.beforeRefresh]() {
-      return true
-    }
-  }
-}
-</script>
-
-<style scoped>
-
-</style>
diff --git a/mes/qd/src/views/wms/bigScreen/yearInOut/index.vue b/mes/qd/src/views/wms/bigScreen/yearInOut/index.vue
deleted file mode 100644
index ccb3c65..0000000
--- a/mes/qd/src/views/wms/bigScreen/yearInOut/index.vue
+++ /dev/null
@@ -1,110 +0,0 @@
-<template>
-  <div class="app-container">
-    <!--工具栏-->
-    <div class="head-container">
-      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
-      <crudOperation :permission="permission" />
-      <!--表单组件-->
-      <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="500px">
-        <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="180px">
-          <el-form-item label="总设计年产量(pcs)">
-            <el-input v-model="form.total_input1" style="width: 200px;" />
-          </el-form-item>
-          <el-form-item label="总设计年产量(吨)">
-            <el-input v-model="form.total_input2" style="width: 200px;" />
-          </el-form-item>
-          <el-form-item label="一期设计年产量(pcs)">
-            <el-input v-model="form.year_output1" style="width: 200px;" />
-          </el-form-item>
-          <el-form-item label="一期设计年产量(吨)">
-            <el-input v-model="form.year_output2" style="width: 200px;" />
-          </el-form-item>
-          <el-form-item label="车间工序数">
-            <el-input v-model="form.process_num" style="width: 200px;" />
-          </el-form-item>
-          <el-form-item label="生产规格数">
-            <el-input v-model="form.product_num" style="width: 200px;" />
-          </el-form-item>
-        </el-form>
-        <div slot="footer" class="dialog-footer">
-          <el-button type="text" @click="crud.cancelCU">取消</el-button>
-          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
-        </div>
-      </el-dialog>
-      <!--表格渲染-->
-      <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
-        <el-table-column type="selection" width="55" />
-        <el-table-column prop="process_num" label="车间工序数" />
-        <el-table-column prop="product_num" label="生产规格数" />
-        <el-table-column prop="total_input1" label="总设计年产量(pcs)" />
-        <el-table-column prop="total_input2" label="总设计年产量(吨)" />
-        <el-table-column prop="year_output1" label="一期设计年产量(pcs)" />
-        <el-table-column prop="year_output2" label="一期设计年产量(吨)" />
-        <el-table-column prop="b_date" label="日期" />
-        <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
-          <template slot-scope="scope">
-            <udOperation
-              :data="scope.row"
-              :permission="permission"
-            />
-          </template>
-        </el-table-column>
-      </el-table>
-      <!--分页组件-->
-    </div>
-  </div>
-</template>
-
-<script>
-import crudBigScreen from '@/api/wms/bigScreen/bigScreen'
-import CRUD, { crud, form, header, presenter } from '@crud/crud'
-import crudOperation from '@crud/CRUD.operation'
-import udOperation from '@crud/UD.operation'
-
-const defaultForm = { addType: 'yearInOut', id: null, process_num: null, product_num: null, total_input1: null, total_input2: null, year_output1: null, year_output2: null, b_date: null }
-export default {
-  name: 'Yearinout',
-  components: { crudOperation, udOperation },
-  mixins: [presenter(), header(), form(defaultForm), crud()],
-  cruds() {
-    return CRUD({
-      title: '今天昨日出入量',
-      url: 'api/bigScreenScreen/queryInfo',
-      idField: 'id',
-      sort: 'id,desc',
-      crudMethod: { ...crudBigScreen },
-      query: {
-        queryType: 'yearInOut'
-      },
-      optShow: {
-        add: true,
-        edit: false,
-        del: false,
-        download: false,
-        reset: false
-      }
-    })
-  },
-  data() {
-    return {
-      permission: {
-      },
-      rules: {
-        id: [
-          { required: true, message: '标识不能为空', trigger: 'blur' }
-        ]
-      }
-    }
-  },
-  methods: {
-    // 钩子：在获取表格数据之前执行，false 则代表不获取数据
-    [CRUD.HOOK.beforeRefresh]() {
-      return true
-    }
-  }
-}
-</script>
-
-<style scoped>
-
-</style>
diff --git a/mes/qd/src/views/wms/sch/point/index.vue b/mes/qd/src/views/wms/sch/point/index.vue
index 5e5baca..37f75e6 100644
--- a/mes/qd/src/views/wms/sch/point/index.vue
+++ b/mes/qd/src/views/wms/sch/point/index.vue
@@ -237,6 +237,7 @@
         <el-table-column prop="task_code" label="锁定任务编码" width="100" />
         <el-table-column prop="inv_code" label="锁定单据编码" width="130" />
         <el-table-column prop="inv_type" label="锁定单据类型" width="110" :formatter="invtypeFormat" />
+        <el-table-column prop="vehicle_qty" label="载具数量" />
         <el-table-column prop="update_by" label="修改者" />
         <el-table-column prop="update_time" label="修改时间" width="150" />
         <el-table-column