From affed18049021cec87fd09a4ea309c2762aa32ea Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Fri, 15 Sep 2023 17:55:57 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=9F=A5=E8=AF=A2=E9=9B=B6=E6=8B=85=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E6=A8=A1=E7=B3=8A=E6=9F=A5=E8=AF=A2=202.=E5=BA=93?=
 =?UTF-8?q?=E4=BD=8D=E4=BF=A1=E6=81=AF=E5=8D=95=E6=95=B0=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/logpm/warehouse/vo/UpShelfAllocationVO.java | 1 +
 .../com/logpm/warehouse/mapper/WarehouseTrayTypeMapper.xml    | 2 +-
 .../service/impl/WarehouseUpdownTypeServiceImpl.java          | 4 +++-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/UpShelfAllocationVO.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/UpShelfAllocationVO.java
index 5dd50a2fe..a2ad354bb 100644
--- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/UpShelfAllocationVO.java
+++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/UpShelfAllocationVO.java
@@ -24,6 +24,7 @@ public class UpShelfAllocationVO implements Serializable {
 	private Long trayId;//托盘id
 	private String trayCode;//托盘编码
 	private Integer trayNum;//托盘数量
+	private Integer orderNum;//单数
 
 	private List<UpShelfDataVO> list = new ArrayList<>();
 
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseTrayTypeMapper.xml b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseTrayTypeMapper.xml
index 58fe764e7..661d54859 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseTrayTypeMapper.xml
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseTrayTypeMapper.xml
@@ -65,7 +65,7 @@
         from logpm_distribution_stock_article ldsa
         where ldsa.is_deleted = 0
           and ldsa.is_zero = 1
-            and ldsa.waybill_number = #{waybillCode}
+            and ldsa.waybill_number like concat('%',#{waybillCode},'%')
             and ldsa.warehouse_id = #{warehouseId}
     </select>
 
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java
index cf01e0386..3a0cbe922 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java
@@ -357,6 +357,8 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 		//同一个货位上能存所有类型的货物，所以要分三类来查 association_type 1订单号（零担） 3包件码（订单号） 4库存品
 		List<UpShelfDataVO> packageList = warehouseUpdownGoodsService.findPackageByUpdownTypeId(updownTypeId);
 		List<UpShelfDataVO> zeroList = warehouseUpdownGoodsService.findZeroByUpdownTypeId(updownTypeId);
+		Integer orderNum = packageList.size() + zeroList.size();
+		upShelfAllocationVO.setOrderNum(orderNum);
 		List<UpShelfDataVO> stockList = warehouseUpdownGoodsService.findStockByUpdownTypeId(updownTypeId);
 		upShelfAllocationVO.getList().addAll(packageList);
 		upShelfAllocationVO.getList().addAll(zeroList);
@@ -760,7 +762,7 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 			log.warn("##############upShelfOrder: 仓库不存在 warehouseId={}",wid);
 			return R.fail(403,"仓库不存在");
 		}
-		if(wid.equals(warehouseId)){
+		if(!wid.equals(warehouseId)){
 			log.warn("##############upShelfOrder: 库位不属于本仓库 warehouseId={} wid={}",warehouseId,wid);
 			return R.fail(403,"库位不属于本仓库");
 		}