pda盘点确认

This commit is contained in:
liuhanqing
2025-06-19 17:47:52 +08:00
parent b9fc02c01b
commit afb022d365
29 changed files with 1022 additions and 100 deletions

View File

@@ -0,0 +1,82 @@
<?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.check.commit.mapper.CheckCommitRecordMapper">
<resultMap type="CheckCommitRecord" id="CheckCommitRecordResult">
<result property="pdGuid" column="pd_guid" />
<result property="trayCode" column="tray_code" />
<result property="stockId" column="stock_id" />
<result property="quantity" column="quantity" />
<result property="spare1" column="spare1" />
<result property="spare2" column="spare2" />
<result property="spare3" column="spare3" />
</resultMap>
<sql id="selectCheckCommitRecordVo">
select pd_guid, tray_code, stock_id, quantity, spare1, spare2, spare3 from check_commit_record
</sql>
<select id="selectCheckCommitRecordList" parameterType="CheckCommitRecord" resultMap="CheckCommitRecordResult">
<include refid="selectCheckCommitRecordVo"/>
<where>
<if test="pdGuid != null "> and pd_guid = #{pdGuid}</if>
<if test="trayCode != null and trayCode != ''"> and tray_code = #{trayCode}</if>
<if test="stockId != null and stockId != ''"> and stock_id = #{stockId}</if>
<if test="quantity != null and quantity != ''"> and quantity = #{quantity}</if>
<if test="spare1 != null and spare1 != ''"> and spare1 = #{spare1}</if>
<if test="spare2 != null and spare2 != ''"> and spare2 = #{spare2}</if>
<if test="spare3 != null and spare3 != ''"> and spare3 = #{spare3}</if>
</where>
</select>
<select id="selectCheckCommitRecordByPdGuid" parameterType="Long" resultMap="CheckCommitRecordResult">
<include refid="selectCheckCommitRecordVo"/>
where pd_guid = #{pdGuid}
</select>
<insert id="insertCheckCommitRecord" parameterType="CheckCommitRecord" useGeneratedKeys="true" keyProperty="pdGuid">
insert into check_commit_record
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="trayCode != null">tray_code,</if>
<if test="stockId != null">stock_id,</if>
<if test="quantity != null">quantity,</if>
<if test="spare1 != null">spare1,</if>
<if test="spare2 != null">spare2,</if>
<if test="spare3 != null">spare3,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="trayCode != null">#{trayCode},</if>
<if test="stockId != null">#{stockId},</if>
<if test="quantity != null">#{quantity},</if>
<if test="spare1 != null">#{spare1},</if>
<if test="spare2 != null">#{spare2},</if>
<if test="spare3 != null">#{spare3},</if>
</trim>
</insert>
<update id="updateCheckCommitRecord" parameterType="CheckCommitRecord">
update check_commit_record
<trim prefix="SET" suffixOverrides=",">
<if test="trayCode != null">tray_code = #{trayCode},</if>
<if test="stockId != null">stock_id = #{stockId},</if>
<if test="quantity != null">quantity = #{quantity},</if>
<if test="spare1 != null">spare1 = #{spare1},</if>
<if test="spare2 != null">spare2 = #{spare2},</if>
<if test="spare3 != null">spare3 = #{spare3},</if>
</trim>
where pd_guid = #{pdGuid}
</update>
<delete id="deleteCheckCommitRecordByPdGuid" parameterType="Long">
delete from check_commit_record where pd_guid = #{pdGuid}
</delete>
<delete id="deleteCheckCommitRecordByPdGuids" parameterType="String">
delete from check_commit_record where pd_guid in
<foreach item="pdGuid" collection="array" open="(" separator="," close=")">
#{pdGuid}
</foreach>
</delete>
</mapper>

View File

@@ -67,6 +67,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="spare4" column="spare4" />
<result property="spare5" column="spare5" />
<result property="spare6" column="spare6" />
<result property="cargoSpaceName" column="cargo_space_name" />
<association property="extraField" javaType="ExtraField">
<result property="productId" column="product_id" />
<result property="materialDesc" column="product_name" />
@@ -85,9 +87,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
csd.assign_num_j, csd.print_date, csd.stock_status, csd.supplier_id, csd.customer_id, csd.unit, csd.spec,
csd.scan_num, csd.scan_num_x, csd.scan_num_j, csd.spare1, csd.spare2, csd.spare3, csd.spare4,csd.spare5, csd.spare6,
bp.product_name,bp.spare1 as englishDesc,
bp.spare2 as netWeight,bp.spare5 as length,bp.spare6 as width,bp.spare7 as height,bp.spare8 as volume
bp.spare2 as netWeight,bp.spare5 as length,bp.spare6 as width,bp.spare7 as height,bp.spare8 as volume,
bcs.cargo_space_name
from check_stockin_detail_finish csd
left join bas_product bp on csd.product_id = bp.product_id
left join bas_cargo_space bcs on csd.spare1 = bcs.cargo_space_id
</sql>
<sql id="selectCheckStockinDetailFinishVo">

View File

@@ -35,6 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="spare4" column="spare4" />
<result property="spare5" column="spare5" />
<result property="spare6" column="spare6" />
<result property="cargoSpaceName" column="cargo_space_name" />
<association property="extraField" javaType="ExtraField">
<result property="productId" column="product_id" />
<result property="materialDesc" column="product_name" />
@@ -53,9 +54,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
csd.assign_num_j, csd.print_date, csd.stock_status, csd.supplier_id, csd.customer_id, csd.unit, csd.spec,
csd.scan_num, csd.scan_num_x, csd.scan_num_j, csd.spare1, csd.spare2, csd.spare3, csd.spare4,csd.spare5, csd.spare6,
bp.product_name,bp.spare1 as englishDesc,
bp.spare2 as netWeight,bp.spare5 as length,bp.spare6 as width,bp.spare7 as height,bp.spare8 as volume
bp.spare2 as netWeight,bp.spare5 as length,bp.spare6 as width,bp.spare7 as height,bp.spare8 as volume,
bcs.cargo_space_name
from check_stockin_detail csd
left join bas_product bp on csd.product_id = bp.product_id
left join bas_cargo_space bcs on csd.spare1 = bcs.cargo_space_id
</sql>
<select id="selectCheckStockinDetailList" parameterType="CheckStockinDetail" resultMap="CheckStockinDetailResult">

View File

@@ -62,6 +62,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<include refid="selectCheckStockinVo"/>
where stock_guid = #{stockGuid}
</select>
<select id="autoAllot" parameterType="java.util.Map" statementType="CALLABLE">
{
call proc_check_auto_allocation(
#{v_stockout_detail_id,mode=IN,jdbcType=VARCHAR},
#{v_result,mode=OUT,jdbcType=VARCHAR},
#{v_resultString,mode=OUT,jdbcType=VARCHAR}
)
}
</select>
<insert id="insertCheckStockin" parameterType="CheckStockin">
insert into check_stockin