Merge branch 'master' of http://121.40.234.130:8899/root/hl_one

mes/qd/src/router/routers.js

@@ -13,7 +13,7 @@ export const constantRouterMap = [
   },
   {
     path: '/produceTask',
-    component: (resolve) => require(['@/views/wms/mps/produce/bigScreen'], resolve),
+    component: (resolve) => require(['@/views/wms/product_manage/workorder/bigScreen'], resolve),
     hidden: true,
     meta: { title: '加工看板' }
   },

mes/qd/src/views/wms/product_manage/workorder/AddDialog.vue

@@ -180,7 +180,7 @@
 import CRUD, { crud, header, presenter } from '@crud/crud'
 import MaterDtl from '@/views/wms/pub/MaterDialog'
 import crudWorkProcedure from '@/api/wms/basedata/pdm/workProcedure'
-import crudProduceshiftorder from '@/api/wms/mps/produceshiftorder'
+import crudProduceshiftorder from '@/views/wms/product_manage/workorder'
 
 export default {
   name: 'AddDtl',

mes/qd/src/views/wms/product_manage/workorder/ReplaceDeviceDialog.vue

@@ -63,7 +63,7 @@
 <script>
 import CRUD, { crud } from '@crud/crud'
 import crudWorkProcedure from '@/api/wms/basedata/pdm/workProcedure'
-import crudProduceshiftorder from '@/api/wms/mps/produceshiftorder'
+import crudProduceshiftorder from '@/views/wms/product_manage/workorder'
 import crudDevice from '@/api/wms/pdm/device'
 
 export default {
@@ -141,8 +141,8 @@ export default {
         this.$emit('AddChanged')
       })
     },
