diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionStockArticleClient.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionStockArticleClient.java
index 1e031bb57..02bbf3795 100644
--- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionStockArticleClient.java
+++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionStockArticleClient.java
@@ -16,8 +16,6 @@
  */
 package com.logpm.distribution.feign;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.logpm.distribution.entity.DistributionStockArticleEntity;
 import org.springblade.common.constant.ModuleNameConstant;
 import org.springblade.core.mp.support.BladePage;
@@ -101,4 +99,6 @@ public interface IDistributionStockArticleClient {
 	@GetMapping(API_PREFIX + "/findStockArticleByCodeAndMarketAndWarehouseId")
 	List<DistributionStockArticleEntity> findStockArticleByCodeAndMarketAndWarehouseId(@RequestParam String incomingBatch,@RequestParam String marketNames,@RequestParam Long warehouseId);
 
+	@GetMapping(API_PREFIX + "/findShelfNumByOrderCodeAndWarehouseId")
+	Map findShelfNumByOrderCodeAndWarehouseId(@RequestParam String orderCode, @RequestParam Long warehouseId);
 }
diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/ParcelListVO.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/ParcelListVO.java
index 50a1d3ef2..158e125f3 100644
--- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/ParcelListVO.java
+++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/ParcelListVO.java
@@ -22,5 +22,6 @@ public class ParcelListVO implements Serializable {
 	private String allocationTitle;//货位
 	private Integer isFleeing;//是否窜货 0否 1是
 	private Integer deletedStatus;//是否可删除 0否 1是
+	private Integer conditions;//1定制品 2库存品
 
 }
diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/TrayTypeDataListVO.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/TrayTypeDataListVO.java
index e25f2bb8e..b3709746c 100644
--- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/TrayTypeDataListVO.java
+++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/TrayTypeDataListVO.java
@@ -17,6 +17,7 @@ public class TrayTypeDataListVO implements Serializable {
 	private String sku;//sku
 	private String cargoUnit;//cargoUnit
 	private String incomingBatch;//批次号
+	private String serviceNumber;//服务号
 
 	private Integer scanNum;//已扫件数
 	private Integer isFleeing;//是否串货 1是0否
diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/UpdownStockVO.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/UpdownStockVO.java
index 7f7e9e762..2b825bdcc 100644
--- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/UpdownStockVO.java
+++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/UpdownStockVO.java
@@ -15,6 +15,7 @@ public class UpdownStockVO implements Serializable {
 	private String materialName;//物料名称
 	private Integer totalNumber;//合同数量
 	private Integer residueNumber;//剩余数量
+	private Integer goodsType;//货物类型
 	private String incomingBatch;//批次号
 	private List<PositionVO> list = new ArrayList<>();
 
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionStockArticleClient.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionStockArticleClient.java
index bba65b68a..7ca004af3 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionStockArticleClient.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionStockArticleClient.java
@@ -181,4 +181,9 @@ public class DistributionStockArticleClient implements IDistributionStockArticle
 		return distributionStockArticleService.findStockArticleByCodeAndMarketAndWarehouseId(incomingBatch,marketNames,warehouseId);
 	}
 
+	@Override
+	public Map findShelfNumByOrderCodeAndWarehouseId(String orderCode, Long warehouseId) {
+		return distributionStockArticleService.findShelfNumByOrderCodeAndWarehouseId(orderCode,warehouseId);
+	}
+
 }
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.java
index fc9da3fde..7e1989161 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.java
@@ -17,17 +17,14 @@
 package com.logpm.distribution.mapper;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.logpm.distribution.dto.DistributionStockArticleOweDTO;
 import com.logpm.distribution.entity.DistributionStockArticleEntity;
-import com.logpm.distribution.excel.DistributionStockArticleExcel;
 import com.logpm.distribution.vo.DistributionParcelNumberVO;
 import com.logpm.distribution.vo.DistributionStockArticleGroundingVO;
 import com.logpm.distribution.vo.DistributionStockArticleQRCodeVO;
 import com.logpm.distribution.vo.DistributionStockArticleVO;
-import com.logpm.distribution.vo.app.DistributionAppStockArticleVO;
 import com.logpm.distribution.vo.app.queryOrderVO;
 import org.apache.ibatis.annotations.Param;
 
@@ -116,4 +113,6 @@ public interface DistributionStockArticleMapper extends BaseMapper<DistributionS
 	 * @return
 	 */
     List<DistributionStockArticleGroundingVO> selectListGrounding(@Param("ids")List<String> ids);
