opt:现场问题的一些处理与优化

wms_pro/qd/src/views/system/timing/index.vue

@@ -35,8 +35,18 @@
           @click="delCtuIvt"
         >人工清除CTU库库存
         </el-button>
+        <!--        <el-button-->
+        <!--          slot="right"-->
+        <!--          class="filter-item"-->
+        <!--          size="mini"-->
+        <!--          type="warning"-->
+        <!--          icon="el-icon-warning"-->
+        <!--          @click="updateLockIvt"-->
+        <!--        >批量解除技改禁用仓位锁-->
+        <!--        </el-button>-->
       </crudOperation>
       <Log ref="log" />
+
     </div>
     <!--Form表单-->
     <el-dialog
@@ -205,7 +215,7 @@ import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
 import pagination from '@crud/Pagination'
 import Crontab from './components/crontab'
-import { delCtuIvt } from '@/views/wms/dispatch_manage/task/schBaseTask'
+import { delCtuIvt, updateLockIvt } from '@/views/wms/dispatch_manage/task/schBaseTask'
 import * as crudSchBaseTask from '@/views/wms/dispatch_manage/task/schBaseTask'
 import crudUser from '@/views/system/user/user'
 
@@ -312,6 +322,21 @@ export default {
         })
       })
     },
+    updateLockIvt() {
+      this.$confirm(`此操作将清空本次技改库位的禁用锁，清除后锁数据无法恢复，本次技改确认完成后再操作！`, '警告', {
+        confirmButtonText: '人工清除',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.$confirm(`二次提醒：此操作将清空所有技改的禁用锁，清除后锁数据无法恢复，请谨慎操作，本次技改确认完成后再操作！`, '警告', {
+          confirmButtonText: '我要清除',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+
+        })
+      })
+    },
     delMethod(id) {
       this.delLoading = true
       crudJob.del([id]).then(() => {

wms_pro/qd/src/views/wms/dispatch_manage/task/index.vue

@@ -172,6 +172,7 @@
       <!--          style="width: 60px"-->
       <!--        />-->
       <el-button type="primary" @click="taskScheduler()">执行整出任务</el-button>
+      <el-button type="warning" @click="cancelTask()">批量取消任务</el-button>
       <!--      </span>-->
       <crudOperation :permission="permission" />
       <!--表单组件-->
@@ -290,13 +291,13 @@
               @click="doOperate(scope.row, 'a')"
             >完成
             </el-button>
-            <el-button
-              type="text"
-              icon="el-icon-success"
-              :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-success"-->
+            <!--              :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"
@@ -467,12 +468,16 @@ export default {
       this.query.vehicle_code = ''
       this.crud.toQuery()
     },
-    taskScheduler() {
+    cancelTask() {
       if (this.crud.selections.length === 0) {
         this.crud.notify('请选择一个任务', CRUD.NOTIFICATION_TYPE.INFO)
         return
       }
-      crudSchBaseTask.scheduler(JSON.stringify(this.crud.selections)).then(res => {
+      if (this.crud.selections.length > 20) {
+        this.crud.notify('取消任务数量一次不允许超过20个', CRUD.NOTIFICATION_TYPE.INFO)
+        return
+      }
+      crudSchBaseTask.cancelTask(JSON.stringify(this.crud.selections)).then(res => {
         this.crud.toQuery()
         this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
       })

wms_pro/qd/src/views/wms/dispatch_manage/task/index2.vue

@@ -213,13 +213,13 @@
               @click="doOperate(scope.row, 'a')"
             >完成
             </el-button>
-            <el-button
-              type="text"
-              icon="el-icon-success"
-              :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-success"-->
+            <!--              :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"

wms_pro/qd/src/views/wms/dispatch_manage/task/schBaseTask.js

@@ -46,6 +46,14 @@ export function scheduler(data) {
     data
   })
 }
+export function cancelTask(data) {
+  return request({
+    url: 'api/schBaseTask/cancelTask',
+    method: 'post',
+    data
+  })
+}
+
 export function delCtuIvt(data) {
   return request({
     url: 'api/schBaseTask/delCtuIvt',
@@ -53,5 +61,12 @@ export function delCtuIvt(data) {
     data
   })
 }
+export function updateLockIvt(data) {
+  return request({
+    url: 'api/schBaseTask/updateLockIvt',
+    method: 'post',
+    data
+  })
+}
 
-export default { add, edit, del, getTaskStatusList, operation, scheduler, delCtuIvt }
+export default { add, edit, del, getTaskStatusList, operation, scheduler, delCtuIvt, cancelTask, updateLockIvt }

wms_pro/qd/src/views/wms/stor_manage/storIvtInfo/StructAttrDialog.vue

@@ -40,6 +40,14 @@
           placeholder="物料编码模糊查询"
         />
       </el-form-item>
+      <el-form-item label="载具码">
+        <el-input
+          v-model="query.vehicleCode"
+          clearable
+          size="mini"
+          placeholder="载具码模糊查询"
+        />
+      </el-form-item>
       <rrOperation />
     </el-form>