fix:移库、出库及基础功能业务流程修改

nladmin-ui/src/views/wms/decision_manage/strategy/AddDialog.vue

@@ -118,7 +118,9 @@ export default {
       strategyTypeList: [
         { 'label': '入库', 'value': '1' },
         { 'label': '出库', 'value': '2' },
-        { 'label': '通用', 'value': '3' }
+        { 'label': '通用', 'value': '3' },
+        { 'label': '空托盘入库', 'value': '4' },
+        { 'label': '空托盘出库', 'value': '5' }
       ],
       classTypeList: [
         { 'label': '实现类', 'value': '1' },

nladmin-ui/src/views/wms/pub/StructDialog.vue

@@ -115,7 +115,7 @@ export default {
       rows: [],
       dialogDis: true,
       lock: '',
-      defaultList: ['1582991156504039424', '1645705331612979200']
+      defaultList: []
     }
   },
   watch: {
@@ -143,9 +143,7 @@ export default {
       this.crud.query.stor_id = this.storId
       this.crud.query.layer_num = this.layerNum
       this.query.lock_type = this.lock
-      if (this.storId === this.defaultList[0]) {
+      this.query.is_have = '1'
-        this.crud.query.sect_id = this.defaultList[1]
-      }
       return true
     },
     open() {

nladmin-ui/src/views/wms/st/inbill/AddDtl.vue

@@ -146,9 +146,6 @@ export default {
     submit() {
       this.$emit('update:dialogShow', false)
       this.rows = this.$refs.multipleTable.selection
-      console.log('获取的rows:')
-      console.log(this.rows)
-      this.$emit('tableChanged', this.rows)
       group.getAllGroupInfo(this.rows).then(res => {
         this.rows = res.content
         this.$emit('tableChanged', this.rows)

nladmin-ui/src/views/wms/st/movebill/AddDialog.vue

@@ -65,6 +65,7 @@
         <el-select
           v-model="form.bill_type"
           placeholder="业务类型"
+          :disabled="crud.status.view > 0"
           class="filter-item"
         >
           <el-option
@@ -227,7 +228,7 @@ const defaultForm = {
   bill_status: '10',
   total_qty: '0',
   detail_count: '0',
-  bill_type: '29',
+  bill_type: '99',
   remark: '',
   biz_date: new Date(),
   create_mode: '',
@@ -287,12 +288,14 @@ export default {
       this.$emit('AddChanged')
     },
     [CRUD.HOOK.afterToEdit]() {
+      this.storId = this.form.stor_id
+      this.sectList.push(this.storId)
       movestor.getMoveDtl({ 'moveinv_id': this.form.moveinv_id }).then(res => {
         this.form.tableData = res
         // 将明细变成不可编辑
         for (let i = 0; i < this.form.tableData.length; i++) {
           const row = this.form.tableData[i]
-          row.edit = true
+          this.$set(row, 'edit', true)
           this.form.tableData.splice(i, 1, row)
         }
       })
@@ -303,7 +306,7 @@ export default {
         // 将明细变成不可编辑
         for (let i = 0; i < this.form.tableData.length; i++) {
           const row = this.form.tableData[i]
-          row.edit = true
+          this.$set(row, 'edit', true)
           this.form.tableData.splice(i, 1, row)
         }
       })
@@ -338,10 +341,11 @@ export default {
     tableChanged(rows) {
       const tablemap = new Map()
       rows.forEach((item) => {
+        debugger
         if (this.form.tableData.length !== 0) {
           this.flagnow = false
           for (let i = 0; i < this.form.tableData.length; i++) {
-            if (this.form.tableData[i].stockrecord_id === item.stockrecord_id) {
+            if (this.form.tableData[i].storagevehicleext_id === item.storagevehicleext_id) {
               this.flagnow = true
             }
           }
@@ -350,14 +354,14 @@ export default {
             this.$set(item, 'work_status', '10')
             this.$set(item, 'turnin_sect_code', '')
             this.$set(item, 'turnin_struct_code', '')
-            tablemap.set(item.stockrecord_id, item)
+            tablemap.set(item.storagevehicleext_id, item)
           }
         } else {
           this.$set(item, 'edit', false)
           this.$set(item, 'work_status', '10')
           this.$set(item, 'turnin_sect_code', '')
           this.$set(item, 'turnin_struct_code', '')
-          tablemap.set(item.stockrecord_id, item)
+          tablemap.set(item.storagevehicleext_id, item)
         }
       })
       for (const value of tablemap.values()) {

nladmin-ui/src/views/wms/st/movebill/AddDtl.vue

@@ -97,6 +97,7 @@ import CRUD, { header, presenter } from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
 import pagination from '@crud/Pagination'
 import crudSectattr from '@/views/wms/basedata/sectattr/sectattr'
+import movestor from '@/views/wms/st/movebill/movestor'
 
 export default {
   name: 'AddDtl',
@@ -163,9 +164,6 @@ export default {
   methods: {
     [CRUD.HOOK.beforeRefresh]() {
       this.crud.query.stor_id = this.storId
-      if (this.storId === this.defaultList[0]) {
-        this.crud.query.sect_id = this.defaultList[1]
-      }
     },
     open() {
       crudSectattr.getSect({ 'stor_id': this.storId }).then(res => {
@@ -204,8 +202,11 @@ export default {
         this.$message('请先勾选物料')
         return
       }
+      movestor.getCanuseIvt(this.rows).then(res => {
+        this.rows = res.content
+        this.$emit('tableChanged', this.rows)
+      })
       this.$emit('update:dialogShow', false)
-      this.$emit('tableChanged', this.rows)
       this.crud.resetQuery(false)
     }
   }

nladmin-ui/src/views/wms/st/movebill/movestor.js

@@ -40,4 +40,12 @@ export function confirm(data) {
   })
 }
 
-export default { add, edit, del, getMoveDtl, confirm }
+export function getCanuseIvt(data) {
+  return request({
+    url: 'api/moveStor/getCanuseIvt',
+    method: 'get',
+    data
+  })
+}
+
+export default { add, edit, del, getMoveDtl, confirm, getCanuseIvt }

nladmin-ui/src/views/wms/st/outbill/AddDialog.vue

@@ -157,10 +157,10 @@
           <span v-show="scope.row.edit">{{ scope.row.pcsn }}</span>
         </template>
       </el-table-column>
+      <el-table-column prop="max_qty" label="可出重量" width="150" align="center" />
       <el-table-column prop="plan_qty" label="出库重量" width="150" align="center">
         <template scope="scope">
-          <el-input-number v-show="!scope.row.edit" v-model="scope.row.plan_qty" :precision="3" :controls="false" :min="1" style="width: 120px" />
+          <el-input-number  v-model="scope.row.plan_qty" :precision="3" :controls="false" :min="1" style="width: 120px" />
-          <span v-show="scope.row.edit">{{ scope.row.plan_qty }}</span>
         </template>
       </el-table-column>
       <el-table-column prop="qty_unit_name" label="单位" align="center" />
@@ -266,12 +266,10 @@ export default {
         this.crud.notify('请至少选择一条明细', CRUD.NOTIFICATION_TYPE.INFO)
         return false
       }
-      if (this.form.bill_type !== '1004') {
+      for (let i = 0; i < this.form.tableData.length; i++) {
-        this.form.out_stor_id = ''
+        const row = this.form.tableData[i]
-      }
+        if (row.plan_qty > row.max_qty) {
-      if (this.form.bill_type === '1004') {
+          this.crud.notify('出库数量不能大于可出数量', CRUD.NOTIFICATION_TYPE.INFO)
-        if (!this.form.out_stor_id) {
-          this.crud.notify('移入仓库不能为空！', CRUD.NOTIFICATION_TYPE.INFO)
           return false
         }
       }
@@ -346,10 +344,11 @@ export default {
       rows.forEach((item) => {
         // 添加plan_qty
         item.plan_qty = item.qty
+        item.max_qty = item.qty
         if (this.form.tableData.length !== 0) {
           this.flagnow = false
           for (let i = 0; i < this.form.tableData.length; i++) {
-            if (this.form.tableData[i].storagevehicle_code === item.storagevehicle_code && this.form.tableData[i].pcsn === item.pcsn) {
+            if (this.form.tableData[i].storagevehicleext_id === item.storagevehicleext_id) {
               this.flagnow = true
             }
           }

nladmin-ui/src/views/wms/statement/structivt/index.vue

@@ -86,12 +86,12 @@
         <el-table-column prop="material_name" label="物料名称" :min-width="flexWidth('material_name',crud.data,'物料名称')" />
         <el-table-column prop="pcsn" label="批次号" :min-width="flexWidth('pcsn',crud.data,'批次号')" />
         <el-table-column prop="storagevehicle_code" label="载具号" :min-width="flexWidth('storagevehicle_code',crud.data,'载具号')" />
-        <el-table-column prop="qty" label="总数" :formatter="crud.formatNum3" :min-width="100" />
+        <el-table-column  label="总数" :min-width="100" >
-        <el-table-column  label="可用数" :min-width="100" >
           <template slot-scope="scope">
-            <span>{{ scope.row.qty - scope.row.frozen_qty }}</span>
+            <span>{{ scope.row.qty + scope.row.frozen_qty }}</span>
           </template>
         </el-table-column>
+        <el-table-column prop="qty" label="可用数" :formatter="crud.formatNum3" :min-width="100" />
         <el-table-column prop="frozen_qty" label="冻结数" :formatter="crud.formatNum3" :min-width="100" />
         <el-table-column prop="qty_unit_name" label="计量单位" :min-width="flexWidth('qty_unit_name',crud.data,'计量单位')" />
         <el-table-column prop="remark" label="备注" :min-width="flexWidth('remark',crud.data,'备注')" />