生成入库单据功能 接收单据质检功能

This commit is contained in:
liuhanqing
2025-05-22 11:33:23 +08:00
parent 6dd0f8481c
commit 20f2c73a65
27 changed files with 826 additions and 1419 deletions

View File

@@ -3,7 +3,7 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.in.stockindetail.mapper.InStockinDetailMapper">
<resultMap type="InStockinDetail" id="InStockinDetailResult">
<result property="stockinDetailId" column="stockin_detail_id" />
<result property="stockinGuid" column="stockin_guid" />
@@ -40,7 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectInStockinDetailList" parameterType="InStockinDetail" resultMap="InStockinDetailResult">
<include refid="selectInStockinDetailVo"/>
<where>
<where>
<if test="stockinGuid != null and stockinGuid != ''"> and stockin_guid = #{stockinGuid}</if>
<if test="stockinId != null and stockinId != ''"> and stockin_id = #{stockinId}</if>
<if test="lotNo != null and lotNo != ''"> and lot_no = #{lotNo}</if>
@@ -68,7 +68,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="spare6 != null and spare6 != ''"> and spare6 = #{spare6}</if>
</where>
</select>
<select id="selectInStockinDetailByStockinDetailId" parameterType="String" resultMap="InStockinDetailResult">
<include refid="selectInStockinDetailVo"/>
where stockin_detail_id = #{stockinDetailId}
@@ -135,6 +135,73 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="spare6 != null">#{spare6},</if>
</trim>
</insert>
<insert id="insertInStockinDetailList">
INSERT INTO in_stockin_detail
<trim prefix="(" suffix=")" suffixOverrides=",">
<!-- 动态选择字段 -->
<if test="list[0].stockinDetailId != null">stockin_detail_id,</if>
<if test="list[0].stockinGuid != null and list[0].stockinGuid != ''">stockin_guid,</if>
<if test="list[0].stockinId != null and list[0].stockinId != ''">stockin_id,</if>
<if test="list[0].lotNo != null and list[0].lotNo != ''">lot_no,</if>
<if test="list[0].productGuid != null">product_guid,</if>
<if test="list[0].productId != null and list[0].productId != ''">product_id,</if>
<if test="list[0].quantity != null">quantity,</if>
<if test="list[0].quantityX != null">quantity_x,</if>
<if test="list[0].quantityJ != null">quantity_j,</if>
<if test="list[0].price != null">price,</if>
<if test="list[0].cargoNo != null">cargo_no,</if>
<if test="list[0].remark != null">remark,</if>
<if test="list[0].assignNum != null">assign_num,</if>
<if test="list[0].assignNumX != null">assign_num_x,</if>
<if test="list[0].assignNumJ != null">assign_num_j,</if>
<if test="list[0].printDate != null">print_date,</if>
<if test="list[0].stockStatus != null">stock_status,</if>
<if test="list[0].supplierId != null">supplier_id,</if>
<if test="list[0].customerId != null">customer_id,</if>
<if test="list[0].unit != null">unit,</if>
<if test="list[0].spec != null">spec,</if>
<if test="list[0].spare1 != null">spare1,</if>
<if test="list[0].spare2 != null">spare2,</if>
<if test="list[0].spare3 != null">spare3,</if>
<if test="list[0].spare4 != null">spare4,</if>
<if test="list[0].spare5 != null">spare5,</if>
<if test="list[0].spare6 != null">spare6,</if>
</trim>
<!-- values 部分:遍历列表插入多行 -->
VALUES
<foreach collection="list" item="item" separator=",">
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="item.stockinDetailId != null">#{item.stockinDetailId},</if>
<if test="item.stockinGuid != null and item.stockinGuid != ''">#{item.stockinGuid},</if>
<if test="item.stockinId != null and item.stockinId != ''">#{item.stockinId},</if>
<if test="item.lotNo != null and item.lotNo != ''">#{item.lotNo},</if>
<if test="item.productGuid != null">#{item.productGuid},</if>
<if test="item.productId != null and item.productId != ''">#{item.productId},</if>
<if test="item.quantity != null">#{item.quantity},</if>
<if test="item.quantityX != null">#{item.quantityX},</if>
<if test="item.quantityJ != null">#{item.quantityJ},</if>
<if test="item.price != null">#{item.price},</if>
<if test="item.cargoNo != null">#{item.cargoNo},</if>
<if test="item.remark != null">#{item.remark},</if>
<if test="item.assignNum != null">#{item.assignNum},</if>
<if test="item.assignNumX != null">#{item.assignNumX},</if>
<if test="item.assignNumJ != null">#{item.assignNumJ},</if>
<if test="item.printDate != null">#{item.printDate},</if>
<if test="item.stockStatus != null">#{item.stockStatus},</if>
<if test="item.supplierId != null">#{item.supplierId},</if>
<if test="item.customerId != null">#{item.customerId},</if>
<if test="item.unit != null">#{item.unit},</if>
<if test="item.spec != null">#{item.spec},</if>
<if test="item.spare1 != null">#{item.spare1},</if>
<if test="item.spare2 != null">#{item.spare2},</if>
<if test="item.spare3 != null">#{item.spare3},</if>
<if test="item.spare4 != null">#{item.spare4},</if>
<if test="item.spare5 != null">#{item.spare5},</if>
<if test="item.spare6 != null">#{item.spare6},</if>
</trim>
</foreach>
</insert>
<update id="updateInStockinDetail" parameterType="InStockinDetail">
update in_stockin_detail
@@ -174,9 +241,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</delete>
<delete id="deleteInStockinDetailByStockinDetailIds" parameterType="String">
delete from in_stockin_detail where stockin_detail_id in
delete from in_stockin_detail where stockin_detail_id in
<foreach item="stockinDetailId" collection="array" open="(" separator="," close=")">
#{stockinDetailId}
</foreach>
</delete>
</mapper>
</mapper>

