lhq/FT542-WMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

单据字段调整，子单货位分配，定时作业

Browse Source
This commit is contained in:
lsymicc
2025-12-10 09:20:41 +08:00
parent 4e79dcb95f
commit 51c8764a34
23 changed files with 450 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
ruoyi-admin/src/main/resources/mapper/bas/cargoSpace/BasCargoSpaceMapper.xml
View File

@@ -83,6 +83,36 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
order by the_platoon,the_floor,the_column
</select>
<select id="selectBasCargoSpaceListByGroupCodingNo" parameterType="string" resultMap="BasCargoSpaceResult">
<include refid="selectBasCargoSpaceVo"/>
<where>
<if test="cargoSpaceId != null and cargoSpaceId != ''"> and bcs.cargo_space_id like concat('%', #{cargoSpaceId}, '%')</if>
<if test="warehouseId != null and warehouseId != ''"> and bcs.warehouse_id = #{warehouseId}</if>
<if test="roadwayId != null and roadwayId != ''"> and bcs.roadway_id = #{roadwayId}</if>
<if test="cargoAreaId != null and cargoAreaId != ''"> and bcs.cargo_area_id = #{cargoAreaId}</if>
<if test="theType != null and theType != ''"> and bcs.the_type = #{theType}</if>
<if test="theTypeName != null and theTypeName != ''"> and bcs.the_type_name like concat('%', #{theTypeName}, '%')</if>
<if test="cargoSpaceName != null and cargoSpaceName != ''"> and bcs.cargo_space_name like concat('%', #{cargoSpaceName}, '%')</if>
<if test="thePlatoon != null "> and bcs.the_platoon = #{thePlatoon}</if>
<if test="theColumn != null "> and bcs.the_column = #{theColumn}</if>
<if test="theFloor != null "> and bcs.the_floor = #{theFloor}</if>
<if test="status != null and status != ''"> and bcs.status = #{status}</if>
<if test="locked != null and locked != ''"> and bcs.locked = #{locked}</if>
<if test="trayCode != null and trayCode != ''"> and bcs.tray_code like concat('%', #{trayCode}, '%')</if>
<if test="cargoHight != null and cargoHight != ''"> and bcs.cargo_hight = #{cargoHight}</if>
<if test="issDouble != null and issDouble != ''"> and bcs.iss_double = #{issDouble}</if>
<if test="groupCodingNo != null and groupCodingNo != ''"> and bcs.group_coding_no = #{groupCodingNo}</if>
<if test="groupCoding != null and groupCoding != ''"> and bcs.group_coding = #{groupCoding}</if>
<if test="cargoSpaceLogo != null and cargoSpaceLogo != ''"> and bcs.cargo_space_logo = #{cargoSpaceLogo}</if>
<if test="thisCargoArea != null and thisCargoArea != ''"> and bcs.this_cargo_area = #{thisCargoArea}</if>
<!-- <if test="params.warehouseDataScope != null and params.warehouseDataScope !=''">-->
<!-- ${params.warehouseDataScope}-->
<!-- </if>-->
</where>
order by group_coding desc
</select>
<select id="selectBasCargoSpaceByCargoSpaceId" parameterType="String" resultMap="BasCargoSpaceResult">
<include refid="selectBasCargoSpaceVo"/>
where cargo_space_id = #{cargoSpaceId}

25
ruoyi-admin/src/main/resources/mapper/in/ErpInStockinMapper.xml
View File

@@ -57,11 +57,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</where>
</select>
<select id="selectErpInStockinByStockinGuid" parameterType="String" resultMap="ErpInStockinResult">
<include refid="selectErpInStockinVo"/>
where stockin_guid = #{stockinGuid}
</select>
<select id="selectErpInStockinByKuin" parameterType="String" resultMap="ErpInStockinResult">
<include refid="selectErpInStockinVo"/>
where kuin = #{kuin}
</select>
<select id="selectErpInStockinByRkbh" parameterType="String" resultMap="ErpInStockinResult">
<include refid="selectErpInStockinVo"/>
where rkbh = #{rkbh}
</select>
<insert id="insertErpInStockin" parameterType="ErpInStockin">
insert into erp_in_stockin
<trim prefix="(" suffix=")" suffixOverrides=",">
@@ -131,9 +141,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="sysIcusIInheritIdIidI413 != null">sysIcusIInheritIdIidI413 = #{sysIcusIInheritIdIidI413},</if>
<if test="sysIcusIInheritIdIidI414 != null">sysIcusIInheritIdIidI414 = #{sysIcusIInheritIdIidI414},</if>
<if test="sysIcusIInheritIdIidI415 != null">sysIcusIInheritIdIidI415 = #{sysIcusIInheritIdIidI415},</if>
<if test="stockinGuid != null">stockin_guid = #{stockinGuid},</if>
</trim>
where kuin = #{kuin}
where stockin_guid = #{stockinGuid}
</update>
<insert id="upsertErpInStockin" parameterType="ErpInStockin">
@@ -154,14 +163,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-- ON tar.stockin_id = src.stockin_id
</insert>
<delete id="deleteErpInStockinByKuin" parameterType="String">
delete from erp_in_stockin where kuin = #{kuin}
<delete id="deleteErpInStockinByStockinGuid" parameterType="String">
delete from erp_in_stockin where stockin_guid = #{stockinGuid}
</delete>
<delete id="deleteErpInStockinByKuins" parameterType="String">
delete from erp_in_stockin where kuin in
<foreach item="kuin" collection="array" open="(" separator="," close=")">
#{kuin}
<delete id="deleteErpInStockinByStockinGuids" parameterType="String">
delete from erp_in_stockin where stockin_guid in
<foreach item="stockinGuid" collection="array" open="(" separator="," close=")">
#{stockinGuid}
</foreach>
</delete>
</mapper>

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

@@ -107,6 +107,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where stockin_detail_id = #{stockinDetailId}
</select>
<select id="selectInStockinDetailByStockinGuid" parameterType="String" resultMap="InStockinDetailResult">
<include refid="selectInStockinDetailVo"/>
where stockin_guid = #{stockinGuid}
</select>
<insert id="insertInStockinDetail" parameterType="InStockinDetail">
insert into in_stockin_detail
<trim prefix="(" suffix=")" suffixOverrides=",">

5
ruoyi-admin/src/main/resources/mapper/stock/BasStockMapper.xml
View File

@@ -220,6 +220,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where stock_id = #{stockId}
</select>
<select id="selectBasStockListByProductId" parameterType="string" resultMap="BasStockResult">
<include refid="selectBasStockVo"/>
where bs.product_id = #{productId}
</select>
<insert id="insertBasStock" parameterType="BasStock">
insert into bas_stock
<trim prefix="(" suffix=")" suffixOverrides=",">