lhq/FT542-WMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

zxt/stock 库存管理 (#1)

Browse Source 
库存字段和映射修改 前端显示修改

Co-authored-by: escapemoon <18834580489@163.com>
Reviewed-on: http://106.13.86.63:10082/lhq/FT542-WMS/pulls/1
This commit was merged in pull request #1.
This commit is contained in:
zxt
2025-12-08 10:26:40 +08:00
parent 0ad1b6b601
commit 20bbc6019a
14 changed files with 1572 additions and 258 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
ruoyi-ui/src/views/search/ViewStockDetail/index.vue
View File

@@ -422,6 +422,49 @@
<el-form-item label="价格" prop="price">
<el-input v-model="form.price" placeholder="请输入价格" />
</el-form-item>
<!-- 新增 pd_ 明细字段显示 -->
<el-form-item label="明细ID" prop="pdDetailId">
<el-input v-model="form.pdDetailId" placeholder="请输入明细ID" />
</el-form-item>
<el-form-item label="明细产品名" prop="pdProductName">
<el-input v-model="form.pdProductName" placeholder="请输入明细产品名称" />
</el-form-item>
<el-form-item label="明细型号" prop="pdModel">
<el-input v-model="form.pdModel" placeholder="请输入明细型号" />
</el-form-item>
<el-form-item label="明细单位" prop="pdUnit">
<el-input v-model="form.pdUnit" placeholder="请输入明细单位" />
</el-form-item>
<el-form-item label="明细单价" prop="pdUnitPrice">
<el-input v-model="form.pdUnitPrice" placeholder="请输入明细单价" />
</el-form-item>
<el-form-item label="明细数量" prop="pdQuantity">
<el-input v-model="form.pdQuantity" placeholder="请输入明细数量" />
</el-form-item>
<el-form-item label="明细总价" prop="pdTotalPrice">
<el-input v-model="form.pdTotalPrice" placeholder="请输入明细总价" />
</el-form-item>
<el-form-item label="明细批号" prop="pdBatchNo">
<el-input v-model="form.pdBatchNo" placeholder="请输入明细批号" />
</el-form-item>
<el-form-item label="明细序列号" prop="pdSerialNo">
<el-input v-model="form.pdSerialNo" placeholder="请输入明细序列号" />
</el-form-item>
<el-form-item label="生产日期" prop="pdProdDate">
<el-date-picker v-model="form.pdProdDate" type="date" value-format="yyyy-MM-dd" placeholder="请选择生产日期" />
</el-form-item>
<el-form-item label="有效日期" prop="pdValidDate">
<el-date-picker v-model="form.pdValidDate" type="date" value-format="yyyy-MM-dd" placeholder="请选择有效日期" />
</el-form-item>
<el-form-item label="到货日期" prop="pdArrivalDate">
<el-date-picker v-model="form.pdArrivalDate" type="date" value-format="yyyy-MM-dd" placeholder="请选择到货日期" />
</el-form-item>
<el-form-item label="明细备注" prop="pdRemark">
<el-input v-model="form.pdRemark" placeholder="请输入明细备注" />
</el-form-item>
<el-form-item label="装卸工" prop="pdLoader">
<el-input v-model="form.pdLoader" placeholder="请输入装卸工" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确定</el-button>
@@ -529,6 +572,22 @@ export default {
spec: null,
unit: null,
price: null
,
// pd_ 明细字段
pdDetailId: null,
pdProductName: null,
pdModel: null,
pdUnit: null,
pdUnitPrice: null,
pdQuantity: null,
pdTotalPrice: null,
pdBatchNo: null,
pdSerialNo: null,
pdProdDate: null,
pdValidDate: null,
pdArrivalDate: null,
pdRemark: null,
pdLoader: null
}
this.resetForm("form")
},

2
ruoyi-ui/src/views/stock/freeze/index.vue
View File

@@ -60,6 +60,8 @@
<!-- <el-table-column label="库存编码" align="center" prop="stockId" /> &lt;!&ndash; 库存编码 &ndash;&gt;-->
<el-table-column label="货位编码" align="left" prop="cargoSpaceId" /> <!-- 货位编码 -->
<el-table-column label="货位名称" align="left" prop="cargoSpaceName" /> <!-- 货位名称 -->
<!-- <el-table-column label="单位名称" align="left" prop="unitName" />
<el-table-column label="产品型号" align="left" prop="productModel" /> -->
<!-- <el-table-column label="托盘条码" align="left" prop="trayCode" /> &lt;!&ndash; 托盘条码 &ndash;&gt;-->
<el-table-column label="原库位状态" align="left" prop="oldStatus" >
<template slot-scope="scope">

283
ruoyi-ui/src/views/stock/management/index.vue
View File

