diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dao/mapper/PdmProduceWorkorderMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dao/mapper/PdmProduceWorkorderMapper.xml
index 1f14bd62..4fbfefd8 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dao/mapper/PdmProduceWorkorderMapper.xml
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dao/mapper/PdmProduceWorkorderMapper.xml
@@ -66,6 +66,9 @@
         <if test="query.sale_id != null and query.sale_id != ''">
             and ShiftOrder.sale_id like  '%${query.sale_id}%'
         </if>
+        <if test="query.material_code != null and query.material_code != ''">
+            and material.material_code = #{query.material_code}
+        </if>
         <if test="query.material != null and query.material != ''">
             and (
             material.material_code like '%${query.material}%' or
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dto/WorkorderQuery.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dto/WorkorderQuery.java
index fbd652ce..659ed746 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dto/WorkorderQuery.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dto/WorkorderQuery.java
@@ -20,6 +20,7 @@ public class WorkorderQuery extends BaseQuery<PdmProduceWorkorder> {
     private String workorder_code;
     private String device_code;
     private String material;
+    private String material_code;
     private String order_status;
     private String plan_start_time;
     private String plan_end_time;
diff --git a/mes/qd/src/views/wms/analysis_manage/workProgress/OrderViewDialog.vue b/mes/qd/src/views/wms/analysis_manage/workProgress/OrderViewDialog.vue
new file mode 100644
index 00000000..bfa780e8
--- /dev/null
+++ b/mes/qd/src/views/wms/analysis_manage/workProgress/OrderViewDialog.vue
@@ -0,0 +1,300 @@
+<template>
+  <el-dialog
+    :before-close="crud.cancelCU"
+    :title="crud.status.title"
+    :visible.sync="dialogVisible"
+    :close-on-click-modal="false"
+    width="1200px"
+  >
+    <el-card class="box-card" shadow="never">
+      <el-form ref="form" :inline="true" :model="masterForm "  disabled size="mini">
+        <el-form-item label="销售订单">
+          <el-input v-model="masterForm.sale_code" style="width: 120px;" />
+        </el-form-item>
+        <el-form-item label="订单行号">
+          <el-input v-model="masterForm.seq_no" style="width: 120px;" />
+        </el-form-item>
+        <el-form-item label="物料规格">
+          <el-input v-model="masterForm.material_spec" style="width: 120px;" />
+        </el-form-item>
+        <el-form-item label="物料编码">
+          <el-input v-model="masterForm.material_code" style="width: 120px;" />
+        </el-form-item>
+        <el-form-item label="订单数量">
+          <el-input v-model="masterForm.sale_qty" style="width: 120px;" />
+        </el-form-item>
+        <el-form-item label="合同号">
+          <el-input v-model="masterForm.contract_code" style="width: 120px;" />
+        </el-form-item>
+        <el-form-item label="创建时间">
+          <el-input v-model="masterForm.create_time" style="width: 120px;" />
+        </el-form-item>
+      </el-form>
+    </el-card>
+    <el-table
+      ref="table"
+      v-loading="crud.loading"
+      :data="crud.data"
+      size="mini"
+      style="width: 100%;"
+    >
+      <el-table-column v-if="false" label="生产班次工单标识" prop="workorder_id"/>
+      <el-table-column label="工单编号" prop="workorder_code" width="100px" />
+      <el-table-column label="工单状态" prop="workorder_status">
+        <template slot-scope="scope">
+          {{ dict.label.MPS_BD_ORDERSTATUS[scope.row.workorder_status] }}
+        </template>
+      </el-table-column>
+      <el-table-column label="生产车间" prop="product_area"/>
+      <el-table-column label="计划数量" prop="plan_qty"/>
+      <el-table-column label="满筐数量" prop="outupperlimit_qty"/>
+      <el-table-column label="电气实时数" prop="dq_real_qty" show-overflow-tooltip width="100"/>
+      <el-table-column label="报工总数" prop="real_qty"/>
+      <el-table-column
+        :min-width="flexWidth('material_code',crud.data,'物料编码')"
+        label="物料编码"
+        prop="material_code"
+      />
+      <el-table-column
+        :min-width="flexWidth('material_spec',crud.data,'物料规格')"
+        label="物料规格"
+        prop="material_spec"
+      />
+      <el-table-column
+        :min-width="flexWidth('device_code',crud.data,'当前设备编码')"
+        label="当前设备信息"
+        prop="device_code"
+      />
+      <el-table-column
+        :min-width="flexWidth('workprocedure_name',crud.data,'工序名称')"
+        label="工序名称"
+        prop="workprocedure_name"
+      />
+      <el-table-column :formatter="crud.formatQlNum4" label="物料单重" prop="material_weight" width="100"/>
+      <el-table-column
+        :min-width="flexWidth('planproducestart_date',crud.data,'计划开始时间')"
+        label="计划开始时间"
+        prop="planproducestart_date"
+      />
+      <el-table-column
+        :min-width="flexWidth('planproduceend_date',crud.data,'计划结束时间')"
+        label="计划结束时间"
+        prop="planproduceend_date"
+      />
+      <el-table-column
+        :min-width="flexWidth('realproducestart_date',crud.data,'实际开始时间')"
+        label="实际开始时间"
+        prop="realproducestart_date"
+      />
+      <el-table-column
+        :min-width="flexWidth('realproduceend_date',crud.data,'实际结束时间')"
+        label="实际结束时间"
+        prop="realproduceend_date"
+      />
+      <el-table-column
+        :formatter="formatBoolean"
+        label="允许修改报工数"
+        prop="is_canupdate_update"
+        show-overflow-tooltip
+        width="200"
+      />
+      <el-table-column :formatter="formatBoolean" label="是否搬运" prop="is_needmove"/>
+      <el-table-column label="班次类型" prop="shift_type_scode">
+        <template slot-scope="scope">
+          {{ dict.label.PDM_BI_SHIFTTYPE[scope.row.shift_type_scode] }}
+        </template>
+      </el-table-column>
+      <el-table-column label="创建类型" prop="create_type" width="100">
+        <template slot-scope="scope">
+          {{ dict.label.WORKORDER_CREATE_TYPE[scope.row.create_type] }}
+        </template>
+      </el-table-column>
+      <el-table-column :formatter="formatBoolean" label="是否异常" prop="is_error"/>
+      <el-table-column label="异常信息" prop="error_info" show-overflow-tooltip/>
+      <el-table-column label="备注" prop="remark"/>
+      <el-table-column label="工单id" prop="workorder_id" width="160px"/>
+      <el-table-column label="报废总数" prop="nok_qty"/>
+      <el-table-column label="报修总数" prop="repare_qty"/>
+      <el-table-column label="人员实际数量" prop="person_real_qty" show-overflow-tooltip width="100"/>
+      <el-table-column label="操作工" prop="current_produce_person_name" show-overflow-tooltip/>
+      <el-table-column :min-width="flexWidth('create_name',crud.data,'创建人')" label="创建人" prop="create_name"/>
+      <el-table-column
+        :min-width="flexWidth('create_time',crud.data,'创建时间')"
+        label="创建时间"
+        prop="create_time"
+      />
+      <el-table-column :min-width="flexWidth('down_name',crud.data,'下发人')" label="下发人" prop="down_name"/>
+      <el-table-column :min-width="flexWidth('down_time',crud.data,'下发时间')" label="下发时间" prop="down_time"/>
+      <el-table-column :min-width="flexWidth('confirm_name',crud.data,'完工人')" label="完工人" prop="confirm_name"/>
+      <el-table-column
+        :min-width="flexWidth('confirm_time',crud.data,'完工时间')"
+        label="完工时间"
+        prop="confirm_time"
+      />
+    </el-table>
+    <pagination />
+    <span slot="footer" class="dialog-footer">
+          <el-button type="primary" @click="submit">确 定</el-button>
+        </span>
+  </el-dialog>
+</template>
+
+<script>
+import crudProduceshiftorder from '@/views/wms/product_manage/workorder/produceshiftorder'
+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'
+import pagination from '@crud/Pagination'
+import crudClassstandard from '@/api/wms/basedata/master/classstandard'
+
+const defaultForm = {
+  workorder_id: null,
+  workorder_code: null,
+  shift_type_scode: '1',
+  workprocedure_id: null,
+  product_area: '',
+  plan_qty: null,
+  real_qty: null,
+  person_real_qty: null,
+  dq_real_qty: null,
+  material_id: null,
+  material_code: null,
+  material_weight: null,
+  material_name: null,
+  material_spec: null,
+  planproducestart_date: null,
+  planproduceend_date: null,
+  realproducestart_date: null,
+  realproduceend_date: null,
+  device_code: null,
+  current_produce_person_id: null,
+  is_canupdate_update: true,
+  package_ext: {},
+  workorder_status: null,
+  is_needmove: true,
+  sale_id: null,
+  create_type: null,
+  is_error: null,
+  error_info: null,
+  remark: null,
+  create_id: null,
+  create_name: null,
+  create_time: null,
+  update_id: null,
+  update_name: null,
+  update_time: null,
+  is_delete: null
+}
+export default {
+  name: 'Produceshiftorder',
+  components: {
+    pagination,
+    crudOperation,
+    rrOperation,
+    udOperation
+  },
+  mixins: [presenter(), header(), form(defaultForm), crud()],
+  dicts: ['PDM_BI_SHIFTTYPE', 'MPS_BD_ORDERSTATUS', 'WORKORDER_CREATE_TYPE', 'is_used', 'PDM_BI_ORDERTYPE', 'IS_OR_NOT', 'product_area'],
+  cruds() {
+    return CRUD({
+      title: '工单', url: 'api/produceWorkorder', idField: 'workorder_id', sort: 'workorder_id,desc',
+      optShow: {
+        add: false,
+        edit: false,
+        del: false,
+        download: false,
+        reset: true
+      },
+      query: {
+        order_status: '-1',
+        product_area: '',
+        is_error: '0'
+      },
+      crudMethod: { ...crudProduceshiftorder }
+    })
+  },
+  data() {
+    return {
+      trueorfalse: [{ value: true, label: '是' }, { value: false, label: '否' }],
+      classes3: [],
+      materType: '01',
+      order_status: ['-1'],
+      permission: {},
+      masterForm: {}
+    }
+  },
+  created() {
+    this.getworkprocedure()
+    this.initClass3()
+  },
+  methods: {
+    openQuery(param){
+      this.masterForm = param
+      this.dialogVisible = true
+      // this.crud.query.sale_id = param.sale_id
+      this.crud.query.material_code = param.material_code
+      this.crud.toQuery()
+    },
+    submit() {
+      this.masterForm = {},
+      this.dialogVisible = false
+    },
+    formatBoolean: function(row, column) {
+      var ret = ''
+      if (row[column.property] === true) {
+        ret = '是' // 根据自己的需求设定
+      } else {
+        ret = '否'
+      }
+      return ret
+    },
+    formatNum0(row, column) {
+      if (!row[column.property]) {
+        return 0
+      }
+      return parseFloat(row[column.property]).toFixed(0)
+    },
+    buildTree(classes) {
+      classes.forEach(data => {
+        if (data.children) {
+          this.buildTree(data.children)
+        }
+        if (data.hasChildren && !data.children) {
+          data.children = null // 重点代码
+        }
+      })
+    },
+    // 获取子节点数据
+    loadChildNodes({ 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)
+        })
+      }
+    },
+    initClass3() {
+      const param = {
+        parent_class_code: '07'
+      }
+      crudClassstandard.getClassType(param).then(res => {
+        const data = res.content
+        this.buildTree(data)
+        this.classes3 = data
+      })
+    },
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/mes/qd/src/views/wms/analysis_manage/workProgress/dailyStructivt.js b/mes/qd/src/views/wms/analysis_manage/workProgress/dailyStructivt.js
deleted file mode 100644
index c7fb0841..00000000
--- a/mes/qd/src/views/wms/analysis_manage/workProgress/dailyStructivt.js
+++ /dev/null
@@ -1,33 +0,0 @@
-import request from '@/utils/request'
-
-export function add(data) {
-  return request({
-    url: 'api/structivtDaily',
-    method: 'post',
-    data
-  })
-}
-
-export function del(ids) {
-  return request({
-    url: 'api/structivtDaily',
-    method: 'delete',
-    data: ids
-  })
-}
-export function sync(param) {
-  return request({
-    url: 'api/structivtDaily/sync',
-    method: 'post',
-    data: param
-  })
-}
-
-export function edit(data) {
-  return request({
-    url: 'api/structivtDaily',
-    method: 'put',
-    data
-  })
-}
-export default { add, edit, del, sync }
diff --git a/mes/qd/src/views/wms/analysis_manage/workProgress/index.vue b/mes/qd/src/views/wms/analysis_manage/workProgress/index.vue
index a6096e83..41fdd0b6 100644
--- a/mes/qd/src/views/wms/analysis_manage/workProgress/index.vue
+++ b/mes/qd/src/views/wms/analysis_manage/workProgress/index.vue
@@ -1,60 +1,108 @@
 <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="80px"
-          label-suffix=":"
-        >
-          <el-form-item label="所属库区">
-            <el-cascader
-              placeholder="所属库区"
-              :options="sects"
-              :props="{ checkStrictly: true }"
+      <el-form
+        :inline="true"
+        class="demo-form-inline"
+        label-position="right"
+        label-suffix=":"
+        label-width="80px"
+      >
+        <el-form-item label="销售单号">
+          <el-input
+            v-model="query.sale_code"
+            class="filter-item"
+            clearable
+            placeholder="销售单号"
+            style="width: 200px;"
+          />
+        </el-form-item>
+        <el-form-item label="物料搜索">
+          <el-input
+            v-model="query.material"
+            class="filter-item"
+            clearable
+            placeholder="物料编码、名称或规格"
+            size="small"
+            style="width: 200px;"
+          />
+        </el-form-item>
+        <el-form-item label="订单交期">
+          <el-date-picker
+            v-model="query.planTime"
+            :default-time="['00:00:00', '23:59:59']"
+            end-placeholder="结束日期"
+            start-placeholder="开始日期"
+            type="daterange"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            @change="crud.toQuery"
+          />
+        </el-form-item>
+        <el-form-item label="创建时间">
+          <el-date-picker
+            v-model="query.createTime"
+            :default-time="['00:00:00', '23:59:59']"
+            end-placeholder="结束日期"
+            start-placeholder="开始日期"
+            type="daterange"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            @change="crud.toQuery"
+          />
+          <el-form-item label="单据类型">
+            <el-select
+              v-model="query.sale_type"
               clearable
-              class="filter-item"
-              @change="sectQueryChange"
-            />
+              filterable
+              placeholder="请选择"
+              style="width: 200px"
+              @change="crud.toQuery"
+            >
+              <el-option
+                v-for="item in dict.PCS_SAL_TYPE"
+                :key="item.id"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
           </el-form-item>
-          <el-form-item label="物料编码">
-            <el-input
-              v-model="query.blurry"
-              clearable
-              size="mini"
-              placeholder="物料编码,规格"
-              @keyup.enter.native="crud.toQuery"
+        </el-form-item>
+        <el-form-item label="生成方式">
+          <el-select
+            v-model="query.create_mode"
+            clearable
+            filterable
+            placeholder="请选择"
+            style="width: 200px"
+            @change="crud.toQuery"
+          >
+            <el-option
+              v-for="item in dict.ST_CREATE_MODE"
+              :key="item.id"
+              :label="item.label"
+              :value="item.value"
             />
-          </el-form-item>
-          <rrOperation />
-        </el-form>
-      </div>
-      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
-      <crudOperation :permission="permission">
-        <el-button
-          slot="right"
-          class="filter-item"
-          type="warning"
-          icon="el-icon-check"
-          size="mini"
-          @click="sync"
-        >
-          同步
-        </el-button>
-        <!--        <el-button-->
-        <!--          slot="right"-->
-        <!--          class="filter-item"-->
-        <!--          type="warning"-->
-        <!--          icon="el-icon-check"-->
-        <!--          size="mini"-->
-        <!--          :disabled="confirm_flag"-->
-        <!--          @click="sync"-->
-        <!--        >-->
-        <!--          导出-->
-        <!--        </el-button>-->
-      </crudOperation>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="状态">
+          <el-select
+            v-model="query.status"
+            clearable
+            filterable
+            placeholder="请选择"
+            style="width: 200px"
+            @change="crud.toQuery"
+          >
+            <el-option
+              v-for="item in dict.PCS_SALE_STATUS"
+              :key="item.id"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <rrOperation :crud="crud"/>
+      </el-form>
       <!--表格渲染-->
       <el-table
         ref="table"
@@ -64,179 +112,191 @@
         style="width: 100%;"
         @selection-change="crud.selectionChangeHandler"
       >
-        <!--
-        <el-table-column type="selection" width="55" />
--->
-        <el-table-column prop="stor_name" label="所属仓库" width="120" show-overflow-tooltip />
-        <el-table-column prop="sect_name" label="所属库区" width="120" show-overflow-tooltip />
-        <el-table-column prop="struct_code" label="所属仓位" width="120" />
-        <el-table-column prop="material_code" label="物料编码" width="150" />
-        <el-table-column prop="material_spec" label="物料规格" width="150" />
-        <el-table-column prop="material_id" label="物料id" width="150" />
-        <el-table-column prop="canuse_qty" label="可用总数" width="150" />
-        <el-table-column prop="ivt_qty" label="库存总数" width="150" />
-        <el-table-column prop="frozen_qty" label="冻结总数" width="150" />
-        <el-table-column prop="warehousing_qty" label="待入总数" width="150" />
-        <el-table-column prop="qty_unit_id" label="单位" width="150" :formatter="formatUnit" />
-        <el-table-column prop="create_time" label="统计日期" width="150" fixed="right" align="center" />
+        <el-table-column label="销售单号" min-width="100" prop="sale_code" show-overflow-tooltip/>
+        <el-table-column label="行号" min-width="60" prop="seq_no" show-overflow-tooltip/>
+        <el-table-column :min-width="flexWidth('material_spec', crud.data, '物料规格')" label="物料规格" prop="material_spec">
+          <template slot-scope="scope">
+            <el-link type="warning" @click="orderView(scope.row)">{{ scope.row.material_spec }}</el-link>
+          </template>
+        </el-table-column>
+        <el-table-column :min-width="flexWidth('contract_code', crud.data, '合同号')" label="合同号" prop="contract_code"/>
+        <el-table-column :min-width="flexWidth('material_name', crud.data, '物料名称')" label="物料名称" prop="material_name"/>
+        <el-table-column label="订单数量" min-width="80" prop="sale_qty"/>
+        <el-table-column label="需生产数量" min-width="88" prop="need_product_qty"/>
+        <el-table-column label="已生产数量" min-width="88" prop="product_qty"/>
+        <el-table-column label="刻字数量" prop="lettering_qty"/>
+        <el-table-column label="预入库数量" min-width="88" prop="instor_qty"/>
+        <el-table-column label="入库数量" prop="in_storage_qty"/>
+        <el-table-column label="发货数量" prop="sendout_qty"/>
+        <el-table-column label="预入库交期" min-width="100" prop="warehousing_date" show-overflow-tooltip/>
+        <el-table-column label="计划交期" min-width="100" prop="plandeliverDate" show-overflow-tooltip/>
+        <el-table-column label="订单交期" min-width="100" prop="order_date" show-overflow-tooltip/>
+        <el-table-column label="订单状态" prop="status">
+          <template slot-scope="scope">
+            {{ dict.label.PCS_SALE_STATUS[scope.row.status] }}
+          </template>
+        </el-table-column>
+        <el-table-column label="计量单位" min-width="80" prop="qty_unit_name" show-overflow-tooltip/>
+        <el-table-column :min-width="flexWidth('rawmaterial_name', crud.data, '原辅料信息')" label="原辅料信息" prop="rawmaterial_name" show-overflow-tooltip/>
+        <el-table-column :min-width="flexWidth('rate_qty', crud.data, '单重')" label="单重" prop="rate_qty" show-overflow-tooltip/>
+        <el-table-column :min-width="flexWidth('canuse_qty', crud.data, '原辅料库存')" label="原辅料库存" prop="canuse_qty" show-overflow-tooltip width="90"/>
+        <el-table-column label="销售单类型" min-width="100" prop="sale_type" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ dict.label.PCS_SAL_TYPE[scope.row.sale_type] }}
+          </template>
+        </el-table-column>
+        <el-table-column label="生成方式" min-width="100" prop="create_mode">
+          <template slot-scope="scope">
+            {{ dict.label.ST_CREATE_MODE[scope.row.create_mode] }}
+          </template>
+        </el-table-column>
+        <el-table-column label="创建人" prop="create_name"/>
+        <el-table-column :min-width="flexWidth('createTime', crud.data, '创建时间')" label="创建时间" prop="createTime"/>
+        <el-table-column :min-width="flexWidth('update_time',crud.data,'修改时间')" label="修改时间" prop="update_time"/>
+        <el-table-column label="备注" min-width="200" prop="remark" show-overflow-tooltip />
       </el-table>
       <!--分页组件-->
