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

新增盘点单据 修改货位盘点查询接口

Browse Source
This commit is contained in:
猫猫guowen
2025-09-18 10:28:05 +08:00
parent d7f70237f2
commit 0a0d4c44db
7 changed files with 81 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ruoyi-admin/src/main/java/com/ruoyi/bas/cargoSpace/controller/BasCargoSpaceController.java
View File

@@ -43,6 +43,18 @@ public class BasCargoSpaceController extends BaseController
return getDataTable(list);
}
/**
* 查询货位列表（根据巷道出库锁状态过滤）
*/
@PreAuthorize("@ss.hasPermi('bas:cargoSpace:list')")
@GetMapping("/listByRoadway")
public TableDataInfo listByRoadway(BasCargoSpace basCargoSpace)
{
startPage();
List<BasCargoSpace> list = basCargoSpaceService.selectBasCargoSpaceListByRoadway(basCargoSpace);
return getDataTable(list);
}
/**
* 导出库存信息列表
*/

8
ruoyi-admin/src/main/java/com/ruoyi/bas/cargoSpace/mapper/BasCargoSpaceMapper.java
View File

@@ -76,4 +76,12 @@ public interface BasCargoSpaceMapper extends BaseMapper<BasCargoSpace>
* @return
*/
BasCargoSpace selectEmptyCargoSpaceByWarehouseId(BasCargoSpace basWarehouse);
/**
* 查询库存信息列表（根据巷道出库锁状态过滤）
*
* @param basCargoSpace 库存信息
* @return 库存信息集合
*/
public List<BasCargoSpace> selectBasCargoSpaceListByRoadway(BasCargoSpace basCargoSpace);
}

8
ruoyi-admin/src/main/java/com/ruoyi/bas/cargoSpace/service/IBasCargoSpaceService.java
View File

@@ -68,4 +68,12 @@ public interface IBasCargoSpaceService extends IService<BasCargoSpace>
* @return
*/
BasCargoSpace selectEmptyCargoSpaceByWarehouseId(BasCargoSpace basWarehouse);
/**
* 查询库存信息列表（根据巷道出库锁状态过滤）
*
* @param basCargoSpace 库存信息
* @return 库存信息集合
*/
public List<BasCargoSpace> selectBasCargoSpaceListByRoadway(BasCargoSpace basCargoSpace);
}

11
ruoyi-admin/src/main/java/com/ruoyi/bas/cargoSpace/service/impl/BasCargoSpaceServiceImpl.java
View File

@@ -101,5 +101,16 @@ public class BasCargoSpaceServiceImpl extends ServiceImpl<BasCargoSpaceMapper,Ba
return basCargoSpaceMapper.selectEmptyCargoSpaceByWarehouseId(basWarehouse);
}
/**
* 查询库存信息列表（根据巷道出库锁状态过滤）
*
* @param basCargoSpace 库存信息
* @return 库存信息集合
*/
@Override
@DataScope(warehouseAlias = "bw")
public List<BasCargoSpace> selectBasCargoSpaceListByRoadway(BasCargoSpace basCargoSpace) {
return basCargoSpaceMapper.selectBasCargoSpaceListByRoadway(basCargoSpace);
}
}

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

@@ -189,5 +189,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</if>
ORDER BY the_platoon, the_column, the_floor
</select>
<select id="selectBasCargoSpaceListByRoadway" parameterType="BasCargoSpace" resultMap="BasCargoSpaceResult">
select bcs.cargo_space_id, bcs.warehouse_id, bw.warehouse_name, bcs.roadway_id, bcs.cargo_area_id, bcs.the_type,
bcs.the_type_name, bcs.cargo_space_name, bcs.the_platoon, bcs.the_column, bcs.the_floor, bcs.status, bcs.locked,
bcs.tray_code, bcs.cargo_hight, bcs.iss_double, bcs.group_coding_no, bcs.group_coding, bcs.cargo_space_logo,
bcs.this_cargo_area
from bas_cargo_space bcs
left join bas_warehouse bw on bw.warehouse_id = bcs.warehouse_id
left join bas_roadway br on br.roadway_id = bcs.roadway_id
${params.dataScope}
where br.out_locked = 'N'
<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>
</select>
</mapper>

9
ruoyi-ui/src/api/bas/cargoSpace.js
View File

@@ -42,3 +42,12 @@ export function delCargoSpace(cargoSpaceId) {
method: 'delete'
})
}
// 查询库存信息列表（根据巷道出库锁状态过滤）
export function listCargoSpaceByRoadway(query) {
return request({
url: '/bas/cargoSpace/listByRoadway',
method: 'get',
params: query
})
}

8
ruoyi-ui/src/views/check/create/index.vue
View File

@@ -254,7 +254,7 @@
import { listWarehouse } from "@/api/bas/warehouse";
import { saveCheckStock } from "@/api/check/stockCheck";
import { listManagement} from "@/api/stock/management"
import { listCargoSpace} from "@/api/bas/cargoSpace"
import { listCargoSpaceByRoadway} from "@/api/bas/cargoSpace"
export default {
name: "AddOutStock",
@@ -320,7 +320,8 @@
productName: null,
cargoSpaceName: null,
warehouseId: null,
status: null
status: null,
locked:null
},
// 托盘详情弹窗显示状态
trayDetailVisible: false,
@@ -382,7 +383,8 @@
if (this.formData.checkType==='2'){
this.trayQueryParams.warehouseId = "01";
this.trayQueryParams.status = 2;
listCargoSpace(this.trayQueryParams).then(response => {
this.trayQueryParams.locked='N';
listCargoSpaceByRoadway(this.trayQueryParams).then(response => {
this.trayOptions = response.rows;
this.trayTotal = response.total;
this.trayLoading = false;