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

2023-05-31 09:13:36 +08:00
parent d4b1400ed6 85b5367584
commit 408111084b
50 changed files with 502 additions and 198 deletions
--- a/mes/qd/src/views/wms/scheduler_manage/task/index.vue
+++ b/mes/qd/src/views/wms/scheduler_manage/task/index.vue
@@ -132,11 +132,12 @@
              />
            </el-select>
          </el-form-item>
+
          <rrOperation />
        </el-form>
-
      </div>
      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
+      <el-button  type="primary" @click="taskScheduler()" >任务调度</el-button>
      <crudOperation :permission="permission" />
      <!--表格渲染-->
      <el-table
@@ -148,9 +149,9 @@
        @selection-change="crud.selectionChangeHandler"
      >
        <el-table-column type="selection" width="50" />
+        <el-table-column prop="task_code" label="任务编码" min-width="100" show-overflow-tooltip />
        <el-table-column v-if="true" prop="task_id" label="任务标识" min-width="150" show-overflow-tooltip />
        <el-table-column v-if="true" prop="material_id" label="物料标识" min-width="150" show-overflow-tooltip />
-        <el-table-column prop="task_code" label="任务编码" min-width="100" show-overflow-tooltip />
        <el-table-column prop="acs_task_type" label="acs任务类型" min-width="120" show-overflow-tooltip>
          <template slot-scope="scope">
            {{ acsTaskTypeList[scope.row.acs_task_type - 1] }}
@@ -160,21 +161,20 @@
        <el-table-column v-if="false" prop="task_status" label="任务状态" />
        <el-table-column prop="product_area" label="生产车间" />
        <el-table-column prop="task_status_name" label="任务状态" width="120px" :formatter="formatTaskStatusName" />
-        <el-table-column prop="vehicle_type" label="载具类型" min-width="100" show-overflow-tooltip>
-          <template slot-scope="scope">
-            {{ dict.label.vehicle_type[scope.row.vehicle_type] }}
-          </template>
-        </el-table-column>
+
        <el-table-column prop="point_code1" label="起点" width="100" />
        <el-table-column prop="point1_region_name" label="起点区域" width="120" />
        <el-table-column prop="point_code2" label="终点" min-width="100" show-overflow-tooltip />
        <el-table-column prop="point2_region_name" label="终点区域" min-width="120" show-overflow-tooltip />
        <el-table-column prop="point_code3" label="返回点" min-width="100" show-overflow-tooltip />
        <el-table-column prop="point3_region_name" label="返回点区域" min-width="120" show-overflow-tooltip />
-        <!--        <el-table-column prop="point_code4" label="点位4" min-width="100" show-overflow-tooltip />-->
-        <!--        <el-table-column prop="point4_region_name" label="点位4区域" min-width="120" show-overflow-tooltip />-->
        <el-table-column prop="vehicle_code" label="载具编码1" min-width="100" show-overflow-tooltip />
        <el-table-column prop="vehicle_code2" label="载具编码2" min-width="100" show-overflow-tooltip />
+        <el-table-column prop="vehicle_type" label="载具类型" min-width="100" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ dict.label.vehicle_type[scope.row.vehicle_type] }}
+          </template>
+        </el-table-column>
        <el-table-column prop="remark" label="提示" width="120" show-overflow-tooltip />
        <el-table-column prop="finished_type" label="任务完成类型" min-width="100" show-overflow-tooltip>
          <template slot-scope="scope">
