后端:

多个 Controller 中对状态判断使用了安全的 Convert.toInt(..., 0)(带默认值),避免空值拆箱导致 NPE:修改点包括 CheckStockinController、CheckStockinDetailController、InStockinController、InStockinDetailController、ReceiveStockinController、ReceiveStockinDetailController 等。
实体 InStockinDetail 新增字段:productName(物料名称)和 supplierName(供应商名称),并加了 @Excel 注解以支持导出/映射。
前端(Vue):

把“常用编码”改名为“产品分类”,同时把某些列/占位文本更新为“价格”或“产品分类”。
在多个视图中注释或调整了部分列(如来源/台次/创建时间等),以隐藏或调整显示。
优化了“入库新增”页面中的供应商选择流程:修复分页回调(对话框分页现在调用 getSupplierListForDialog),为供应商表格添加了双击快速确认事件 @row-dblclick,并在 handleSupplierRowClick / handleSupplierRowDblClick / confirmSelectSupplier 中加入了 console.log 调试输出与防护($refs 判空)。
其他小修订:

在 BasProduct 中把 @Excel(name = "常用编码") 改为 @Excel(name = "产品分类"),并把 “单价” 注解改为 @Excel(name="价格")。
调整一些表格列的注释与显示,以改进 UX 或临时隐藏列。
This commit is contained in:
escapemoon
2025-12-15 15:11:15 +08:00
16 changed files with 284 additions and 1135 deletions

View File

@@ -17,28 +17,3 @@ export function getStockSummary(onlyIdentity) {
})
}
// 新增库存汇总
export function addStockSummary(data) {
return request({
url: '/search/StockSummary',
method: 'post',
data: data
})
}
// 修改库存汇总
export function updateStockSummary(data) {
return request({
url: '/search/StockSummary',
method: 'put',
data: data
})
}
// 删除库存汇总
export function delStockSummary(onlyIdentity) {
return request({
url: '/search/StockSummary/' + onlyIdentity,
method: 'delete'
})
}

View File

@@ -3,7 +3,7 @@ import store from './store'
import { Message } from 'element-ui'
import NProgress from 'nprogress'
import 'nprogress/nprogress.css'
import { getToken } from '@/utils/auth'
import { getToken } from '@//auth'
import { isPathMatch } from '@/utils/validate'
import { isRelogin } from '@/utils/request'

View File

@@ -177,7 +177,7 @@
<el-table-column label="物料编码" align="left" prop="productId"/><!--物料编码-->
<el-table-column label="物料名称" align="left" prop="productName" width="160"/><!--物料编码-->
<el-table-column label="计划数量" align="right" prop="quantity"/><!--计划数量-->
<el-table-column label="扫码数量" align="right" prop="scanNum"/><!--扫码数量-->
<el-table-column label="扫码数量" align="right" prop="scanNum"/><!--扫 码数量-->
<el-table-column label="实际数量" align="right" prop="assignNum"/><!--实际数量-->
<el-table-column label="供应商" align="left" prop="supplierName" width="160"/><!--供应商-->
<el-table-column label="规格型号" align="left" prop="spec" width="160"/>

View File