+
+	Map findShelfNumByOrderCodeAndWarehouseId(@Param("orderCode")String orderCode, @Param("warehouseId")Long warehouseId);
 }
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml
index 126dc96e4..766c74dd5 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml
@@ -304,17 +304,53 @@
     </select>
 
     <select id="fingListByServiceNumber" resultType="java.util.Map">
-        select ldsa.service_number serviceNum,
-               ldsa.order_code orderCode,
-               1 goodsType,
-               ldsa.total_number num,
-               ldsa.complete_set completeSet
-        from logpm_distribution_stock_article ldsa
-        where ldsa.is_deleted = 0
-          and ldsa.genre = 1
-        and ldsa.service_number = #{serviceNumber}
-        and ldsa.warehouse_id = #{warehouseId}
+        SELECT
+            ldsa.service_number serviceNum,
+            ldsa.order_code orderCode,
+            1 goodsType,
+            ldsa.total_number totalNum,
+            count(ldpl.id) num
+        FROM
+            logpm_distribution_stock_article ldsa
+            left join logpm_distribution_parcel_list ldpl on ldpl.order_code = ldsa.order_code
+            left join logpm_warehouse_tray_goods lwtg on ldpl.order_package_code = lwtg.association_value and lwtg.association_type = 3
+            left join logpm_warehouse_updown_goods lwug on ldpl.order_package_code = lwug.association_value and lwug.association_type = 3
+        WHERE
+            ldsa.is_deleted = 0
+          AND ldsa.service_number = #{serviceNumber}
+          AND ldsa.warehouse_id = #{warehouseId}
+          and lwtg.id is null
+          and lwug.id is null
+        group by ldsa.service_number,
+                 ldsa.order_code,
+                 ldsa.total_number
+        HAVING count(ldpl.id) > 0
+    </select>
+
+    <select id="findShelfNumByOrderCodeAndWarehouseId" resultType="java.util.Map">
+        SELECT
+            ldsa.service_number serviceNum,
+            ldsa.order_code orderCode,
+            1 goodsType,
+            ldsa.total_number totalNum,
+            count(ldpl.id) num
+        FROM
+            logpm_distribution_stock_article ldsa
+                left join logpm_distribution_parcel_list ldpl on ldpl.order_code = ldsa.order_code
+                left join logpm_warehouse_tray_goods lwtg on ldpl.order_package_code = lwtg.association_value and lwtg.association_type = 3
+                left join logpm_warehouse_updown_goods lwug on ldpl.order_package_code = lwug.association_value and lwug.association_type = 3
+        WHERE
+            ldsa.is_deleted = 0
+          AND ldsa.order_code = #{orderCode}
+          AND ldsa.warehouse_id = #{warehouseId}
+          and lwtg.id is null
+          and lwug.id is null
+        group by ldsa.service_number,
+                 ldsa.order_code,
+                 ldsa.total_number
+        HAVING count(ldpl.id) > 0
     </select>
+
     <select id="pageListOwe" parameterType="com.logpm.distribution.dto.DistributionStockArticleOweDTO"
             resultType="com.logpm.distribution.entity.DistributionStockArticleEntity">
         select ldsa.id, ldsa.tenant_id,
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockArticleService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockArticleService.java
index 5f9973700..56a3f9fa4 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockArticleService.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockArticleService.java
@@ -180,4 +180,6 @@ public interface IDistributionStockArticleService extends BaseService<Distributi
 	IPage<DistributionParcelListVO> getPackageListByStockArticleId(IPage<DistributionParcelListVO> page, Long orderId);
 
 	List<DistributionStockArticleQRCodeVO> selectTemplate(List<Long> ids);
+
+	Map findShelfNumByOrderCodeAndWarehouseId(String orderCode, Long warehouseId);
 }
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java
index a4b62abac..98d6f47da 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java
@@ -40,14 +40,12 @@ import com.logpm.distribution.vo.*;
 import com.logpm.distribution.vo.app.queryOrderVO;
 import com.logpm.distribution.wrapper.DistributionParcelListWrapper;
 import com.logpm.distribution.wrapper.DistributionStockArticleWrapper;
-import com.logpm.warehouse.entity.WarehouseTrayGoodsEntity;
 import com.logpm.warehouse.feign.IWarehouseTrayGoodsClient;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.common.constant.DictBizConstant;
 import org.springblade.common.constant.common.IsOrNoConstant;
 import org.springblade.common.constant.order.OrderStatusConstant;