-    getNotWorkDeviceByWorkproceduceId(workproceduce_id) {
-      crudProduceshiftorder.getNotWorkDeviceByWorkproceduceId({ workproceduce_id: workproceduce_id }).then(res => {
+    getNotWorkDeviceByWorkproceduceId(workprocedure_id) {
+      crudProduceshiftorder.getNotWorkDeviceByWorkproceduceId({ workprocedure_id: workprocedure_id }).then(res => {
         this.deviceList = res
       })
     },

mes/qd/src/views/wms/product_manage/workorder/UploadDialog.vue

@@ -38,7 +38,7 @@
 </template>
 
 <script>
-import crudProduceshiftorder from '@/api/wms/mps/produceshiftorder'
+import crudProduceshiftorder from '@/views/wms/product_manage/workorder'
 import CRUD, { crud } from '@crud/crud'
 
 export default {

mes/qd/src/views/wms/product_manage/workorder/ViewDialog.vue

@@ -186,7 +186,7 @@
 <script>
 import { crud } from '@crud/crud'
 import crudWorkProcedure from '@/api/wms/basedata/pdm/workProcedure'
-import crudProduceshiftorder from '@/api/wms/mps/produceshiftorder'
+import crudProduceshiftorder from '@/views/wms/product_manage/workorder/produceshiftorder'
 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'

mes/qd/src/views/wms/product_manage/workorder/bigScreen.vue

@@ -95,7 +95,7 @@
 
 <script>
 import crud from '@/mixins/crud'
-import crudProduceshiftorder from '@/api/wms/mps/produceshiftorder'
+import crudProduceshiftorder from '@/views/wms/product_manage/workorder'
 
 export default {
   name: 'BigscreenTask',

mes/qd/src/views/wms/product_manage/workorder/index.vue

@@ -176,6 +176,27 @@
         >
           下发
         </el-button>
+        <el-button
+          slot="right"
+          class="filter-item"
+          type="success"
+          icon="el-icon-position"
+          size="mini"
+          :disabled="is_disabled(crud.selections)"
+          @click="unSubmits(crud.selections)"
+        >
+          取消下发
+        </el-button>
+        <el-button
+          slot="right"
+          class="filter-item"
+          type="success"
+          icon="el-icon-position"
+          size="mini"
+          @click="report()"
+        >
+          报工审核
+        </el-button>
         <el-button
           slot="right"
           class="filter-item"
@@ -228,9 +249,9 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item v-if="crud.status.add" label="生产设备" prop="current_device_code">
+          <el-form-item v-if="crud.status.add" label="生产设备" prop="device_code">
             <el-select
-              v-model="form.current_device_code"
+              v-model="form.device_code"
               clearable
               class="filter-item"
               style="width: 200px;"
@@ -374,7 +395,7 @@
         <el-table-column prop="planproduceend_date" label="计划结束时间" width="100" show-overflow-tooltip />
         <el-table-column prop="realproducestart_date" label="实际开始时间" width="100" show-overflow-tooltip />
         <el-table-column prop="realproduceend_date" label="实际结束时间" width="100" show-overflow-tooltip />
-        <el-table-column prop="current_device_code" label="当前设备编码" width="100" show-overflow-tooltip />
+        <el-table-column prop="device_code" label="当前设备编码" width="100" show-overflow-tooltip />
         <el-table-column prop="is_canupdate_update" label="操作工是否允许修改报工数量" width="200" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ dict.label.IS_OR_NOT[scope.row.is_canupdate_update] }}
@@ -425,6 +446,7 @@
       @setMaterValue="setMaterValue"
     />
     <ViewDialog ref="child3" />
+    <reportDialog ref="report" />
     <UploadDialog :dialog-show.sync="uploadShow" @tableChanged3="tableChanged3" />
     <AddDialog :dialog-show.sync="addShow" @AddChanged="querytable" />
     <ReplaceDeviceDialog ref="child4" @AddChanged="querytable" />
@@ -432,7 +454,7 @@
 </template>
 
 <script>
-import crudProduceshiftorder from '@/api/wms/mps/produceshiftorder'
+import crudProduceshiftorder from '@/views/wms/product_manage/workorder/produceshiftorder'
 import CRUD, { presenter, header, form, crud } from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
@@ -442,11 +464,12 @@ import crudWorkProcedure from '@/api/wms/basedata/pdm/workProcedure'
 import MaterDtl from '@/views/wms/pub/MaterDialog'
 import Treeselect, { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
-import ViewDialog from '@/views/wms/mps/produce/ViewDialog'
+import ViewDialog from '@/views/wms/product_manage/workorder/ViewDialog'
+import reportDialog from '@/views/wms/product_manage/workorder/reportDialog'
 import crudClassstandard from '@/api/wms/basedata/master/classstandard'
-import AddDialog from '@/views/wms/mps/produce/AddDialog'
-import UploadDialog from '@/views/wms/mps/produce/UploadDialog'
-import ReplaceDeviceDialog from '@/views/wms/mps/produce/ReplaceDeviceDialog'
+import AddDialog from '@/views/wms/product_manage/workorder/AddDialog'
+import UploadDialog from '@/views/wms/product_manage/workorder/UploadDialog'
+import ReplaceDeviceDialog from '@/views/wms/product_manage/workorder/ReplaceDeviceDialog'
 
 const defaultForm = {
   workorder_id: null,
@@ -467,7 +490,7 @@ const defaultForm = {
   planproduceend_date: null,
   realproducestart_date: null,
   realproduceend_date: null,
-  current_device_code: null,
+  device_code: null,
   current_produce_person_id: null,
   is_canupdate_update: null,
   workorder_status: null,
@@ -487,7 +510,7 @@ const defaultForm = {
 }
 export default {
   name: 'Produceshiftorder',
-  components: { AddDialog, pagination, crudOperation, rrOperation, udOperation, MaterDtl, Treeselect, ViewDialog, UploadDialog, ReplaceDeviceDialog },
+  components: { AddDialog, pagination, crudOperation, rrOperation, udOperation, MaterDtl, Treeselect, ViewDialog,reportDialog, UploadDialog, ReplaceDeviceDialog },
   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() {
@@ -552,7 +575,7 @@ export default {
         is_canupdate_update: [
           { required: true, message: '不能为空', trigger: 'blur' }
         ],
-        current_device_code: [
+        device_code: [
           { required: true, message: '设备不能为空', trigger: 'blur' }
         ]
       }
@@ -566,9 +589,9 @@ export default {
     tableChanged3() {
       this.crud.toQuery()
     },
-    getNotWorkDeviceByWorkproceduceId(workproceduce_id) { // 根据工序标识获取设备列表
-      crudProduceshiftorder.getNotWorkDeviceByWorkproceduceId({ workproceduce_id: workproceduce_id }).then(res => {
-        this.deviceList = res
+    getNotWorkDeviceByWorkproceduceId(workprocedure_id) { // 根据工序标识获取设备列表
+      crudProduceshiftorder.getNotWorkDeviceByWorkproceduceId({ workprocedure_id: workprocedure_id }).then(res => {
+        this.deviceList = res.content
       })
     },
     initDataPlan() {
@@ -675,6 +698,10 @@ export default {
         this.$refs.child3.setForm(row)
       }
     },
+    // 查看
+    report() {
+      this.$refs.report.setForm()
+    },
     // 强制完成
     forceFinish(rows) {
       var i = Number(0)
@@ -760,6 +787,17 @@ export default {
         this.crud.notify('下发成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
         this.crud.toQuery()
       })
+    }, // 取消下发
+    unSubmits(rows) {
+      var orders = []
+      console.log(rows)
+      rows.forEach((item) => {
+        orders.push(item.workorder_id)
+      })
+      crudProduceshiftorder.unSubmits(orders).then(res => {
+        this.crud.notify('下发成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+        this.crud.toQuery()
+      })
     },
     add() {
       this.addShow = true

mes/qd/src/views/wms/product_manage/workorder/produceshiftorder.js

@@ -35,7 +35,14 @@ export function edit(data) {
 export function submits(data) {
   return request({
     url: 'api/produceWorkorder/submits',
-    method: 'put',
+    method: 'post',
+    data
+  })
+}
+export function unSubmits(data) {
+  return request({
+    url: 'api/produceWorkorder/submits',
+    method: 'post',
     data
   })
 }
@@ -128,4 +135,4 @@ export function replaceDevice(data) {
   })
 }
 
-export default { add, addRows, edit, del, submits, getDevice, getTable, openStart, saveReport, finish, getReportWork, forceFinish, getDtl, excelImport, getNotWorkDeviceByWorkproceduceId, replaceDevice }
+export default { add, addRows, edit, del, submits, unSubmits, getTable, openStart, saveReport, finish, getReportWork, forceFinish, getDtl, excelImport, getNotWorkDeviceByWorkproceduceId, replaceDevice }

mes/qd/src/views/wms/product_manage/workorder/reportDialog.vue

@@ -0,0 +1,174 @@
+<template>
+  <el-dialog
+    title="报工审核"
+    append-to-body
+    fullscreen
+    :visible.sync="dialogVisible"
+    @open="open"
+    @close="close"
+  >
+    <el-card class="box-card" shadow="never">
+      <el-form ref="form" :inline="true" :model="form" :rules="rules" size="mini" label-width="180px">
+        <el-form-item label="工单编码">
+          <el-input v-model="form.workorder_code" style="width: 200px;" />
+        </el-form-item>
+        <el-form-item label="只显示未审核">
+          <el-switch
+            v-model="form.is_report"
+            active-color="#409EFF"
+            inactive-color="#F56C6C"
+            active-value="true"
+            inactive-valu="false"
+          />
+        </el-form-item>
+        <el-dropdown split-button type="primary" class="filter-item" @click>
+          <i class="el-icon-search el-icon--left" />查询
+        </el-dropdown>
+      </el-form>
+
+    </el-card>
+    <div class="crud-opts2" style="margin-top: 30px;margin-bottom: 15px">
+      <span class="role-span">工单生产记录详情</span>
+      <span class="crud-opts-right2">
+        <!--左侧插槽-->
+        <slot name="left" />
+      </span>
+
+    </div>
+    <!--表格渲染-->
+    <el-table
+      ref="table"
+      :data="tableData"
+      style="width: 100%;"
+      max-height="300"
+      border
+      :highlight-current-row="true"
+      :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
+    >
+      <el-table-column prop="device_code" label="设备编码" align="center" />
+      <el-table-column prop="workorder_code" label="工单编号" />
+      <el-table-column prop="shift_type_scode" label="班次类型" />
+      <el-table-column prop="product_area" label="生产车间" />
+      <el-table-column prop="device_name" label="设备名称" align="center" min-width="200" show-overflow-tooltip />
+      <el-table-column prop="dq_init_qty" label="电气期初数量" />
+      <el-table-column prop="person_init_qty" label="人员期初数量" />
+      <el-table-column prop="dq_report_qty" label="电气报工数量" />
+      <el-table-column prop="person_report_qty" label="人员报工数量" />
+      <el-table-column prop="dq_finish_qty" label="电气期末数量" />
+      <el-table-column prop="person_finish_qty" label="人员期末数量" />
+      <el-table-column prop="operatetime_start" label="开工时间" />
+      <el-table-column prop="operatetime_end" label="完工时间" />
+      <el-table-column prop="nick_name" label="操作人" align="center" />
+    </el-table>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="dialogVisible = false">取 消</el-button>
+      <el-button type="primary" @click="dialogVisible = false">确定</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import { crud } from '@crud/crud'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+import crudProduceshiftorder from '@/views/wms/product_manage/workorder/produceshiftorder'
+
+export default {
+  name: 'ViewDialog',
+  components: {  },
+  dicts: ['PDM_BI_SHIFTTYPE', 'MPS_BD_ORDERSTATUS', 'is_used', 'PDM_BI_ORDERTYPE', 'IS_OR_NOT'],
+  mixins: [crud()],
+  props: {
+    dialogShow: {
+      type: Boolean,
+      default: false
+    },
+    bussConfig: {
+      type: Object
+    },
+    openParam: {
+      type: Object
+    }
+  },
+  data() {
+    return {
+      dialogVisible: false,
+      classes3: [],
+      form: {
+        sale_id: null,
+        workorder_id: null,
+        workorder_code: null,
+        producedeviceorder_code: null,
+        shift_type_scode: null,
+        workprocedure_id: null,
+        produce_date: null,
+        plan_qty: null,
+        real_qty: null,
+        report_qty: null,
+        material_id: null,
+        material_code: null,
+        material_weight: null,
+        planproducestart_date: null,
+        planproduceend_date: null,
+        realproducestart_date: null,
+        realproduceend_date: null,
+        order_status: null,
+        is_needmove: null,
+        order_type_scode: null,
+        create_id: null,
+        create_name: null,
+        create_time: null,
+        update_optid: null,
+        update_optname: null,
+        update_time: null,
+        sysdeptid: null,
+        syscompanyid: null,
+        is_delete: null,
+        material_name: null,
+        device_id: null,
+        is_canupdate_update: null,
+        material_spec: null
+      },
+      workprocedureList: [],
+      tableData: [],
+      rules: {
+      }
+    }
+  },
+  watch: {
+    dialogShow: {
+      handler(newValue) {
+        this.dialogVisible = newValue
+      }
+    }
+  },
+  methods: {
+    open() {
+      // this.getworkprocedure()
+      // this.initClass3()
+      // this.is_null()
+      // crudProduceshiftorder.getDtl({ workorder_id: this.form.workorder_id }).then(res => {
+      //   this.tableData = res
+      // })
+    },
+    setForm() {
+      this.dialogVisible = true
+    }
+  }
+}
+</script>
+
+<style>
+.crud-opts2 {
+  padding: 0 0;
+  display: -webkit-flex;
+  display: flex;
+  align-items: center;
+}
+.crud-opts2 .crud-opts-right2 {
+  margin-left: auto;
+  padding: 4px 4px;
+}
+.input-with-select  {
+  background-color: #fff;
+}
+</style>

mes/qd/src/views/wms/pub/StructDialog.vue

@@ -66,7 +66,7 @@
 import CRUD, { header, presenter } from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
 import pagination from '@crud/Pagination'
-import crudRegion from '@/api/wms/sch/region'
+import crudRegion from '@/views/wms/scheduler_manage/region/region'
 
 export default {
   name: 'StructDialog',

mes/qd/src/views/wms/scheduler_manage/point/index.vue

@@ -434,16 +434,16 @@
 
 <script>
 import crudDevice from '@/api/wms/pdm/device'
-import crudRegion from '@/api/wms/sch/region'
-import crudPoint, { changeActive } from '@/api/wms/sch/point'
+import crudRegion from '@/views/wms/scheduler_manage/region/region'
+import crudPoint, { changeActive } from '@/views/wms/scheduler_manage/point/point'
 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 ViewDialog from '@/views/wms/product_manage/sch/point/ViewDialog'
-import MaterialDialog from '@/views/wms/product_manage/sch/point/MaterialDialog'
-import WorkOrderDialog from '@/views/wms/product_manage/sch/point/WorkOrderDialog'
+import ViewDialog from '@/views/wms/scheduler_manage/point/ViewDialog'
+import MaterialDialog from '@/views/wms/scheduler_manage/point/MaterialDialog'
+import WorkOrderDialog from '@/views/wms/scheduler_manage/point/WorkOrderDialog'
 
 const defaultForm = {
   point_id: null,

mes/qd/src/views/wms/scheduler_manage/region/index.vue

@@ -137,7 +137,7 @@
 </template>
 
 <script>
-import crudRegion from '@/api/wms/sch/region'
+import crudRegion from '@/views/wms/scheduler_manage/region/region'
 import CRUD, { crud, form, header, presenter } from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'

mes/qd/src/views/wms/scheduler_manage/task/index.vue

@@ -233,7 +233,7 @@
 </template>
 
 <script>
-import crudTask from '@/api/wms/sch/task'
+import crudTask from '@/views/wms/scheduler_manage/task/task'
 import CRUD, { crud, header, presenter } from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'

mes/qd/src/views/wms/storage_manage/product/productIn/DivDialog.vue

@@ -221,7 +221,7 @@
 import CRUD, { crud } from '@crud/crud'
 import StructDiv from '@/views/wms/pub/StructDialog'
 import crudProductIn from '@/views/wms/storage_manage/product/productIn/productin'
-import crudPoint from '@/api/wms/sch/point'
+import crudPoint from '@/views/wms/scheduler_manage/point/point'
 import AddBox from '@/views/wms/storage_manage/product/productIn/AddBox'
 
 export default {

mes/qd/src/views/wms/storage_manage/product/productOut/DivDialog.vue

@@ -246,8 +246,8 @@
 import CRUD, { crud } from '@crud/crud'
 import productOut from '@/views/wms/storage_manage/product/productOut/productout'
 import StructIvt from '@/views/wms/storage_manage/product/productOut/StructIvt'
-import crudRegion from '@/api/wms/sch/region'
-import crudPoint from '@/api/wms/sch/point'
+import crudRegion from '@/views/wms/scheduler_manage/region/region'
+import crudPoint from '@/views/wms/scheduler_manage/point/point'
 
 export default {
   name: 'DivDialog',

mes/qd/src/views/wms/storage_manage/rawproduct/rawProductIn/DivDialog.vue

@@ -202,8 +202,8 @@
 <script>
 import CRUD, { crud } from '@crud/crud'
 import crudProductIn from '@/views/wms/storage_manage/rawproduct/rawProductIn/rawproductin'
-import crudPoint from '@/api/wms/sch/point'
-import crudRegion from '@/api/wms/sch/region'
+import crudPoint from '@/views/wms/scheduler_manage/point/point'
+import crudRegion from '@/views/wms/scheduler_manage/region/region'
 
 export default {
   name: 'DivDialog',

mes/qd/src/views/wms/storage_manage/rawproduct/rawProductOut/DivDialog.vue

@@ -202,8 +202,8 @@
 <script>
 import CRUD, { crud } from '@crud/crud'
 import crudProductIn from '@/views/wms/storage_manage/rawproduct/rawProductIn/rawproductin'
-import crudPoint from '@/api/wms/sch/point'
-import crudRegion from '@/api/wms/sch/region'
+import crudPoint from '@/views/wms/scheduler_manage/point/point'
+import crudRegion from '@/views/wms/scheduler_manage/region/region'
 
 export default {
   name: 'DivDialog',