src/api/pickDetail.js

@@ -55,21 +55,5 @@ export function pickBarBack(pickDetailId) {
     data: pickDetailId
   })
 }
-/* 呼叫验货*/
-export function hjYh(ids) {
-  return request({
-    url: 'api/pickDetail/hjYh',
-    method: 'post',
-    data: ids
-  })
-}
-/* 验货完成*/
-export function yhWc(ids) {
-  return request({
-    url: 'api/pickDetail/yhWc',
-    method: 'post',
-    data: ids
-  })
-}
 
-export default { add, edit, del,allocate,cancelAllocate,picking,pickBarBack,hjYh,yhWc }
+export default { add, edit, del,allocate,cancelAllocate,picking,pickBarBack }

src/api/point.js

@@ -94,10 +94,5 @@ export function queryPointInfo(data) {
     data
   })
 }
-export function clearCk() {
+
-  return request({
+export default { add, edit, del,getPoints,queryPointList ,fullStockIn,pointCallStock,fullStockOut,pointStockBack,multiAdjust,queryPointInfo}
-    url: 'api/point/clearCk',
-    method: 'post'
-  })
-}
-export default { add, edit, del,getPoints,queryPointList ,fullStockIn,pointCallStock,fullStockOut,pointStockBack,multiAdjust,queryPointInfo,clearCk}

src/views/base-data/point/index.vue

@@ -88,15 +88,16 @@
           :show-file-list="true">
           <el-button size="mini" type="success" icon="el-icon-upload2">导入</el-button>
         </el-upload>
+
         <el-button
-            slot="left"
+          v-show="false"
-            class="filter-item"
+          slot="right"
-            type="danger"
+          class="filter-item"
-            icon="el-icon-remove"
+          size="mini"
-            size="mini"
+          type="danger"
-            @click="clearCk()"
+          icon="el-icon-s-order"
-        >
+          @click="MultiAdjust"
-          清空备货位
+        >批量调整
         </el-button>
       </crudOperation>
 
@@ -397,13 +398,6 @@ export default {
         data.enabled = !data.enabled
       })
     },
