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

入库条码打印修改 生成入库作业 手动完成入库作业

Browse Source
This commit is contained in:
liuhanqing
2025-09-16 15:22:58 +08:00
parent 5049b8e79f
commit 7a87a99e05
11 changed files with 173 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -180,8 +180,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectEmptyCargoSpaceByWarehouseId" resultType="com.ruoyi.bas.cargoSpace.domain.BasCargoSpace">
SELECT TOP 1 cargo_space_id as cargoSpaceId
FROM bas_cargo_space
WHERE warehouse_id = #{warehouseId}
AND status = '1'
WHERE status = '1'
<if test="warehouseId != null">
and warehouse_id = #{warehouseId}
</if>
<if test="roadwayId != null">
and roadway_id = #{roadwayId}
</if>
ORDER BY the_platoon, the_column, the_floor
</select>

14
ruoyi-admin/src/main/resources/mapper/job/MydoJobDetailMapper.xml
View File

@@ -228,6 +228,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="spare2 != null">spare2,</if>
<if test="spare3 != null">spare3,</if>
<if test="spare4 != null">spare4,</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>
<if test="spare9 != null">spare9,</if>
<if test="spec != null">spec,</if>
<if test="unit != null">unit,</if>
<if test="pickQuantity != null">pick_quantity,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -257,6 +264,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="spare2 != null">#{spare2},</if>
<if test="spare3 != null">#{spare3},</if>
<if test="spare4 != null">#{spare4},</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>
<if test="spare9 != null">#{spare9},</if>
<if test="spec != null">#{spec},</if>
<if test="unit != null">#{unit},</if>
<if test="pickQuantity != null">#{pick_quantity},</if>
</trim>
</insert>