-      <pagination />
+      <pagination/>
+      <OrderViewDialog ref="OrderViewDialog" />
     </div>
   </div>
 </template>
 
 <script>
-import qualityanilysis from '@/views/wms/analysis_manage/qlmanage/qualityanilysis'
+import crudSaleOrder from '@/views/wms/pcs/saleorder/saleOrder'
 import CRUD, { crud, form, header, presenter } from '@crud/crud'
-import crudOperation from '@crud/CRUD.operation'
-import pagination from '@crud/Pagination'
-import crudSectattr from '@/api/wms/basedata/st/sectattr'
 import rrOperation from '@crud/RR.operation'
-import crudMdPbMeasureunit from '@/api/wms/basedata/master/mdPbMeasureunit'
-import { downloadFile } from '@/utils'
+import crudOperation from '@crud/CRUD.operation'
+import OrderViewDialog from '@/views/wms/analysis_manage/workProgress/OrderViewDialog'
+import pagination from '@crud/Pagination'
+import Treeselect, { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+import crudClassstandard from '@/api/wms/basedata/master/classstandard'
 
 const defaultForm = {
-  struct_id: null,
-  cascader: null,
-  struct_code: null,
-  struct_name: null,
-  simple_name: null,
-  sect_id: null,
-  sect_code: null,
-  sect_name: null,
-  stor_id: null,
-  material_code: null,
-  stor_code: null,
-  stor_name: null,
-  stor_type: null,
-  capacity: null,
-  width: null,
-  height: null,
-  zdepth: null,
-  weight: null,
-  xqty: null,
-  yqty: null,
-  zqty: null,
-  is_tempstruct: '0',
+  sale_id: null,
+  sale_code: null,
+  seq_no: null,
+  contract_code: null,
+  sale_type: null,
+  material_id: null,
+  status: null,
+  sale_qty: null,
+  produce_seq: null,
+  cust_id: null,
+  qty_unit_id: null,
+  plandeliver_date: null,
   create_id: null,
   create_name: null,
   create_time: null,
   update_optid: null,
   update_optname: null,
   update_time: null,
-  is_delete: null,
-  back_ground_color: null,
-  front_ground_color: null,
-  back_ground_pic: null,
-  font_direction_scode: null,
-  is_used: true,
-  is_zdepth: null,
-  storagevehicle_id: null,
-  storagevehicle_code: null,
-  storagevehicle_type: null,
-  is_emptyvehicle: null,
-  storagevehicle_qty: null,
-  lock_type: null,
-  material_height_type: null,
-  ext_id: null,
-  remark: null
+  cust_code: null,
+  cust_name: null
 }
 export default {
-  name: 'Structattr',
-  dicts: ['ST_INV_BCP_IN_TYPE'],
-  components: { pagination, crudOperation, rrOperation },
+  name: 'SaleOrder',
+  dicts: ['PCS_SALE_STATUS', 'PCS_SAL_TYPE', 'IS_OR_NOT', 'product_area', 'ST_CREATE_MODE'],
+  components: {
+    pagination,
+    crudOperation,
+    rrOperation,
+    Treeselect,
+    OrderViewDialog
+  },
   mixins: [presenter(), header(), form(defaultForm), crud()],
   cruds() {
     return CRUD({
-      title: '仓位',
-      optShow: { add: false, reset: true },
-      url: 'api/structivtDaily',
-      idField: 'id',
-      crudMethod: { ...dailyStructivt }
+      title: '销售订单',
+      url: 'api/mpsSaleOrder',
+      idField: 'sale_id',
+      sort: 'sale_id,desc',
+      optShow: {
+        add: false,
+        edit: false,
+        del: false,
+        reset: true,
+        download: false
+      },
+      crudMethod: { ...crudSaleOrder }
     })
   },
   data() {
-    const numberOne = (rule, value, callback) => {
-      const numReg = /^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/
-      const numRe = new RegExp(numReg)
-      if (value) {
-        if (!numRe.test(value)) {
-          callback(new Error('只能输入数字'))
-        } else {
-          callback()
-        }
-      } else {
-        callback()
-      }
-    }
     return {
-      measure_unit: [],
-      sects: [],
-      downloadLoading: false,
+      unit_list: [{ value: 16, label: '个\\只' }],
+      customer_list: [],
+      classes3: [],
       permission: {
-        add: ['admin', 'dept:add'],
-        edit: ['admin', 'dept:edit'],
-        del: ['admin', 'dept:del']
+        add: ['admin', 'roles:add'],
+        edit: ['admin', 'roles:edit'],
+        del: ['admin', 'roles:del']
       },
-      trueorfalse: [{ value: true, label: '是' }, { value: false, label: '否' }]
+      queryTypeOptions: [{ key: 'sale_code', display_name: '销售单号' }]
     }
   },
   created() {
-    crudSectattr.getSect({}).then(res => {
-      this.sects = res.content
-    })
-    crudMdPbMeasureunit.getSelect().then(res => {
-      this.measure_unit = res.content
-    })
+    this.initClass3()
   },
   methods: {
-    sync() {
-      dailyStructivt.sync(Array.of('st_ivt_structivt_bcp', 'st_ivt_structivt_cp', 'st_ivt_structivt_yl')).then(result => {
-        this.crud.notify('同步成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
-      }).catch(() => { })
-    },
-    downloadMethod() {
-      this.beforeInit()
-      this.downloadLoading = true
-      download(this.url + '/download', this.params).then(result => {
-        this.downloadFile(result, this.title + '数据', 'xlsx')
-        this.downloadLoading = false
-      }).catch(() => {
-        this.downloadLoading = false
+    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
+        })
       })
     },
-    beforeInit() {
-      return true
+    orderView(row) {
+      console.log(row)
+      this.$refs.OrderViewDialog.openQuery(row)
     },
-    sectChange(val) {
-      this.form.sect_id = val[1]
-    },
-    formatUnit(row, column) {
-      const values = this.measure_unit.filter(v => {
-        return v.value === row.qty_unit_id
-      })
-      return values[0].label
-    },
-    sectQueryChange(val) {
-      if (val.length === 1) {
-        this.query.stor_id = val[0]
-        this.query.sect_id = ''
-      }
-      if (val.length === 0) {
-        this.query.sect_id = ''
-        this.query.stor_id = ''
-      }
-      if (val.length === 2) {
-        this.query.stor_id = val[0]
-        this.query.sect_id = val[1]
-      }
+    tableChanged3() {
       this.crud.toQuery()
-    }
+    },
+    buildTree(classes) {
+      classes.forEach(data => {
+        if (data.children) {
+          this.buildTree(data.children)
+        }
+        if (data.hasChildren && !data.children) {
+          data.children = null // 重点代码
+        }
+      })
+    },
+    // 获取子节点数据
+    loadChildNodes({ 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)
+        })
+      }
+    },
+    initClass3() {
+      const param = {
+        parent_class_code: '07'
+      }
+      crudClassstandard.getClassType(param).then(res => {
+        const data = res.content
+        this.buildTree(data)
+        this.classes3 = data
+      })
+    },
   }
 }
 </script>
 
