Merge branch 'dev' into pre-production

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataWarehouseController.java

@@ -31,6 +31,7 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import lombok.extern.log4j.Log4j2;
+import org.springblade.common.cache.CacheNames;
 import org.springblade.common.cache.CacheObjNames;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.cache.utils.CacheUtil;
@@ -211,7 +212,12 @@ public class BasicdataWarehouseController extends BladeController {
 	public R submit(@Valid @RequestBody BasicdataWarehouseEntity warehouseWarehouse) {
 		BladeUser user = AuthUtil.getUser();
 		CacheUtil.evict(CacheObjNames.basic_data_warehourse_list.getCacheName(), CacheObjNames.basic_data_warehourse_list.getKeyPrefix(),user.getUserId());
-		return R.status(warehouseService.saveOrUpdate(warehouseWarehouse));
+		boolean b = warehouseService.saveOrUpdate(warehouseWarehouse);
+		if(b){
+			// 清除缓存
+			bladeRedis.del(CacheNames.tenantKeyObj(user.getTenantId(), CacheNames.USER_WAREHOUSE_OWN, user.getUserId()));
+		}
+		return R.status(b);
 	}
 
 	/**

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.java

@@ -395,7 +395,7 @@ public interface DistributionReservationMapper extends BaseMapper<DistributionRe
 	 * @param reservationId
 	 * @return
 	 */
-	List<DistributionStockupOrderListVO> selectStockupZeroOrderList(@Param("param") Long reservationId);
+	List<DistributionStockupOrderListVO> selectStockupZeroOrderList(@Param("reservationId") Long reservationId);
 
 	/**
 	 * 批量查询包件信息

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

@@ -57,7 +57,6 @@ import com.logpm.warehouse.vo.TrayTypeDataVO;
 import lombok.extern.log4j.Log4j2;
 import org.apache.commons.lang.StringUtils;
 import org.jetbrains.annotations.NotNull;
-import org.springblade.common.constant.DictBizConstant;
 import org.springblade.common.constant.DistributionTypeConstant;
 import org.springblade.common.constant.Inventory.InventoryLoadingStatusConstant;
 import org.springblade.common.constant.Inventory.InventorySigningStatusConstant;
@@ -75,7 +74,6 @@ import org.springblade.common.constant.order.OrderStatusConstant;
 import org.springblade.common.constant.orderpackage.*;
 import org.springblade.common.constant.printTemplate.PrintTemplateStatusConstant;
 import org.springblade.common.constant.reservation.*;
-import org.springblade.common.constant.signing.SignforDriverSigningStatusConstant;
 import org.springblade.common.constant.signing.SignforStatusConstant;
 import org.springblade.common.constant.stockup.StockAssignStatusConstant;
 import org.springblade.common.constant.stockup.StockupStatusConstant;
@@ -92,7 +90,6 @@ import org.springblade.core.redis.cache.BladeRedis;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
-import org.springblade.core.tool.constant.BladeConstant;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.ObjectUtil;
 import org.springblade.system.cache.DictBizCache;
@@ -880,7 +877,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 	private void extracteOrderPackageStatus(DistrilbutionloadingscanDTO distrilbutionloadingscanDTO, DistributionParcelListEntity parcelListEntity, BasicdataWarehouseEntity myCurrentWarehouse, DistributionReservationEntity reservationEntity) {
 		Map<String,Object> map = new HashMap<>();
 		map.put("orderPackageCode",parcelListEntity.getOrderPackageCode());
-		map.put("warehouseId",, myCurrentWarehouse.getId());
+		map.put("warehouseId", myCurrentWarehouse.getId());
 		//包件配送下架
 		warehouseUpdownTypeClient.downDeliveryPackage(map);
 		//维护订单的信息