fix:1.修复输送线命令下发是否校验库存；

2.组盘导入增加新物料； 3.删除组盘信息，关联删除载具物料表；
2025-02-10 22:13:28 +08:00
parent d4bcbf78f6
commit 33ad2a0d7e
10 changed files with 147 additions and 99 deletions
--- a/wms_pro/qd/src/views/wms/dispatch_manage/task/index.vue
+++ b/wms_pro/qd/src/views/wms/dispatch_manage/task/index.vue
@@ -10,8 +10,6 @@
          label-width="80px"
          label-suffix=":"
        >
-
-
          <el-form-item label="任务号">
            <label slot="label">任&nbsp;&nbsp;务&nbsp;号:</label>
            <el-input
@@ -22,6 +20,16 @@
              @keyup.enter.native="crud.toQuery"
            />
          </el-form-item>
+          <el-form-item label="任务ID">
+            <label slot="label">任&nbsp;&nbsp;务&nbsp;ID:</label>
+            <el-input
+              v-model="query.task_id"
+              clearable
+              style="width: 240px"
+              placeholder="任务ID"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
          <el-form-item label="载具号">
            <label slot="label">载&nbsp;&nbsp;具&nbsp;号:</label>
            <el-input
@@ -49,8 +57,8 @@
              range-separator="至"
              start-placeholder="开始日期"
              end-placeholder="结束日期"
-              @change="crud.toQuery">
-            </el-date-picker>
+              @change="crud.toQuery"
+            />
          </el-form-item>
          <el-form-item label="任务状态">
            <el-select
@@ -70,7 +78,7 @@
              />
            </el-select>
          </el-form-item>
-          <rrOperation/>
+          <rrOperation />
        </el-form>
      </div>
      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
@@ -83,44 +91,57 @@
        />
        <el-button type="primary" @click="taskScheduler()">任务调度</el-button>
      </span>
-      <crudOperation :permission="permission"/>
+      <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="800px">
-        <el-form ref="form" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true"
-                 :model="form" :rules="rules" size="mini" label-width="115px" label-suffix=":">
+      <el-dialog
+        :close-on-click-modal="false"
+        :before-close="crud.cancelCU"
+        :visible.sync="crud.status.cu > 0"
+        :title="crud.status.title"
+        width="800px"
+      >
+        <el-form
+          ref="form"
+          style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;"
+          :inline="true"
+          :model="form"
+          :rules="rules"
+          size="mini"
+          label-width="115px"
+          label-suffix=":"
+        >
          <el-form-item label="任务编码">
-            <el-input v-model="form.task_code" style="width: 240px;"/>
+            <el-input v-model="form.task_code" style="width: 240px;" />
          </el-form-item>
          <el-form-item label="任务状态">
-            <el-input v-model="form.status" style="width: 240px;"/>
+            <el-input v-model="form.status" style="width: 240px;" />
          </el-form-item>
          <el-form-item label="点位1">
-            <el-input v-model="form.point_code1" style="width: 240px;"/>
+            <el-input v-model="form.point_code1" style="width: 240px;" />
          </el-form-item>
          <el-form-item label="点位2">
-            <el-input v-model="form.point_code2" style="width: 240px;"/>
+            <el-input v-model="form.point_code2" style="width: 240px;" />
          </el-form-item>
          <el-form-item label="点位3">
-            <el-input v-model="form.point_code3" style="width: 240px;"/>
+            <el-input v-model="form.point_code3" style="width: 240px;" />
          </el-form-item>
          <el-form-item label="点位4">
-            <el-input v-model="form.point_code4" style="width: 240px;"/>
+            <el-input v-model="form.point_code4" style="width: 240px;" />
          </el-form-item>
          <el-form-item label="载具类型">
-            <el-input v-model="form.vehicle_type" style="width: 240px;"/>
+            <el-input v-model="form.vehicle_type" style="width: 240px;" />
          </el-form-item>
          <el-form-item label="载具编码">
-            <el-input v-model="form.vehicle_code" style="width: 240px;"/>
+            <el-input v-model="form.vehicle_code" style="width: 240px;" />
          </el-form-item>
          <el-form-item label="优先级">
