opt:整理出入库单代码，去除弃用代码

2024-10-30 14:18:26 +08:00
parent 2efdc243fb
commit 71fc99ad9f
18 changed files with 15 additions and 1580 deletions
--- a/lms/nladmin-ui/src/views/wms/st/inAndOutReturn/inandoutreturn.js
+++ b/lms/nladmin-ui/src/views/wms/st/inAndOutReturn/inandoutreturn.js
@@ -56,12 +56,4 @@ export function disupload(data) {
  })
 }

-export function getType(data) {
-  return request({
-    url: '/api/inandoutreturn/getType',
-    method: 'post',
-    data
-  })
-}
-
-export default { add, edit, del, upload, uploadMES, uploadSAP, disupload, getType }
+export default { add, edit, del, upload, uploadMES, uploadSAP, disupload }
--- a/lms/nladmin-ui/src/views/wms/st/inbill/StructUpdateDialog.vue
+++ b/lms/nladmin-ui/src/views/wms/st/inbill/StructUpdateDialog.vue
@@ -1,268 +0,0 @@
-<template>
-  <el-dialog
-    title="任务修改"
-    append-to-body
-    :visible.sync="dialogVisible"
-    destroy-on-close
-    fullscreen
-    width="1000px"
-    @close="close"
-    @open="open"
-  >
-
-    <el-row :gutter="20">
-      <el-col :span="20" style="border: 1px solid white">
-        <span />
-      </el-col>
-      <el-col :span="4">
-        <span>
-          <el-button icon="el-icon-check" size="mini" :loading="crud.cu === 2" type="primary" @click="submit">确定</el-button>
-          <el-button icon="el-icon-close" size="mini" type="info" @click="dialogVisible = false">关闭</el-button>
-        </span>
-      </el-col>
-    </el-row>
-
-    <el-form ref="taskForm" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true" :model="form" size="mini" label-width="85px" label-suffix=":">
-      <el-form-item label="任务号" prop="task_code">
-        <label slot="label">任&nbsp;&nbsp;务&nbsp;号:</label>
-        <el-input v-model="form.task_code" disabled style="width: 210px" />
-      </el-form-item>
-      <el-form-item label="存储载具" prop="storagevehicle_code">
-        <el-input v-model="form.storagevehicle_code" disabled style="width: 210px" />
-      </el-form-item>
-      <el-form-item label="原入库点" prop="point_code">
-        <el-input v-model="form.point_code" disabled style="width: 210px" />
-      </el-form-item>
-
-      <el-form-item label="入库点" prop="new_point_code">
-        <label slot="label">入&nbsp;&nbsp;库&nbsp;点:</label>
-        <el-select
-          v-model="form.new_point_code"
-          clearable
-          placeholder="请选择"
-          class="filter-item"
-          style="width: 210px"
-        >
-          <el-option
-            v-for="item in pointlist"
-            :key="item.point_code"
-            :label="item.point_code"
-            :value="item.point_code"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="原货位" prop="struct_code">
-        <label slot="label">原&nbsp;&nbsp;货&nbsp;位:</label>
-        <el-input v-model="form.struct_code" disabled style="width: 210px" />
-      </el-form-item>
-      <el-form-item label="新货位" prop="new_struct_code">
-        <label slot="label">新&nbsp;&nbsp;货&nbsp;位:</label>
-        <el-input v-model="form.new_struct_code" disabled style="width: 210px" />
-      </el-form-item>
-      <el-form-item label="所属库区" prop="new_struct_code">
-        <el-cascader
-          v-model="query.sect"
-          style="width: 210px"
-          placeholder="所属库区"
-          :options="sects"
-          :props="{ checkStrictly: true }"
-          clearable
-          @change="sectQueryChange"
-        />
-      </el-form-item>
-      <el-form-item label="模糊查询" prop="struct_code">
-        <el-input
-          v-model="query.search"
-          clearable
-          style="width: 200px"
-          size="mini"
-          placeholder="输入货位编码、名称"
-          prefix-icon="el-icon-search"
-          class="filter-item"
-        />
-      </el-form-item>
-      <rrOperation />
-    </el-form>
-
-    <!--表格渲染-->
-    <el-table
-      ref="table"
-      v-loading="crud.loading"
-      :data="crud.data"
-      style="width: 100%"
-      :row-class-name="tableRowClassName"
-      highlight-current-row
-      border
-      :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
-      @row-click="clcikRow"
-      @select="handleSelectionChange"
-      @select-all="onSelectAll"
-    >
-      <el-table-column prop="struct_code" label="货位编码" />
-      <el-table-column prop="struct_name" label="货位名称" />
-      <el-table-column prop="material_height_type_name" label="高度类型" />
-      <el-table-column prop="sect_name" label="库区名称" />
-    </el-table>
-    <!--分页组件-->
-    <pagination />
-
-  </el-dialog>
-</template>
-
-<script>
-
-import CRUD, { header, presenter } from '@crud/crud'
-import rrOperation from '@crud/RR.operation'
-import crudOperation from '@crud/CRUD.operation'
-import pagination from '@crud/Pagination'
-import crudStructattr from '@/views/wms/basedata/st/struct/structattr'
-import crudSectattr from '@/views/wms/basedata/st/sect/sectattr'
-import crudRawAssist from '@/views/wms/st/inbill/rawassist'
-import crudPoint from '@/views/wms/sch/point'
-
-export default {
-  name: 'StructDiv',
-  components: { crudOperation, rrOperation, pagination },
-  cruds() {
-    return CRUD({
-      title: '仓位',
-      optShow: {},
-      url: 'api/structattr',
-      idField: 'struct_id',
-      sort: 'struct_id,desc',
-      crudMethod: { ...crudStructattr }
-    })
-  },
-  mixins: [presenter(), header()],
-  props: {
-    dialogShow: {
-      type: Boolean,
-      default: false
-    },
-    sectProp: {
-      type: Object,
-      default: null
-    },
-    bucketForm: {
-      type: Object,
-      default: null
-    }
-  },
-  data() {
-    return {
-      sects: [],
-      classes: [],
-      pointlist: [],
-      dialogVisible: false,
-      sectProp: null,
-      checkrow: {},
-      form: {
-        task_id: '',
-        task_code: '',
-        storagevehicle_code: '',
-        point_code: '',
-        new_point_code: '',
-        struct_code: '',
-        new_struct_code: ''
-      },
-      rows: []
-    }
-  },
-  watch: {
-    dialogShow: {
-      handler(newValue, oldValue) {
-        this.dialogVisible = newValue
-      }
-    },
-    sectProp: {
-      handler(newValue, oldValue) {
-        this.sectProp = newValue
-      }
-    },
-    bucketForm: {
-      handler(newValue, oldValue) {
-        this.form = newValue
-      }
-    }
-  },
-  methods: {
-    [CRUD.HOOK.beforeRefresh]() {
-      this.crud.query.lock_type = '1'
-    },
-    open() {
-      crudSectattr.getSect({ 'is_materialstore': '1', 'sect_type_attr': '00' }).then(res => {
-        this.sects = res.content
-      })
-      crudPoint.getPoint({ 'area_type': '21' }).then(res => {
-        this.pointlist = res
-      })
-      if (this.sectProp) {
-        this.query.sect = this.sectProp
-        if (this.sectProp.length === 1) {
-          this.query.stor_id = this.sectProp[0]
-          this.query.sect_id = ''
-        }
-        if (this.sectProp.length === 0) {
-          this.query.sect_id = ''
-          this.query.stor_id = ''
-        }
-        if (this.sectProp.length === 2) {
-          this.query.stor_id = this.sectProp[0]
-          this.query.sect_id = this.sectProp[1]
-        }
-      }
-      this.crud.toQuery()
-    },
-    clcikRow(row, column, event) {
-      this.form.new_struct_code = row.struct_code
-    },
-    tableRowClassName({ row, rowIndex }) {
-      row.index = rowIndex
-    },
-    sectQueryChange(val) {
-      if (val.length === 1) {
-        this.query.stor_id = val[0]
-        this.query.sect_id = ''
-      }
-      if (val.length === 0) {
-        this.query.sect_id = ''
-        this.query.stor_id = ''
-      }
-      if (val.length === 2) {
-        this.query.stor_id = val[0]
-        this.query.sect_id = val[1]
-      }
-    },
-    handleSelectionChange(val, row) {
-      if (val.length > 1) {
-        this.$refs.table.clearSelection()
-        this.$refs.table.toggleRowSelection(val.pop())
-      } else {
-        this.checkrow = row
-      }
-    },
-    onSelectAll() {
-      this.$refs.table.clearSelection()
-    },
-    close() {
-      this.crud.resetQuery()
-      this.query.sect = null
-      this.$emit('update:dialogShow', false)
-    },
-    submit() {
-      this.crud.resetQuery()
-      crudRawAssist.updateTask(this.form).then(res => {
-        this.$emit('update:dialogShow', false)
-        this.$emit('updateCommit', this.checkrow)
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-::v-deep .el-dialog__body {
-  padding-top: 0px;
-}
-</style>
-
--- a/lms/nladmin-ui/src/views/wms/st/inbill/TaskDialog.vue
+++ b/lms/nladmin-ui/src/views/wms/st/inbill/TaskDialog.vue
@@ -64,16 +64,6 @@
      <span class="crud-opts-right2">
        <!--左侧插槽-->
        <slot name="left" />
-    <!--    <el-button
-          slot="left"
-          class="filter-item"
-          type="primary"
-          icon="el-icon-plus"
-          size="mini"
-          @click="updateTask()"
-        >
-          修改
-        </el-button>-->
        <el-button
          slot="left"
          class="filter-item"
@@ -104,16 +94,6 @@
        >
          标识完成
        </el-button>
-    <!--    <el-button
-          slot="left"
-          class="filter-item"
-          type="warning"
-          icon="el-icon-check"
-          size="mini"
-          @click="cancelTask()"
-        >
-          取消完成
-        </el-button>-->
      </span>
    </div>
    <el-card class="box-card" shadow="never" :body-style="{padding:'0'}">
@@ -144,19 +124,16 @@
      </el-table>
    </el-card>

-    <StructUpdateDiv :dialog-show.sync="structShow" :sect-prop="sectProp" :bucket-form="bucketForm" @updateCommit="updateCommit" />
-
  </el-dialog>
 </template>

 <script>
 import CRUD, { crud } from '@crud/crud'
-import StructUpdateDiv from '@/views/wms/st/inbill/StructUpdateDialog'
 import crudRawAssist from '@/views/wms/st/inbill/rawassist'

 export default {
  name: 'TaskDialog',
-  components: { StructUpdateDiv },
+  components: {},
  mixins: [crud()],
  dicts: ['io_bill_status', 'task_status'],
  props: {
@@ -182,13 +159,10 @@ export default {
      tableDtl: [],
      stor_id: '',
      sect_id: '',
-      sectProp: null,
-      structShow: false,
      sects: [],
      dis_row: null,
      fullscreenLoading: false,
      bucketParam: null,
-      bucketForm: null,
      bucketDtlShow: false,
      form: {
        tableMater: [],
@@ -270,28 +244,6 @@ export default {
        this.fullscreenLoading = false
      })
    },
-    cancelTask() {
-      if (!this.dis_row) {
-        this.crud.notify('请选择一条任务项', CRUD.NOTIFICATION_TYPE.INFO)
-        return
-      }
-      if (this.dis_row.work_status !== '99') {
-        this.crud.notify('只能对状态为完成的任务进行取消！', CRUD.NOTIFICATION_TYPE.INFO)
-        return
-      }
-      this.fullscreenLoading = true
-      crudRawAssist.cancelTask(this.dis_row).then(res => {
-        this.fullscreenLoading = false
-        crudRawAssist.queryTask(this.form.dtl_row).then(res2 => {
-          this.form.tableMater = res2
-          this.crud.notify('取消确认任务成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
-        }).catch(() => {
-          this.fullscreenLoading = false
-        })
-      }).catch(() => {
-        this.fullscreenLoading = false
-      })
-    },
    reIssueTask() {
      if (!this.dis_row) {
        this.crud.notify('请选择一条任务项', CRUD.NOTIFICATION_TYPE.INFO)
@@ -316,25 +268,6 @@ export default {
        this.form.tableMater = res
      })
    },
-    updateTask() {
-      if (!this.dis_row) {
-        this.crud.notify('请选择一条任务项', CRUD.NOTIFICATION_TYPE.INFO)
-        return
-      }
-      debugger
-      if (this.dis_row.work_status !== '01') {
-        this.crud.notify('只能对状态为生成的任务进行修改！', CRUD.NOTIFICATION_TYPE.INFO)
-        return
-      }
-      this.structShow = true
-      this.bucketForm = this.dis_row
-    },
-    updateCommit() {
-      crudRawAssist.queryTask(this.form.dtl_row).then(res => {
-        this.form.tableMater = res
-        this.crud.notify('修改任务成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
-      })
-    },
    checkedChange(val) {
      this.form.dtl_row.checked = this.form.checked
      crudRawAssist.queryTask(this.form.dtl_row).then(res => {
--- a/lms/nladmin-ui/src/views/wms/st/inbill/rawassist.js
+++ b/lms/nladmin-ui/src/views/wms/st/inbill/rawassist.js
@@ -128,14 +128,6 @@ export function bucketDtl(data) {
  })
 }

-export function updateTask(data) {
-  return request({
-    url: '/api/in/rawAssist/updateTask',
-    method: 'post',
-    data
-  })
-}
-
 export function delTask(data) {
  return request({
    url: '/api/in/rawAssist/delTask',
@@ -160,14 +152,6 @@ export function confirmTask(data) {
  })
 }

-export function cancelTask(data) {
-  return request({
-    url: '/api/in/rawAssist/cancelTask',
-    method: 'post',
-    data
-  })
-}
-
 export function confirm(data) {
  return request({
    url: '/api/in/rawAssist/confirm',
@@ -176,22 +160,6 @@ export function confirm(data) {
  })
 }

-export function backConfirm(data) {
-  return request({
-    url: '/api/in/rawAssist/backConfirm',
-    method: 'post',
-    data
-  })
-}
-
-export function delDis(data) {
-  return request({
-    url: '/api/in/rawAssist/delDis',
-    method: 'post',
-    data
-  })
-}
-
 export function queryBoxMater(data) {
  return request({
    url: '/api/in/rawAssist/queryBoxMater',
@@ -201,5 +169,5 @@ export function queryBoxMater(data) {
 }

 export default { add, edit, del, insertDtl, getIODtl, commit, checkVehicle,
-  deleteDisDtl, getDisDtl, divStruct, allDivStruct, unDivStruct, divPoint, delDis, queryBoxMater,
-  queryTask, bucketDtl, updateTask, delTask, reIssueTask, confirmTask, cancelTask, confirm, backConfirm }
+  deleteDisDtl, getDisDtl, divStruct, allDivStruct, unDivStruct, divPoint, queryBoxMater,
+  queryTask, bucketDtl, delTask, reIssueTask, confirmTask, confirm }
--- a/lms/nladmin-ui/src/views/wms/st/outbill/AddDialog.vue
+++ b/lms/nladmin-ui/src/views/wms/st/outbill/AddDialog.vue
@@ -389,11 +389,6 @@ export default {
      this.materShow = true
      this.nowindex = index
      this.nowrow = row
-      /*     checkoutbill.paramByCodeType({ 'bill_type': this.form.bill_type }).then(res => {
-             this.materType = res.materType
-             this.nowindex = index
-             this.nowrow = row
-           })*/
    },
    queryDtl(index, row) {
      if (this.form.bill_type === '') {
@@ -406,9 +401,6 @@ export default {
      }
      this.storId = this.form.stor_id
      this.dtlShow = true
-      /*    checkoutbill.paramByCodeType({ 'bill_type': this.form.bill_type }).then(res => {
-            this.materType = res.materType
-          })*/
    },
    tableChanged(rows) {
      rows.forEach((item) => {
--- a/lms/nladmin-ui/src/views/wms/st/outbill/DivDialog.vue
+++ b/lms/nladmin-ui/src/views/wms/st/outbill/DivDialog.vue
@@ -201,17 +201,6 @@
      <span v-if="mstrow.stor_id !== '1582991156504039455'" class="crud-opts-right2">
        <!--左侧插槽-->
        <slot name="left" />
-        <!--    <el-button
-          slot="left"
-          class="filter-item"
-          type="warning"
-          icon="el-icon-check"
-          size="mini"
-          :disabled="button4"
-          @click="setPoint()"
-        >
-          设置站点
-        </el-button>-->
        <el-button
          v-if="this.mstrow.bill_type !== '1011'"
          slot="left"
@@ -617,26 +606,6 @@ export default {
        })
      }
    },
-    setPoint() {
-      if (this.form2.point_code === '') {
-        this.crud.notify('请先选择站点！', CRUD.NOTIFICATION_TYPE.INFO)
-        return
-      }
-      if (this.currentDis.point_code) {
-        this.crud.notify('站点已设置！', CRUD.NOTIFICATION_TYPE.INFO)
-        return
-      }
-      if (this.currentDis.work_status !== '00') {
-        this.crud.notify('任务已生成！', CRUD.NOTIFICATION_TYPE.INFO)
-        return
-      }
-      if (this.currentDis.iostorinvdis_id !== null) {
-        this.currentDis.point_code = this.form2.point_code
-        checkoutbill.setPoint(this.currentDis).then(res => {
-          this.queryTableDdis(this.currentDis.iostorinvdtl_id)
-        })
-      }
-    },
    oneSetPoint2() {
      if (this.form2.point_code === '') {
        this.crud.notify('请先选择站点！', CRUD.NOTIFICATION_TYPE.INFO)
--- a/lms/nladmin-ui/src/views/wms/st/outbill/TaskDialog.vue
+++ b/lms/nladmin-ui/src/views/wms/st/outbill/TaskDialog.vue
@@ -82,17 +82,6 @@
        >
          标示完成
        </el-button>
- <!--       <el-button
-          slot="left"
-          class="filter-item"
-          type="primary"
-          icon="el-icon-close"
-          size="mini"
-          :disabled="button3"
-          @click="cancleTaskfinish"
-        >
-          取消完成
-        </el-button>-->
      </span>
    </div>
    <el-card class="box-card" shadow="never" :body-style="{padding:'0'}">
@@ -242,17 +231,6 @@ export default {
        })
      }
    },
-    cancleTaskfinish() {
-      if (this.currentDis != null) {
-        this.fullscreenLoading = true
-        checkoutbill.cancleTaskfinish(this.currentDis).then(res => {
-          this.queryTableDdis()
-          this.fullscreenLoading = false
-        }).catch(() => {
-          this.fullscreenLoading = false
-        })
-      }
-    },
    handleDtlCurrentChange(current) {
      if (current !== null) {
        this.tabledis = []
--- a/lms/nladmin-ui/src/views/wms/st/outbill/checkoutbill.js
+++ b/lms/nladmin-ui/src/views/wms/st/outbill/checkoutbill.js
@@ -102,20 +102,6 @@ export function oneCancel(data) {
    data
  })
 }
-export function setPoint(data) {
-  return request({
-    url: '/api/checkoutbill/setPoint',
-    method: 'post',
-    data
-  })
-}
-export function oneSetPoint(data) {
-  return request({
-    url: '/api/checkoutbill/oneSetPoint',
-    method: 'post',
-    data
-  })
-}
 export function getStructIvt(params) {
  return request({
    url: '/api/checkoutbill/getStructIvt',
@@ -151,40 +137,6 @@ export function finishTask(data) {
    data
  })
 }
-export function cancleTaskfinish(data) {
-  return request({
-    url: '/api/checkoutbill/cancleTaskfinish',
-    method: 'post',
-    data
-  })
-}
-export function paramByCodeType(data) {
-  return request({
-    url: '/api/checkoutbill/paramByCodeType',
-    method: 'post',
-    data
-  })
-}
-export function schAreaType(data) {
-  return request({
-    url: '/api/checkoutbill/schAreaType',
-    method: 'post',
-    data
-  })
-}
-export function backConfirm(data) {
-  return request({
-    url: '/api/checkoutbill/backConfirm',
-    method: 'post',
-    data
-  })
-}
-export function getType() {
-  return request({
-    url: '/api/checkoutbill/getType',
-    method: 'get'
-  })
-}
 export function moneySubmit(data) {
  return request({
    url: '/api/checkoutbill/moneySubmit',
@@ -262,4 +214,4 @@ export function saveUpdate(data) {
    data
  })
 }
-export default { add, edit, del, allDiv, allCancel, getOutBillDtl, getOutBillDis, getOutBillDis2, setPoint, oneSetPoint, getOutBillTask, getStructIvt, manualDiv, confirm, issueTask, finishTask, cancleTaskfinish, getInvTypes, paramByCodeType, schAreaType, backConfirm, getOutBillDisDtl, getType, allDivOne, moneySubmit, getDisNum, queryBox, getOutBillTask2, oneCancel, cancelTask, allSetPoint, oneSetPoint2, outReturn, updataIsOverdue, excelImport, saveUpdate }
+export default { add, edit, del, allDiv, allCancel, getOutBillDtl, getOutBillDis, getOutBillDis2, getOutBillTask, getStructIvt, manualDiv, confirm, issueTask, finishTask, getInvTypes, getOutBillDisDtl, allDivOne, moneySubmit, getDisNum, queryBox, getOutBillTask2, oneCancel, cancelTask, allSetPoint, oneSetPoint2, outReturn, updataIsOverdue, excelImport, saveUpdate }
--- a/lms/nladmin-ui/src/views/wms/st/outbill/index.vue
+++ b/lms/nladmin-ui/src/views/wms/st/outbill/index.vue
@@ -589,15 +589,6 @@ export default {
      }
    },
    printExcel(jo) {
-      /*if (jo.bill_type !== '1004' && jo.bill_type !== '1009') {
-        if (jo.shd_dtl_num === '') {
-          return this.crud.notify('客户为空！', CRUD.NOTIFICATION_TYPE.INFO)
-        }
-      }*/
-
-     /* if (jo.bill_type === '1004' || jo.bill_type === '1009') {
-        jo.shd_dtl_num = 44
-      }*/
      jo.shd_dtl_num = 44
      checkoutbill.getDisNum({ 'iostorinv_id': jo.iostorinv_id }).then(res => {
        const j = Math.ceil(res.num / jo.shd_dtl_num)