add：临时通道移库

2023-05-18 17:37:02 +08:00
parent e8abec2f26
commit 1ab3878fe2
14 changed files with 675 additions and 61 deletions
--- a/lms/nladmin-ui/src/views/system/monitor/device/structStage.js
+++ b/lms/nladmin-ui/src/views/system/monitor/device/structStage.js
@@ -30,3 +30,11 @@ export function autoWeb() { // 查询立库监控数据
    method: 'post'
  })
 }
+
+export function queryNum(data) { // 获取个数
+  return request({
+    url: 'api/autoWeb/queryNum',
+    method: 'post',
+    data
+  })
+}
--- a/lms/nladmin-ui/src/views/wms/agvrush/devicecharge/index.vue
+++ b/lms/nladmin-ui/src/views/wms/agvrush/devicecharge/index.vue
@@ -146,6 +146,7 @@ export default {
    }
  },
  mounted() {
+    this.query.is_fault = '1'
    this.init()
  },
  beforeDestroy() {
--- a/lms/nladmin-ui/src/views/wms/sendout/outone/index.vue
+++ b/lms/nladmin-ui/src/views/wms/sendout/outone/index.vue
@@ -1,5 +1,47 @@
 <template>
  <div>
+    <el-row style="padding-top: 10px;padding-left: 10px;padding-bottom: 30px">
+      <el-form
+        :inline="true"
+        class="demo-form-inline"
+        label-position="right"
+        label-width="100px"
+        label-suffix=":"
+      >
+        <el-form-item label="发货区层数">
+          <el-select
+            v-model="stageParam"
+            size="mini"
+            placeholder="请选择"
+            class="filter-item"
+            @change="changeStage"
+          >
+            <el-option
+              v-for="item in layerList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="有货点位">
+          <el-input
+            v-model="numData.haveMoney"
+            disabled
+            style="width: 80px"
+            size="mini"
+          />
+        </el-form-item>
+        <el-form-item label="无货点位">
+          <el-input
+            v-model="numData.unMoney"
+            disabled
+            style="width: 80px"
+            size="mini"
+          />
+        </el-form-item>
+      </el-form>
+    </el-row>
    <el-row>
      <div id="container" className="container" />
    </el-row>
@@ -56,7 +98,7 @@ import '@logicflow/extension/lib/style/index.css'

 import { LogicFlow } from '@logicflow/core'
 import { registerCustomElement } from '@/views/system/logicflow/editor/components/node'
-import { getStructByCodesFs, unLockPoint } from '@/views/system/monitor/device/structStage'
+import { getStructByCodesFs, unLockPoint, queryNum } from '@/views/system/monitor/device/structStage'
 let data = {}
 let lf = ''
 export default {
@@ -82,11 +124,21 @@ export default {
      },
      allStructMsg: [],
      msgTop: '200px',
-      msgLeft: '200px'
+      msgLeft: '200px',
+      layerList: [
+        { 'label': '发货1层', 'value': 'FS_1' },
+        { 'label': '发货2层', 'value': 'FS_2' }
+      ],
+      numData: {
+        haveMoney: null,
+        unMoney: null
+      },
+      layerNum: '1'
    }
  },
  mounted() {
    this.init()
+    this.queryNum()
  },
  beforeDestroy() {
    // js提供的clearInterval方法用来清除定时器
@@ -176,10 +228,12 @@ export default {
      this.timer = setInterval(() => { // 定时刷新设备的状态信息
        console.log('定时器启动')
        this.initStatus()
+        this.queryNum()
      }, 10000)
    },
    initStatus() { // 初始化数据
      let resion = {}
+      debugger
      resion = lf.getGraphData().nodes.map(item => ({ id: item.id, struct_id: item.properties.struct_id }))
      getStructByCodesFs(resion).then(res => {
        this.allStructMsg = res
@@ -231,6 +285,10 @@ export default {
            const obj = { name: '木箱总重', value: data1[val] }
            this.arr.push(obj)
          }
+          if (val === 'container_weight' && data1.container_weight) {
+            const obj = { name: '子卷净重', value: data1[val] }
+            this.arr.push(obj)
+          }
        }
        if (data.length > 1) { // 显示子卷
          for (let i = 0; i < data.length; i++) {
@@ -264,11 +322,27 @@ export default {
      unLockPoint(this.form).then(res => {
        this.dialogFormVisible1 = false
        this.initStageData()
+        this.queryNum()
        this.$message({
          message: '解绑成功',
          type: 'success'
        })
      })
+    },
+    changeStage(value) {
+      if (value === 'FS_1') {
+        this.layerNum = '1'
+      } else if (value === 'FS_2') {
+        this.layerNum = '2'
+      }
+      this.initStageData()
+      this.queryNum()
+    },
+    queryNum() {
+      queryNum({ 'layer_num': this.layerNum }).then(res => {
+        this.numData.haveMoney = res.haveMoney
+        this.numData.unMoney = res.unMoney
+      })
    }
  }
 }
--- a/lms/nladmin-ui/src/views/wms/st/inStor/moveStor/AddDialog.vue
+++ b/lms/nladmin-ui/src/views/wms/st/inStor/moveStor/AddDialog.vue
@@ -117,6 +117,22 @@
          :disabled="crud.status.view > 0"
        />
      </el-form-item>
+      <el-form-item v-if="form.bill_type === '30'" label="所属区域" prop="block_num">
+        <el-select
+          v-model="form.block_num"
+          clearable
+          placeholder="所属区域"
+          class="filter-item"
+          :disabled="crud.status.view > 0"
+        >
+          <el-option
+            v-for="item in blockList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
      <el-form-item label="备注" prop="remark">
        <label slot="label">备&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注:</label>
        <el-input
@@ -137,6 +153,7 @@
        <slot name="left" />
        <el-button
          slot="left"
+          v-if="form.bill_type !== '30'"
          class="filter-item"
          type="primary"
          icon="el-icon-plus"
@@ -244,8 +261,9 @@ import crudUserStor from '@/views/wms/basedata/st/userStor/userStor'
 const defaultForm = {
  bill_code: '',
  stor_id: '1582991156504039424',
-  stor_code: '',
-  stor_name: '',
+  stor_code: 'AC01',
+  stor_name: '兰州仓库',
+  block_num: null,
  bill_status: '10',
  total_qty: '0',
  detail_count: '0',
@@ -279,6 +297,41 @@ export default {
      storlist: [],
      invtypelist: [],
      layer_num: null,
+      blockList: [
+        { 'label': '101', 'value': '101' },
+        { 'label': '103', 'value': '103' },
+        { 'label': '105', 'value': '105' },
+        { 'label': '107', 'value': '107' },
+        { 'label': '109', 'value': '109' },
+        { 'label': '111', 'value': '111' },
+        { 'label': '113', 'value': '113' },
+        { 'label': '115', 'value': '115' },
+        { 'label': '117', 'value': '117' },
+        { 'label': '119', 'value': '119' },
+        { 'label': '121', 'value': '121' },
+        { 'label': '201', 'value': '201' },
+        { 'label': '203', 'value': '203' },
+        { 'label': '205', 'value': '205' },
+        { 'label': '207', 'value': '207' },
+        { 'label': '209', 'value': '209' },
+        { 'label': '211', 'value': '211' },
+        { 'label': '213', 'value': '213' },
+        { 'label': '215', 'value': '215' },
+        { 'label': '217', 'value': '217' },
+        { 'label': '219', 'value': '219' },
+        { 'label': '221', 'value': '221' },
+        { 'label': '301', 'value': '301' },
+        { 'label': '303', 'value': '303' },
+        { 'label': '305', 'value': '305' },
+        { 'label': '307', 'value': '307' },
+        { 'label': '309', 'value': '309' },
+        { 'label': '311', 'value': '311' },
+        { 'label': '313', 'value': '313' },
+        { 'label': '315', 'value': '315' },
+        { 'label': '317', 'value': '317' },
+        { 'label': '319', 'value': '319' },
+        { 'label': '321', 'value': '321' }
+      ],
      rules: {
        stor_id: [
          { required: true, message: '仓库不能为空', trigger: 'blur' }
@@ -320,7 +373,6 @@ export default {
      })
    },
    [CRUD.HOOK.afterToView]() {
-      debugger
      handmovestor.getOutBillDtl({ 'moveinv_id': this.form.moveinv_id }).then(res => {
        this.form.tableData = res
        // 将明细变成不可编辑
@@ -332,7 +384,6 @@ export default {
      })
    },
    bill_statusFormat(row) {
-      debugger
      return this.dict.label.work_status[row.work_status]
    },
    quality_scodeFormat(row) {
@@ -470,13 +521,20 @@ export default {
      }
    },
    [CRUD.HOOK.beforeSubmit]() {
-      if (this.form.tableData.length === 0) {
-        this.crud.notify('请至少选择一条明细', CRUD.NOTIFICATION_TYPE.INFO)
-        return false
-      }
-      for (let i = 0; i < this.form.tableData.length; i++) {
-        if (!this.form.tableData[i].edit) {
-          this.crud.notify('尚有未完成编辑的物料明细序号' + (i + 1) + '，请检查！')
+      if (this.form.bill_type !== '30') {
+        if (this.form.tableData.length === 0) {
+          this.crud.notify('请至少选择一条明细', CRUD.NOTIFICATION_TYPE.INFO)
+          return false
+        }
+        for (let i = 0; i < this.form.tableData.length; i++) {
+          if (!this.form.tableData[i].edit) {
+            this.crud.notify('尚有未完成编辑的物料明细序号' + (i + 1) + '，请检查！')
+            return false
+          }
+        }
+      } else {
+        if (!this.form.block_num) {
+          this.crud.notify('请选择所属区域', CRUD.NOTIFICATION_TYPE.INFO)
          return false
        }
      }
--- a/lms/nladmin-ui/src/views/wms/st/inStor/moveStor/index.vue
+++ b/lms/nladmin-ui/src/views/wms/st/inStor/moveStor/index.vue
@@ -303,6 +303,17 @@ export default {
      return row.bill_status !== '99'
    },
    taskOpen() {
+      this.loadingConfirm = true
+      debugger
+      const a = this.currentRow
+      handmovestor.handdown({ 'moveinv_id': this.currentRow.moveinv_id, 'bill_type': this.currentRow.bill_type }).then(res => {
+        this.querytable()
+        this.loadingConfirm = false
+      }).catch(() => {
+        this.loadingConfirm = false
+      })
+    },
+    taskOpen2() {
      this.loadingConfirm = true
      handmovestor.handdown({ 'moveinv_id': this.currentRow.moveinv_id }).then(res => {
        this.querytable()