zxt
20bbc6019a
库存字段和映射修改 前端显示修改 Co-authored-by: escapemoon <18834580489@163.com> Reviewed-on: http://106.13.86.63:10082/lhq/FT542-WMS/pulls/1
266 lines
15 KiB
XML
266 lines
15 KiB
XML
<?xml version="1.0" encoding="UTF-8" ?>
|
||
<!DOCTYPE mapper
|
||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||
<mapper namespace="com.ruoyi.search.ViewStockDetail.mapper.ViewStockDetailMapper">
|
||
|
||
<resultMap type="ViewStockDetail" id="ViewStockDetailResult">
|
||
<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" />
|
||
<!-- 与 BasStock 不符的字段已注释 -->
|
||
<!-- <result property="spec" column="spec" /> -->
|
||
<result property="quantity" column="quantity" />
|
||
<!-- <result property="price" column="price" /> -->
|
||
<!-- <result property="unit" column="unit" /> -->
|
||
<!-- <result property="cargoNo" column="cargo_no" /> -->
|
||
<result property="orderId" column="order_id" />
|
||
<!-- bs.power 字段与 BasStock 不一致，已注释 -->
|
||
<!-- <result property="power" column="power_col" /> -->
|
||
<!-- <result property="parentId" column="parent_id" /> -->
|
||
<result property="stockinId" column="stockin_id" />
|
||
<!-- 供应商相关字段与 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" />
|
||
<!-- stackingId 非 BasStock 字段，已注释 -->
|
||
<!-- <result property="stackingId" column="stacking_id" /> -->
|
||
<result property="backDate" column="back_date" />
|
||
<!-- 备注字段使用 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" />
|
||
|
||
<!-- 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.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
|
||
|
||
</sql>
|
||
|
||
<select id="selectViewStockDetailList" parameterType="ViewStockDetail" resultMap="ViewStockDetailResult">
|
||
<include refid="selectViewStockDetailVo"/>
|
||
<where>
|
||
<if test="stockId != null and stockId != ''"> and bs.stock_id = #{stockId}</if>
|
||
<if test="cargoSpaceId != null and cargoSpaceId != ''"> and bs.cargo_space_id = #{cargoSpaceId}</if>
|
||
<if test="stockStatus != null and stockStatus != ''"> and bs.stock_status = #{stockStatus}</if>
|
||
<if test="lotNo != null and lotNo != ''"> and bs.lot_no = #{lotNo}</if>
|
||
<if test="inDate != null and inDate != ''"> and bs.in_date like concat('%', #{inDate}, '%')</if>
|
||
<if test="backDate != null and backDate != ''"> and bs.back_date = #{backDate}</if>
|
||
<if test="productName != null and productName != ''"> and bs.product_name like concat('%', #{productName}, '%')</if>
|
||
<if test="quantity != null and quantity != ''"> and bs.quantity = #{quantity}</if>
|
||
<if test="trayCode != null and trayCode != ''"> and bs.tray_code = #{trayCode}</if>
|
||
<if test="outQuantity != null and outQuantity != ''"> and bs.out_quantity = #{outQuantity}</if>
|
||
<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="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>
|
||
<if test="productId != null and productId != ''"> and bs.product_id = #{productId}</if>
|
||
<if test="roadwayId != null and roadwayId != ''"> and bcs.roadway_id = #{roadwayId}</if>
|
||
<if test="theFloor != null and theFloor != ''"> and bcs.the_floor = #{theFloor}</if>
|
||
<if test="thePlatoon != null and thePlatoon != ''"> and bcs.the_platoon = #{thePlatoon}</if>
|
||
<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="price != null and price != ''"> and bp.price = #{price}</if>
|
||
<if test="inDateStart != null and inDateStart != ''"> and bs.in_date >= #{inDateStart}</if>
|
||
<if test="inDateEnd != null and inDateEnd != ''"> and bs.in_date <= #{inDateEnd}</if>
|
||
<if test="productType != null and productType != ''"> and bp.spare1 = #{productType}</if>
|
||
</where>
|
||
|
||
</select>
|
||
|
||
<select id="selectViewStockDetailByOnlyIdentity" parameterType="Long" resultMap="ViewStockDetailResult">
|
||
<include refid="selectViewStockDetailVo"/>
|
||
where only_identity = #{onlyIdentity}
|
||
</select>
|
||
|
||
<insert id="insertViewStockDetail" parameterType="ViewStockDetail">
|
||
insert into view_stock_detail
|
||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||
<if test="onlyIdentity != null">only_identity,</if>
|
||
<if test="stockId != null and stockId != ''">stock_id,</if>
|
||
<if test="cargoSpaceId != null">cargo_space_id,</if>
|
||
<if test="trayCode != null">tray_code,</if>
|
||
<if test="quantity != null">quantity,</if>
|
||
<if test="jobId != null">job_id,</if>
|
||
<if test="lotNo != null">lot_no,</if>
|
||
<if test="stockinDetailId != null">stockin_detail_id,</if>
|
||
<if test="inDate != null">in_date,</if>
|
||
<if test="warehouseId != null">warehouse_id,</if>
|
||
<if test="stackingId != null">stacking_id,</if>
|
||
<if test="cargoSpaceName != null">cargo_space_name,</if>
|
||
<if test="roadwayId != null">roadway_id,</if>
|
||
<if test="cargoSpaceStatus != null">cargo_space_status,</if>
|
||
<if test="locked != null">locked,</if>
|
||
<if test="productId != null">product_id,</if>
|
||
<if test="productName != null">product_name,</if>
|
||
<if test="spec != null">spec,</if>
|
||
<if test="unit != null">unit,</if>
|
||
<if test="price != null">price,</if>
|
||
<if test="remark != null">remark,</if>
|
||
<if test="spare1 != null">spare1,</if>
|
||
<if test="spare2 != null">spare2,</if>
|
||
<if test="spare5 != null">spare5,</if>
|
||
<if test="spare6 != null">spare6,</if>
|
||
<if test="spare7 != null">spare7,</if>
|
||
<if test="spare8 != null">spare8,</if>
|
||
</trim>
|
||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||
<if test="onlyIdentity != null">#{onlyIdentity},</if>
|
||
<if test="stockId != null and stockId != ''">#{stockId},</if>
|
||
<if test="cargoSpaceId != null">#{cargoSpaceId},</if>
|
||
<if test="trayCode != null">#{trayCode},</if>
|
||
<if test="quantity != null">#{quantity},</if>
|
||
<if test="jobId != null">#{jobId},</if>
|
||
<if test="lotNo != null">#{lotNo},</if>
|
||
<if test="stockinDetailId != null">#{stockinDetailId},</if>
|
||
<if test="inDate != null">#{inDate},</if>
|
||
<if test="warehouseId != null">#{warehouseId},</if>
|
||
<if test="stackingId != null">#{stackingId},</if>
|
||
<if test="cargoSpaceName != null">#{cargoSpaceName},</if>
|
||
<if test="roadwayId != null">#{roadwayId},</if>
|
||
<if test="cargoSpaceStatus != null">#{cargoSpaceStatus},</if>
|
||
<if test="locked != null">#{locked},</if>
|
||
<if test="productId != null">#{productId},</if>
|
||
<if test="productName != null">#{productName},</if>
|
||
<if test="spec != null">#{spec},</if>
|
||
<if test="unit != null">#{unit},</if>
|
||
<if test="price != null">#{price},</if>
|
||
<if test="remark != null">#{remark},</if>
|
||
<if test="spare1 != null">#{spare1},</if>
|
||
<if test="spare2 != null">#{spare2},</if>
|
||
<if test="spare5 != null">#{spare5},</if>
|
||
<if test="spare6 != null">#{spare6},</if>
|
||
<if test="spare7 != null">#{spare7},</if>
|
||
<if test="spare8 != null">#{spare8},</if>
|
||
</trim>
|
||
</insert>
|
||
|
||
<update id="updateViewStockDetail" parameterType="ViewStockDetail">
|
||
update view_stock_detail
|
||
<trim prefix="SET" suffixOverrides=",">
|
||
<if test="stockId != null and stockId != ''">stock_id = #{stockId},</if>
|
||
<if test="cargoSpaceId != null">cargo_space_id = #{cargoSpaceId},</if>
|
||
<if test="trayCode != null">tray_code = #{trayCode},</if>
|
||
<if test="quantity != null">quantity = #{quantity},</if>
|
||
<if test="jobId != null">job_id = #{jobId},</if>
|
||
<if test="lotNo != null">lot_no = #{lotNo},</if>
|
||
<if test="stockinDetailId != null">stockin_detail_id = #{stockinDetailId},</if>
|
||
<if test="inDate != null">in_date = #{inDate},</if>
|
||
<if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
|
||
<if test="stackingId != null">stacking_id = #{stackingId},</if>
|
||
<if test="cargoSpaceName != null">cargo_space_name = #{cargoSpaceName},</if>
|
||
<if test="roadwayId != null">roadway_id = #{roadwayId},</if>
|
||
<if test="cargoSpaceStatus != null">cargo_space_status = #{cargoSpaceStatus},</if>
|
||
<if test="locked != null">locked = #{locked},</if>
|
||
<if test="productId != null">product_id = #{productId},</if>
|
||
<if test="productName != null">product_name = #{productName},</if>
|
||
<if test="spec != null">spec = #{spec},</if>
|
||
<if test="unit != null">unit = #{unit},</if>
|
||
<if test="price != null">price = #{price},</if>
|
||
<if test="remark != null">remark = #{remark},</if>
|
||
<if test="spare1 != null">spare1 = #{spare1},</if>
|
||
<if test="spare2 != null">spare2 = #{spare2},</if>
|
||
<if test="spare5 != null">spare5 = #{spare5},</if>
|
||
<if test="spare6 != null">spare6 = #{spare6},</if>
|
||
<if test="spare7 != null">spare7 = #{spare7},</if>
|
||
<if test="spare8 != null">spare8 = #{spare8},</if>
|
||
</trim>
|
||
where only_identity = #{onlyIdentity}
|
||
</update>
|
||
|
||
<delete id="deleteViewStockDetailByOnlyIdentity" parameterType="Long">
|
||
delete from view_stock_detail where only_identity = #{onlyIdentity}
|
||
</delete>
|
||
|
||
<delete id="deleteViewStockDetailByOnlyIdentitys" parameterType="String">
|
||
delete from view_stock_detail where only_identity in
|
||
<foreach item="onlyIdentity" collection="array" open="(" separator="," close=")">
|
||
#{onlyIdentity}
|
||
</foreach>
|
||
</delete>
|
||
</mapper>
|