-import org.springblade.common.constant.orderpackage.OrderPackageGroundingStatusConstant;
 import org.springblade.common.constant.orderpackage.OrderPackageReservationStatusConstant;
 import org.springblade.common.constant.orderpackage.OrderPackageStatusConstant;
 import org.springblade.common.constant.printTemplate.PrintTemplateStatusConstant;
@@ -1207,6 +1205,11 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 		return arrayList;
 	}
 
+	@Override
+	public Map findShelfNumByOrderCodeAndWarehouseId(String orderCode, Long warehouseId) {
+		return baseMapper.findShelfNumByOrderCodeAndWarehouseId(orderCode,warehouseId);
+	}
+
 
 	@Override
 	public DistributionStockArticleEntity findZeroByOrderCodeAndWarehouseId(String orderCode, Long warehouseId) {
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseTrayGoodsMapper.xml b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseTrayGoodsMapper.xml
index b1583ba64..67f7731e5 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseTrayGoodsMapper.xml
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseTrayGoodsMapper.xml
@@ -5,6 +5,7 @@
     <select id="getListByTrayTypeId" resultType="com.logpm.warehouse.vo.TrayTypeDataListVO">
         select ldsa.id dataId,
                ldsa.order_code dataCode,
+               ldsa.service_number serviceNumber,
                1 goodsType,
                sum(lwtg.num) scanNum,
                MAX(ldsa.total_number) orderTotalNum,
@@ -26,6 +27,7 @@
         select ldpl.order_code orderCode,
                lwtg.tray_code trayCode,
                lwt.pallet_name trayName,
+               ldsa.service_number serviceNum,
                1 goodsType,
                sum(lwtg.num) shelfNum,
                max(ldsa.total_number) totalNum
@@ -39,7 +41,8 @@
           and lwtg.tray_type_id = #{trayTypeId}
         group by ldpl.order_code,
                lwtg.tray_code,
-                 lwt.pallet_name
+                 lwt.pallet_name,
+                 ldsa.service_number
     </select>
 
     <select id="getListByTrayTypeIdAndOrderCode" resultType="com.logpm.distribution.entity.DistributionParcelListEntity">
@@ -247,6 +250,7 @@
         select ldpl.order_package_code orderPackageCode,
                ldpl.material_name materialName,
                ldpl.material_code materialCode,
+               ldpl.conditions conditions,
                CONCAT(ldpl.firsts,'-',ldpl.`second`,'-',ldpl.third_product) pinming,
                lwtg.id trayGoodsId,
                lwt.id trayId,
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayGoodsLogServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayGoodsLogServiceImpl.java
index 6b67f6fd9..99aa70a70 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayGoodsLogServiceImpl.java
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayGoodsLogServiceImpl.java
@@ -81,6 +81,7 @@ public class WarehouseTrayGoodsLogServiceImpl extends BaseServiceImpl<WarehouseT
 			trayGoodsLogEntity.setRemark(remark);
 			trayGoodsLogEntity.setPalletizingType(palletizingType);
 			trayGoodsLogEntity.setWarehouseId(warehouseId);
+			trayGoodsLogEntity.setId(null);
 			ls.add(trayGoodsLogEntity);
 		}
 		saveBatch(ls);
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java
index 02b4fd021..18d2bfcb1 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java
@@ -155,6 +155,8 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
 		trayTypeDataVO.setName(trayTypeEntity.getFilterValue());
 		trayTypeDataVO.setOrderTotalNum(trayTypeEntity.getOrderTotalNum());
 		trayTypeDataVO.setTrayType(trayType);
+		String trayTypeName = DictBizCache.getValue(DictBizConstant.PALLET_ORDER_TYPE, trayTypeEntity.getTrayType());
+		trayTypeDataVO.setTrayTypeName(trayTypeName);
 		trayTypeDataVO.setMarketId(trayTypeEntity.getMarketId());
 		trayTypeDataVO.setMarketName(trayTypeEntity.getMarketName());
 		trayTypeDataVO.setReamrk(trayTypeEntity.getRemark());
