add：库存查询袋信息

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

@@ -131,6 +131,7 @@
     >
       <el-table-column type="index" label="序号" width="55" align="center" />
       <el-table-column show-overflow-tooltip prop="storagevehicle_code" label="载具编码" />
+      <el-table-column show-overflow-tooltip prop="bag_code" label="袋码" />
       <el-table-column show-overflow-tooltip prop="material_code" label="物料编码" />
       <el-table-column show-overflow-tooltip prop="material_name" label="物料名称" />
       <el-table-column show-overflow-tooltip prop="material_spec" label="物料规格" />
@@ -313,7 +314,7 @@ export default {
         rows.forEach((item) => {
           let same_mater = true
           this.form.tableData.forEach((row) => {
-            if (row.pcsn === item.pcsn) {
+            if (row.pcsn === item.pcsn && row.bag_code === item.bag_code) {
               same_mater = false
             }
           })

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

@@ -53,6 +53,7 @@
       >
         <el-table-column type="selection" width="55" />
         <el-table-column show-overflow-tooltip width="150" prop="vehicle_code" label="载具编码" />
+        <el-table-column show-overflow-tooltip width="150" prop="bag_code" label="袋码" />
         <el-table-column show-overflow-tooltip width="150" prop="material_code" label="物料编码" />
         <el-table-column show-overflow-tooltip width="150" prop="material_name" label="物料名称" />
         <el-table-column show-overflow-tooltip width="150" prop="material_spec" label="物料规格" />

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

@@ -139,6 +139,7 @@
         <el-table-column prop="pcsn" label="批次号" align="center" width="150" />
         <!--        <el-table-column prop="sap_pcsn" label="SAP批次号" align="center" />-->
         <el-table-column prop="storagevehicle_code" label="载具号" align="center" />
+        <el-table-column prop="bag_code" label="袋码" align="center" />
         <el-table-column prop="plan_qty" :formatter="crud.formatNum3" label="数量" align="center" />
         <el-table-column prop="point_code" label="起始位置" align="center" />
         <el-table-column prop="struct_code" label="目的位置" align="center" />

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

@@ -0,0 +1,138 @@
+<template>
+  <el-dialog
+    title="袋明细查询"
+    append-to-body
+    :visible.sync="dialogVisible"
+    destroy-on-close
+    width="1000px"
+    @close="close"
+    @open="open"
+  >
+    <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.bag_code"
+            clearable
+            size="mini"
+            placeholder="袋码编码"
+            @keyup.enter.native="crud.toQuery"
+          />
+        </el-form-item>
+        <rrOperation />
+      </el-form>
+    </div>
+    <div class="head-container">
+      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
+      <crudOperation />
+      <!--表格渲染-->
+      <el-table
+        ref="deviceTable"
+        v-loading="crud.loading"
+        :data="crud.data"
+        style="width: 100%;"
+        size="mini"
+        @selection-change="crud.selectionChangeHandler"
+      >
+        <el-table-column prop="bag_code" label="袋码" :min-width="flexWidth('bag_code',crud.data,'袋码')" />
+        <el-table-column prop="vehicle_code" label="载具编码" :min-width="flexWidth('vehicle_code',crud.data,'载具编码')" />
+        <el-table-column prop="material_code" label="物料编码" :min-width="flexWidth('material_code',crud.data,'物料编码')" />
+        <el-table-column prop="material_name" label="物料名称" :min-width="flexWidth('material_name',crud.data,'物料名称')" />
+        <el-table-column prop="material_spec" label="物料规格" :min-width="flexWidth('material_spec',crud.data,'物料规格')" />
+        <el-table-column prop="pcsn" label="批次" :min-width="flexWidth('pcsn',crud.data,'批次')" />
+        <el-table-column prop="status" label="状态" :formatter="formattStatus" :min-width="flexWidth('status',crud.data,'状态')" />
+        <el-table-column prop="qty" label="组袋重量" :formatter="crud.formatNum3" :min-width="100" />
+        <el-table-column prop="supp_code" label="供应商" :min-width="flexWidth('supp_code',crud.data,'供应商')" />
+        <el-table-column prop="remark" label="备注" :min-width="flexWidth('remark',crud.data,'备注')" />
+        <el-table-column prop="create_name" label="组袋人" :min-width="flexWidth('create_name',crud.data,'组盘人')" />
+        <el-table-column prop="create_time" label="组袋时间" :min-width="flexWidth('create_time',crud.data,'组盘时间')" />
+      </el-table>
+      <!--分页组件-->
+      <pagination />
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+
+import CRUD, { presenter, header } from '@crud/crud'
+import crudOperation from '@crud/CRUD.operation'
+import pagination from '@crud/Pagination'
+import crudGroup from '@/views/wms/basedata/group/group'
+import rrOperation from '@crud/RR.operation'
+
+export default {
+  name: 'ReceiveDialog',
+  dicts: ['GROUP_STATUS'],
+  components: { crudOperation, pagination, rrOperation },
+  mixins: [presenter(), header()],
+  cruds() {
+    return CRUD({
+      url: 'api/group',
+      idField: 'group_id',
+      sort: 'group_id,desc',
+      crudMethod: { ... crudGroup },
+      optShow: {
+        add: false,
+        edit: false,
+        del: false,
+        download: false,
+        reset: false
+      }
+    })
+  },
+  props: {
+    dialogShow: {
+      type: Boolean,
+      default: false
+    },
+    openParam: {
+      type: String
+    }
+  },
+  data() {
+    return {
+      dialogVisible: false,
+      openParamOne: null,
+      bagDialog: false
+    }
+  },
+  watch: {
+    dialogShow: {
+      handler(newValue, oldValue) {
+        this.dialogVisible = newValue
+        this.crud.query.storagevehicle_code = this.openParam
+      }
+    }
+  },
+  methods: {
+    handleClose(done) {
+      this.$confirm('确认关闭？')
+        .then(_ => {
+          done()
+        })
+        .catch(_ => {
+        })
+    },
+    close() {
+      this.$emit('update:dialogShow', false)
+    },
+    formattStatus(row) {
+      return this.dict.label.GROUP_STATUS[row.status]
+    },
+    open() {
+      this.crud.toQuery()
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

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

@@ -88,7 +88,7 @@
         <el-table-column prop="pcsn" label="批次号" :min-width="flexWidth('pcsn',crud.data,'批次号')" />
         <el-table-column prop="storagevehicle_code" label="载具号">
           <template slot-scope="scope">
-            <el-link type="warning" @click="toView(scope.row.vehicle_code)">{{ scope.row.storagevehicle_code }}</el-link>
+            <el-link type="warning" @click="openBucket(scope.row)">{{ scope.row.storagevehicle_code }}</el-link>
           </template>
         </el-table-column>
         <el-table-column prop="canuse_qty" label="可用数" :formatter="crud.formatNum3" :min-width="100" />
@@ -99,13 +99,15 @@
       </el-table>
       <!--分页组件-->
       <pagination />
-      <image-modal :visible.sync="showModal" :image-url="imageUrl" />
+<!--      <image-modal :visible.sync="showModal" :image-url="imageUrl" />-->
+      <BagDialog :dialog-show.sync="bagDialog" :open-param="openParam" />
     </div>
   </div>
 </template>
 
 <script>
 import crudStructivt from '@/views/wms/statement/structivt/structivt'
+import BagDialog from '@/views/wms/statement/structivt/BagDialog'
 import CRUD, { presenter, header, crud } from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
@@ -113,11 +115,10 @@ import pagination from '@crud/Pagination'
 import crudSectattr from '@/views/wms/basedata/sectattr/sectattr'
 import { download } from '@/api/data'
 import { downloadFile } from '@/utils'
-import imageModal from './image'
 
 export default {
   name: 'Structivt',
-  components: { pagination, crudOperation, rrOperation, imageModal },
+  components: { pagination, crudOperation, rrOperation, BagDialog },
   mixins: [presenter(), header(), crud()],
   cruds() {
     return CRUD({
@@ -136,6 +137,8 @@ export default {
   data() {
     return {
       sects: [],
+      openParam: null,
+      bagDialog: false,
       showModal: false,
       imageUrl: '',
       permission: {},
@@ -163,6 +166,10 @@ export default {
       }
       )
     },
+    openBucket(row) {
+      this.openParam = row.storagevehicle_code
+      this.bagDialog = true
+    },
     sectQueryChange(val) {
       if (val.length === 1) {
         this.query.stor_id = val[0]