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 1c349f375..022653660 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
@@ -78,7 +78,8 @@
         goods_allocation.reserve4,
         goods_allocation.reserve5,
         goods_allocation.goods_area_id,
-        CONCAT(goods_allocation.layer_num,'层',goods_allocation.column_num,'列') goodsAllocationName,
+--         CONCAT(goods_allocation.layer_num,'层',goods_allocation.column_num,'列') goodsAllocationName,
+      goods_allocation.qr_code goodsAllocationName ,
 --         goods_allocation.goods_allocation_name,
         goods_allocation.warehouse_id,
         goods_allocation.goods_shelf_id,
diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsAreaServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsAreaServiceImpl.java
index 3b33a0ad3..5f878d741 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsAreaServiceImpl.java
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsAreaServiceImpl.java
@@ -337,6 +337,8 @@ public class BasicdataGoodsAreaServiceImpl extends BaseServiceImpl<BasicdataGood
 		List<BasicdatavisualizationSheetOne> basicdatavisualizationSheetOnes = baseMapper.exportWarehouseByorderId(warehouseId);
 			basicdatavisualizationSheetOnes.forEach(e->{
 				if (StringUtils.isNotBlank(e.getThirdProduct())){e.setThirdProduct(this.countUniqueProperties(e.getThirdProduct()));}
+				if(StringUtils.isNotBlank(e.getMaterialName())){e.setMaterialName(this.countUniqueProperties(e.getMaterialName()));}
+				if(StringUtils.isNotBlank(e.getMaterialCode())){e.setMaterialName(this.countUniqueProperties(e.getMaterialCode()));}
 			});
 		//sheetTwo
 		List<BasicdatavisualizationSheetTwo> basicdatavisualizationSheetTwos = baseMapper.exportWarehouseByallocation(warehouseId);
diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsShelfServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsShelfServiceImpl.java
index ec33fb0bd..3457b8812 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsShelfServiceImpl.java
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsShelfServiceImpl.java
@@ -357,20 +357,22 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl<BasicdataGoo
 			for (Integer i = 0; i < rowNum; i++) {
 				for (Integer j = 0; j < storeyNum; j++) {
 					BasicdataGoodsAllocationEntity basicdataGoodsAllocationEntity = new BasicdataGoodsAllocationEntity();
-					//设置所在列
-					basicdataGoodsAllocationEntity.setColumnNum(i + 1);
-					//设置所在层
-					basicdataGoodsAllocationEntity.setLayerNum(j + 1);
 					int row = i + 1;
 					int layer = j + 1;
+					//设置所在列
+					basicdataGoodsAllocationEntity.setColumnNum(row);
+					//设置所在层
+					basicdataGoodsAllocationEntity.setLayerNum(layer);
+
 					//	basicdataGoodsAllocationEntity.setQrCode(allocationCode + "-" + row + "-" + layer);
 					//	basicdataGoodsAllocationEntity.setWarehouseId(basicdataGoodsShelfEntity.getWarehouseId());
 					basicdataGoodsAllocationEntity.setGoodsAreaId(basicdataGoodsShelfDTO.getGoodsAreaId());
 					basicdataGoodsAllocationEntity.setGoodsShelfId(basicdataGoodsShelfDTO.getId());
 					basicdataGoodsAllocationEntity.setGoodsAllocationName(layer + "-" + row);
 					basicdataGoodsAllocationEntity.setWarehouseId(ck);
-					String code = basicTenantCodeClient.shelfCode(AuthUtil.getTenantId(), "5");
-					String allocationCode = basicdataGoodsShelfDTO.getGoodsShelfName()+"-" + basicdataGoodsAllocationEntity.getColumnNum() + "-" + basicdataGoodsAllocationEntity.getLayerNum()  ;
+					//String code = basicTenantCodeClient.shelfCode(AuthUtil.getTenantId(), "5");
+				//	String allocationCode = basicdataGoodsShelfDTO.getGoodsShelfName()+"-" + basicdataGoodsAllocationEntity.getColumnNum() + "-" + basicdataGoodsAllocationEntity.getLayerNum()  ;
+					String allocationCode =basicdataGoodsShelfDTO.getGoodsShelfName()+"排-" +basicdataGoodsAllocationEntity.getLayerNum()  + "层-" +   basicdataGoodsAllocationEntity.getColumnNum() +"列";
 					basicdataGoodsAllocationEntity.setQrCode(allocationCode);
 //				basicdataGoodsAllocationEntity.setAllocationStatuc("1");
 //				basicdataGoodsAllocationEntity.setEnableStatus("1");
@@ -422,7 +424,9 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl<BasicdataGoo
 							basicdataGoodsAllocationEntity.setLayerNum(z);
 							basicdataGoodsAllocationEntity.setGoodsAreaId(basicdataGoodsShelfDTO.getGoodsAreaId());
 							basicdataGoodsAllocationEntity.setGoodsShelfId(basicdataGoodsShelfDTO.getId());
+							String allocationCode =basicdataGoodsShelfDTO.getGoodsShelfName()+"排-" +basicdataGoodsAllocationEntity.getLayerNum()  + "层-" +   basicdataGoodsAllocationEntity.getColumnNum() +"列";
 							basicdataGoodsAllocationEntity.setGoodsAllocationName(z + "-" + k);
+							basicdataGoodsAllocationEntity.setQrCode(allocationCode);
 							basicdataGoodsAllocationEntity.setWarehouseId(ck);
 							arrayList.add(basicdataGoodsAllocationEntity);
 						}
@@ -440,7 +444,7 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl<BasicdataGoo
 							basicdataGoodsAllocationEntity.setGoodsAllocationName(z + "-" + k);
 							basicdataGoodsAllocationEntity.setWarehouseId(ck);
 //							String code = basicTenantCodeClient.shelfCode(AuthUtil.getTenantId(), "5");
-							String allocationCode = basicdataGoodsShelfDTO.getGoodsShelfName()+"-" + basicdataGoodsAllocationEntity.getColumnNum() + "-" + basicdataGoodsAllocationEntity.getLayerNum()  ;
+							String allocationCode =basicdataGoodsShelfDTO.getGoodsShelfName()+"排-" +basicdataGoodsAllocationEntity.getLayerNum()  + "层-" +   basicdataGoodsAllocationEntity.getColumnNum() +"列";
 							basicdataGoodsAllocationEntity.setQrCode(allocationCode);
 							arrayList.add(basicdataGoodsAllocationEntity);
 						}