@@ -549,7 +551,9 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
 			log.warn("#########orderScanOrderPackageCode: 不属于同一个"+msg+" 串货 filterValue={} orderPackageCode={}",filterValue,orderPackageCode);
 			return Resp.scanFail(2001,"不属于同一个"+msg,"窜货，扫描当前托盘"+msg+"，窜货1件");
 		}else{
-			return R.success("扫描成功");
+			Map<String,String> map = new HashMap<>();
+			map.put("orderCode",orderCode);
+			return R.data(map);
 		}
 	}
 
@@ -2034,6 +2038,8 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
 		List<UpShelfDataVO> packageList = warehouseTrayGoodsService.getUpListByTrayTypeId(trayTypeId);
 		List<UpShelfDataVO> zeroList = warehouseTrayGoodsService.getZeroUpListByTrayTypeId(trayTypeId);
 		List<UpShelfDataVO> stockList = warehouseTrayGoodsService.getStockUpListByTrayTypeId(trayTypeId);
+		packageList.addAll(zeroList);
+		packageList.addAll(stockList);
 //		if(PalletProductTypeConstant.CUSTOMIZED.equals(type)){
 //			listByTrayTypeId = warehouseTrayGoodsService.getUpListByTrayTypeId(trayTypeId);
 //		}else if(PalletProductTypeConstant.ARTIFICIAL.equals(type)){
@@ -2061,12 +2067,13 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
 		map.put("trayCode",trayCode);
 		map.put("trayName",palletName);
 		map.put("totalNum",totalNum);
+		map.put("trayNum",totalNum+stockNum);
 		map.put("orderTotalNum",orderTotalNum);
 		map.put("stockNum",stockNum);
 		map.put("stockTotalNum",stockTotalNum);
-		map.put("packageList",packageList);
-		map.put("zeroList",zeroList);
-		map.put("stockList",stockList);
+		map.put("list",packageList);
+//		map.put("zeroList",zeroList);
+//		map.put("stockList",stockList);
 		return R.data(map);
 	}
 
@@ -2290,7 +2297,8 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
 			List<UpShelfDataVO> packageList = warehouseTrayGoodsService.getUpListByTrayTypeId(trayTypeId);
 			List<UpShelfDataVO> zeroList = warehouseTrayGoodsService.getZeroUpListByTrayTypeId(trayTypeId);
 			List<UpShelfDataVO> stockList = warehouseTrayGoodsService.getStockUpListByTrayTypeId(trayTypeId);
-
+			packageList.addAll(zeroList);
+			packageList.addAll(stockList);
 //			List<UpShelfDataVO> listByTrayTypeId = null;
 //			if(PalletProductTypeConstant.CUSTOMIZED.equals(type)){
 //				listByTrayTypeId = warehouseTrayGoodsService.getUpListByTrayTypeId(trayTypeId);
@@ -2317,12 +2325,13 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
 			map.put("trayCode",trayCode);
 			map.put("trayName",palletName);
 			map.put("totalNum",totalNum);
+			map.put("trayNum",totalNum+stockNum);
 			map.put("orderTotalNum",orderTotalNum);
 			map.put("stockNum",stockNum);
 			map.put("stockTotalNum",stockTotalNum);
-			map.put("packageList",packageList);
-			map.put("zeroList",zeroList);
-			map.put("stockList",stockList);
+			map.put("list",packageList);
+//			map.put("zeroList",zeroList);
+//			map.put("stockList",stockList);
 			return R.data(map);
 		}
 	}
@@ -2677,36 +2686,52 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
 		String trayType = targetTrayTypeEntity.getTrayType();//打托方式
 		Long filterId = targetTrayTypeEntity.getFilterId();
 		String filterValue = targetTrayTypeEntity.getFilterValue();
