diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/app/BasicdataGoodsAllocationPDAlController.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/app/BasicdataGoodsAllocationPDAlController.java index 4122c06de..f0b00f5da 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/app/BasicdataGoodsAllocationPDAlController.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/app/BasicdataGoodsAllocationPDAlController.java @@ -31,6 +31,7 @@ public class BasicdataGoodsAllocationPDAlController { @ApiOperationSupport(order = 1) @ApiOperation(value = "查询货位接口列表", notes = "查询货位接口列表") public R> list(@RequestParam Map basicdataGoodsAllocation) { + basicdataGoodsAllocation.put("appEnableStatus", "1"); List records = goodsAllocationService.selectGoodsAllocationList(basicdataGoodsAllocation); List ls = new ArrayList<>(); Map> map = new HashMap<>(); diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAllocationMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAllocationMapper.xml index 90171cb4a..9779f7f5d 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAllocationMapper.xml +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAllocationMapper.xml @@ -105,6 +105,9 @@ LEFT JOIN logpm_warehouse_warehouse AS warehouse ON goods_area.warehouse_id = warehouse.id goods_allocation.is_deleted = 0 + + and goods_allocation.enable_status = 1 + AND goods_allocation.goods_area_id=#{po.goodsAreaId} @@ -123,8 +126,8 @@ and goods_allocation.layer_num = #{po.layerNum} - - and goods_allocation.goods_allocation_name like concat('%', #{po.goodsAllocationName},'%') + + and goods_allocation.qr_code like concat('%', #{po.goodsAllocationName},'%') AND goods_allocation.goods_shelf_id=#{po.goodsShelfId}