@@ -485,7 +489,8 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl<BasicdataGoo
 							basicdataGoodsAllocationEntity.setGoodsAllocationName(i + "-" + k);
 							basicdataGoodsAllocationEntity.setWarehouseId(ck);
 //							String code = basicTenantCodeClient.shelfCode(AuthUtil.getTenantId(), "5");
-							String allocationCode =  basicdataGoodsShelfDTO.getGoodsShelfName()+"-" + basicdataGoodsAllocationEntity.getColumnNum() + "-" + basicdataGoodsAllocationEntity.getLayerNum()  ;
+							String allocationCode =basicdataGoodsShelfDTO.getGoodsShelfName()+"排-" +basicdataGoodsAllocationEntity.getLayerNum()  + "层-" +   basicdataGoodsAllocationEntity.getColumnNum() +"列";
+//							basicdataGoodsAllocationEntity.setGoodsAllocationName(allocationCode);
 							basicdataGoodsAllocationEntity.setQrCode(allocationCode);
 							arrayList.add(basicdataGoodsAllocationEntity);
 						}
@@ -533,10 +538,11 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl<BasicdataGoo
 							basicdataGoodsAllocationEntity.setLayerNum(z);
 							basicdataGoodsAllocationEntity.setGoodsAreaId(basicdataGoodsShelfDTO.getGoodsAreaId());
 							basicdataGoodsAllocationEntity.setGoodsShelfId(basicdataGoodsShelfDTO.getId());
-							basicdataGoodsAllocationEntity.setGoodsAllocationName(z + "-" + i);
+					//		basicdataGoodsAllocationEntity.setGoodsAllocationName(z + "-" + i);
 							basicdataGoodsAllocationEntity.setWarehouseId(ck);
 //							String code = basicTenantCodeClient.shelfCode(AuthUtil.getTenantId(), "5");
-							String allocationCode =  basicdataGoodsShelfDTO.getGoodsShelfName()+"-" + basicdataGoodsAllocationEntity.getColumnNum() + "-" + basicdataGoodsAllocationEntity.getLayerNum()  ;
+							String allocationCode =basicdataGoodsShelfDTO.getGoodsShelfName()+"排-" +basicdataGoodsAllocationEntity.getLayerNum()  + "层-" +   basicdataGoodsAllocationEntity.getColumnNum() +"列";
+							basicdataGoodsAllocationEntity.setGoodsAllocationName(z + "-" + i);
 							basicdataGoodsAllocationEntity.setQrCode(allocationCode);
 							arrayList.add(basicdataGoodsAllocationEntity);
 						}