View File

@@ -3,7 +3,7 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.receive.stockindetail.mapper.ReceiveStockinDetailMapper">
<resultMap type="ReceiveStockinDetail" id="ReceiveStockinDetailResult">
<result property="stockinDetailId" column="stockin_detail_id" />
<result property="stockinGuid" column="stockin_guid" />
@@ -40,7 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectReceiveStockinDetailList" parameterType="ReceiveStockinDetail" resultMap="ReceiveStockinDetailResult">
<include refid="selectReceiveStockinDetailVo"/>
<where>
<where>
<if test="stockinGuid != null and stockinGuid != ''"> and stockin_guid = #{stockinGuid}</if>
<if test="stockinId != null and stockinId != ''"> and stockin_id = #{stockinId}</if>
<if test="lotNo != null and lotNo != ''"> and lot_no = #{lotNo}</if>
@@ -68,7 +68,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="spare6 != null and spare6 != ''"> and spare6 = #{spare6}</if>
</where>
</select>
<select id="selectReceiveStockinDetailByStockinDetailId" parameterType="String" resultMap="ReceiveStockinDetailResult">
<include refid="selectReceiveStockinDetailVo"/>
where stockin_detail_id = #{stockinDetailId}
@@ -135,6 +135,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="spare6 != null">#{spare6},</if>
</trim>
</insert>
<insert id="insertReceiveStockinDetailHistory">
insert into receive_stockin_detail_finish
select * from receive_stockin_detail where stockin_guid = #{receiveStockinGuid}
</insert>
<update id="updateReceiveStockinDetail" parameterType="ReceiveStockinDetail">
update receive_stockin_detail
@@ -174,9 +178,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</delete>
<delete id="deleteReceiveStockinDetailByStockinDetailIds" parameterType="String">
delete from receive_stockin_detail where stockin_detail_id in
delete from receive_stockin_detail where stockin_detail_id in
<foreach item="stockinDetailId" collection="array" open="(" separator="," close=")">
#{stockinDetailId}
</foreach>
</delete>
</mapper>
</mapper>

View File

@@ -3,7 +3,7 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.receive.stockin.mapper.ReceiveStockinMapper">
<resultMap type="ReceiveStockin" id="ReceiveStockinResult">
<result property="stockinGuid" column="stockin_guid" />
<result property="stockinId" column="stockin_id" />
@@ -32,7 +32,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectReceiveStockinList" parameterType="ReceiveStockin" resultMap="ReceiveStockinResult">
<include refid="selectReceiveStockinVo"/>
<where>
<where>
<if test="stockinId != null and stockinId != ''"> and stockin_id = #{stockinId}</if>
<if test="inType != null and inType != ''"> and in_type = #{inType}</if>
<if test="createDate != null and createDate != ''"> and create_date = #{createDate}</if>
@@ -53,7 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="supplierNo != null and supplierNo != ''"> and supplier_no = #{supplierNo}</if>
</where>
</select>
<select id="selectReceiveStockinByStockinGuid" parameterType="String" resultMap="ReceiveStockinResult">
<include refid="selectReceiveStockinVo"/>
where stockin_guid = #{stockinGuid}
@@ -104,6 +104,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="supplierNo != null">#{supplierNo},</if>
</trim>
</insert>
<insert id="insertReceiveStockinHistory">
insert into receive_stockin_finish
select * from receive_stockin where stockin_guid = #{stockinGuid}
</insert>
<update id="updateReceiveStockin" parameterType="ReceiveStockin">
update receive_stockin
@@ -135,9 +139,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</delete>
<delete id="deleteReceiveStockinByStockinGuids" parameterType="String">
delete from receive_stockin where stockin_guid in
delete from receive_stockin where stockin_guid in
<foreach item="stockinGuid" collection="array" open="(" separator="," close=")">
#{stockinGuid}
</foreach>
</delete>
</mapper>
</mapper>