-    clearCk() {
-      pointUrl.clearCk().then(res => {
-        this.crud.notify("清理成功", CRUD.NOTIFICATION_TYPE.SUCCESS);
-      }).catch(e => {
-        this.crud.notify("清理失败", CRUD.NOTIFICATION_TYPE.ERROR);
-      })
-    },
     getArea() {
       getAres({size: 50}).then(res => {
         this.areas = res.content.map(function (obj) {

src/views/business-data/businessTask/agvTask.vue

@@ -313,7 +313,7 @@ export default {
       const ids = datas.map(v => v.id);
 
       crudAgvTask.sendReAgvTask(ids).then(res => {
-        this.crud.notify(res.msg, CRUD.NOTIFICATION_TYPE.SUCCESS)
+        this.crud.notify(res.message, CRUD.NOTIFICATION_TYPE.SUCCESS)
         this.crud.toQuery()
       })
     },

src/views/business-data/countPlan/addPlanOrder.vue

@@ -1,80 +0,0 @@
-<template>
-  <div>
-    <el-dialog :visible.sync="this.dialog"
-               :title="title"
-               width="450px"
-               :before-close="cancelForm">
-      <el-form ref="form" :model="form" :rules="rules" size="small">
-        <!--      <el-date-picker v-model="query.createTime" class="date-item" style="width: 100px"/>-->
-        <el-form-item label="工单编号" prop="gdCode">
-          <el-input v-model="form.gdCode" style="width: 270px;" />
-        </el-form-item>
-      </el-form>
-
-      <span slot="footer" class="dialog-footer">
-    <el-button @click="cancelForm">取 消</el-button>
-    <el-button type="primary" @click="submitMlsOrder(form)">确 定</el-button>
-    </span>
-    </el-dialog>
-  </div>
-</template>
-<script>
-import crudOrder from "@/api/order"
-import crudPickDetail from "@/api/pickDetail"
-import DateRangePicker from "@/components/DateRangePicker/index.vue";
-import CRUD, {presenter, header, form, crud} 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'
-const defaultForm = {
-  id: null
-}
-export default {
-  components: {DateRangePicker, pagination, crudOperation, rrOperation, udOperation},
-  mixins: [form(defaultForm), crud()],  data() {
-    return {
-      dialog:false,
-      title: '验货成功',
-      form:{
-        gdCode:null
-      },
-      rules: {
-        gdCode: [
-          {required: true, message: '必填', trigger: 'blur'}
-        ]
-      },
-    }
-  },
-  methods: {
-    openForm(){
-      console.log("打开")
-      this.dialog = true;
-    },
-    cancelForm(){
-      this.dialog = false;
-      this.$refs['form'].resetFields();
-    },
-    submitMlsOrder(data) {
-      console.log("2:"+data.gdCode)
-      crudPickDetail.yhWc(data).then(res => {
-        this.crud.notify(res.msg, CRUD.NOTIFICATION_TYPE.SUCCESS);
-        this.crud.toQuery();
-        this.dialog = false;//关闭窗口
-      })
-    }
-  }
-
-}
-</script>
-
-<style scoped>
-.java.hljs {
-  color: #444;
-  background: #ffffff !important;
-}
-
-::v-deep .el-dialog__body {
-  padding: 0 20px 10px 20px !important;
-}
-</style>

src/views/business-data/countPlan/index.vue

@@ -10,16 +10,6 @@
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
       <crudOperation :permission="permission" :tableKey="this.$options.name" >
-        <el-button
-            slot="left"
-            class="filter-item"
-            type="success"
-            icon="el-icon-zoom-out"
-            size="mini"
-            @click="$refs.addPlanOrder.openForm()"
-        >
-          新增
-        </el-button>
         <el-button
           slot="right"
           class="filter-item"
@@ -39,7 +29,6 @@
           :disabled="crud.selections.length !== 1"
         >盘点登记</el-button>
       </crudOperation>
-      <AddPlanOrder ref="addPlanOrder"/>
       <viewCountDetail ref="planDetail" />
       <viewCountRecord ref="gatherCountRecord" />
       <!--表单组件-->
@@ -106,24 +95,15 @@ import udOperation from '@crud/UD.operation'
 import pagination from '@crud/Pagination'
 import viewCountDetail from '@/views/business-data/countDetail/index.vue'
 import viewCountRecord from '@/views/business-data/countPlan/viewCountRecord.vue'
-import AddPlanOrder from '@/views/business-data/countPlan/addPlanOrder.vue'
 import DonMessage from '@/utils/message'
 const defaultForm = { id: null, code: null, name: null, deptId: null, status: null, type: null, orderQty: null, countQty: null, remark: null, sourceName: null, sourceId: null, createBy: null, updateBy: null, createTime: null, updateTime: null }
 export default {
   name: 'CountPlan',
-  components: { pagination, crudOperation, rrOperation, udOperation, viewCountDetail,viewCountRecord,AddPlanOrder },
+  components: { pagination, crudOperation, rrOperation, udOperation, viewCountDetail,viewCountRecord },
   mixins: [presenter(), header(), form(defaultForm), crud()],
   dicts: ['count_type', 'count_status'],
   cruds() {
-    return CRUD({ title: '盘点计划', url: 'api/countPlan', idField: 'id', sort: 'id,desc', crudMethod: { ...crudCountPlan },
+    return CRUD({ title: '盘点计划', url: 'api/countPlan', idField: 'id', sort: 'id,desc', crudMethod: { ...crudCountPlan }})
-      optShow: {
-        add: false,
-        edit: true,
-        del: true,
-        reset: true,
-        download: true
-      }
-    })
   },
   data() {
     return {

src/views/business-data/countPlan/invTask.vue

@@ -1,255 +0,0 @@
-<template>
-  <div class="app-container">
-    <!--工具栏-->
-    <div class="head-container">
-      <label class="el-form-item-label">任务号</label>
-      <el-input v-model="query.billCode" clearable placeholder="任务号" style="width: 170px;" class="filter-item"
-                @keyup.enter.native="crud.toQuery"/>
-
-      <label class="el-form-item-label">物料编码</label>
-      <el-select v-model="query.itemCode" placeholder="物料编码" filterable style="width: 170px;" class="filter-item">
-        <el-option
-          @keyup.enter.native="crud.toQuery"
-          v-for="item in this.itemListData"
-          :key="item.code"
-          :label="item.code"
-          :value="item.code">
-          <span style="float: left">{{ item.code }}</span>
-          <span style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</span>
-        </el-option>
-      </el-select>
-
-      <label class="el-form-item-label">物料名称</label>
-      <el-input v-model="query.itemName" clearable placeholder="物料名称" style="width: 170px;" class="filter-item"
-                @keyup.enter.native="crud.toQuery"/>
-
-      <label class="el-form-item-label">任务状态</label>
-      <el-select
-        v-model="query.taskStatus"
-        clearable
-        size="small"
-        placeholder="任务状态"
-        class="filter-item"
-        style="width: 150px"
-        @change="crud.toQuery"
-      >
-        <el-option
-          v-for="item in dict.task_status"
-          :key="item.id"
-          :label="item.label"
-          :value="item.value"
-        />
-      </el-select>
-
-      <label class="el-form-item-label">日期</label>
-      <date-range-picker v-model="query.createTime" class="date-item" style="width: 100px"/>
-
-      <div>
-        <label class="el-form-item-label">Mo票</label>
-        <el-input v-model="query.propC1" clearable placeholder="Mo票" style="width: 170px;" class="filter-item"
-                  @keyup.enter.native="crud.toQuery"/>
-        <label class="el-form-item-label">工单编号</label>
-        <el-input v-model="query.orderNumber" clearable placeholder="工单编号" style="width: 170px;" class="filter-item"
-                  @keyup.enter.native="crud.toQuery"/>
-        <label class="el-form-item-label">原点位</label>
-        <el-input v-model="query.srcPointCode" clearable placeholder="原点位" style="width: 185px;" class="filter-item"
-                  @keyup.enter.native="crud.toQuery"/>
-        <label class="el-form-item-label">目标点位</label>
-        <el-input v-model="query.dstPointCode" clearable placeholder="目标点位" style="width: 150px;"
-                  class="filter-item" @keyup.enter.native="crud.toQuery"/>
-        <rrOperation :crud="crud"/>
-      </div>
-      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
-      <crudOperation :permission="permission" :tableKey="this.$options.name">
-<!--        <el-button
-            slot="right"
-            class="filter-item"
-            size="mini"
-            type="info"
-            icon="el-icon-s-order"
-            @click="backTask(crud.selections)"
-            :disabled="crud.selections.length !== 1"
-        >返库</el-button>-->
-        <el-button
-            slot="right"
-            class="filter-item"
-            type="success"
-            icon="el-icon-zoom-out"
-            size="mini"
-            @click="$refs.addPlanOrder.openForm()"
-        >
-          验货完成
-        </el-button>
-      </crudOperation>
-      <!--表单组件-->
-      <AddPlanOrder ref="addPlanOrder"/>
-      <!--表格渲染-->
-      <el-table ref="table" height="66vh" v-loading="crud.loading" :data="crud.data" size="small" style="width: 100%;"
-                @selection-change="crud.selectionChangeHandler">
-        <el-table-column type="selection" width="55"/>
-        <el-table-column prop="xh" type="index" :index="indexMethod" label="序号"/>
-        <el-table-column prop="billCode" label="任务号"/>
-        <el-table-column prop="orderNumber" label="工单编号">
-          <template slot-scope="scope">
-            <div>{{ scope.row.itemKey.orderNumber }}</div>
-          </template>
-        </el-table-column>
-        <el-table-column prop="propC1" label="Mo票">
-          <template slot-scope="scope">
-            <div>{{ scope.row.itemKey.propC1 }}</div>
-          </template>
-        </el-table-column>
-        <el-table-column :show-overflow-tooltip="true" prop="itemCode" label="物料编码">
-          <template slot-scope="scope">
-            <div>{{ scope.row.item.code }}</div>
-          </template>
-        </el-table-column>
-        <el-table-column :show-overflow-tooltip="true" prop="itemName" label="物料名称">
-          <template slot-scope="scope">
-            <div>{{ scope.row.item.name }}</div>
-          </template>
-        </el-table-column>
-        <el-table-column prop="srcStockCode" label="容器编码"/>
-        <el-table-column prop="srcPointCode" label="原点位"/>
-        <el-table-column prop="dstPointCode" label="目标点位"/>
-        <el-table-column prop="taskStatus" label="任务状态">
-          <template slot-scope="scope">
-            {{ dict.label.task_status[scope.row.taskStatus] }}
-          </template>
-        </el-table-column>
-        <el-table-column prop="planQty" label="计划数量"/>
-        <el-table-column prop="moveQty" label="移位数量"/>
-        <el-table-column prop="createBy" label="创建人"/>
-        <el-table-column prop="createTime" label="创建时间"/>
-      </el-table>
-      <!--分页组件-->
-      <div style="float: right;">
-        <pagination/>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import crudTask from '@/api/task'
-import CRUD, {presenter, header, form, crud} 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 DateRangePicker from "@/components/DateRangePicker/index.vue";
-import AddPlanOrder from '@/views/business-data/countPlan/addPlanOrder.vue'
-
-import {getItemsList} from "@/api/item";
-import pickDetail from "@/api/pickDetail";
-
-const defaultForm = {
-  id: null,
-  itemId: null,
-  itemKeyId: null,
-  billCode: null,
-  taskType: null,
-  asnDetailId: null,
-  moveDetailId: null,
-  waveDetailId: null,
-  pickDetailId: null,
-  srcStockId: null,
-  dstStockId: null,
-  srcPointId: null,
-  dstPointId: null,
-  srcStockCode: null,
-  dstStockCode: null,
-  srcPointCode: null,
-  dstPointCode: null,
-  invStatus: null,
-  taskStatus: null,
-  beSkip: null,
-  beBack: null,
-  planQty: null,
-  moveQty: null,
-  putCode: null,
-  invId: null,
-  deptId: null,
-  createBy: null,
-  updateBy: null,
-  createTime: null,
-  updateTime: null
-}
-export default {
-  components: {DateRangePicker, pagination, crudOperation, rrOperation, udOperation, AddPlanOrder},
-  mixins: [presenter(), header(), form(defaultForm), crud()],
-  dicts: ['task_status'],
-  cruds() {
-    return CRUD({
-        query: {taskType: ['INV']},
-        title: '验货任务',
-        url: 'api/task',
-        idField: 'id',
-        sort: 'id,desc',
-        crudMethod: {...crudTask},
-        optShow: {
-          add: false,
-          edit: false,
-          del: false,
-          reset: true,
-          download: true
-        },
-        queryOnPresenterCreated: true
-      }
-    )
-  },
-  data() {
-    return {
-      permission: {
-        add: ['admin', 'task:add'],
-        edit: ['admin', 'task:edit'],
-        del: ['admin', 'task:del']
-      },
-      rules: {},
-      queryTypeOptions: [
-        {key: 'itemCode', display_name: '物料代码'},
-        {key: 'itemName', display_name: '物料名称'},
-        {key: 'taskStatus', display_name: '任务状态'},
-        {key: 'srcPointCode', display_name: '源点位编码'},
-        {key: 'dstPointCode', display_name: '目标点位编码'}
-      ],
-      itemListData: []
-    }
-  },
-  mounted() {
-    //初始化数据
-    this.itemDataGet();
-  },
-  methods: {
-    // 钩子：在获取表格数据之前执行，false 则代表不获取数据
-    [CRUD.HOOK.beforeRefresh]() {
-      return true
-    },
-    indexMethod(index) {
-      return index * 1 + 1;
-    },
-    backTask(datas){
-      const ids = datas.map(v => v.id);
-      pickDetail.backTask(ids).then(res => {
-        this.crud.notify(res.msg, res.notify);
-      })
-    },
-    //物料数据
-    itemDataGet() {
-      getItemsList().then(res => {
-        this.itemListData = res;
-      }).catch(e => {
-        this.$message({
-          showClose: true,
-          message: '物料加载失败',
-          type: 'error'
-        });
-      })
-    }
-  }
-}
-</script>
-
-<style scoped>
-
-</style>

src/views/business-data/inventory/index.vue

@@ -33,42 +33,13 @@
       <label class="el-form-item-label">容器号</label>
       <el-input v-model="query.stockCode" clearable placeholder="请输入容器号" style="width: 150px;" class="filter-item"
                 @keyup.enter.native="crud.toQuery"/>
-      <label class="el-form-item-label">待检验</label>
-      <el-select
-          v-model="query.beLock"
-          clearable
-          size="small"
-          placeholder="状态"
-          class="filter-item"
-          style="width: 100px"
-          @change="crud.toQuery"
-      >
-        <el-option
-            v-for="item in dict.base_staus"
-            :key="item.id"
-            :label="item.label"
-            :value="item.value"
-        />
-      </el-select>
       <rrOperation :crud="crud"/>
 
       <el-button class="filter-item" size="mini" type="warning" icon="el-icon-refresh-left" @click="resetQuery">重置
       </el-button>
 
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
-      <crudOperation :permission="permission" :tableKey="this.$options.name">
+      <crudOperation :permission="permission" :tableKey="this.$options.name"/>
-        <el-button
-            slot="left"
-            class="filter-item"
-            type="danger"
-            icon="el-icon-circle-plus-outline"
-            size="mini"
-            :disabled="crud.selections.length == 0"
-            @click="hjYh(crud.selections)"
-        >
-          呼叫验货
-        </el-button>
-      </crudOperation>
       <!--表单组件-->
       <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0"
                  :title="crud.status.title" width="500px">
@@ -151,11 +122,6 @@
         <el-table-column prop="stockCode" label="容器号"/>
         <el-table-column prop="quantity" label="数量"/>
         <el-table-column prop="queuedQty" label="占用数"/>
-        <el-table-column prop="beLock" label="待检验">
-          <template slot-scope="scope">
-            {{ dict.label.base_staus[scope.row.beLock] }}
-          </template>
-        </el-table-column>
         <el-table-column prop="createTime" label="入库时间"/>
         <!--        <el-table-column v-if="checkPer(['admin','fileManagement:edit','fileManagement:del'])" label="操作"
                                  width="150px" align="center" fixed="right">
@@ -183,7 +149,6 @@ import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
 import udOperation from '@crud/UD.operation'
 import pagination from '@crud/Pagination'
-import pickDetail from "@/api/pickDetail";
 
 const defaultForm = {
   id: null,
@@ -214,7 +179,6 @@ export default {
   name: 'Inventory',
   components: {pagination, crudOperation, rrOperation, udOperation},
   mixins: [presenter(), header(), form(defaultForm), crud()],
-  dicts: ['base_staus'],
   cruds() {
     return CRUD({
       query: {
@@ -262,13 +226,6 @@ export default {
         })
       })
     },
-    hjYh(datas) {
-      const ids = datas.map(v => v.id);
-      pickDetail.hjYh(ids).then(res => {
-        this.crud.notify(res.msg, res.notify);
-        this.crud.toQuery();
-      })
-    },
     deleteDataM(id) {//删除数据的方法
       let ids = [];
       ids.push(id);

src/views/business-data/pickDetail/pickTask.vue

@@ -46,7 +46,7 @@
 
       <div>
         <label class="el-form-item-label">Mo票</label>
-        <el-input v-model="query.propC1" clearable placeholder="Mo票" style="width: 170px;" class="filter-item"
+        <el-input v-model="query.propC1" clearable placeholder="Mo票" style="width: 180px;" class="filter-item"
                   @keyup.enter.native="crud.toQuery"/>
         <label class="el-form-item-label">工单编号</label>
         <el-input v-model="query.orderNumber" clearable placeholder="工单编号" style="width: 170px;" class="filter-item"