修改托盘查询

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTrayMapper.xml

@@ -84,6 +84,9 @@
             <if test="po.palletCode !=null and po.palletCode != ''">
                and tray.pallet_code like concat('%',#{po.palletCode},'%')
             </if>
+            <if test="po.palletName !=null and po.palletName != ''">
+               and tray.pallet_name like concat('%',#{po.palletName},'%')
+            </if>
         </where>
             order by tray.create_time  desc
     </select>

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java

@@ -1808,7 +1808,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 					list1.add(distributionStock);
 				}
 			});
-			String collect = voList.stream().map(DistributionStockPackageVO::getPacketBarCode).collect(Collectors.joining(","));
+
 			Long warehouseId ;
 			if(one.getStockUpType().equals("3")){
 				DistrilbutionBillLadingEntity distrilbutionBillLadingEntity = distrilbutionBillLadingMapper.selectById(stockupDTO.getReservationId());
@@ -1820,8 +1820,9 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 			if(ObjectUtils.isNull(warehouseId)){
 				throw new ServiceException("预约信息不存在，无法备货！");
 			}
+			String  trayCode= stockupDTO.getTrayBarCode() ;
 			//货位下架
-			R r = warehouseUpdownTypeClient.downPackage(collect,warehouseId );
+			R r = warehouseUpdownTypeClient.downTray(trayCode,warehouseId );
 			if(r.getCode() != 200){
 				throw new ServiceException("下架失败！！");
 			}