-<style scoped>
-
-</style>
+<style scoped></style>
diff --git a/mes/qd/src/views/wms/analysis_manage/workTask/dailyStructivt.js b/mes/qd/src/views/wms/analysis_manage/workTask/dailyStructivt.js
deleted file mode 100644
index c7fb0841..00000000
--- a/mes/qd/src/views/wms/analysis_manage/workTask/dailyStructivt.js
+++ /dev/null
@@ -1,33 +0,0 @@
-import request from '@/utils/request'
-
-export function add(data) {
-  return request({
-    url: 'api/structivtDaily',
-    method: 'post',
-    data
-  })
-}
-
-export function del(ids) {
-  return request({
-    url: 'api/structivtDaily',
-    method: 'delete',
-    data: ids
-  })
-}
-export function sync(param) {
-  return request({
-    url: 'api/structivtDaily/sync',
-    method: 'post',
-    data: param
-  })
-}
-
-export function edit(data) {
-  return request({
-    url: 'api/structivtDaily',
-    method: 'put',
-    data
-  })
-}
-export default { add, edit, del, sync }
diff --git a/mes/qd/src/views/wms/analysis_manage/workTask/index.vue b/mes/qd/src/views/wms/analysis_manage/workTask/index.vue
index 37a215c3..de258931 100644
--- a/mes/qd/src/views/wms/analysis_manage/workTask/index.vue
+++ b/mes/qd/src/views/wms/analysis_manage/workTask/index.vue
@@ -1,60 +1,161 @@
 <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="80px"
           label-suffix=":"
