zyr/FT546MWS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

入库部分和接口

Browse Source
This commit is contained in:
张怡蓉
2026-01-05 16:09:50 +08:00
parent f5f4d1007a
commit 9ffd5c01a3
25 changed files with 504 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-admin/src/main/resources/mapper/in/InStockinDetailFinishMapper.xml
View File

@@ -94,7 +94,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
isd.assign_num, isd.assign_num_x, isd.assign_num_j, isd.print_date, isd.stock_status,
isd.supplier_id, isd.customer_id, isd.unit, isd.spec, isd.spare1, isd.spare2, isd.spare3, isd.spare4,
isd.spare5, isd.spare6, isd.scan_num, isd.scan_num_x, isd.scan_num_j,
bp.product_name,
isd.product_name,
isd.spare7,isd.spare8,isd.spare9
from in_stockin_detail_finish isd
left join bas_product bp on bp.product_id = isd.product_id

6
ruoyi-admin/src/main/resources/mapper/in/InStockinDetailMapper.xml
View File

@@ -60,7 +60,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
isd.assign_num, isd.assign_num_x, isd.assign_num_j, isd.print_date, isd.stock_status,
isd.supplier_id, isd.customer_id, isd.unit, isd.spec, isd.spare1, isd.spare2, isd.spare3, isd.spare4,
isd.spare5, isd.spare6, isd.scan_num, isd.scan_num_x, isd.scan_num_j,
bp.product_name,
isd.product_name,
isd.spare7,isd.spare8,isd.spare9
from in_stockin_detail isd
left join bas_product bp on bp.product_id = isd.product_id
@@ -138,7 +138,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="spare7 != null">spare7,</if>
<if test="spare8 != null">spare8,</if>
<if test="spare9 != null">spare9,</if>
<if test="spec != null">spec,</if>
<if test="scanNum != null">scan_num,</if>
<if test="scanNumX != null">scan_num_x,</if>
<if test="scanNumJ != null">scan_num_j,</if>
@@ -174,7 +174,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="spare7 != null">#{spare7},</if>
<if test="spare8 != null">#{spare8},</if>
<if test="spare9 != null">#{spare9},</if>
<if test="spec != null">#{spec},</if>
<if test="scanNum != null">#{scanNum},</if>
<if test="scanNumX != null">#{scanNumX},</if>
<if test="scanNumJ != null">#{scanNumJ},</if>

9
ruoyi-admin/src/main/resources/mapper/in/InStockinFinishMapper.xml
View File

@@ -110,6 +110,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<include refid="selectInStockinFinishVo"/>
where is2.stockin_guid = #{stockinGuid}
</select>
<select id="selectInStockinFinishByStockinId" parameterType="String" resultMap="InStockinFinishResult">
<include refid="selectInStockinFinishVo"/>
where is2.stockin_id = #{stockinId}
</select>
<select id="selectInStockinFinishListByInStockin" resultMap="InStockinResult">
<include refid="selectInStockinFinishVo"/>
<where>
@@ -135,7 +142,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and is2.stockin_id in (
select distinct stockin_id from in_stockin_detail_finish isd
left join bas_product bp on isd.product_id = bp.product_id
where bp.product_name like concat('%',#{materialDesc},'%')
where isd.product_name like concat('%',#{materialDesc},'%')
)
</if>
<if test="lotNo !=null and lotNo!=''">

7
ruoyi-admin/src/main/resources/mapper/in/InStockinMapper.xml
View File

@@ -84,7 +84,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and is2.stockin_id in (
select distinct stockin_id from in_stockin_detail isd
left join bas_product bp on isd.product_id = bp.product_id
where bp.product_name like concat('%',#{materialDesc},'%')
where isd.product_name like concat('%',#{materialDesc},'%')
)
</if>
<if test="lotNo !=null and lotNo!=''">
@@ -111,6 +111,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where is2.stockin_guid = #{stockinGuid}
</select>
<select id="selectInStockinByStockinId" parameterType="String" resultMap="InStockinResult">
<include refid="selectInStockinVo"/>
where is2.stockin_id = #{stockinId}
</select>
<insert id="insertInStockin" parameterType="InStockin">
insert into in_stockin
<trim prefix="(" suffix=")" suffixOverrides=",">