@@ -635,7 +641,7 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl<BasicdataGoo
 							basicdataGoodsAllocationEntity.setGoodsShelfId(basicdataGoodsShelfDTO.getId());
 							basicdataGoodsAllocationEntity.setGoodsAllocationName(z + "-" + i);
 //							String code = basicTenantCodeClient.shelfCode(AuthUtil.getTenantId(), "5");
-							String allocationCode = basicdataGoodsShelfDTO.getGoodsShelfName()+"-" + basicdataGoodsAllocationEntity.getColumnNum() + "-" + basicdataGoodsAllocationEntity.getLayerNum()  ;
+							String allocationCode =basicdataGoodsShelfDTO.getGoodsShelfName()+"排-" +basicdataGoodsAllocationEntity.getLayerNum()  + "层-" +   basicdataGoodsAllocationEntity.getColumnNum() +"列";
 							basicdataGoodsAllocationEntity.setQrCode(allocationCode);
 							basicdataGoodsAllocationEntity.setWarehouseId(ck);
 							arrayList.add(basicdataGoodsAllocationEntity);
@@ -845,6 +851,8 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl<BasicdataGoo
 				basicdataGoodsAllocationEntity.setGoodsAreaId(basicdataGoodsShelfDTO.getGoodsAreaId());
 				basicdataGoodsAllocationEntity.setGoodsShelfId(basicdataGoodsShelfDTO.getId());
 				basicdataGoodsAllocationEntity.setGoodsAllocationName(z + "-" + k);
+				String allocationCode =basicdataGoodsShelfDTO.getGoodsShelfName()+"排-" +basicdataGoodsAllocationEntity.getLayerNum()  + "层-" +   basicdataGoodsAllocationEntity.getColumnNum() +"列";
+				basicdataGoodsAllocationEntity.setQrCode(allocationCode);
 				basicdataGoodsAllocationEntity.setWarehouseId(ck);
 				arrayList.add(basicdataGoodsAllocationEntity);
 			}
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml
index 949dd35d4..fa7a0dc9c 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml
@@ -84,6 +84,9 @@
             </if>
              <if test="param.firsts !='' and param.firsts != null">
              and   ldpl.firsts = #{param.firsts}
+            </if>
+             <if test="param.second !='' and param.second != null">
+             and   ldpl.second = #{param.second}
             </if>
             <if test="param.thirdProduct !='' and param.thirdProduct != null">
              and   ldpl.third_product = #{param.thirdProduct}
@@ -110,7 +113,13 @@
                 and   ldpl.brand_name like concat('%',#{param.brandName},'%')
             </if>
             <if test="param.orderPackageFreezeStatus !='' and param.orderPackageFreezeStatus != null">
-                and   ldpl.order_package_freeze_status  like concat('%',#{param.orderPackageFreezeStatus},'%')
+                and   ldpl.order_package_freeze_status  = #{param.orderPackageFreezeStatus}
+            </if>
+             <if test="param.pallet !='' and param.pallet != null">
+                and   lwtg.tray_code  = #{param.pallet}
+            </if>
+             <if test="param.goodsAllocation !='' and param.goodsAllocation != null">
+                and   lwtg.position_code  = #{param.goodsAllocation}
             </if>
         </where>
 
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseTaskApiController.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseTaskApiController.java
index f05031eaf..578ffddc5 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseTaskApiController.java
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseTaskApiController.java
@@ -8,6 +8,7 @@ import com.logpm.basicdata.feign.IBasicdataWarehouseClient;
 import com.logpm.warehouse.dto.QuestDetailDTO;
 import com.logpm.warehouse.dto.TaskSearchDTO;
 import com.logpm.warehouse.entity.QuestDetailEntity;
+import org.springblade.core.mp.support.Query;
 import com.logpm.warehouse.service.ITaskQuestService;
 import com.logpm.warehouse.vo.TaskContractVO;
 import com.logpm.warehouse.vo.TaskQuestApiVO;
@@ -19,7 +20,6 @@ import lombok.AllArgsConstructor;
 import lombok.extern.log4j.Log4j2;
 import org.springblade.common.exception.CustomerException;
 import org.springblade.core.mp.support.Condition;
-import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.StringUtil;