+          label-width="90px"
         >
-          <el-form-item label="所属库区">
-            <el-cascader
-              placeholder="所属库区"
-              :options="sects"
-              :props="{ checkStrictly: true }"
-              clearable
+          <el-form-item label="生产车间">
+            <el-select
+              v-model="query.product_area"
               class="filter-item"
-              @change="sectQueryChange"
-            />
-          </el-form-item>
-          <el-form-item label="物料编码">
-            <el-input
-              v-model="query.blurry"
               clearable
+              filterable
+              placeholder="区域类型"
               size="mini"
-              placeholder="物料编码,规格"
-              @keyup.enter.native="crud.toQuery"
+              style="width: 200px;"
+            >
+              <el-option
+                v-for="item in dict.product_area"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="工单检索">
+            <el-input
+              v-model="query.workorder_code"
+              class="filter-item"
+              clearable
+              placeholder="工单编码、工单标识"
+              size="mini"
+              style="width: 200px;"
             />
           </el-form-item>
-          <rrOperation />
+          <el-form-item label="物料搜索">
+            <el-input
+              v-model="query.material"
+              class="filter-item"
+              clearable
+              placeholder="物料编码、名称或规格"
+              size="mini"
+              style="width: 200px;"
+            />
+          </el-form-item>
+          <el-form-item label="所属工序">
+            <el-select
+              v-model="query.workprocedure_id"
+              class="filter-item"
+              clearable
+              filterable
+              placeholder="所属工序"
+              size="small"
+              style="width: 220px"
+            >
+              <el-option
+                v-for="item in workprocedureList"
+                :key="item.workprocedure_id"
+                :label="item.workprocedure_name"
+                :value="item.workprocedure_id"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="设备搜索">
+            <el-input
+              v-model="query.device_code"
+              class="filter-item"
+              clearable
+              placeholder="设备编号"
+              size="mini"
+              style="width: 200px;"
+            />
+          </el-form-item>
+          <el-form-item label=" 工单状态">
+            <el-select
+              v-model="order_status"
+              class="filter-item"
+              clearable
+              multiple
+              placeholder="请选择"
+              style="width: 200px"
+            >
+              <el-option
+                label="未完成"
+                value="-1"
+              />
+              <el-option
+                v-for="item in dict.MPS_BD_ORDERSTATUS"
+                :key="item.id"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="班次类型">
+            <el-select
+              v-model="query.shift_type_scode"
+              clearable
+              filterable
+              placeholder="请选择"
+              style="width: 200px"
+            >
+              <el-option
+                v-for="item in dict.PDM_BI_SHIFTTYPE"
+                :key="item.id"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="计划日期">
+            <el-date-picker
+              v-model="query.planTime"
+              :default-time="['00:00:00','23:59:59']"
+              end-placeholder="结束日期"
+              start-placeholder="开始日期"
+              type="daterange"
+              value-format="yyyy-MM-dd"
+            />
+          </el-form-item>
+          <el-form-item label="生产日期">
+            <el-date-picker
+              v-model="query.createTime"
+              :default-time="['00:00:00','23:59:59']"
+              end-placeholder="结束日期"
+              start-placeholder="开始日期"
+              type="daterange"
+              value-format="yyyy-MM-dd"
+            />
+          </el-form-item>
+          <el-form-item label="订单检索">
+            <el-input
+              v-model="query.sale_id"
+              class="filter-item"
+              clearable
+              placeholder="订单编码、订单标识"
+              size="mini"
+              style="width: 200px;"
+            />
+          </el-form-item>
+          <el-form-item label="是否异常">
+            <el-switch
+              v-model="query.is_error"
+              active-color="#C0CCDA"
+              active-value="0"
+              inactive-color="#409EFF"
+              inactive-value="1"
+            />
+          </el-form-item>
+          <rrOperation :crud="crud"/>
         </el-form>
       </div>
