Merge remote-tracking branch 'origin/dev' into dev

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java

@@ -2127,12 +2127,12 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
 	@Override
 	public void downPackageByOrderPackageCode(String orderPackageCode,String remark,Long warehouseId) {
 		QueryWrapper<WarehouseTrayGoodsEntity> trayGoodsQueryWrapper = new QueryWrapper<>();
-		DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCode(orderPackageCode);
+		DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCodeAndWarehouseId(orderPackageCode,warehouseId);
 		trayGoodsQueryWrapper.eq("association_type","3")
 			.eq("association_value",orderPackageCode);
 		WarehouseTrayGoodsEntity trayGoodsEntity = warehouseTrayGoodsService.getOne(trayGoodsQueryWrapper);
 		StringBuffer stringBuffer = new StringBuffer();
-		if (Func.isNotEmpty(trayGoodsEntity)){
+		if (!Objects.isNull(trayGoodsEntity)){
 			Long trayGoodsId = trayGoodsEntity.getId();
 			Long trayTypeId = trayGoodsEntity.getTrayTypeId();
 			Long trayId = trayGoodsEntity.getTrayId();

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java

@@ -1370,7 +1370,7 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 				WarehouseTrayGoodsEntity warehouseTrayGoodsEntity = warehouseTrayGoodsService.getOne(trayGoodsEntityQueryWrapper);
 				if(!Objects.isNull(warehouseTrayGoodsEntity)){
 					//有托盘，托盘下托
-					warehouseTrayTypeService.downPackageByOrderPackageCode(orderPackageCode,"包件下架:同步下托",warehouseId);
+					warehouseTrayTypeService.downPackageByOrderPackageCode(orderPackageCode,"包件解托",warehouseId);
 				}
 				continue;
 			}