@@ -17,7 +17,45 @@
</el-select>
</el-form-item>
<el-form-item label="巷道" prop="roadwayId">
<el-form-item label="库存状态" prop="stockStatus">
<el-select v-model="queryParams.stockStatus" placeholder="请选择库存状态" clearable @change="handleQuery">
<el-option
v-for="dict in dict.type.stock_status"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="库存编码" prop="stockId">
<el-input
v-model="queryParams.stockId"
placeholder="请输入库存编码"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="产品GUID" prop="productGuid">
<el-input
v-model="queryParams.productGuid"
placeholder="请输入产品GUID"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="批次号(库存批次)" prop="lotNo">
<el-input
v-model="queryParams.lotNo"
placeholder="请输入库存批次号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="巷道" prop="roadwayId">
<el-input
v-model="queryParams.roadwayId"
placeholder="请输入巷道"
@@ -48,7 +86,7 @@
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
</el-form-item> -->
<el-form-item label="物料编码" prop="productId">
<el-input
v-model="queryParams.productId"
@@ -57,14 +95,14 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="规格型号" prop="spec">
<!-- <el-form-item label="规格型号" prop="spec">
<el-input
v-model="queryParams.spec"
placeholder="请输入规格型号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
</el-form-item> -->
<el-form-item label="常用编码" prop="parentId">
<el-input
v-model="queryParams.parentId"
@@ -97,6 +135,87 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="入库主题" prop="Title">
<el-input v-model="queryParams.Title" placeholder="请输入入库主题" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="入库编号" prop="Rkbh">
<el-input v-model="queryParams.Rkbh" placeholder="请输入入库编号" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="审批状态" prop="Status">
<el-input v-model="queryParams.Status" placeholder="请输入审批状态" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="明细产品名" prop="pdProductName">
<el-input
v-model="queryParams.pdProductName"
placeholder="请输入明细产品名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="明细型号" prop="pdModel">
<el-input
v-model="queryParams.pdModel"
placeholder="请输入明细型号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item> -->
<el-form-item label="明细单位" prop="pdUnit">
<el-input
v-model="queryParams.pdUnit"
placeholder="请输入明细单位"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="明细单价" prop="pdUnitPrice">
<el-input
v-model="queryParams.pdUnitPrice"
placeholder="请输入明细单价"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="明细数量" prop="pdQuantity">
<el-input
v-model="queryParams.pdQuantity"
placeholder="请输入明细数量"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="明细金额" prop="pdTotalPrice">
<el-input
v-model="queryParams.pdTotalPrice"
placeholder="请输入明细金额"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item> -->
<!-- <el-form-item label="明细生产日期" prop="pdProdDate">
<el-date-picker clearable
v-model="queryParams.pdProdDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择生产日期">
</el-date-picker>
</el-form-item> -->
<!-- <el-form-item label="批号" prop="pdBatchNo">
<el-input
v-model="queryParams.pdBatchNo"
placeholder="请输入批号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="序列号" prop="pdSerialNo">
<el-input
v-model="queryParams.pdSerialNo"
placeholder="请输入序列号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item> -->
<el-form-item label="入库单号" prop="stockinId">
<el-input
v-model="queryParams.stockinId"
@@ -122,7 +241,7 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="合同号" prop="orderId">
<!-- <el-form-item label="合同号" prop="orderId">
<el-input
v-model="queryParams.orderId"
placeholder="请输入合同号"
@@ -139,7 +258,7 @@
:value="dict.value"
/>
</el-select>
</el-form-item>
</el-form-item> -->
<el-form-item label="起始时间" prop="inDateStart">
<el-date-picker clearable
v-model="queryParams.inDateStart"
@@ -156,7 +275,7 @@
placeholder="请选择截止时间">
</el-date-picker>
</el-form-item>
<el-form-item label="周转类型" prop="voltage">
<!-- <el-form-item label="周转类型" prop="voltage">
<el-select v-model="queryParams.voltage" placeholder="请选择周转类型" clearable>
<el-option
v-for="dict in dict.type.turnover_type"
@@ -185,8 +304,8 @@
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="形态类型" prop="productType">
</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"
@@ -219,7 +338,7 @@
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
</el-form-item> -->
<el-form-item>
@@ -280,17 +399,31 @@
<el-table-column label="库位编码" align="center" prop="cargoSpaceId" width="160"/>
<el-table-column label="托盘" align="center" prop="trayCode"/>
<el-table-column label="产品编码" align="center" prop="productId"/>
<el-table-column label="产品GUID" align="center" prop="productGuid"/>
<el-table-column label="库存批次" align="center" prop="lotNo"/>
<el-table-column label="产品名称" align="center" prop="productName" width="160" />
<el-table-column label="入库主题" align="center" prop="Title" />
<el-table-column label="入库编号" align="center" prop="Rkbh" />
<el-table-column label="审批状态" align="center" prop="Status" />
<el-table-column label="规格" align="center" prop="spec" width="160"/>
<el-table-column label="明细产品名" align="center" prop="pdProductName" width="160"/>
<!-- <el-table-column label="批号" align="center" prop="pdBatchNo" width="140"/>
<el-table-column label="序列号" align="center" prop="pdSerialNo" width="160"/> -->
<!-- <el-table-column label="明细型号" align="center" prop="pdModel" width="140"/> -->
<el-table-column label="明细单位" align="center" prop="pdUnit" width="100"/>
<el-table-column label="明细单价" align="center" prop="pdUnitPrice" width="120"/>
<el-table-column label="明细数量" align="center" prop="pdQuantity" width="100"/>
<el-table-column label="明细金额" align="center" prop="pdTotalPrice" width="120"/>
<el-table-column label="数量" align="center" prop="quantity"/>
<el-table-column label="单价" align="center" prop="price"/>
<el-table-column label="金额" align="center" prop="spare6"/>
<el-table-column label="出库数量" align="center" prop="outQuantity"/>
<!-- <el-table-column label="单价" align="center" prop="price"/>
<el-table-column label="金额" align="center" prop="spare6"/> -->
<el-table-column label="产品状态" align="center" prop="productType">
<template slot-scope="scope">
<dict-tag :options="dict.type.product_type" :value="scope.row.productType"/>
</template>
</el-table-column>
<el-table-column label="单位" align="center" prop="unit"/>
<!-- <el-table-column label="单位名称" align="center" prop="unit"/>
<el-table-column label="图号" align="center" prop="cargoNo"/>
<el-table-column label="合同号" align="center" prop="orderId"/>
<el-table-column label="台次" align="center" prop="spare5"/>
@@ -299,23 +432,31 @@
<template slot-scope="scope">
<dict-tag :options="dict.type.quality_type" :value="scope.row.spare8"/>
</template>
</el-table-column>
</el-table-column> -->
<el-table-column label="常用编码" align="center" prop="parentId"/>
<el-table-column label="入库单号" align="center" prop="stockinId" width="160"/>
<el-table-column label="入库子单ID" align="center" prop="stockinDetailId" width="160"/>
<el-table-column label="供应商编码" align="center" prop="supplierId" width="160"/>
<el-table-column label="供应商名称" align="center" prop="supplierName" width="160"/>
<el-table-column label="仓库编码" align="center" prop="warehouseId"/>
<el-table-column label="仓库名称" align="center" prop="warehouseName"/>
<el-table-column label="首次入库时间" align="center" prop="inDate" width="160"/>
<!-- <el-table-column label="生产日期" align="center" prop="pdProdDate" width="140"/>
<el-table-column label="有效日期" align="center" prop="pdValidDate" width="140"/>
<el-table-column label="到货日期" align="center" prop="pdArrivalDate" width="140"/> -->
<el-table-column label="最后出库时间" align="center" prop="stackingId" width="160"/>
<el-table-column label="盘点标识" align="center" prop="spare7">
<!-- <el-table-column label="盘点标识" align="center" prop="spare7">
<template slot-scope="scope">
<dict-tag :options="dict.type.check_flag" :value="scope.row.spare7"/>
</template>
</el-table-column>
<el-table-column label="盘点时间" align="center" prop="backDate" width="160"/>
<el-table-column label="盘点时间" align="center" prop="backDate" width="160"/> -->
<el-table-column label="备注" align="center" prop="remark"/>
<el-table-column label="来源" align="center" prop="spare4">
<el-table-column label="入库备注" align="center" prop="Intro"/>
<!-- <el-table-column label="明细备注" align="center" prop="pdRemark"/> -->
<el-table-column label="装卸工" align="center" prop="pdLoader"/>
<el-table-column label="明细ID" align="center" prop="pdDetailId"/>
<!-- <el-table-column label="来源" align="center" prop="spare4">
<template slot-scope="scope">
<dict-tag :options="dict.type.origin_type" :value="scope.row.spare4"/>
</template>
@@ -325,6 +466,7 @@
<dict-tag :options="dict.type.purpose_type" :value="scope.row.spare1"/>
</template>
</el-table-column>
<el-table-column label="产品型号" align="center" prop="productModel"/> -->
<el-table-column width=120 label="操作" align="center" class-name="small-padding fixed-width"> <!-- 操作 -->
<template slot-scope="scope">
<el-button
@@ -406,6 +548,49 @@
<el-input v-model="form.quantity" placeholder="请输入库存数量" />
</el-form-item>
<el-form-item label="单位名称" prop="unit">
<el-input v-model="form.unit" placeholder="请输入单位名称" />
</el-form-item>
<el-form-item label="产品型号" prop="productModel">
<el-input v-model="form.productModel" placeholder="请输入产品型号" />
</el-form-item>
<!-- SQL 新增字段输入（可删减） -->
<el-form-item label="入库主题" prop="Title">
<el-input v-model="form.Title" placeholder="请输入入库主题" />
</el-form-item>
<el-form-item label="入库编号" prop="Rkbh">
<el-input v-model="form.Rkbh" placeholder="请输入入库编号" />
</el-form-item>
<el-form-item label="审批状态" prop="Status">
<el-input v-model="form.Status" placeholder="请输入审批状态" />
</el-form-item>
<!-- <el-form-item label="集合数据(Rows)" prop="Rows">
<el-input v-model="form.Rows" placeholder="集合数据(JSON)" />
</el-form-item> -->
<el-form-item label="入库id(Kuin)" prop="Kuin">
<el-input v-model="form.Kuin" placeholder="请输入入库id" />
</el-form-item>
<el-form-item label="申请人" prop="Cateid">
<el-input v-model="form.Cateid" placeholder="请输入申请人" />
</el-form-item>
<el-form-item label="申请日期" prop="Date3">
<el-date-picker v-model="form.Date3" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择申请日期" />
</el-form-item>
<el-form-item label="确认日期" prop="Date5">
<el-date-picker v-model="form.Date5" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择确认日期" />
</el-form-item>
<el-form-item label="审批人" prop="Catein">
<el-input v-model="form.Catein" placeholder="请输入审批人" />
</el-form-item>
<el-form-item label="入库备注(Intro)" prop="Intro">
<el-input v-model="form.Intro" placeholder="请输入入库备注" />
</el-form-item>
<el-form-item label="关联单据(Caigou)" prop="Caigou">
<el-input v-model="form.Caigou" placeholder="请输入关联单据id" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确定 <!-- 确定 --></el-button>
@@ -579,6 +764,12 @@ export default {
inDate: null,
backDate: null,
productGuid: null,
pdModel: null,
pdUnit: null,
pdUnitPrice: null,
pdQuantity: null,
pdTotalPrice: null,
pdProdDate: null,
quantity: null,
jobId: null,
trayCode: null,
@@ -596,6 +787,9 @@ export default {
spare5: null,
spare6: null,
theFloor: null,
pdProductName: null,
pdBatchNo: null,
pdSerialNo: null,
cargoSpaceStockStatus:2
},
queryWarehouse: {
@@ -691,10 +885,63 @@ export default {
spare3: null,
spare4: null,
spare5: null,
spare6: null
spare6: null,
// SQL 新增字段
Rows: null,
Title: null,
Kuin: null,
Complete1: null,
Cateid: null,
Date3: null,
Date5: null,
Catein: null,
Intro2: null,
Intro: null,
Caigou: null,
Date7: null,
Kg: null,
Sort1: null,
Rkbh: null,
Status: null,
KuinList: null,
sysIcusIInheritIdIidI413: null,
sysIcusIInheritIdIidI414: null,
sysIcusIInheritIdIidI415: null,
// pd_ 明细字段
pdDetailId: null,
pdProductName: null,
pdModel: null,
pdUnit: null,
pdUnitPrice: null,
pdAuxUnit: null,
pdAttr1: null,
pdAttr2: null,
pdQuantity: null,
pdInQty: null,
pdAuxQuantity: null,
pdTotalPrice: null,
pdCostUnitPrice: null,
pdTotalPrice2: null,
pdAccountCostTotal: null,
pdAccountQuantity: null,
pdAccountStatus: null,
pdBatchNo: null,
pdSerialNo: null,
pdProdDate: null,
pdValidDate: null,
pdArrivalDate: null,
pdRemark: null,
pdCustom1: null,
pdCustom2: null,
pdCustom3: null,
pdCustom4: null,
pdCustom5: null,
pdCustom6: null,
pdLoader: null
}
this.resetForm("form")
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1

2
ruoyi-ui/src/views/stock/record/index.vue
View File

@@ -92,6 +92,8 @@
<el-table-column label="初始物品名称" align="left" prop="productGuid" /> <!-- 托盘条码 -->
<el-table-column label="操作后物品编码" align="left" prop="productId" /> <!-- 物品编码 -->
<el-table-column label="操作后物品名称" align="left" prop="productName" /> <!-- 物品名称 -->
<el-table-column label="单位名称" align="left" prop="unitName" />
<el-table-column label="产品型号" align="left" prop="productModel" />
<el-table-column label="初始数量" align="right" prop="oldQuantity" /> <!-- 初始数量 -->
<el-table-column label="操作后数量" align="right" prop="quantity" /> <!-- 操作后数量 -->
<el-table-column label="操作" align="left" prop="method"> <!-- 操作 -->