-		if("1".equals(type)){
-			//订制品
-			if("10".equals(trayType)){//服务号
-				panduanPackageByService(sourceTrayGoodsList,filterId,filterValue,targetTrayTypeEntity);
-			}else if("20".equals(trayType)){//订单自编号
-				panduanPackageByOrderCode(sourceTrayGoodsList,filterId,filterValue,targetTrayTypeEntity);
-			}else if("30".equals(trayType)){//商场
-				panduanPackageByMarket(sourceTrayGoodsList,filterId,filterValue,targetTrayTypeEntity);
-			}else if("40".equals(trayType)){//门店
-				panduanPackageByStore(sourceTrayGoodsList,filterId,filterValue,targetTrayTypeEntity);
-			}else if("50".equals(trayType)){//客户
-				panduanPackageByCustomer(sourceTrayGoodsList,filterId,filterValue,targetTrayTypeEntity);
-			}else if("60".equals(trayType)){//仓库
-				panduanPackageByWarehouse(sourceTrayGoodsList,filterId,filterValue,targetTrayTypeEntity);
-			}
-		}else if("2".equals(type)){
-			//零担
-			if("10".equals(trayType)){//运单号
-				panduanZeroByWaybillNo(sourceTrayGoodsList,filterId,filterValue,targetTrayTypeEntity);
-			}else if("20".equals(trayType)){//订单自编码（零担）
-				panduanZeroByOrderCode(sourceTrayGoodsList,filterId,filterValue,targetTrayTypeEntity);
-			}
-		}else if("3".equals(type)){
-			//库存品
-			if("10".equals(trayType)){//物料名称
-				panduanStockByMaterialName(sourceTrayGoodsList,filterId,filterValue,targetTrayTypeEntity);
-			}else if("20".equals(trayType)){//物料编码
-				panduanStockByMaterialId(sourceTrayGoodsList,filterId,filterValue,targetTrayTypeEntity);
-			}
+
+		if("10".equals(trayType)){//服务号
+			panduanPackageByService(sourceTrayGoodsList,filterId,filterValue,targetTrayTypeEntity);
+		}else if("20".equals(trayType)){//订单自编号
+			panduanPackageByOrderCode(sourceTrayGoodsList,filterId,filterValue,targetTrayTypeEntity);
+		}else if("30".equals(trayType)){//商场
+			panduanPackageByMarket(sourceTrayGoodsList,filterId,filterValue,targetTrayTypeEntity);
+		}else if("40".equals(trayType)){//门店
+			panduanPackageByStore(sourceTrayGoodsList,filterId,filterValue,targetTrayTypeEntity);
+		}else if("50".equals(trayType)){//客户
+			panduanPackageByCustomer(sourceTrayGoodsList,filterId,filterValue,targetTrayTypeEntity);
+		}else if("60".equals(trayType)){//仓库
+			panduanPackageByWarehouse(sourceTrayGoodsList,filterId,filterValue,targetTrayTypeEntity);
 		}
+
+
+//		if("1".equals(type)){
+//			//订制品
+//			if("10".equals(trayType)){//服务号
+//				panduanPackageByService(sourceTrayGoodsList,filterId,filterValue,targetTrayTypeEntity);
+//			}else if("20".equals(trayType)){//订单自编号
+//				panduanPackageByOrderCode(sourceTrayGoodsList,filterId,filterValue,targetTrayTypeEntity);
+//			}else if("30".equals(trayType)){//商场
+//				panduanPackageByMarket(sourceTrayGoodsList,filterId,filterValue,targetTrayTypeEntity);
+//			}else if("40".equals(trayType)){//门店
+//				panduanPackageByStore(sourceTrayGoodsList,filterId,filterValue,targetTrayTypeEntity);
+//			}else if("50".equals(trayType)){//客户
+//				panduanPackageByCustomer(sourceTrayGoodsList,filterId,filterValue,targetTrayTypeEntity);
+//			}else if("60".equals(trayType)){//仓库
+//				panduanPackageByWarehouse(sourceTrayGoodsList,filterId,filterValue,targetTrayTypeEntity);
+//			}
+//		}else if("2".equals(type)){
+//			//零担
+//			if("10".equals(trayType)){//运单号
+//				panduanZeroByWaybillNo(sourceTrayGoodsList,filterId,filterValue,targetTrayTypeEntity);
+//			}else if("20".equals(trayType)){//订单自编码（零担）
+//				panduanZeroByOrderCode(sourceTrayGoodsList,filterId,filterValue,targetTrayTypeEntity);
+//			}
+//		}else if("3".equals(type)){
+//			//库存品
+//			if("10".equals(trayType)){//物料名称
+//				panduanStockByMaterialName(sourceTrayGoodsList,filterId,filterValue,targetTrayTypeEntity);
+//			}else if("20".equals(trayType)){//物料编码
+//				panduanStockByMaterialId(sourceTrayGoodsList,filterId,filterValue,targetTrayTypeEntity);
+//			}
+//		}
 		//更新值
 		warehouseTrayGoodsService.updateBatchById(sourceTrayGoodsList);
 		warehouseTrayGoodsLogService.saveLogByTrayGoodsList(sourceTrayGoodsList,"1","合托:绑定","1",targetTrayTypeEntity.getWarehouseId());
@@ -2869,9 +2894,18 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
 		Long trayTypeId = targetTrayTypeEntity.getId();
 		for (WarehouseTrayGoodsEntity trayGoodsEntity:sourceTrayGoodsList){
 			String orderPackageCode = trayGoodsEntity.getAssociationValue();
+			log.info("#################panduanPackageByWarehouse: 当前处理的包条 {}",orderPackageCode);
 			DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCode(orderPackageCode);
+			if(Objects.isNull(parcelListEntity)){
+				log.info("#################panduanPackageByWarehouse: 包件信息不存在 {}",orderPackageCode);
+				continue;
+			}
 			Long stockArticleId = parcelListEntity.getStockArticleId();
 			DistributionStockArticleEntity stockArticleEntity = distributionStockArticleClient.findEntityByStockArticleId(stockArticleId);
+			if(Objects.isNull(stockArticleEntity)){
+				log.info("#################panduanPackageByWarehouse: 订单信息不存在 {}",orderPackageCode);
+				continue;
+			}
 			String warehouse = stockArticleEntity.getWarehouse();
 			if(!warehouse.equals(filterValue)){
 				trayGoodsEntity.setIsFleeing("1");
@@ -2888,9 +2922,18 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
 		Long trayTypeId = targetTrayTypeEntity.getId();
 		for (WarehouseTrayGoodsEntity trayGoodsEntity:sourceTrayGoodsList){
 			String orderPackageCode = trayGoodsEntity.getAssociationValue();
+			log.info("#################panduanPackageByCustomer: 当前处理的包条 {}",orderPackageCode);
 			DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCode(orderPackageCode);
+			if(Objects.isNull(parcelListEntity)){
+				log.info("#################panduanPackageByCustomer: 包件信息不存在 {}",orderPackageCode);
+				continue;
+			}
 			Long stockArticleId = parcelListEntity.getStockArticleId();
 			DistributionStockArticleEntity stockArticleEntity = distributionStockArticleClient.findEntityByStockArticleId(stockArticleId);
+			if(Objects.isNull(stockArticleEntity)){
+				log.info("#################panduanPackageByCustomer: 订单信息不存在 {}",orderPackageCode);
+				continue;
+			}
 			String customerName = stockArticleEntity.getCustomerName();
 			String customerTelephone = stockArticleEntity.getCustomerTelephone();
 			if(!filterValue.equals(customerName+customerTelephone)){
@@ -2908,9 +2951,18 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
 		Long trayTypeId = targetTrayTypeEntity.getId();
 		for (WarehouseTrayGoodsEntity trayGoodsEntity:sourceTrayGoodsList){
 			String orderPackageCode = trayGoodsEntity.getAssociationValue();
+			log.info("#################panduanPackageByStore: 当前处理的包条 {}",orderPackageCode);
 			DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCode(orderPackageCode);
+			if(Objects.isNull(parcelListEntity)){
+				log.info("#################panduanPackageByStore: 包件信息不存在 {}",orderPackageCode);
+				continue;
+			}
 			Long stockArticleId = parcelListEntity.getStockArticleId();
 			DistributionStockArticleEntity stockArticleEntity = distributionStockArticleClient.findEntityByStockArticleId(stockArticleId);
+			if(Objects.isNull(stockArticleEntity)){
+				log.info("#################panduanPackageByStore: 订单信息不存在 {}",orderPackageCode);
+				continue;
+			}
 			String storeName = stockArticleEntity.getStoreName();
 			if(!storeName.equals(filterValue)){
 				trayGoodsEntity.setIsFleeing("1");
@@ -2927,9 +2979,18 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
 		Long trayTypeId = targetTrayTypeEntity.getId();
 		for (WarehouseTrayGoodsEntity trayGoodsEntity:sourceTrayGoodsList){
 			String orderPackageCode = trayGoodsEntity.getAssociationValue();
+			log.info("#################panduanPackageByMarket: 当前处理的包条 {}",orderPackageCode);
 			DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCode(orderPackageCode);
+			if(Objects.isNull(parcelListEntity)){
+				log.info("#################panduanPackageByMarket: 包件信息不存在 {}",orderPackageCode);
+				continue;
+			}
 			Long stockArticleId = parcelListEntity.getStockArticleId();
 			DistributionStockArticleEntity stockArticleEntity = distributionStockArticleClient.findEntityByStockArticleId(stockArticleId);
+			if(Objects.isNull(stockArticleEntity)){
+				log.info("#################panduanPackageByMarket: 订单信息不存在 {}",orderPackageCode);
+				continue;
+			}
 			String mallName = stockArticleEntity.getMallName();
 			if(!mallName.equals(filterValue)){
 				trayGoodsEntity.setIsFleeing("1");
@@ -2946,7 +3007,12 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
 		Long trayTypeId = targetTrayTypeEntity.getId();
 		for (WarehouseTrayGoodsEntity trayGoodsEntity:sourceTrayGoodsList){
 			String orderPackageCode = trayGoodsEntity.getAssociationValue();
+			log.info("#################panduanPackageByOrderCode: 当前处理的包条 {}",orderPackageCode);
 			DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCode(orderPackageCode);
+			if(Objects.isNull(parcelListEntity)){
+				log.info("#################panduanPackageByOrderCode: 包件信息不存在 {}",orderPackageCode);
+				continue;
+			}
 			Long stockArticleId = parcelListEntity.getStockArticleId();
 			if(!stockArticleId.equals(filterId)){
 				trayGoodsEntity.setIsFleeing("1");
@@ -2963,7 +3029,12 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
 		Long trayTypeId = targetTrayTypeEntity.getId();
 		for (WarehouseTrayGoodsEntity trayGoodsEntity:sourceTrayGoodsList){
 			String orderPackageCode = trayGoodsEntity.getAssociationValue();
+			log.info("#################panduanPackageByService: 当前处理的包条 {}",orderPackageCode);
 			DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCode(orderPackageCode);
+			if(Objects.isNull(parcelListEntity)){
+				log.info("#################panduanPackageByService: 包件信息不存在 {}",orderPackageCode);
+				continue;
+			}
 			String serviceNumber = parcelListEntity.getServiceNumber();
 			if(!serviceNumber.equals(filterValue)){
 				trayGoodsEntity.setIsFleeing("1");
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 9d2e31bf2..5cdb6b24d 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
@@ -254,11 +254,11 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 				log.warn("#################findUpShelfScanGoods: 订单信息不存在 orderCode={}",orderCode);
 				throw new CustomerException(403,"订单信息不存在");
 			}
-			Integer genre = stockArticleEntity.getGenre();
-			if(genre == 2){
-				log.warn("#################findUpShelfScanGoods: 该包件订单已转库存品 orderCode={}",orderCode);
-				throw new CustomerException(403,"该包件订单已转库存品");
-			}
+//			Integer genre = stockArticleEntity.getGenre();
+//			if(genre == 2){
+//				log.warn("#################findUpShelfScanGoods: 该包件订单已转库存品 orderCode={}",orderCode);
+//				throw new CustomerException(403,"该包件订单已转库存品");
+//			}
 			String serviceNumber = stockArticleEntity.getServiceNumber();
 			List<Map> ls = distributionStockArticleClient.fingListByServiceNumber(serviceNumber,warehouseId);
 			List<UpShelfDataVO> list = new ArrayList<>();
@@ -266,8 +266,8 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 				UpShelfDataVO upShelfDataVO = new UpShelfDataVO();
 				upShelfDataVO.setServiceNum((String) map.get("serviceNum"));
 				upShelfDataVO.setOrderCode((String) map.get("orderCode"));
-				upShelfDataVO.setTotalNum((Integer) map.get("num"));
-				upShelfDataVO.setCompleteSet((Integer) map.get("completeSet"));
+				upShelfDataVO.setTotalNum((Integer) map.get("totalNum"));
+				upShelfDataVO.setShelfNum((Integer) map.get("num"));
 				upShelfDataVO.setGoodsType((Integer) map.get("goodsType"));
 				list.add(upShelfDataVO);
 			}
@@ -286,25 +286,16 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 				throw new CustomerException(403,"包件不在当前仓库");
 			}
 
-			DistributionStockArticleEntity stockArticleEntity = distributionStockArticleClient.findStockArticleByOrderCodeAndWarehouseId(orderCode,warehouseId);
-			if(Objects.isNull(stockArticleEntity)){
-				log.warn("#################findUpShelfScanGoods: 订单信息不存在 orderCode={}",orderCode);
-				throw new CustomerException(403,"订单信息不存在");
-			}
-			Integer genre = stockArticleEntity.getGenre();
-			if(genre == 2){
-				log.warn("#################findUpShelfScanGoods: 该包件订单已转库存品 orderCode={}",orderCode);
-				throw new CustomerException(403,"该包件订单已转库存品");
-			}
+			Map map = distributionStockArticleClient.findShelfNumByOrderCodeAndWarehouseId(orderCode,warehouseId);
 
 			List<UpShelfDataVO> ls = new ArrayList<>();
-			UpShelfDataVO dataVO = new UpShelfDataVO();
-			dataVO.setServiceNum(stockArticleEntity.getServiceNumber());
-			dataVO.setOrderCode(stockArticleEntity.getOrderCode());
-			dataVO.setTotalNum(stockArticleEntity.getTotalNumber());
-			dataVO.setCompleteSet(stockArticleEntity.getCompleteSet());
-			dataVO.setGoodsType(1);
-			ls.add(dataVO);
+			UpShelfDataVO upShelfDataVO = new UpShelfDataVO();
+			upShelfDataVO.setServiceNum((String) map.get("serviceNum"));
+			upShelfDataVO.setOrderCode((String) map.get("orderCode"));
+			upShelfDataVO.setTotalNum((Integer) map.get("totalNum"));
+			upShelfDataVO.setShelfNum((Integer) map.get("num"));
+			upShelfDataVO.setGoodsType((Integer) map.get("goodsType"));
+			ls.add(upShelfDataVO);
 			return ls;
 		}else if(upshelfScanType == 3){
 			//包条码查询服务号维度
@@ -324,11 +315,6 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 				log.warn("#################findUpShelfScanGoods: 订单信息不存在 orderCode={}",orderCode);
 				throw new CustomerException(403,"订单信息不存在");
 			}
-			Integer genre = stockArticleEntity.getGenre();
-			if(genre == 2){
-				log.warn("#################findUpShelfScanGoods: 该包件订单已转库存品 orderCode={}",orderCode);
-				throw new CustomerException(403,"该包件订单已转库存品");
-			}
 
 			String orderPackageGroundingStatus = parcelListEntity.getOrderPackageGroundingStatus();
 //			if("20".equals(orderPackageGroundingStatus)){
@@ -506,10 +492,14 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 				throw new CustomerException(403,"托盘未找到打托数据");
 			}
 			String type = trayTypeEntity.getType();//打托分类
-			upShelfAllocationVO.setTotalNum(trayTypeEntity.getTotalNum());
+			Integer totalNum = trayTypeEntity.getTotalNum();
+			Integer stockNum = trayTypeEntity.getStockNum();
+			Integer total = totalNum + stockNum;
+			upShelfAllocationVO.setTotalNum(totalNum);
 			upShelfAllocationVO.setOrderTotalnum(trayTypeEntity.getOrderTotalNum());
-			upShelfAllocationVO.setStockNum(trayTypeEntity.getStockNum());
+			upShelfAllocationVO.setStockNum(stockNum);
 			upShelfAllocationVO.setStockTotalNum(trayTypeEntity.getStockTotalNum());
+			upShelfAllocationVO.setTrayNum(total);
 //			if("1".equals(type) || "2".equals(type)){
 //				upShelfAllocationVO.setTrayNum(trayTypeEntity.getTotalNum());
 //			}else if("3".equals(type) || "4".equals(type)){
@@ -2205,6 +2195,7 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 		}
 		updownStockVO.setResidueNumber(quantityStock);
 		updownStockVO.setList(updownGoodsByStock);
+		updownStockVO.setGoodsType(3);
 		return updownStockVO;
 	}
 
@@ -2320,13 +2311,10 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 		String type = trayTypeEntity.getType();
 		//更新货位缓存
 //		warehouseGoodsAllocationClient.updateAllocationCache(allocationId.toString());
-		if("3".equals(type)){
-			Integer stockNum = trayTypeEntity.getStockNum();
-			return Resp.scanSuccess("上架成功","整托上架成功"+stockNum+"件");
-		}else{
-			Integer totalNum = trayTypeEntity.getTotalNum();
-			return Resp.scanSuccess("上架成功","整托上架成功"+totalNum+"件");
-		}
+		Integer stockNum = trayTypeEntity.getStockNum();
+		Integer totalNum = trayTypeEntity.getTotalNum();
+		Integer total = stockNum + totalNum;
+		return Resp.scanSuccess("上架成功","整托上架成功"+total+"件");
 	}
 
 	private List<WarehouseUpdownGoodsEntity> changeTrayGoodsToUpdownGoodsAndLog(List<WarehouseTrayGoodsEntity> trayGoodsList,WarehouseUpdownTypeEntity updownTypeEntity) {