-      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
-      <crudOperation :permission="permission">
-        <el-button
-          slot="right"
-          class="filter-item"
-          type="warning"
-          icon="el-icon-check"
-          size="mini"
-          @click="sync"
-        >
-          同步
-        </el-button>
-        <!--        <el-button-->
-        <!--          slot="right"-->
-        <!--          class="filter-item"-->
-        <!--          type="warning"-->
-        <!--          icon="el-icon-check"-->
-        <!--          size="mini"-->
-        <!--          :disabled="confirm_flag"-->
-        <!--          @click="sync"-->
-        <!--        >-->
-        <!--          导出-->
-        <!--        </el-button>-->
-      </crudOperation>
+      <crudOperation :permission="permission" />      <!--新增，修改弹窗-->
       <!--表格渲染-->
       <el-table
         ref="table"
@@ -62,176 +163,129 @@
         :data="crud.data"
         size="mini"
         style="width: 100%;"
-        @selection-change="crud.selectionChangeHandler"
       >
-        <!--
-        <el-table-column type="selection" width="55" />
--->
-        <el-table-column prop="stor_name" label="所属仓库" width="120" show-overflow-tooltip />
-        <el-table-column prop="sect_name" label="所属库区" width="120" show-overflow-tooltip />
-        <el-table-column prop="struct_code" label="所属仓位" width="120" />
-        <el-table-column prop="material_code" label="物料编码" width="150" />
-        <el-table-column prop="material_spec" label="物料规格" width="150" />
-        <el-table-column prop="material_id" label="物料id" width="150" />
-        <el-table-column prop="canuse_qty" label="可用总数" width="150" />
-        <el-table-column prop="ivt_qty" label="库存总数" width="150" />
-        <el-table-column prop="frozen_qty" label="冻结总数" width="150" />
-        <el-table-column prop="warehousing_qty" label="待入总数" width="150" />
-        <el-table-column prop="qty_unit_id" label="单位" width="150" :formatter="formatUnit" />
-        <el-table-column prop="create_time" label="统计日期" width="150" fixed="right" align="center" />
+        <el-table-column type="index" label="序号" width="55" align="center" />
+        <el-table-column label="生产车间" prop="product_area"/>
+        <el-table-column :min-width="flexWidth('workprocedure_name',crud.data,'工序名称')" label="工序名称" prop="workprocedure_name"/>
+        <el-table-column :min-width="flexWidth('device_code',crud.data,'当前设备编码')" label="当前设备信息" prop="device_code"/>
+        <el-table-column label="工单编号" prop="workorder_code" width="100px" />
+        <el-table-column label="工单状态" prop="workorder_status">
+          <template slot-scope="scope">
+            {{ dict.label.MPS_BD_ORDERSTATUS[scope.row.workorder_status] }}
+          </template>
+        </el-table-column>
+        <el-table-column label="计划数量" prop="plan_qty"/>
+        <el-table-column label="电气实时数" prop="dq_real_qty" show-overflow-tooltip width="100"/>
+        <el-table-column label="未生产数量" prop="slope" width="120">
+          <template slot-scope="scope">
+            {{ scope.row.plan_qty-scope.row.dq_real_qty}}
+          </template>
+        </el-table-column>
+        <el-table-column label="报工总数" prop="real_qty"/>
+        <el-table-column label="报废总数" prop="nok_qty"/>
+        <el-table-column label="报修总数" prop="repare_qty"/>
+        <el-table-column label="生产效率(ps)" prop="slope" width="120">
+          <template slot-scope="scope">
+            {{ scope.row.slope==undefined?0:scope.row.slope }}
+          </template>
+        </el-table-column>
+        <el-table-column label="剩余生产分钟" prop="slope" width="160">
+          <template slot-scope="scope">
+            {{ scope.row.slope==undefined?99999:Number((scope.row.plan_qty-scope.row.dq_real_qty)/(60*scope.row.slope)).toFixed(3)}}
+          </template>
+        </el-table-column>
+        <el-table-column :min-width="flexWidth('material_code',crud.data,'物料编码')" label="物料编码" prop="material_code"/>
+        <el-table-column :min-width="flexWidth('material_spec',crud.data,'物料规格')" label="物料规格" prop="material_spec"/>
+        <el-table-column :formatter="crud.formatQlNum4" label="物料单重" prop="material_weight" width="100"/>
+        <el-table-column label="班次类型" prop="shift_type_scode">
+          <template slot-scope="scope">
+            {{ dict.label.PDM_BI_SHIFTTYPE[scope.row.shift_type_scode] }}
+          </template>
+        </el-table-column>
+        <el-table-column :min-width="flexWidth('create_time',crud.data,'创建时间')" label="创建时间" prop="create_time"/>
+        <el-table-column :min-width="flexWidth('down_time',crud.data,'下发时间')" label="下发时间" prop="down_time"/>
+        <el-table-column :min-width="flexWidth('open_time',crud.data,'开工时间')" label="开工时间" prop="open_time"/>
+        <el-table-column :min-width="flexWidth('planproducestart_date',crud.data,'计划开始时间')" label="计划开始时间" prop="planproducestart_date"/>
+        <el-table-column :min-width="flexWidth('planproduceend_date',crud.data,'计划结束时间')" label="计划结束时间" prop="planproduceend_date"/>
       </el-table>
       <!--分页组件-->