@@ -3,55 +3,31 @@
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="分组选项">
<el-checkbox-group v-model="queryParams.groupFields" @change="handleQuery">
<el-checkbox label="orderId">库存状态</el-checkbox>
<el-checkbox label="orderId">套账</el-checkbox>
<el-checkbox label="orderId">托盘</el-checkbox>
<el-checkbox label="orderId">物料编码</el-checkbox>
<el-checkbox label="orderId">规格</el-checkbox>
<el-checkbox label="orderId">单价</el-checkbox>
<el-checkbox label="orderId">物料状态</el-checkbox>
<el-checkbox label="orderId">图号</el-checkbox>
<el-checkbox label="orderId">合同号</el-checkbox>
<el-checkbox label="orderId">台次</el-checkbox>
<el-checkbox label="orderId">件次</el-checkbox>
<el-checkbox label="orderId">质量</el-checkbox>
<el-checkbox label="orderId">产品分类</el-checkbox>
<el-checkbox label="orderId">入库单号</el-checkbox>
<el-checkbox label="orderId">供应商编码</el-checkbox>
<el-checkbox label="orderId">来源</el-checkbox>
<el-checkbox label="orderId">用途</el-checkbox>
<el-checkbox label="cargoSpaceId">货位编码</el-checkbox>
<el-checkbox label="productId">物料编码</el-checkbox>
<el-checkbox label="productName">物料名称</el-checkbox>
<el-checkbox label="parentId">产品分类</el-checkbox>
<el-checkbox label="price">价格</el-checkbox>
<el-checkbox label="cargoNo">产品编码</el-checkbox>
<el-checkbox label="unit">单位</el-checkbox>
<el-checkbox label="spec">型号</el-checkbox>
<el-checkbox label="spare1">单位名称</el-checkbox>
<el-checkbox label="spare3">url</el-checkbox>
<el-checkbox label="spare4">btnurl</el-checkbox>
<el-checkbox label="spare5">unitPrices</el-checkbox>
<el-checkbox label="spare6">units</el-checkbox>
<el-checkbox label="spare7">unitjb</el-checkbox>
<el-checkbox label="cargoSpaceName">货位名称</el-checkbox>
<el-checkbox label="status">货位状态</el-checkbox>
<el-checkbox label="locked">货位锁</el-checkbox>
</el-checkbox-group>
</el-form-item>
<br>
<el-form-item label="巷道" prop="roadwayId">
<el-form-item label="库存编码" prop="stockId">
<el-input
v-model="queryParams.roadwayId"
placeholder="请输入巷道"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="层" prop="theFloor">
<el-input
v-model="queryParams.theFloor"
placeholder="请输入层"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="排" prop="thePlatoon">
<el-input
v-model="queryParams.thePlatoon"
placeholder="请输入排"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="列" prop="theColumn">
<el-input
v-model="queryParams.theColumn"
placeholder="请输入列"
v-model="queryParams.stockId"
placeholder="请输入库存编码"
clearable
@keyup.enter.native="handleQuery"
/>
@@ -64,38 +40,6 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="规格型号" prop="spec">
<el-input
v-model="queryParams.spec"
placeholder="请输入规格型号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="产品分类" prop="parentId">
<el-input
v-model="queryParams.parentId"
placeholder="请输入产品分类"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="供应代号" prop="supplierId">
<el-input
v-model="queryParams.supplierId"
placeholder="请输入供应商代号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="供应名称" prop="supplierName">
<el-input
v-model="queryParams.supplierName"
placeholder="请输入供应商名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="物料名称" prop="productName">
<el-input
v-model="queryParams.productName"
@@ -104,129 +48,28 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="入库单号" prop="stockinId">
<el-input
v-model="queryParams.stockinId"
placeholder="请输入入库单号"
clearable
@keyup.enter.native="handleQuery"
/>
<el-form-item label="货位状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择货位状态" clearable>
<el-option
v-for="dict in dict.type.cargo_space_status"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="单价" prop="price">
<el-input
v-model="queryParams.price"
placeholder="请输入单价"
clearable
@keyup.enter.native="handleQuery"
/>
<el-form-item label="锁定状态" prop="locked">
<el-select v-model="queryParams.locked" placeholder="请选择货位锁定状态" clearable>
<el-option
v-for="dict in dict.type.cargo_space_lock_status"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="托盘号" prop="trayCode">
<el-input
v-model="queryParams.trayCode"
placeholder="请输入托盘号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="合同号" prop="orderId">
<el-input
v-model="queryParams.orderId"
placeholder="请输入合同号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="用途" prop="spare4">
<el-select v-model="queryParams.spare4" placeholder="请选择用途" clearable>
<el-option
v-for="dict in dict.type.purpose_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="起始时间" prop="inDateStart">
<el-date-picker clearable
v-model="queryParams.inDateStart"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择起始时间">
</el-date-picker>
</el-form-item>
<el-form-item label="截止日期" prop="inDateEnd">
<el-date-picker clearable
v-model="queryParams.inDateEnd"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择截止时间">
</el-date-picker>
</el-form-item>
<el-form-item label="周转类型" prop="voltage">
<el-select v-model="queryParams.voltage" placeholder="请选择周转类型" clearable>
<el-option
v-for="dict in dict.type.turnover_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="来源" prop="spare1">
<el-select v-model="queryParams.spare1" placeholder="请选择来源" clearable>
<el-option
v-for="dict in dict.type.origin_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="套账" prop="spare3">
<el-select v-model="queryParams.spare3" placeholder="请选择套账" clearable>
<el-option
v-for="dict in dict.type.account_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="形态类型" prop="productType">
<el-select v-model="queryParams.productType" placeholder="请选择形态类型" clearable>
<el-option
v-for="dict in dict.type.product_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="台次" prop="spare5">
<el-input
v-model="queryParams.spare5"
placeholder="请输入台次"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="件次" prop="power">
<el-input
v-model="queryParams.power"
placeholder="请输入件次"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="库外" prop="outside">
<el-input
v-model="queryParams.outside"
placeholder="请输入库外"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -254,56 +97,33 @@
max-height="650"
>
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="订单号" align="center" prop="orderId" width="160" v-if="queryParams.groupFields.includes('orderId')" />
<el-table-column label="库存编码" align="left" prop="stockId" width="160" />
<el-table-column label="物料编码" align="left" prop="productId" width="160" v-if="queryParams.groupFields.includes('productId')" />
<el-table-column label="物料名称" align="center" prop="productName" width="160" v-if="queryParams.groupFields.includes('productName')" />
<el-table-column label="批号" align="center" prop="lotNo" width="160" v-if="queryParams.groupFields.includes('lotNo')" />
<!-- <el-table-column label="单位" align="center" prop="unit" width="120" v-if="queryParams.groupFields.includes('unit')" /> -->
<!-- <el-table-column label="仓库" align="left" prop="warehouseName" width="120" v-if="queryParams.groupFields.includes('warehouseId')" />-->
<el-table-column label="巷道" align="left" prop="roadwayId" width="160" />
<el-table-column label="货位" align="left" prop="cargoSpaceName" width="160" v-if="queryParams.groupFields.includes('cargoSpaceId')" />
<el-table-column label="物料名称" align="left" prop="productName" width="160" v-if="queryParams.groupFields.includes('productName')" />
<el-table-column label="货位编码" align="left" prop="cargoSpaceId" width="160" v-if="queryParams.groupFields.includes('cargoSpaceId')" />
<el-table-column label="库存数量" align="right" prop="quantity" width="120" />
<!-- <el-table-column label="型号" align="center" prop="spare1" width="120" v-if="queryParams.groupFields.includes('spare1')" /> -->
<!-- <el-table-column label="单件净重" align="center" prop="spare2" width="120" v-if="queryParams.groupFields.includes('spare2')" /> -->
<!-- <el-table-column label="电压" align="center" prop="spare5" width="120" v-if="queryParams.groupFields.includes('spare5')" /> -->
<!-- <el-table-column label="功率" align="center" prop="spare6" width="120" v-if="queryParams.groupFields.includes('spare6')" /> -->
<!-- <el-table-column label="相位" align="center" prop="spare7" width="120" v-if="queryParams.groupFields.includes('spare7')" /> -->
<!-- <el-table-column label="毛重" align="center" prop="spare8" width="120" v-if="queryParams.groupFields.includes('spare8')" /> -->
<el-table-column label="规格" align="left" prop="spec" width="160" v-if="queryParams.groupFields.includes('spec')" />
<el-table-column label="品号描述" align="left" prop="price" width="160" v-if="queryParams.groupFields.includes('price')" />
<el-table-column label="产品分类" align="left" prop="parentId" width="160" v-if="queryParams.groupFields.includes('parentId')" />
<el-table-column label="英文描述" align="left" prop="cargoNo" width="160" v-if="queryParams.groupFields.includes('cargoNo')" />
<el-table-column label="NC号" align="left" prop="spare9" width="160" v-if="queryParams.groupFields.includes('spare9')" />
<el-table-column label="电源线" align="left" prop="spare10" width="160" v-if="queryParams.groupFields.includes('spare10')" />
<el-table-column label="插头" align="left" prop="spare11" width="160" v-if="queryParams.groupFields.includes('spare11')" />
<el-table-column label="接嘴" align="left" prop="spare12" width="160" v-if="queryParams.groupFields.includes('spare12')" />
<el-table-column label="快捷码" align="left" prop="spare13" width="160" v-if="queryParams.groupFields.includes('spare13')" />
<el-table-column label="库存单位编号" align="left" prop="spare14" width="160" v-if="queryParams.groupFields.includes('spare14')" />
<el-table-column label="库存单位名称" align="left" prop="spare15" width="160" v-if="queryParams.groupFields.includes('spare15')" />
<el-table-column label="品号群组" align="left" prop="spare16" width="160" v-if="queryParams.groupFields.includes('spare16')" />
<el-table-column label="归类品" align="left" prop="spare17" width="160" v-if="queryParams.groupFields.includes('spare17')" />
<el-table-column label="计量体系" align="left" prop="spare18" width="160" v-if="queryParams.groupFields.includes('spare18')" />
<el-table-column label="群组名称" align="left" prop="spare19" width="160" v-if="queryParams.groupFields.includes('spare19')" />
<el-table-column label="批号管理" align="left" prop="spare20" width="160" v-if="queryParams.groupFields.includes('spare20')" />
<el-table-column label="状态" align="left" prop="spare21" width="160" v-if="queryParams.groupFields.includes('spare21')" />
<el-table-column label="产品大类" align="left" prop="spare22" width="160" v-if="queryParams.groupFields.includes('spare22')" />
<el-table-column label="产品二类" align="left" prop="spare23" width="160" v-if="queryParams.groupFields.includes('spare23')" />
<el-table-column label="产品线/产品系列" align="left" prop="spare24" width="160" v-if="queryParams.groupFields.includes('spare24')" />
<el-table-column label="BOM状态" align="left" prop="spare25" width="160" v-if="queryParams.groupFields.includes('spare25')" />
<el-table-column label="产品定位" align="left" prop="spare26" width="160" v-if="queryParams.groupFields.includes('spare26')" />
<el-table-column label="电脑板型号" align="left" prop="spare27" width="160" v-if="queryParams.groupFields.includes('spare27')" />
<el-table-column label="非标要求" align="left" prop="spare28" width="160" v-if="queryParams.groupFields.includes('spare28')" />
<el-table-column label="品牌" align="left" prop="spare29" width="160" v-if="queryParams.groupFields.includes('spare29')" />
<el-table-column label="非标颜色" align="left" prop="spare30" width="160" v-if="queryParams.groupFields.includes('spare30')" />
<el-table-column label="主颜色" align="left" prop="spare31" width="160" v-if="queryParams.groupFields.includes('spare31')" />
<el-table-column label="辅助颜色" align="left" prop="spare32" width="160" v-if="queryParams.groupFields.includes('spare32')" />
<el-table-column label="是否标准款" align="left" prop="spare33" width="160" v-if="queryParams.groupFields.includes('spare33')" />
<el-table-column label="包装方式" align="left" prop="spare34" width="160" v-if="queryParams.groupFields.includes('spare34')" />
<el-table-column label="主要包装方式" align="left" prop="spare35" width="160" v-if="queryParams.groupFields.includes('spare35')" />
<el-table-column label="长" align="right" prop="spare36" width="160" v-if="queryParams.groupFields.includes('spare36')" />
<el-table-column label="宽" align="right" prop="spare37" width="160" v-if="queryParams.groupFields.includes('spare37')" />
<el-table-column label="高" align="right" prop="spare38" width="160" v-if="queryParams.groupFields.includes('spare38')" />
<el-table-column label="包装材积" align="center" prop="spare39" width="160" v-if="queryParams.groupFields.includes('spare39')" />
<el-table-column label="价格" align="right" prop="price" width="160" v-if="queryParams.groupFields.includes('price')" />
<el-table-column label="产品编码" align="left" prop="cargoNo" width="160" v-if="queryParams.groupFields.includes('cargoNo')" />
<el-table-column label="单位" align="left" prop="unit" width="160" v-if="queryParams.groupFields.includes('unit')" />
<el-table-column label="型号" align="left" prop="spec" width="160" v-if="queryParams.groupFields.includes('spec')" />
<el-table-column label="单位名称" align="left" prop="spare1" width="160" v-if="queryParams.groupFields.includes('spare1')" />
<el-table-column label="url" align="left" prop="spare3" width="160" v-if="queryParams.groupFields.includes('spare3')" />
<el-table-column label="btnurl" align="left" prop="spare4" width="160" v-if="queryParams.groupFields.includes('spare4')" />
<el-table-column label="unitPrices" align="left" prop="spare5" width="160" v-if="queryParams.groupFields.includes('spare5')" />
<el-table-column label="units" align="left" prop="spare6" width="160" v-if="queryParams.groupFields.includes('spare6')" />
<el-table-column label="unitjb" align="left" prop="spare7" width="160" v-if="queryParams.groupFields.includes('spare7')" />
<el-table-column label="货位名称" align="left" prop="cargoSpaceName" width="160" v-if="queryParams.groupFields.includes('cargoSpaceName')" />
<el-table-column label="货位状态" align="left" prop="status" width="160" v-if="queryParams.groupFields.includes('status')" >
<template slot-scope="scope">
<dict-tag :options="dict.type.cargo_space_status" :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column label="货位锁" align="left" prop="locked" width="160" v-if="queryParams.groupFields.includes('locked')" >
<template slot-scope="scope">
<dict-tag :options="dict.type.cargo_space_lock_status" :value="scope.row.locked"/>
</template>
</el-table-column>
<el-table-column label="备注" align="left" prop="remark" width="160" />
</el-table>
@@ -323,7 +143,7 @@ import { listWarehouse } from "@/api/bas/warehouse"
export default {
name: "StockSummary",
dicts:['product_status', 'stock_status','cargo_space_status','cargo_space_lock_status','product_type','origin_type','account_type','turnover_type','purpose_type','quality_type','check_flag'],
dicts:['cargo_space_status','cargo_space_lock_status'],
data() {
return {
// 遮罩层
@@ -346,54 +166,24 @@ export default {
queryParams: {
pageNum: 1,
pageSize: 10,
stockId:null,
cargoSpaceId:null,
productId: null,
productName: null,
spec: null,
unit: null,
lotNo: null,
warehouseId: null,
orderId:null,
roadwayId: null,
quantity: null,
parentId: null,
cargoNo: null,
spare3: null,
spare4: null,
spare5: null,
spare6: null,
spare7: null,
spare8: null,
spare9: null,
spare10: null,
spare11: null,
spare12: null,
spare13: null,
spare14: null,
spare15: null,
spare16: null,
spare17: null,
spare18: null,
spare19: null,
spare20: null,
spare21: null,
spare22: null,
spare23: null,
spare24: null,
spare25: null,
spare26: null,
spare27: null,
spare28: null,
spare29: null,
spare30: null,
spare31: null,
spare32: null,
spare33: null,
spare34: null,
spare35: null,
spare36: null,
spare37: null,
spare38: null,
spare39: null,
parentId:null,
price:null,
cargoNo:null,
unit:null,
spec:null,
spare1:null,
spare3:null,
spare4:null,
spare5:null,
spare6:null,
spare7:null,
cargoSpaceName:null,
status:null,
locked:null,
//分组字段
groupFields: []
}
@@ -402,49 +192,23 @@ export default {
created() {
// 初始化时全选分组选项
this.queryParams.groupFields = [
'cargoSpaceId',
'productId',
'productName',
'parentId',
'price',
'cargoNo',
'roadwayId',
'orderId',
'unit',
'spec',
'spare1',
'spare3',
'spare4',
'spare5',
'spare6',
'spare7',
'spare8',
'spare9',
'spare10',
'spare11',
'spare12',
'spare13',
'spare14',
'spare15',
'spare16',
'spare17',
'spare18',
'spare19',
'spare20',
'spare21',
'spare22',
'spare23',
'spare24',
'spare25',
'spare26',
'spare27',
'spare28',
'spare29',
'spare30',
'spare31',
'spare32',
'spare33',
'spare34',
'spare35',
'spare36',
'spare37',
'spare38',
'spare39',
'productId', 'productName', 'spec', 'unit', 'lotNo', 'warehouseId', 'cargoSpaceId',
'price', 'spare1', 'spare2', 'spare5', 'spare6', 'spare7', 'spare8'
'cargoSpaceName',
'status',
'locked'
];
this.getList();
this.getWarehouseList()
@@ -492,49 +256,23 @@ export default {
this.resetForm("queryForm");
// 重置时恢复全选状态
this.queryParams.groupFields = [
'cargoSpaceId',
'productId',
'productName',
'parentId',
'price',
'cargoNo',
'orderId',
'roadwayId',
'unit',
'spec',
'spare1',
'spare3',
'spare4',
'spare5',
'spare6',
'spare7',
'spare8',
'spare9',
'spare10',
'spare11',
'spare12',
'spare13',
'spare14',
'spare15',
'spare16',
'spare17',
'spare18',
'spare19',
'spare20',
'spare21',
'spare22',
'spare23',
'spare24',
'spare25',
'spare26',
'spare27',
'spare28',
'spare29',
'spare30',
'spare31',
'spare32',
'spare33',
'spare34',
'spare35',
'spare36',
'spare37',
'spare38',
'spare39',
'productId', 'productName', 'spec', 'unit', 'lotNo', 'warehouseId', 'cargoSpaceId',
'price', 'spare1', 'spare2', 'spare5', 'spare6', 'spare7', 'spare8'
'cargoSpaceName',
'status',
'locked'
];
this.handleQuery();
},