From 95fbac58188aebad019ea54d2671a0df9cd0ca4a Mon Sep 17 00:00:00 2001
From: liuxy <lxy1605052545@163.com>
Date: Mon, 8 Aug 2022 17:31:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/org/nl/modules/quartz/task/Test.java |  35 +-
 .../impl/StoragevehicleinfoServiceImpl.java   |  28 +-
 .../java/org/nl/wms/basedata/st/wql/stivt.xls | Bin 229888 -> 230912 bytes
 .../wms/sch/service/wql/QSCH_BASE_POINT.wql   |   1 +
 .../java/org/nl/wms/sch/service/wql/sch.xls   | Bin 172544 -> 173056 bytes
 .../src/test/java/org/nl/Test3.java           |  42 +++
 .../master/businesstypematerial/index.vue     | 211 -----------
 .../master/materialParameters/index.vue       | 275 --------------
 .../materialParameters/view/CpDialog.vue      | 341 ------------------
 .../materialParameters/view/YflDialog.vue     | 177 ---------
 .../views/wms/bigScreen/shopInfo/index.vue    | 184 ----------
 .../src/views/wms/bigScreen/stock/index.vue   | 103 ------
 .../src/views/wms/bigScreen/supply/index.vue  | 103 ------
 .../wms/bigScreen/todayAndPlanNum/index.vue   | 106 ------
 .../views/wms/bigScreen/yearInOut/index.vue   | 110 ------
 mes/qd/src/views/wms/sch/point/index.vue      |   1 +
 16 files changed, 48 insertions(+), 1669 deletions(-)
 delete mode 100644 mes/qd/src/views/wms/basedata/master/businesstypematerial/index.vue
 delete mode 100644 mes/qd/src/views/wms/basedata/master/materialParameters/index.vue
 delete mode 100644 mes/qd/src/views/wms/basedata/master/materialParameters/view/CpDialog.vue
 delete mode 100644 mes/qd/src/views/wms/basedata/master/materialParameters/view/YflDialog.vue
 delete mode 100644 mes/qd/src/views/wms/bigScreen/shopInfo/index.vue
 delete mode 100644 mes/qd/src/views/wms/bigScreen/stock/index.vue
 delete mode 100644 mes/qd/src/views/wms/bigScreen/supply/index.vue
 delete mode 100644 mes/qd/src/views/wms/bigScreen/todayAndPlanNum/index.vue
 delete mode 100644 mes/qd/src/views/wms/bigScreen/yearInOut/index.vue

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 f835f852a9bcd8e2b22fa3291435206a0444ff07..973f6148c67c5dabf219969d16bff51d522d1ddd 100644
GIT binary patch
delta 28757
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
F{{Y|35pe(j

delta 28431
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

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 b634bb49214d3f8501395a61a6aa97c2404e1cd3..211287158db98bde8464dcf8921780709260d075 100644
GIT binary patch
delta 17069
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
b&R)u&;H}}nvuuc{#3@I^8>`>qtF`|Jt_}bX

delta 16969
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
b)vVx;^R_kRZ?kEx5VjqSYN}by*Qoyw1a+?h

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