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

151
ruoyi-admin/src/main/resources/mapper/search/ViewStockDetailMapper.xml
View File

@@ -5,81 +5,115 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<mapper namespace="com.ruoyi.search.ViewStockDetail.mapper.ViewStockDetailMapper">
<resultMap type="ViewStockDetail" id="ViewStockDetailResult">
<result property="spare3" column="spare3" />
<result property="cargoSpaceId" column="cargo_space_id" />
<result property="trayCode" column="tray_code" />
<result property="productId" column="product_id" />
<result property="productName" column="product_name" />
<result property="spec" column="spec" />
<!-- 与 BasStock 不符的字段已注释 -->
<!-- <result property="spec" column="spec" /> -->
<result property="quantity" column="quantity" />
<result property="spare6" column="spare6" />
<result property="price" column="price" />
<result property="spare1" column="spare1" />
<result property="unit" column="unit" />
<result property="cargoNo" column="cargo_no" />
<!-- <result property="price" column="price" /> -->
<!-- <result property="unit" column="unit" /> -->
<!-- <result property="cargoNo" column="cargo_no" /> -->
<result property="orderId" column="order_id" />
<result property="spare5" column="spare5" />
<result property="power" column="power" />
<result property="spare8" column="spare8" />
<result property="parentId" column="parent_id" />
<!-- bs.power 字段与 BasStock 不一致，已注释 -->
<!-- <result property="power" column="power_col" /> -->
<!-- <result property="parentId" column="parent_id" /> -->
<result property="stockinId" column="stockin_id" />
<result property="supplierName" column="supplier_name" />
<result property="supplierNo" column="supplier_no" />
<!-- 供应商相关字段与 BasStock 不符，已注释 -->
<!-- <result property="supplierName" column="supplier_name" /> -->
<!-- <result property="supplierNo" column="supplier_no" /> -->
<result property="warehouseId" column="warehouse_id" />
<result property="warehouseName" column="warehouse_name" />
<result property="inDate" column="in_date" />
<result property="stackingId" column="stacking_id" />
<result property="spare7" column="spare7" />
<!-- stackingId 非 BasStock 字段，已注释 -->
<!-- <result property="stackingId" column="stacking_id" /> -->
<result property="backDate" column="back_date" />
<result property="remark" column="remark" />
<!-- 备注字段使用 pd_remark（明细）或保留在 BasStock 中，基于适配需求先注释 remark -->
<!-- <result property="remark" column="remark" /> -->
<result property="stockId" column="stock_id" />
<result property="stockStatus" column="stock_status" />
<result property="lotNo" column="lot_no" />
<result property="outQuantity" column="out_quantity" />
<result property="spare4" column="spare4" />
<result property="spare1" column="spare1" />
<result property="productType" column="productType" />
<!-- productType 来自 bas_product(bp)，BasStock 未将其作为主表字段，已注释 -->
<!-- <result property="productType" column="productType" /> -->
<!-- 添加 BasStock 的 pd_ 明细映射 -->
<result property="pdDetailId" column="pd_detail_id" />
<result property="pdProductName" column="pd_product_name" />
<result property="pdModel" column="pd_model" />
<result property="pdUnit" column="pd_unit" />
<result property="pdUnitPrice" column="pd_unit_price" />
<result property="pdAuxUnit" column="pd_aux_unit" />
<result property="pdAttr1" column="pd_attr1" />
<result property="pdAttr2" column="pd_attr2" />
<result property="pdQuantity" column="pd_quantity" />
<result property="pdInQty" column="pd_in_qty" />
<result property="pdAuxQuantity" column="pd_aux_quantity" />
<result property="pdTotalPrice" column="pd_total_price" />
<result property="pdCostUnitPrice" column="pd_cost_unit_price" />
<result property="pdTotalPrice2" column="pd_total_price_2" />
<result property="pdAccountCostTotal" column="pd_account_cost_total" />
<result property="pdAccountQuantity" column="pd_account_quantity" />
<result property="pdAccountStatus" column="pd_account_status" />
<result property="pdBatchNo" column="pd_batch_no" />
<result property="pdSerialNo" column="pd_serial_no" />
<result property="pdProdDate" column="pd_prod_date" />
<result property="pdValidDate" column="pd_valid_date" />
<result property="pdArrivalDate" column="pd_arrival_date" />
<result property="pdRemark" column="pd_remark" />
<result property="pdCustom1" column="pd_custom1" />
<result property="pdCustom2" column="pd_custom2" />
<result property="pdCustom3" column="pd_custom3" />
<result property="pdCustom4" column="pd_custom4" />
<result property="pdCustom5" column="pd_custom5" />
<result property="pdCustom6" column="pd_custom6" />
<result property="pdLoader" column="pd_loader" />
</resultMap>
<sql id="selectViewStockDetailVo">
select bs.spare3, --账套
bs.cargo_space_id, --库位编码
bs.tray_code, --托盘
bs.product_id, --产品编码
bs.product_name,--产品名称
bp.spec, -- 规格
bs.quantity, -- 数量
bs.spare6, -- 金额
bp.price, --单价
bp.spare1 as productType, --产品状态
bp.unit, -- 单位
bp.cargo_no, --图号
bs.order_id, --合同号
bs.spare5, --台次
bs.power, --件次
bs.spare8, --质量
bp.parent_id, --常用编码
bs.stockin_id, --入库单号
bs2.supplier_name, --供应商名称
bs2.supplier_no, --供应商编号
bw.warehouse_id, --仓库编码
bw.warehouse_name, --仓库名称
bs.in_date, --入库时间
bs.stacking_id, --出库时间
bs.spare7, --盘点标识
bs.back_date, --盘点时间
bp.remark, --备注
bs.stock_id, --库存编码
bs.stock_status, --库存状态
bs.lot_no, --批次号
bs.out_quantity,
bs.spare4, --来源
bs.spare1 --用途
from bas_stock bs
select bs.cargo_space_id, --库位编码
bs.tray_code, --托盘
bs.product_id, --产品编码
bs.product_name,--产品名称
bs.quantity, -- 数量
bs.order_id, --合同号
bs.stockin_id, --入库单号
bw.warehouse_id, --仓库编码
bw.warehouse_name, --仓库名称
bs.in_date, --入库时间
bs.back_date, --盘点时间
-- bas_stock 的 pd_ 明细字段
bs.pd_product_name, -- 明细产品名称
bs.pd_batch_no, -- 明细批次号
bs.pd_serial_no, -- 明细序列号
bs.pd_model, -- 明细型号
bs.pd_unit, -- 明细单位
bs.pd_unit_price, -- 明细单价
bs.pd_quantity, -- 明细数量
bs.pd_total_price, -- 明细金额
bs.pd_cost_unit_price,
bs.pd_prod_date, -- 明细生产日期
bs.pd_valid_date, -- 明细有效日期
bs.pd_arrival_date, -- 明细到货日期
bs.pd_remark, -- 明细备注
bs.stock_id, --库存编码
bs.stock_status, --库存状态
bs.lot_no, --批次号
bs.out_quantity
from bas_stock bs
left join bas_product bp on bs.product_id = bp.product_id
left join bas_warehouse bw on bs.warehouse_id = bw.warehouse_id
left join bas_cargo_space bcs on bs.cargo_space_id = bcs.cargo_space_id
left join bas_supplier bs2 on bs.phase = bs2.supplier_no
</sql>
<select id="selectViewStockDetailList" parameterType="ViewStockDetail" resultMap="ViewStockDetailResult">
@@ -98,11 +132,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="stockinId != null and stockinId != ''"> and bs.stockin_id = #{stockinId}</if>
<if test="warehouseId != null and warehouseId != ''"> and bs.warehouse_id = #{warehouseId}</if>
<if test="stackingId != null and stackingId != ''"> and bs.stacking_id = #{stackingId}</if>
<if test="spare1 != null and spare1 != ''"> and bs.spare1 = #{spare1}</if>
<if test="spare3 != null and spare3 != ''"> and bs.spare3 = #{spare3}</if>
<if test="spare4 != null and spare4 != ''"> and bs.spare4 = #{spare4}</if>
<if test="spare5 != null and spare5 != ''"> and bs.spare5 = #{spare5}</if>
<if test="spare6 != null and spare6 != ''"> and bs.spare6 = #{spare6}</if>
<if test="voltage != null and voltage != ''"> and bs.voltage = #{voltage}</if>
<if test="power != null and power != ''"> and bs.power = #{power}</if>
<if test="orderId != null and orderId != ''"> and bs.order_id = #{orderId}</if>
@@ -113,8 +143,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="theColumn != null and theColumn != ''"> and bcs.the_column = #{theColumn}</if>
<if test="spec != null and spec != ''"> and bp.spec = #{spec}</if>
<if test="parentId != null and parentId != ''"> and bp.parent_id = #{parentId}</if>
<if test="supplierId != null and supplierId != ''"> and bs2.supplier_no = #{supplierId}</if>
<if test="supplierName != null and supplierName != ''"> and bs2.supplier_name = #{supplierName}</if>
<if test="price != null and price != ''"> and bp.price = #{price}</if>
<if test="inDateStart != null and inDateStart != ''"> and bs.in_date &gt;= #{inDateStart}</if>
<if test="inDateEnd != null and inDateEnd != ''"> and bs.in_date &lt;= #{inDateEnd}</if>