rev:出入库流程兼容

2024-06-03 10:09:04 +08:00
parent e446f8b743
commit a243c910ce
85 changed files with 741 additions and 301 deletions
--- a/wms_pro/qd/src/views/wms/stor_manage/in/AddDialog.vue
+++ b/wms_pro/qd/src/views/wms/stor_manage/in/AddDialog.vue
@@ -46,10 +46,10 @@
          />
        </el-select>
      </el-form-item>
-      <el-form-item label="仓库" prop="stor_id">
+      <el-form-item label="仓库" prop="id">
        <label slot="label">仓库</label>
        <el-select
-          v-model="form.stor_id"
+          v-model="form.id"
          clearable
          class="filter-item"
          style="width: 210px"
@@ -57,9 +57,9 @@
        >
          <el-option
            v-for="item in storlist"
-            :key="item.stor_id"
+            :key="item.id"
            :label="item.stor_name"
-            :value="item.stor_id"
+            :value="item.id"
          />
        </el-select>
      </el-form-item>
@@ -278,7 +278,7 @@ const defaultForm = {
  bill_type: '',
  remark: '',
  workshop_id: '',
-  stor_id: '',
+  id: '',
  biz_date: new Date(),
  create_mode: '',
  tableData: [],
--- a/wms_pro/qd/src/views/wms/stor_manage/in/DivDialog.vue
+++ b/wms_pro/qd/src/views/wms/stor_manage/in/DivDialog.vue
@@ -289,7 +289,7 @@ export default {
  data() {
    return {
      dialogVisible: false,
-      stor_id: '1528627995269533696',
+      id: '1528627995269533696',
      sect_id: '1528631043496742912',
      sectProp: null,
      structShow: false,
@@ -305,7 +305,7 @@ export default {
        dtl_row: null,
        storage_qty: '',
        sect_id: '',
-        stor_id: '',
+        id: '',
        point_code: null,
        vehicle_code: '',
        bucketunique: '',
@@ -335,7 +335,7 @@ export default {
      }
    },
    open() {
-      crudSectattr.getSect({ 'stor_id': this.storId }).then(res => {
+      crudSectattr.getSect({ 'id': this.storId }).then(res => {
        this.sects = res.content
      })
      const area_type = 'A1_CPRK01'
@@ -548,21 +548,21 @@ export default {

      this.sectProp = val
      if (val.length === 1) {
-        this.stor_id = val[0]
+        this.id = val[0]
        this.sect_id = ''
      }
      if (val.length === 0) {
        this.sect_id = ''
-        this.stor_id = ''
+        this.id = ''
      }
      if (val.length === 2) {
-        this.stor_id = val[0]
+        this.id = val[0]
        this.sect_id = val[1]
      }
    },
    tableChanged(row) {
      this.form.sect_id = this.sect_id
-      this.form.stor_id = this.stor_id
+      this.form.id = this.id
      this.dis_row.struct_id = row.struct_id
      this.divBtn = true
      crudProductIn.divStruct(this.dis_row).then(res => {
@@ -595,7 +595,7 @@ export default {
        }
        this.divBtn = true

-        this.dis_row.stor_id = this.stor_id.toString()
+        this.dis_row.id = this.id.toString()
        this.dis_row.sect_id = this.sect_id.toString()
        this.dis_row.vehicle_overstruct_type = this.form.vehicle_overstruct_type
        crudProductIn.divStruct(this.dis_row).then(res => {
@@ -609,7 +609,7 @@ export default {
          this.divBtn = false
        })
      } else {
-        if (!this.stor_id) {
+        if (!this.id) {
          this.crud.notify('请先选择仓库！', CRUD.NOTIFICATION_TYPE.INFO)
          return
        }
--- a/wms_pro/qd/src/views/wms/stor_manage/in/GroupDickDialog.vue
+++ b/wms_pro/qd/src/views/wms/stor_manage/in/GroupDickDialog.vue
@@ -243,7 +243,7 @@ export default {
      dialogVisible: false,
      GroupShow: false,
      click_Row: {},
-      stor_id: '1528627995269533696',
+      id: '1528627995269533696',
      sect_id: '1528631043496742912',
      sectProp: null,
      structShow: false,
--- a/wms_pro/qd/src/views/wms/stor_manage/in/ViewDialog.vue
+++ b/wms_pro/qd/src/views/wms/stor_manage/in/ViewDialog.vue
@@ -150,7 +150,7 @@
        <el-table-column prop="point_code1" label="起始位置" align="center" width="120"/>
        <el-table-column prop="point_code2" label="目的位置" align="center" width="120"/>
        <el-table-column prop="task_code" label="任务号" align="center" />
-        <el-table-column prop="task_status" label="任务状态" align="center" :formatter="formatStatus"/>
+        <el-table-column prop="status" label="任务状态" align="center" :formatter="formatStatus"/>
        <el-table-column prop="source_form_type" label="源单类型" align="center" width="150"/>
        <el-table-column show-overflow-tooltip prop="source_form_id" label="源单id" align="center" width="150"/>
      </el-table>
@@ -260,7 +260,7 @@ export default {
      }
    },
    formatStatus(row) {
-      return this.dict.label.FORM_STATUS[row.task_status]
+      return this.dict.label.FORM_STATUS[row.status]
    },
    formatBaseType(row) {
      return this.dict.label.PCS_SAL_TYPE[row.base_bill_type]
--- a/wms_pro/qd/src/views/wms/stor_manage/in/index.vue
+++ b/wms_pro/qd/src/views/wms/stor_manage/in/index.vue
@@ -285,7 +285,7 @@ export default {
    divOpen() {
      crudProductIn.getIosInvDtl({ 'bill_code': this.currentRow.bill_code }).then(res => {
        this.openParam = res
-        this.storId = this.currentRow.stor_id
+        this.storId = this.currentRow.id
        this.billType = this.currentRow.bill_type
        this.divShow = true
      })
--- a/wms_pro/qd/src/views/wms/stor_manage/out/GroupDickDialog.vue
+++ b/wms_pro/qd/src/views/wms/stor_manage/out/GroupDickDialog.vue
@@ -243,7 +243,7 @@ export default {
      dialogVisible: false,
      GroupShow: false,
      click_Row: {},
-      stor_id: '1528627995269533696',
+      id: '1528627995269533696',
      sect_id: '1528631043496742912',
      sectProp: null,
      structShow: false,
--- a/wms_pro/qd/src/views/wms/stor_manage/out/TaskDialog.vue
+++ b/wms_pro/qd/src/views/wms/stor_manage/out/TaskDialog.vue
@@ -147,7 +147,7 @@
        <el-table-column prop="point_code1" label="任务起始位置" align="center" width="120"/>
        <el-table-column prop="point_code2" label="任务目的位置" align="center" width="120"/>
        <el-table-column prop="task_code" label="任务号" align="center" />
-        <el-table-column prop="task_status" label="任务状态" align="center" :formatter="formatStatus"/>
+        <el-table-column prop="status" label="任务状态" align="center" :formatter="formatStatus"/>
        <el-table-column prop="source_form_type" label="源单类型" align="center" width="150"/>
        <el-table-column show-overflow-tooltip prop="source_form_id" label="源单id" align="center" width="150"/>
      </el-table>
@@ -277,7 +277,7 @@ export default {
      data.pop = true
    },
    formatStatus(row) {
-      return this.statusEnum.label.FORM_STATUS[row.task_status]
+      return this.statusEnum.label.FORM_STATUS[row.status]
    },
    close() {
      this.form.tableMater = []
@@ -460,21 +460,21 @@ export default {

      this.sectProp = val
      if (val.length === 1) {
-        this.stor_id = val[0]
+        this.id = val[0]
        this.sect_id = ''
      }
      if (val.length === 0) {
        this.sect_id = ''
-        this.stor_id = ''
+        this.id = ''
      }
      if (val.length === 2) {
-        this.stor_id = val[0]
+        this.id = val[0]
        this.sect_id = val[1]
      }
    },
    tableChanged(row) {
      this.form.sect_id = this.sect_id
-      this.form.stor_id = this.stor_id
+      this.form.id = this.id
      this.dis_row.struct_id = row.struct_id
      this.divBtn = true
    },
--- a/wms_pro/qd/src/views/wms/stor_manage/out/ViewDialog.vue
+++ b/wms_pro/qd/src/views/wms/stor_manage/out/ViewDialog.vue
@@ -131,9 +131,9 @@
        <el-table-column prop="point_code1" label="任务起始位置" align="center" width="120"/>
        <el-table-column prop="point_code2" label="任务目的位置" align="center" width="120"/>
        <el-table-column prop="task_code" label="任务号" align="center" />
-        <el-table-column prop="task_status" label="任务状态">
+        <el-table-column prop="status" label="任务状态">
          <template slot-scope="scope">
-            {{ statusEnum.label.FORM_STATUS[scope.row.task_status] }}
+            {{ statusEnum.label.FORM_STATUS[scope.row.status] }}
          </template>
        </el-table-column>
        <el-table-column prop="source_form_type" label="源单类型" align="center" width="150"/>