fix:入库 add:出入库记录

2025-07-24 20:23:38 +08:00
parent a302a68618
commit 5c431522e1
25 changed files with 1024 additions and 74 deletions
--- a/nladmin-ui/src/views/wms/basedata/group/index.vue
+++ b/nladmin-ui/src/views/wms/basedata/group/index.vue
@@ -2,63 +2,144 @@
  <div class="app-container">
    <!--工具栏-->
    <div class="head-container">
-      <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.material_code"
-              clearable
-              size="mini"
-              placeholder="物料编码、名称"
-              @keyup.enter.native="crud.toQuery"
+      <el-row>
+        <el-col :span="4">
+          物料查询：
+          <el-input
+            v-model="query.material_code"
+            clearable
+            style="width: 150px"
+            size="mini"
+            placeholder="物料编码、名称"
+            @keyup.enter.native="crud.toQuery"
+          />
+        </el-col>
+        <el-col :span="4">
+          批次查询：
+          <el-input
+            v-model="query.pcsn"
+            clearable
+            style="width: 150px"
+            size="mini"
+            placeholder="批次"
+            @keyup.enter.native="crud.toQuery"
+          />
+        </el-col>
+        <el-col :span="4">
+          载具编码：
+          <el-input
+            v-model="query.storagevehicle_code"
+            clearable
+            style="width: 150px"
+            size="mini"
+            placeholder="载具编码"
+            @keyup.enter.native="crud.toQuery"
+          />
+        </el-col>
+        <el-col :span="4">
+          组盘状态：
+          <el-select
+            v-model="query.status"
+            clearable
+            style="width: 150px"
+            size="mini"
+            placeholder="状态"
+            class="filter-item"
+            @change="crud.toQuery"
+          >
+            <el-option
+              v-for="item in dict.GROUP_STATUS"
+              :label="item.label"
+              :value="item.value"
            />
-          </el-form-item>
-          <el-form-item label="批次号">
-            <el-input
-              v-model="query.pcsn"
-              clearable
-              size="mini"
-              placeholder="批次"
-              @keyup.enter.native="crud.toQuery"
-            />
-          </el-form-item>
-          <el-form-item label="载具编码">
-            <el-input
-              v-model="query.storagevehicle_code"
-              clearable
-              size="mini"
-              placeholder="载具编码"
-              @keyup.enter.native="crud.toQuery"
-            />
-          </el-form-item>
-          <el-form-item label="状态">
-            <el-select
-              v-model="query.status"
-              clearable
-              size="mini"
-              placeholder="状态"
-              class="filter-item"
-              @change="crud.toQuery"
-            >
-              <el-option
-                v-for="item in dict.GROUP_STATUS"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
+          </el-select>
+        </el-col>
+        <el-col :span="4">
          <rrOperation />
-        </el-form>
-      </div>
-      <rrOperation />
+        </el-col>
+      </el-row>
      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
      <crudOperation :permission="permission" />
+      <!--新增表格-->
+      <el-dialog
+        :close-on-click-modal="false"
+        :before-close="crud.cancelCU"
+        :visible.sync="crud.status.cu > 0"
+        :title="crud.status.title"
+        width="1200px"
+      >
+        <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="110px">
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="物料编码" prop="material_code" >
+                <el-input v-model="form.material_code" @focus="getMaterial" style="width: 200px;" :disabled="crud.status.edit > 0" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item  label="物料名称" prop="material_name">
+                <el-input disabled v-model="form.material_name" style="width: 200px;" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item  label="规格" prop="material_spec">
+                <label slot="label">规&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;格</label>
+                <el-input disabled v-model="form.material_spec" style="width: 200px;" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="载具编码" prop="storagevehicle_code">
+                <label slot="label">载具编码</label>
+                <el-input v-model="form.storagevehicle_code" style="width: 200px;" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="物料批号" prop="pcsn">
+                <el-input v-model="form.pcsn" style="width: 200px;" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="物料数量" prop="qty">
+                <el-input-number v-model="form.qty" style="width: 200px;" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="单位" prop="qty_unit_name">
+                <el-select
+                  v-model="form.qty_unit_name"
+                  style="width: 100px"
+                  placeholder=""
+                  @change="unitChange"
+                >
+                  <el-option
+                    v-for="item in tableEnum.md_pb_measureunit"
+                    :key="item.id"
+                    :label="item.label"
+                    :value="item.value+'@'+item.label"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="源单号" prop="ext_code">
+                <el-input v-model="form.ext_code" style="width: 200px;" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="源单类型" prop="ext_type">
+                <el-input v-model="form.ext_type" style="width: 200px;" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="text" @click="crud.cancelCU">取消</el-button>
+          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
+        </div>
+      </el-dialog>
      <!--表格渲染-->
      <el-table
        ref="table"