-      <pagination />
+      <pagination/>
     </div>
   </div>
 </template>
 
 <script>
-import dailyStructivt from '@/views/wms/masterdata_manage/st/dailyStructivt/dailyStructivt'
+import crudProduceshiftorder from '@/views/wms/product_manage/workorder/produceshiftorder'
 import CRUD, { crud, form, header, presenter } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
 import pagination from '@crud/Pagination'
-import crudSectattr from '@/api/wms/basedata/st/sectattr'
-import rrOperation from '@crud/RR.operation'
-import crudMdPbMeasureunit from '@/api/wms/basedata/master/mdPbMeasureunit'
-import { downloadFile } from '@/utils'
+import crudWorkProcedure from '@/api/wms/basedata/pdm/workProcedure'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 
 const defaultForm = {
-  struct_id: null,
-  cascader: null,
-  struct_code: null,
-  struct_name: null,
-  simple_name: null,
-  sect_id: null,
-  sect_code: null,
-  sect_name: null,
-  stor_id: null,
-  material_code: null,
-  stor_code: null,
-  stor_name: null,
-  stor_type: null,
-  capacity: null,
-  width: null,
-  height: null,
-  zdepth: null,
-  weight: null,
-  xqty: null,
-  yqty: null,
-  zqty: null,
-  is_tempstruct: '0',
-  create_id: null,
-  create_name: null,
-  create_time: null,
-  update_optid: null,
-  update_optname: null,
-  update_time: null,
-  is_delete: null,
-  back_ground_color: null,
-  front_ground_color: null,
-  back_ground_pic: null,
-  font_direction_scode: null,
-  is_used: true,
-  is_zdepth: null,
-  storagevehicle_id: null,
-  storagevehicle_code: null,
-  storagevehicle_type: null,
-  is_emptyvehicle: null,
-  storagevehicle_qty: null,
-  lock_type: null,
-  material_height_type: null,
-  ext_id: null,
-  remark: null
 }
 export default {
-  name: 'Structattr',
-  dicts: ['ST_INV_BCP_IN_TYPE'],
-  components: { pagination, crudOperation, rrOperation },
+  name: 'Produceshiftorder',
+  components: {
+    pagination,
+    rrOperation,
+    crudOperation,
+  },
   mixins: [presenter(), header(), form(defaultForm), crud()],
+  dicts: ['PDM_BI_SHIFTTYPE', 'MPS_BD_ORDERSTATUS', 'WORKORDER_CREATE_TYPE', 'is_used', 'PDM_BI_ORDERTYPE', 'IS_OR_NOT', 'product_area'],
   cruds() {
     return CRUD({
-      title: '仓位',
-      optShow: { add: false, reset: true },
-      url: 'api/structivtDaily',
-      idField: 'id',
-      crudMethod: { ...dailyStructivt }
+      title: '工单', url: 'api/produceWorkorder', idField: 'workorder_id', sort: 'workorder_id,desc',
+      optShow: {
+        add: false,
+        edit: false,
+        del: false,
+        download: false,
+        reset: true
+      },
+      query: {
+        order_status: '-1',
+        product_area: '',
+        is_error: '0'
+      },
+      crudMethod: { ...crudProduceshiftorder }
     })
   },
   data() {
-    const numberOne = (rule, value, callback) => {
-      const numReg = /^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/
-      const numRe = new RegExp(numReg)
-      if (value) {
-        if (!numRe.test(value)) {
-          callback(new Error('只能输入数字'))
-        } else {
-          callback()
-        }
-      } else {
-        callback()
-      }
-    }
     return {
-      measure_unit: [],
-      sects: [],
-      downloadLoading: false,
-      permission: {
-        add: ['admin', 'dept:add'],
-        edit: ['admin', 'dept:edit'],
-        del: ['admin', 'dept:del']
-      },
-      trueorfalse: [{ value: true, label: '是' }, { value: false, label: '否' }]
+      workprocedureList:[],
+      trueorfalse: [{ value: true, label: '是' }, { value: false, label: '否' }],
+      deviceList: [],
+      materType: '01',
+      materialShow: false,
+      addShow: false,
+      replaceShow: false,
+      uploadShow: false,
+      userList: [],
+      order_status: ['-1'],
+      permission: {}
     }
   },
   created() {
-    crudSectattr.getSect({}).then(res => {
-      this.sects = res.content
-    })
-    crudMdPbMeasureunit.getSelect().then(res => {
-      this.measure_unit = res.content
-    })
+    this.getworkprocedure()
   },
   methods: {
-    sync() {
-      dailyStructivt.sync(Array.of('st_ivt_structivt_bcp', 'st_ivt_structivt_cp', 'st_ivt_structivt_yl')).then(result => {
-        this.crud.notify('同步成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
-      }).catch(() => { })
+    formatBoolean: function(row, column) {
+      var ret = ''
+      if (row[column.property] === true) {
+        ret = '是' // 根据自己的需求设定
+      } else {
+        ret = '否'
+      }
+      return ret
     },
-    downloadMethod() {
-      this.beforeInit()
-      this.downloadLoading = true
-      download(this.url + '/download', this.params).then(result => {
-        this.downloadFile(result, this.title + '数据', 'xlsx')
-        this.downloadLoading = false
-      }).catch(() => {
-        this.downloadLoading = false
+    // 获取子节点数据
+    getworkprocedure() {
+      // 查询工序
+      crudWorkProcedure.downSelect().then(res => {
+        this.workprocedureList = res
       })
-    },
-    beforeInit() {
-      return true
-    },
-    sectChange(val) {
-      this.form.sect_id = val[1]
-    },
-    formatUnit(row, column) {
-      const values = this.measure_unit.filter(v => {
-        return v.value === row.qty_unit_id
-      })
-      return values[0].label
-    },
-    sectQueryChange(val) {
-      if (val.length === 1) {
-        this.query.stor_id = val[0]
-        this.query.sect_id = ''
-      }
-      if (val.length === 0) {
-        this.query.sect_id = ''
-        this.query.stor_id = ''
-      }
-      if (val.length === 2) {
-        this.query.stor_id = val[0]
-        this.query.sect_id = val[1]
-      }
-      this.crud.toQuery()
     }
   }
 }