add:添加一体机批量入库/组盘

2023-08-04 14:23:32 +08:00
parent 99813b0410
commit 172ec8692c
24 changed files with 1300 additions and 67 deletions
--- a/mes/qd/src/views/wms/pcs/deliveryorder/UploadDialog.vue
+++ b/mes/qd/src/views/wms/pcs/deliveryorder/UploadDialog.vue
@@ -0,0 +1,116 @@
+<template>
+  <el-dialog
+    title="导入Excel文件"
+    append-to-body
+    :visible.sync="dialogVisible"
+    destroy-on-close
+    width="400px"
+    :show-close="true"
+    @close="close"
+    @open="open"
+  >
+    <el-upload
+      ref="upload"
+      class="upload-demo"
+      action=""
+      drag
+      :on-exceed="is_one"
+      :limit="1"
+      :auto-upload="false"
+      :multiple="false"
+      :show-file-list="true"
+      :on-change="uploadByJsqd"
+      :file-list="fileList"
+      accept=".xlsx,.xls"
+    >
+      <i class="el-icon-upload" />
+      <div class="el-upload__text">
+        将文件拖到此处，或
+        <em>点击上传</em>
+      </div>
+      <div slot="tip" class="el-upload__tip">只能上传Excel文件，且不超过10MB</div>
+    </el-upload>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="dialogVisible = false">取 消</el-button>
+      <el-button type="primary" @click="submit">确 定</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import crudSaleOrder from '@/views/wms/pcs/saleorder/saleOrder'
+import CRUD, { crud } from '@crud/crud'
+
+export default {
+  name: 'UploadDialog',
+  mixins: [crud()],
+  components: {},
+  props: {
+    dialogShow: {
+      type: Boolean,
+      default: false
+    },
+    openParam: {
+      type: String
+    }
+  },
+  data() {
+    return {
+      dialogVisible: false,
+      fileList: [],
+      file1: ''
+    }
+  },
+  watch: {
+    dialogShow: {
+      handler(newValue, oldValue) {
+        this.dialogVisible = newValue
+      }
+    },
+    openParam: {
+      handler(newValue, oldValue) {
+        this.opendtlParam = newValue
+      }
+    }
+  },
+  methods: {
+    open() {
+    },
+    close() {
+      this.$emit('update:dialogShow', false)
+    },
+    is_one() {
+      this.crud.notify('只能上传一个excel文件！', CRUD.NOTIFICATION_TYPE.WARNING)
+    },
+    // 文件校验方法
+    beforeAvatarUpload(file) {
+      // 不能导入大小超过2Mb的文件
+      if (file.size > 10 * 1024 * 1024) {
+        return false
+      }
+      return true
+    },
+    // 文件发生改变就会触发的事件
+    uploadByJsqd(file) {
+      this.file1 = file
+    },
+    submit() {
+      if (this.beforeAvatarUpload(this.file1)) {
+        this.fileList.name = this.file1.name
+        this.fileList.url = ''
+        var formdata = new FormData()
+        formdata.append('file', this.file1.raw)
+        // excelImport：请求接口 formdata：传递参数
+        crudSaleOrder.excelImport(formdata).then((res) => {
+          this.crud.notify('导入成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+          this.$emit('tableChanged3', '')
+          this.$emit('update:dialogShow', false)
+        })
+      } else {
+        this.crud.notify('文件过大，请上传小于10MB的文件〜', CRUD.NOTIFICATION_TYPE.WARNING)
+      }
+    }
+  }
+}
+</script>
+
--- a/mes/qd/src/views/wms/pcs/deliveryorder/index.vue
+++ b/mes/qd/src/views/wms/pcs/deliveryorder/index.vue
@@ -230,6 +230,7 @@ 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 UploadDialog from '@/views/wms/pcs/deliveryorder/UploadDialog'
 import Dialog from '@/views/wms/pcs/deliveryorder/Dialog'
 import pagination from '@crud/Pagination'
 import Treeselect, {LOAD_CHILDREN_OPTIONS} from '@riophae/vue-treeselect'
@@ -261,7 +262,7 @@ const defaultForm = {
 export default {
  name: 'DeliveryOrder',
  dicts: ['PCS_DELIVER_TYPE', 'PCS_DELI_STATUS'],
-  components: {pagination, crudOperation, rrOperation, udOperation, Treeselect, Dialog},
+  components: {pagination, crudOperation, rrOperation, udOperation, Treeselect, Dialog, UploadDialog},
  mixins: [presenter(), header(), form(defaultForm), crud()],
  cruds() {
    return CRUD({
--- a/mes/qd/src/views/wms/storage_manage/product/bucketRecord/Dialog.vue
+++ b/mes/qd/src/views/wms/storage_manage/product/bucketRecord/Dialog.vue
@@ -0,0 +1,93 @@
+<template>
+  <el-dialog
+    title="发货单导入"
+    append-to-body
+    :visible.sync="dialogVisible"
+    destroy-on-close
+    :show-close="true"
+    width="500px"
+    v-loading.fullscreen.lock="fullscreenLoading"
+    @close="close"
+  >
+    <div class="head-container">
+      <div>
+        <!-- 搜索 -->
+        <el-form ref="form" :model="form1" :rules="rules" size="mini" label-width="110px">
+          <el-form-item label="日期区间：" prop="createTime">
+            <el-date-picker
+              v-model="form.createTime"
+              type="daterange"
+              value-format="yyyy-MM-dd"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+            />
+          </el-form-item>
+          <el-form-item label="发货单号:" prop="bill_code">
+            <el-input v-model="form.bill_code" style="width: 350px;"/>
+          </el-form-item>
+        </el-form>
+        <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="queryStruct">确认
+        </el-button>
+      </div>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+
+import CRUD, {header, presenter} from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import pagination from '@crud/Pagination'
+import DateRangePicker from '@/components/DateRangePicker/index'
+import crudSap from '@/api/wms/ext/sap'
+
+export default {
+  name: 'ImportOrder',
+  components: {rrOperation, pagination, DateRangePicker},
+  cruds() {
+  },
+  mixins: [presenter(), header()],
+  props: {
+    dialogShow: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      fullscreenLoading: false,
+      dialogVisible: false,
+      form: {}
+    }
+  },
+  watch: {
+    dialogShow: {
+      handler(newValue, oldValue) {
+        this.dialogVisible = newValue
+      }
+    }
+  },
+  methods: {
+    close() {
+      this.form = {}
+      this.$emit('update:dialogShow', false)
+      this.$emit('tableChanged', this.rows)
+    },
+    queryStruct() {
+
+      this.fullscreenLoading = true
+      if (this.form.createTime) {
+        this.form.date_begin = this.form.createTime[0]
+        this.form.date_end = this.form.createTime[1]
+      }
+      crudSap.getDeliveryNote(this.form).then(res => {
+        this.crud.notify(res.message, CRUD.NOTIFICATION_TYPE.SUCCESS)
+        this.fullscreenLoading = false
+      }).catch(() => {
+        this.fullscreenLoading = false
+      })
+    }
+  }
+}
+</script>
+
--- a/mes/qd/src/views/wms/storage_manage/product/bucketRecord/UploadDialog.vue
+++ b/mes/qd/src/views/wms/storage_manage/product/bucketRecord/UploadDialog.vue
@@ -0,0 +1,116 @@
+<template>
+  <el-dialog
+    title="导入Excel文件"
+    append-to-body
+    :visible.sync="dialogVisible"
+    destroy-on-close
+    width="400px"
+    :show-close="true"
+    @close="close"
+    @open="open"
+  >
+    <el-upload
+      ref="upload"
+      class="upload-demo"
+      action=""
+      drag
+      :on-exceed="is_one"
+      :limit="1"
+      :auto-upload="false"
+      :multiple="false"
+      :show-file-list="true"
+      :on-change="uploadByJsqd"
+      :file-list="fileList"
+      accept=".xlsx,.xls"
+    >
+      <i class="el-icon-upload" />
+      <div class="el-upload__text">
+        将文件拖到此处，或
+        <em>点击上传</em>
+      </div>
+      <div slot="tip" class="el-upload__tip">只能上传Excel文件，且不超过10MB</div>
+    </el-upload>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="dialogVisible = false">取 消</el-button>
+      <el-button type="primary" @click="submit">确 定</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import crudbucketrecord from '@/views/wms/storage_manage/product/bucketRecord/bucketrecord'
+import CRUD, { crud } from '@crud/crud'
+
+export default {
+  name: 'UploadDialog',
+  mixins: [crud()],
+  components: {},
+  props: {
+    dialogShow: {
+      type: Boolean,
+      default: false
+    },
+    openParam: {
+      type: String
+    }
+  },
+  data() {
+    return {
+      dialogVisible: false,
+      fileList: [],
+      file1: ''
+    }
+  },
+  watch: {
+    dialogShow: {
+      handler(newValue, oldValue) {
+        this.dialogVisible = newValue
+      }
+    },
+    openParam: {
+      handler(newValue, oldValue) {
+        this.opendtlParam = newValue
+      }
+    }
+  },
+  methods: {
+    open() {
+    },
+    close() {
+      this.$emit('update:dialogShow', false)
+    },
+    is_one() {
+      this.crud.notify('只能上传一个excel文件！', CRUD.NOTIFICATION_TYPE.WARNING)
+    },
+    // 文件校验方法
+    beforeAvatarUpload(file) {
+      // 不能导入大小超过2Mb的文件
+      if (file.size > 10 * 1024 * 1024) {
+        return false
+      }
+      return true
+    },
+    // 文件发生改变就会触发的事件
+    uploadByJsqd(file) {
+      this.file1 = file
+    },
+    submit() {
+      if (this.beforeAvatarUpload(this.file1)) {
+        this.fileList.name = this.file1.name
+        this.fileList.url = ''
+        var formdata = new FormData()
+        formdata.append('file', this.file1.raw)
+        crudbucketrecord.excelImport(formdata).then((res) => {
+          debugger
+          this.crud.notify('导入成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+          this.$emit('tableChanged3', '')
+          this.$emit('update:dialogShow', false)
+        })
+      } else {
+        this.crud.notify('文件过大，请上传小于10MB的文件〜', CRUD.NOTIFICATION_TYPE.WARNING)
+      }
+    }
+  }
+}
+</script>
+
--- a/mes/qd/src/views/wms/storage_manage/product/bucketRecord/bucketrecord.js
+++ b/mes/qd/src/views/wms/storage_manage/product/bucketRecord/bucketrecord.js
@@ -0,0 +1,75 @@
+import request from '@/utils/request'
+
+export function add(data) {
+  return request({
+    url: '/api/mdPbBucketrecord',
+    method: 'post',
+    data
+  })
+}
+
+export function del(ids) {
+  return request({
+    url: '/api/mdPbBucketrecord/',
+    method: 'delete',
+    data: ids
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: '/api/mdPbBucketrecord',
+    method: 'put',
+    data
+  })
+}
+
+export function addPersons(data) {
+  return request({
+    url: '/api/mdPbBucketrecord/addPersons',
+    method: 'post',
+    data
+  })
+}
+
+export function getHeader(data) {
+  return request({
+    url: '/api/mdPbBucketrecord/getHeader',
+    method: 'post',
+    data
+  })
+}
+
+export function getDeviceIdByUserId(data) {
+  return request({
+    url: '/api/mdPbBucketrecord/getDeviceIdByUserId',
+    method: 'post',
+    data
+  })
+}
+
+export function addDevices(data) {
+  return request({
+    url: '/api/mdPbBucketrecord/addDevices',
+    method: 'post',
+    data
+  })
+}
+
+export function deleteRow(data) {
+  return request({
+    url: '/api/mdPbBucketrecord/deleteRow',
+    method: 'delete',
+    data
+  })
+}
+
+export function excelImport(data) {
+  return request({
+    url: '/api/mdPbBucketrecord/excelImport',
+    method: 'post',
+    data
+  })
+}
+
+export default { add, edit, del, addPersons, getHeader, deleteRow, addDevices,excelImport }
--- a/mes/qd/src/views/wms/storage_manage/product/bucketRecord/index.vue
+++ b/mes/qd/src/views/wms/storage_manage/product/bucketRecord/index.vue
@@ -0,0 +1,256 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <div v-if="crud.props.searchToggle">
+        <!-- 搜索 -->
+        <el-form
+          :inline="true"
+          class="demo-form-inline"
+          label-position="right"
+          label-width="80px"
+          label-suffix=":"
+        >
+          <el-form-item label="订单号">
+            <el-input v-model="query.sale_code" clearable placeholder="订单号" style="width: 200px;"
+                      class="filter-item"/>
+          </el-form-item>
+          <el-form-item label="托盘号">
+            <el-input v-model="query.storagevehicle_code" clearable placeholder="托盘号" style="width: 200px;"
+                      class="filter-item"/>
+          </el-form-item>
+          <rrOperation :crud="crud"/>
+        </el-form>
+
+      </div>
+      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
+      <crudOperation :permission="permission">
+        <el-button
+          slot="right"
+          class="filter-item"
+          type="warning"
+          icon="el-icon-upload2"
+          size="mini"
+          @click="uploadShow = true"
+        >
+          导入
+        </el-button>
+      </crudOperation>
+      <!--表单组件-->
+      <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0"
+                 :title="crud.status.title">
+        <el-form
+          ref="form"
+          :inline="true"
+          :model="form"
+          label-width="160px"
+          style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;"
+        >
+          <el-form-item label="托盘号" prop="deliver_code">
+            <el-input v-model="form.storagevehicle_code" style="width: 200px;" />
+          </el-form-item>
+          <el-form-item label="销售单号" prop="deliver_code">
+            <el-input v-model="form.sale_code" style="width: 200px;" />
+          </el-form-item>
+          <el-form-item label="销售单明细" prop="seq_no">
+            <el-input v-model="form.seq_no" style="width: 200px;" />
+          </el-form-item>
+          <el-form-item label="物料编码" prop="material_code">
+            <el-input v-model="form.material_code" style="width: 200px;" />
+          </el-form-item>
+          <el-form-item label="物料规格" prop="material_spec">
+            <el-input-number v-model="form.material_spec" style="width: 200px;" />
+          </el-form-item>
+          <el-form-item label="数量" prop="storage_qty">
+            <el-input v-model="form.storage_qty" style="width: 200px;" />
+          </el-form-item>
+          <el-form-item label="计量单位" prop="unit_name">
+            <!-- unit_list-->
+            <el-select v-model="form.qty_unit_id" placeholder="" style="width: 200px">
+              <el-option
+                v-for="item in unit_list"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="组盘时间" prop="create_time">
+            <el-input v-model="form.create_time" style="width: 200px;" />
+          </el-form-item>
+          <el-form-item label="状态" prop="status">
+            <el-input v-model="form.status" style="width: 200px;" />
+          </el-form-item>
+        </el-form>
+
+        <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px"></el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="text" @click="crud.cancelCU">取消</el-button>
+          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
+        </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="storagevehicle_code" label="托盘号"/>
+        <el-table-column prop="sale_code" label="销售单号"/>
+        <el-table-column prop="seq_no" label="销售单明细"/>
+        <el-table-column prop="material_code" label="物料编码"/>
+        <el-table-column prop="material_spec" label="物料规格"/>
+        <el-table-column prop="storage_qty" label="数量"/>
+        <el-table-column prop="qty_unit_id" label="计量单位"/>
+        <el-table-column prop="create_time" label="组盘时间"/>
+        <el-table-column prop="status" label="状态">
+          <template slot-scope="scope">
+            {{ dict.label.PCS_DELI_STATUS[scope.row.status] }}
+          </template>
+        </el-table-column>
+      </el-table>
+      <!--分页组件-->
+      <pagination/>
+    </div>
+    <UploadDialog
+      :dialog-show.sync="uploadShow"
+      @tableChanged3="tableChanged3"
+    />
+    <Dialog :dialog-show.sync="dialogShow" />
+  </div>
+</template>
+
+<script>
+import crudbucketrecord from '@/views/wms/storage_manage/product/bucketRecord/bucketrecord'
+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 UploadDialog from '@/views/wms/storage_manage/product/bucketRecord/UploadDialog'
+import Dialog from '@/views/wms/storage_manage/product/bucketRecord/Dialog'
+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'
+
+const defaultForm = {
+  deliver_id: null,
+  deliver_code: null,
+  seq_no: null,
+  deliver_type: null,
+  material_id: null,
+  status: null,
+  delivery_qty: null,
+  cust_id: null,
+  qty_unit_id: null,
+  sale_id: null,
+  sale_code: null,
+  sale_seq_no: null,
+  create_id: null,
+  create_name: null,
+  create_time: null,
+  update_optid: null,
+  update_optname: null,
+  update_time: null,
+  cust_code: null,
+  cust_name: null
+}
+export default {
+  name: 'DeliveryOrder',
+  dicts: ['PCS_DELIVER_TYPE', 'PCS_DELI_STATUS'],
+  components: {pagination, crudOperation, rrOperation, udOperation, Treeselect, Dialog, UploadDialog},
+  mixins: [presenter(), header(), form(defaultForm), crud()],
+  cruds() {
+    return CRUD({
+      title: '发货单', url: '/api/mdPbBucketrecord', idField: 'bucket_record_id', sort: 'storagevehicle_code,desc',
+      optShow: {
+        add: true,
+        edit: false,
+        del: false,
+        reset: true,
+        download: false
+      },
+      crudMethod: {...crudbucketrecord}
+    })
+  },
+  data() {
+    return {
+      classes3: [],
+      uploadShow: false,
+      dialogShow: false,
+      permission: {},
+      rules: {},
+      unit_list: [{ value: 16, label: '个\\只' }],
+      queryTypeOptions: [
+        {key: 'deliver_code', display_name: '发货单号'}
+      ]
+    }
+  },
+  created() {
+    this.initClass3()
+  },
+  methods: {
+    queryClassId() {
+      const param = {
+        'class_idStr': this.class_idStr
+      }
+      crudClassstandard.queryClassById(param).then(res => {
+        this.classes = res.content.map(obj => {
+          if (obj.hasChildren) {
+            obj.children = null
+          }
+          return obj
+        })
+      })
+    },
+    tableChanged3() {
+      this.crud.toQuery()
+    },
+    importin() {
+      this.dialogShow = true
+    },
+    buildTree(classes) {
+      classes.forEach(data => {
+        if (data.children) {
+          this.buildTree(data.children)
+        }
+        if (data.hasChildren && !data.children) {
+          data.children = null // 重点代码
+        }
+      })
+    },
+    // 获取子节点数据
+    loadChildNodes({action, parentNode, callback}) {
+      if (action === LOAD_CHILDREN_OPTIONS) {
+        crudClassstandard.getClass({pid: parentNode.id}).then(res => {
+          parentNode.children = res.content.map(function (obj) {
+            if (obj.hasChildren) {
+              obj.children = null
+            }
+            return obj
+          })
+          setTimeout(() => {
+            callback()
+          }, 100)
+        })
+      }
+    },
+    initClass3() {
+      const param = {
+        parent_class_code: '07'
+      }
+      crudClassstandard.getClassType(param).then(res => {
+        const data = res.content
+        this.buildTree(data)
+        this.classes3 = data
+      })
+    },
+    // 钩子：在获取表格数据之前执行，false 则代表不获取数据
+    [CRUD.HOOK.beforeRefresh]() {
+      return true
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>