@@ -96,6 +177,8 @@
      <!--分页组件-->
      <pagination />
    </div>
+    <!--放引用的组件-->
+    <MaterialDialog :dialog-show.sync="materialDialog" @materialChoose="materialChoose" />
  </div>
 </template>

@@ -106,11 +189,14 @@ import crudOperation from '@crud/CRUD.operation'
 import udOperation from '@crud/UD.operation'
 import pagination from '@crud/Pagination'
 import rrOperation from '@crud/RR.operation'
+import MaterialDialog from '@/views/wms/basedata/material/MaterialDialog'

 const defaultForm = {
  group_id: null,
  storagevehicle_code: null,
  material_id: null,
+  material_name: null,
+  material_spec: null,
  pcsn: null,
  qty_unit_id: null,
  qty_unit_name: null,
@@ -125,8 +211,9 @@ const defaultForm = {
 }
 export default {
  name: 'Group',
-  components: { pagination, crudOperation, rrOperation, udOperation },
+  components: { pagination, MaterialDialog, crudOperation, rrOperation, udOperation },
  mixins: [presenter(), header(), form(defaultForm), crud()],
+  tableEnums: ['md_pb_measureunit#unit_name#measure_unit_id'],
  // 数据字典
  dicts: ['is_used', 'GROUP_STATUS'],
  cruds() {
@@ -134,7 +221,7 @@ export default {
      title: '组盘记录',
      url: 'api/group',
      optShow: {
-        add: false,
+        add: true,
        reset: true
      },
      idField: 'group_id',
@@ -145,6 +232,7 @@ export default {
  data() {
    return {
      permission: {},
+      materialDialog: false,
      classes: [],
      rules: {
      }
@@ -157,6 +245,20 @@ export default {
    },
    formattStatus(row) {
      return this.dict.label.GROUP_STATUS[row.status]
+    },
+    getMaterial() {
+      this.materialDialog = true
+    },
+    unitChange(row) {
+      const split = row.split('@')
+      this.form.qty_unit_id = split[0]
+      this.form.qty_unit_name = split[1]
+    },
+    materialChoose(row) {
+      this.form.material_name = row.material_name
+      this.form.material_id = row.material_id
+      this.form.material_code = row.material_code
+      this.form.material_spec = row.material_spec
    }
  }
 }
--- a/nladmin-ui/src/views/wms/basedata/material/MaterialDialog.vue
+++ b/nladmin-ui/src/views/wms/basedata/material/MaterialDialog.vue
@@ -0,0 +1,153 @@
+<template>
+  <el-dialog
+    title="物料选择"
+    append-to-body
+    :visible.sync="dialogVisible"
+    destroy-on-close
+    width="1000px"
+    @close="close"
+    @open="open"
+  >
+    <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.search"
+          clearable
+          size="mini"
+          placeholder="物料名称"
+          @keyup.enter.native="crud.toQuery"
+        />
+      </el-form-item>
+      <rrOperation />
+    </el-form>
+
+    <!--表格渲染-->
+    <el-table
+      ref="table"
+      v-loading="crud.loading"
+      :data="crud.data"
+      style="width: 100%;"
+      size="mini"
+      border
+      :cell-style="{'text-align':'center'}"
+      :header-cell-style="{background:'#f5f7fa',color:'#606266','text-align':'center'}"
+      @select="handleSelectionChange"
+      @select-all="onSelectAll"
+      @current-change="clickChange"
+    >
+      <el-table-column v-if="!isSingle" type="selection" width="55" />
+      <el-table-column v-if="isSingle" label="选择" width="55">
+        <template slot-scope="scope">
+          <el-radio v-model="tableRadio" :label="scope.row"><i /></el-radio>
+        </template>
+      </el-table-column>
+      <el-table-column prop="material_code" label="物料编码" width="140" />
+      <el-table-column prop="material_name" label="物料名称" width="170" show-overflow-tooltip />
+      <el-table-column prop="material_spec" label="物料规格" width="170" show-overflow-tooltip/>
+      <el-table-column prop="class_name" label="物料分类" width="140" />
+      <el-table-column prop="unit_name" label="计量单位" />
+      <el-table-column prop="product_series_name" label="系列" />
+      <el-table-column prop="update_optname" label="修改人" />
+      <el-table-column prop="update_time" label="修改时间" width="135" />
+    </el-table>
+    <!--分页组件-->
+    <pagination />
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="dialogVisible = false">取 消</el-button>
+      <el-button type="primary" @click="submit">确 定</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+
+import CRUD, { header, presenter } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import pagination from '@crud/Pagination'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+
+export default {
+  name: 'MaterialDialog',
+  components: { rrOperation, pagination },
+  dicts: ['is_used'],
+  cruds() {
+    return CRUD({ title: '物料选择', url: 'api/Materia', optShow: {}})
+  },
+  mixins: [presenter(), header()],
+  props: {
+    dialogShow: {
+      type: Boolean,
+      default: false
+    },
+    isSingle: {
+      type: Boolean,
+      default: true
+    }
+  },
+  data() {
+    return {
+      dialogVisible: false,
+      tableRadio: null,
+      tableData: []
+    }
+  },
+  watch: {
+    dialogShow: {
+      handler(newValue) {
+        this.dialogVisible = newValue
+      }
+    }
+  },
+  methods: {
+    clickChange(item) {
+      this.tableRadio = item
+    },
+    open() {
+
+    },
+    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(false)
+      this.$emit('update:dialogShow', false)
+    },
+    submit() {
+      // 处理单选
+      if (this.isSingle && this.tableRadio) {
+        this.$emit('update:dialogShow', false)
+        this.$emit('materialChoose', this.tableRadio)
+        return
+      }
+      this.rows = this.$refs.table.selection
+      if (this.rows.length <= 0) {
+        this.$message('请先勾选物料')
+        return
+      }
+      this.crud.resetQuery(false)
+      this.$emit('update:dialogShow', false)
+      this.$emit('materialChoose', this.rows)
+    }
+  }
+}
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+  ::v-deep .el-dialog__body {
+    padding-top: 0px;
+  }
+</style>
+
--- a/nladmin-ui/src/views/wms/basedata/sectattr/sectattr.js
+++ b/nladmin-ui/src/views/wms/basedata/sectattr/sectattr.js
@@ -32,6 +32,15 @@ export function getSect(params) {
  })
 }

+
+export function getSectCode(params) {
+  return request({
+    url: 'api/sectattr/getSectCode',
+    method: 'get',
+    params
+  })
+}
+
 export function changeActive(data) {
  return request({
    url: 'api/sectattr/changeActive',
@@ -40,4 +49,4 @@ export function changeActive(data) {
  })
 }

-export default { add, edit, del, getSect, changeActive }
+export default { add, edit, del, getSect, getSectCode,changeActive }
--- a/nladmin-ui/src/views/wms/st/inbill/AddDialog.vue
+++ b/nladmin-ui/src/views/wms/st/inbill/AddDialog.vue
@@ -131,6 +131,7 @@
      :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
    >
      <el-table-column type="index" label="序号" width="55" align="center" />
+      <el-table-column show-overflow-tooltip width="150" prop="storagevehicle_code" label="载具编码" />
      <el-table-column show-overflow-tooltip width="150" prop="pcsn" 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="物料名称" />
--- a/nladmin-ui/src/views/wms/st/inbill/DivDialog.vue
+++ b/nladmin-ui/src/views/wms/st/inbill/DivDialog.vue
@@ -256,7 +256,7 @@ export default {
  },
  methods: {
    open() {
-      crudSectattr.getSect({ 'stor_id': this.storId }).then(res => {
+      crudSectattr.getSectCode({ 'stor_id': this.storId }).then(res => {
        this.sects = res.content
      })
      crudPoint.getPointList().then(res => {
@@ -312,6 +312,7 @@ export default {
    },
    sectQueryChange(val) {
      this.sectProp = val
+      debugger
      if (val.length === 1) {
        this.stor_code = val[0]
        this.sect_code = ''
@@ -336,6 +337,8 @@ export default {
        this.form.tableMater[i].sect_name = row.sect_name
        this.form.tableMater.splice(i, 1, this.form.tableMater[i]) // 通过splice 替换数据 触发视图更新
      }
+      this.form.sect_code = this.sect_code
+      this.form.stor_code = this.stor_code
      crudRawAssist.divStruct(this.form).then(res => {
        crudRawAssist.getIODtl({ 'bill_code': this.form.dtl_row.bill_code, 'open_flag': '1' }).then(res => {
          this.openParam = res
@@ -369,6 +372,7 @@ export default {
      }
      // 如果勾选了，直接跳后台
      if (this.form.checked) {
+        debugger
        if (!this.sect_code) {
          this.crud.notify('请先选择区域！', CRUD.NOTIFICATION_TYPE.INFO)
          return
--- a/nladmin-ui/src/views/wms/statement/record/curdStructIvtFlow.js
+++ b/nladmin-ui/src/views/wms/statement/record/curdStructIvtFlow.js
@@ -0,0 +1,28 @@
+import request from '@/utils/request'
+
+export function add(data) {
+  return request({
+    url: 'api/stIvtStructivtflow',
+    method: 'post',
+    data
+  })
+}
+
+export function del(ids) {
+  return request({
+    url: 'api/stIvtStructivtflow',
+    method: 'delete',
+    data: ids
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/stIvtStructivtflow',
+    method: 'put',
+    data
+  })
+}
+
+
+export default {add, edit, del}
--- a/nladmin-ui/src/views/wms/statement/record/index.vue
+++ b/nladmin-ui/src/views/wms/statement/record/index.vue
@@ -0,0 +1,178 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <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.search"
+            clearable
+            style="width: 300px"
+            size="mini"
+            placeholder="请输入仓位信息"
+            prefix-icon="el-icon-search"
+            class="filter-item"
+          />
+        </el-form-item>
+        <el-form-item label="物料编码">
+          <el-input
+            v-model="query.material_code"
+            clearable
+            style="width: 300px"
+            size="mini"
+            placeholder="请输入物料编码"
+            prefix-icon="el-icon-search"
+            class="filter-item"
+          />
+        </el-form-item>
+        <el-form-item label="载具编码">
+          <el-input
+            v-model="query.vehicle_code"
+            clearable
+            style="width: 300px"
+            size="mini"
+            placeholder="请输入载具编码"
+            prefix-icon="el-icon-search"
+            class="filter-item"
+          />
+        </el-form-item>
+        <el-form-item label="批次">
+          <el-input
+            v-model="query.pcsn"
+            clearable
+            style="width: 300px"
+            size="mini"
+            placeholder="请输入批次信息"
+            prefix-icon="el-icon-search"
+            class="filter-item"
+          />
+        </el-form-item>
+        <el-form-item label="变动日期" prop="analyseData">
+          <el-date-picker
+            v-model="query.datepick"
+            type="daterange"
+            value-format="yyyy-MM-dd"
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+          />
+        </el-form-item>
+        <rrOperation />
+      </el-form>
+      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
+      <crudOperation :permission="permission" />
+      <el-table
+        ref="table"
+        v-loading="crud.loading"
+        :data="crud.data"
+        size="mini"
+        style="width: 100%;"
+      >
+        <el-table-column prop="stor_code" label="仓库" width="150" show-tooltip-when-overflow />
+        <el-table-column prop="struct_code" label="仓位编码" width="150" show-tooltip-when-overflow />
+        <el-table-column prop="material_code" label="物料编码" width="150" show-tooltip-when-overflow />
+        <el-table-column prop="material_name" label="物料名称" width="150" show-tooltip-when-overflow />
+        <el-table-column prop="vehicle_code" label="载具编码" width="150" show-tooltip-when-overflow />
+        <el-table-column prop="growth" label="是否增加库存" width="150" show-tooltip-when-overflow>
+          <template slot-scope="scope">
+            {{ scope.row.growth }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="pcsn" label="批次" min-width="150" show-tooltip-when-overflow />
+        <el-table-column prop="qty" label="总库存" min-width="150" show-tooltip-when-overflow />
+        <el-table-column prop="frozen_qty" label="冻结库存" show-tooltip-when-overflow />
+        <el-table-column prop="change_qty" label="变动库存" show-tooltip-when-overflow />
+        <el-table-column prop="unit_name" label="单位" show-tooltip-when-overflow />
+        <el-table-column prop="vehicle_form_data" label="物料扩展信息" width="300" show-tooltip-when-overflow />
+        <el-table-column prop="source_form_type" label="单据编号" show-tooltip-when-overflow />
+        <el-table-column prop="source_form_id" label="单据表名" min-width="120" show-tooltip-when-overflow />
+        <el-table-column prop="task_type" show-overflow-tooltip show-tooltip-when-overflow label="变动类型" />
+<!--          <template slot-scope="scope">-->
+<!--            {{ statusEnum.label.TASK_TYPE[scope.row.task_type] }}-->
+<!--          </template>-->
+<!--        </el-table-column>-->
+        <el-table-column prop="update_time" label="修改时间" width="120" show-tooltip-when-overflow />
+      </el-table>
+      <!--分页组件-->
+      <pagination />
+    </div>
+  </div>
+</template>
+
+<script>
+import curdStructIvtFlow from './curdStructIvtFlow'
+import CRUD, { presenter, header, form, crud } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import crudOperation from '@crud/CRUD.operation'
+import udOperation from '@crud/UD.operation'
+import pagination from '@crud/Pagination'
+
+const defaultForm = {
+  id: null,
+  struct_code: null,
+  material_id: null,
+  pcsn: null,
+  qty: true,
+  frozen_qty: null,
+  vehicle_form_data: null,
+  source_form_type: null,
+  source_form_id: null,
+  task_type: null,
+  unit_id: null,
+  update_time: null,
+  growth: null,
+  vehicle_code: null
+}
+export default {
+  dicts: [],
+  name: 'StructIvtFlow',
+  components: { pagination, crudOperation, rrOperation, udOperation },
+  statusEnums: ['TASK_TYPE'],
+  mixins: [presenter(), header(), form(defaultForm), crud()],
+  cruds() {
+    return CRUD({
+      title: '库存变动记录',
+      url: 'api/stIvtStructivtflow',
+      optShow: {
+        add: false,
+        reset: true
+      },
+      idField: 'id',
+      sort: 'id,desc',
+      crudMethod: { ...curdStructIvtFlow }
+    })
+  },
+  data() {
+    return {
+      permission: {},
+      rules: {}
+    }
+  },
+  created() {
+  },
+  methods: {
+    // 钩子：在获取表格数据之前执行，false 则代表不获取数据
+    [CRUD.HOOK.beforeRefresh]() {
+      if (this.query.datepick) {
+        this.query.start_time = this.query.datepick[0]
+        if (this.query.datepick.length > 1) {
+          this.query.end_time = this.query.datepick[1]
+        }
+      } else {
+        this.query.start_time = ''
+        this.query.end_time = ''
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>