From 8f5695c897253019c15fa753a748d1a782fb1ae0 Mon Sep 17 00:00:00 2001
From: zhaoqiaobo <zhaoqiaobo@163.com>
Date: Thu, 21 Mar 2024 16:38:07 +0800
Subject: [PATCH] =?UTF-8?q?fix(xml=20java):=20=E8=BF=87=E6=BB=A4pda?=
 =?UTF-8?q?=E8=B4=A7=E4=BD=8D=E7=A6=81=E7=94=A8=E7=8A=B6=E6=80=81=E7=9A=84?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1 过滤pda货位禁用状态的数据
---
 .../app/BasicdataGoodsAllocationPDAlController.java        | 1 +
 .../basicdata/mapper/BasicdataGoodsAllocationMapper.xml    | 7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

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<GoodsAllocationSelectDTO>> list(@RequestParam Map<String, Object> basicdataGoodsAllocation) {
+		basicdataGoodsAllocation.put("appEnableStatus", "1");
 		List<BasicdataGoodsAllocationVO> records = goodsAllocationService.selectGoodsAllocationList(basicdataGoodsAllocation);
 		List<GoodsAllocationSelectDTO> ls = new ArrayList<>();
 		Map<String, List<GoodsAllocationSelectDTO>> 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
         <where>
             goods_allocation.is_deleted = 0
+            <if test="po.appEnableStatus!=null and po.appEnableStatus!=''">
+                and goods_allocation.enable_status = 1
+            </if>
             <if test="po.goodsAreaId!=null and po.goodsAreaId!=''">
                 AND  goods_allocation.goods_area_id=#{po.goodsAreaId}
             </if>
@@ -123,8 +126,8 @@
             <if test="po.layerNum != null and po.layerNum!= ''">
                 and goods_allocation.layer_num = #{po.layerNum}
             </if>
-            <if test="po.goods_allocation_name != null and po.goods_allocation_name!= ''">
-                and goods_allocation.goods_allocation_name  like concat('%', #{po.goodsAllocationName},'%')
+            <if test="po.goodsAllocationName != null and po.goodsAllocationName!= ''">
+                and goods_allocation.qr_code  like concat('%', #{po.goodsAllocationName},'%')
             </if>
             <if test="po.goodsShelfId!=null and po.goodsShelfId!=''">
                 AND  goods_allocation.goods_shelf_id=#{po.goodsShelfId}