-            <el-input v-model="form.priority" style="width: 240px;"/>
+            <el-input v-model="form.priority" style="width: 240px;" />
          </el-form-item>
          <el-form-item v-if="false" label="处理类">
-            <el-input v-model="form.handle_class" style="width: 240px;"/>
+            <el-input v-model="form.handle_class" style="width: 240px;" />
          </el-form-item>
          <el-form-item label="备注">
-            <el-input v-model="form.remark" style="width: 240px;"/>
+            <el-input v-model="form.remark" style="width: 240px;" />
          </el-form-item>
        </el-form>
        <div slot="footer" class="dialog-footer">
@@ -129,11 +150,18 @@
        </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="product_area" show-overflow-tooltip show-tooltip-when-overflow label="生产区域"/>
-        <el-table-column prop="task_code" show-overflow-tooltip show-tooltip-when-overflow label="任务编码"/>
+      <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="product_area" show-overflow-tooltip show-tooltip-when-overflow label="生产区域" />
+        <el-table-column prop="id" show-overflow-tooltip show-tooltip-when-overflow label="任务ID" />
+        <el-table-column prop="task_code" show-overflow-tooltip show-tooltip-when-overflow label="任务编码" />
        <el-table-column prop="task_type" show-overflow-tooltip show-tooltip-when-overflow label="任务类型">
          <template slot-scope="scope">
            {{ statusEnum.label.TASK_TYPE[scope.row.task_type] }}
@@ -144,80 +172,79 @@
            {{ scope.row.vehicle_code ? scope.row.vehicle_code : '-' }}
          </template>
        </el-table-column>
-        <el-table-column prop="acs_type" show-overflow-tooltip show-tooltip-when-overflow width="130" label="ACS任务类型"/>
+        <el-table-column prop="acs_type" show-overflow-tooltip show-tooltip-when-overflow width="130" label="ACS任务类型" />
        <el-table-column prop="status" show-overflow-tooltip show-tooltip-when-overflow label="任务状态">
          <template slot-scope="scope">
            {{ statusEnum.label.FORM_STATUS[scope.row.status] }}
          </template>
        </el-table-column>
-        <el-table-column prop="task_step" show-overflow-tooltip show-tooltip-when-overflow width="130" label="任务执行步骤"/>
-        <el-table-column prop="group_code" show-overflow-tooltip show-tooltip-when-overflow label="任务组"/>
-        <el-table-column prop="point_code1" show-overflow-tooltip show-tooltip-when-overflow width="130" label="起点1"/>
-        <el-table-column prop="point_code2" show-overflow-tooltip show-tooltip-when-overflow width="130" label="终点1"/>
-        <el-table-column prop="point_code3" show-overflow-tooltip show-tooltip-when-overflow width="130" label="起点2"/>
-        <el-table-column prop="point_code4" show-overflow-tooltip show-tooltip-when-overflow width="130" label="终点2"/>
+        <el-table-column prop="task_step" show-overflow-tooltip show-tooltip-when-overflow width="130" label="任务执行步骤" />
+        <el-table-column prop="group_code" show-overflow-tooltip show-tooltip-when-overflow label="任务组" />
+        <el-table-column prop="point_code1" show-overflow-tooltip show-tooltip-when-overflow width="130" label="起点1" />
+        <el-table-column prop="point_code2" show-overflow-tooltip show-tooltip-when-overflow width="130" label="终点1" />
+        <el-table-column prop="point_code3" show-overflow-tooltip show-tooltip-when-overflow width="130" label="起点2" />
+        <el-table-column prop="point_code4" show-overflow-tooltip show-tooltip-when-overflow width="130" label="终点2" />

