diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataTrayServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataTrayServiceImpl.java
index 327fa5644..c1a2af45b 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataTrayServiceImpl.java
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataTrayServiceImpl.java
@@ -43,6 +43,7 @@ import com.logpm.basicdata.vo.BasicdataStockArticleVO;
 import com.logpm.basicdata.vo.WarehouseParcelListVO;
 import com.logpm.basicdata.vo.WarehouseStockListVO;
 import com.logpm.distribution.vo.DistributionStockArticleQRCodeVO;
+import com.logpm.warehouse.entity.WarehouseTrayGoodsEntity;
 import com.logpm.warehouse.feign.IWarehouseTrayGoodsClient;
 import com.logpm.warehouse.feign.IWarehouseTrayTypeClient;
 import com.logpm.warehouse.vo.WarehouseTrayQRCode;
@@ -285,8 +286,11 @@ public class BasicdataTrayServiceImpl extends BaseServiceImpl<BasicdataTrayMappe
 
 	@Override
 	public R disable(String ids) {
-		//查询托盘有无绑定货物
-
+		List<Long> longs = Func.toLongList(ids);
+		for (Long aLong : longs) {
+			//查询托盘有无绑定货物
+			List<WarehouseTrayGoodsEntity> trayIdList = warehouseTrayGoodsClient.getTrayIdList(aLong);
+		}
 		return null;
 	}
 
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseGoodsAllocationMapper.xml b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseGoodsAllocationMapper.xml
index 05bc2346d..71d7a4686 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseGoodsAllocationMapper.xml
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseGoodsAllocationMapper.xml
@@ -205,6 +205,7 @@
         ldsl.cargo_number cargoNumber,
         ldsl.cargo_norms cargoNorms,
         ldsl.cargo_unit cargoUnit,
+         ldsl.incoming_batch incomingBatch,
         lbm.product_code materialCode,
         ldsl.sku sku,
         ldsl.stock_list_code stockListCode,
@@ -266,16 +267,16 @@
         GROUP_CONCAT(lwtg.palletizing_type SEPARATOR ',') palletizingType
         FROM
         logpm_warehouse_tray lwt
-        JOIN logpm_warehouse_tary_allocation lwta ON lwt.id = lwta.tary_id
+        JOIN logpm_warehouse_tary_allocation lwta ON lwt.id = lwta.tray_id
         LEFT JOIN logpm_warehouse_tray_goods lwtg on lwtg.tray_id =lwt.id
         <where>
             lwta.is_deleted =0
-            <if test="param.palletName!=null and param.palletName!=''">
-                and lwt.pallet_name like concat('%',#{param.palletName},'%')
-            </if>
-            <if test="param.palletCode!=null and param.palletCode!=''">
-                and lwt.pallet_code like concat('%',#{param.palletCode},'%')
-            </if>
+<!--            <if test="param.palletName!=null and param.palletName!=''">-->
+<!--                and lwt.pallet_name like concat('%',#{param.palletName},'%')-->
+<!--            </if>-->
+<!--            <if test="param.palletCode!=null and param.palletCode!=''">-->
+<!--                and lwt.pallet_code like concat('%',#{param.palletCode},'%')-->
+<!--            </if>-->
             and lwta.allocation_id =#{param.id}
         </where>
         GROUP BY lwt.id
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 a132947e3..671f9cc15 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
@@ -1009,6 +1009,11 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 				.eq("allocation_id",allocationId);
 			WarehouseUpdownGoodsEntity updownGoodsEntity = warehouseUpdownGoodsService.getOne(queryWrapper);
 			Integer num = updownGoodsEntity.getNum();
+			if (enterNum>num){
+				stringBuffer.append("{").append(materialCode).append("}");
+				b =true;
+				continue;
+			}
 			Long updownGoodsId = updownGoodsEntity.getId();
 			Long updownTypeId = updownGoodsEntity.getUpdownTypeId();
 			WarehouseUpdownTypeEntity updownTypeEntity = baseMapper.selectById(updownTypeId);