@@ -242,6 +242,7 @@ 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'
+import {scheduler} from "./task";

 export default {
  name: 'Task',
@@ -255,7 +256,7 @@ export default {
      title: '任务',
      url: 'api/task',
      idField: 'task_id',
-      sort: 'task_id,desc',
+      sort: 'task_code,desc',
      crudMethod: { ...crudTask },
      query: {
        task_code: '',
@@ -323,6 +324,11 @@ export default {
        this.classes1 = data
      })
    },
+    taskScheduler() {
+      crudTask.scheduler().then(res => {
+        this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+      })
+    },
    buildTree(classes) {
      classes.forEach(data => {
        if (data.children) {
--- a/mes/qd/src/views/wms/scheduler_manage/task/task.js
+++ b/mes/qd/src/views/wms/scheduler_manage/task/task.js
@@ -58,6 +58,12 @@ export function operation(data) {
    data
  })
 }
+export function scheduler() {
+  return request({
+    url: '/api/acsToWms/task/taskPublish',
+    method: 'get'
+  })
+}

 export default {
  add,
@@ -67,5 +73,6 @@ export default {
  getTaskStatus,
  getTaskType,
  getAcsTaskType,
-  getFinishType
+  getFinishType,
+  scheduler
 }
--- a/mes/qd/src/views/wms/storage_manage/product/productMoreOrless/AddDialog.vue
+++ b/mes/qd/src/views/wms/storage_manage/product/productMoreOrless/AddDialog.vue
@@ -391,9 +391,11 @@ export default {
      this.form.sect_name = row.sect_name
      this.form.struct_name = row.struct_name
      crudMoreOrless.getStructIvt({'struct_id': row.struct_id}).then(res => {
+        debugger
        this.form.tableData = res
        for (let i = 0; i < this.form.tableData.length; i++) {
          const row = this.form.tableData[i]
+          row.material_id = row.material_id.toString()
          this.$set(row, 'edit', false)
          this.form.tableData.splice(i, 1, row)
        }
@@ -407,7 +409,7 @@ export default {
      this.nowrow = row
    },
    async queryStruct() {
-      if (!this.form.mol_type) {
+      if (!this.form.mol_type) {structShow
        this.crud.notify('请先选择损溢类型！', CRUD.NOTIFICATION_TYPE.INFO)
        return
      }
@@ -450,6 +452,7 @@ export default {
      this.form.struct_name = ''
    },
    handleEdit(index, row) {
+      row.material_id = row.material_id.toString()
      if (!row.edit) {
        if (typeof (row.mol_qty) === 'undefined' | (parseFloat(row.mol_qty) <= 0)) {
          this.crud.notify('不允许损溢数量为0！', CRUD.NOTIFICATION_TYPE.INFO)
@@ -459,6 +462,10 @@ export default {
          this.crud.notify('物料不可为空！', CRUD.NOTIFICATION_TYPE.INFO)
          return false
        }
+        if (!row.storagevehicle_code) {
+          this.crud.notify('载具号不可为空！', CRUD.NOTIFICATION_TYPE.INFO)
+          return false
+        }
        if (this.form.mol_type === '0' && (parseFloat(row.ivt_qty) < parseFloat(row.mol_qty))) {
          this.crud.notify('不允许损数量大于库存数量！', CRUD.NOTIFICATION_TYPE.INFO)
          return false
--- a/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductMoreOrless/index.vue
+++ b/mes/qd/src/views/wms/storage_manage/semiproduct/semiproductMoreOrless/index.vue
@@ -157,7 +157,7 @@
      <!--分页组件-->
      <pagination />
    </div>
-    <AddDialog @AddChanged="querytable" />
+<!--    <AddDialog @AddChanged="querytable" />-->
  </div>
 </template>

@@ -168,13 +168,13 @@ import crudOperation from '@crud/CRUD.operation'
 import udOperation from '@crud/UD.operation'
 import pagination from '@crud/Pagination'
 import DateRangePicker from '@/components/DateRangePicker/index'
-import AddDialog from '@/views/wms/storage_manage/semiproduct/semiproductMoreOrless/AddDialog'
+// import AddDialog from '@/views/wms/storage_manage/semiproduct/semiproductMoreOrless/AddDialog'
 import { mapGetters } from 'vuex'
 import crudStorattr from '@/api/wms/basedata/st/storattr'

 export default {
  name: 'MoreOrLess',
-  components: { AddDialog, crudOperation, rrOperation, udOperation, pagination, DateRangePicker },
+  components: { crudOperation, rrOperation, udOperation, pagination, DateRangePicker },
  cruds() {
    return CRUD({
      title: '',