-        <el-table-column prop="priority" show-overflow-tooltip show-tooltip-when-overflow label="优先级"/>
-        <el-table-column prop="handle_class" show-overflow-tooltip show-tooltip-when-overflow width="150" label="处理类"/>
-        <el-table-column prop="is_send" show-overflow-tooltip show-tooltip-when-overflow label="立即下发"/>
-        <el-table-column prop="remark" show-overflow-tooltip show-tooltip-when-overflow label="备注"/>
-        <el-table-column prop="form_data" show-overflow-tooltip show-tooltip-when-overflow width="130" label="自定义参数"/>
-        <el-table-column prop="create_time" show-overflow-tooltip show-tooltip-when-overflow label="创建时间"/>
-        <el-table-column prop="update_name" show-overflow-tooltip show-tooltip-when-overflow label="修改人"/>
-        <el-table-column prop="update_time" show-overflow-tooltip show-tooltip-when-overflow label="修改时间"/>
+        <el-table-column prop="priority" show-overflow-tooltip show-tooltip-when-overflow label="优先级" />
+        <el-table-column prop="handle_class" show-overflow-tooltip show-tooltip-when-overflow width="150" label="处理类" />
+        <el-table-column prop="is_send" show-overflow-tooltip show-tooltip-when-overflow label="立即下发" />
+        <el-table-column prop="remark" show-overflow-tooltip show-tooltip-when-overflow label="备注" />
+        <el-table-column prop="form_data" show-overflow-tooltip show-tooltip-when-overflow width="130" label="自定义参数" />
+        <el-table-column prop="create_time" show-overflow-tooltip show-tooltip-when-overflow label="创建时间" />
+        <el-table-column prop="update_name" show-overflow-tooltip show-tooltip-when-overflow label="修改人" />
+        <el-table-column prop="update_time" show-overflow-tooltip show-tooltip-when-overflow label="修改时间" />
        <el-table-column v-permission="[]" label="操作" width="250px" align="center" fixed="right">
          <template slot-scope="scope">
            <el-button
              type="text"
              icon="el-icon-success"
-              @click="doOperate(scope.row, 'c')"
              :disabled="scope.row.status!=='10' && scope.row.status!=='30' "
+              @click="doOperate(scope.row, 'c')"
            >下发
            </el-button>
            <el-button
              type="text"
              icon="el-icon-success"
-              @click="doOperate(scope.row, 'a')"
              :disabled="scope.row.status==='80' || scope.row.status==='82' || scope.row.status==='90'"
+              @click="doOperate(scope.row, 'a')"
            >完成
            </el-button>
            <el-button
              type="text"
              icon="el-icon-success"
-              @click="doOperate(scope.row, 'e')"
              :disabled="scope.row.status==='80' || scope.row.status==='82' || scope.row.status==='90'"
+              @click="doOperate(scope.row, 'e')"
            >强制完成
            </el-button>
            <el-button
              type="text"
              icon="el-icon-error"
-              @click="doOperate(scope.row, 'b')"
              :disabled="scope.row.status==='80' || scope.row.status==='82' || scope.row.status==='90'"
+              @click="doOperate(scope.row, 'b')"
            >取消
            </el-button>
          </template>
        </el-table-column>
      </el-table>
      <!--分页组件-->
-      <pagination/>
+      <pagination />
    </div>
  </div>
 </template>

 <script>
-import crudSchBaseTask, {scheduler} from './schBaseTask'
+import crudSchBaseTask, { scheduler } from './schBaseTask'
 // import crudSchBaseTaskconfig from './config/schBaseTaskconfig'
-import CRUD, {crud, form, header, presenter} from '@crud/crud'
+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 crudDict from '@/views/system/dict/dict'

-
 const defaultForm = {
-  id: null,
  product_area: null,
+  task_id: null,
  task_code: null,
  task_type: null,
  acs_type: null,
@@ -241,7 +268,7 @@ const defaultForm = {
 }
 export default {
  name: 'Task',
-  components: {pagination, crudOperation, rrOperation, udOperation},
+  components: { pagination, crudOperation, rrOperation, udOperation },
  mixins: [presenter(), header(), form(defaultForm), crud()],
  statusEnums: ['TASK_TYPE', 'FORM_STATUS'],
  cruds() {
@@ -257,7 +284,7 @@ export default {
        download: false,
        reset: true
      },
-      crudMethod: {...crudSchBaseTask}
+      crudMethod: { ...crudSchBaseTask }
    })
  },
  data() {
@@ -265,7 +292,7 @@ export default {
      undo: 0,
      permission: {},
      rules: {},
-      taskStatusList: [],
+      taskStatusList: []
    }
  },
  created() {