From bb9e715070365b8c78e9d8ebd57a084d46921661 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Sun, 7 Apr 2024 14:19:10 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E6=88=96=E8=80=85?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BB=93=E5=BA=93=E4=BA=86=E4=BB=A5=E5=90=8E?= =?UTF-8?q?=E6=B8=85=E9=99=A4=E4=BB=93=E5=BA=93=E5=88=97=E8=A1=A8=E7=BC=93?= =?UTF-8?q?=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BasicdataWarehouseController.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataWarehouseController.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataWarehouseController.java index 48cf0b0ec..b3000cbe9 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataWarehouseController.java +++ b/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); } /** From c3d442b4fb95982b3306a6743e178116bef4280a Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Sun, 7 Apr 2024 15:53:00 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E9=A2=84=E7=BA=A6?= =?UTF-8?q?=E5=8D=95ID=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../distribution/mapper/DistributionReservationMapper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.java index 400ea280d..144a2f312 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.java @@ -395,7 +395,7 @@ public interface DistributionReservationMapper extends BaseMapper selectStockupZeroOrderList(@Param("param") Long reservationId); + List selectStockupZeroOrderList(@Param("reservationId") Long reservationId); /** * 批量查询包件信息 From 1bd08900fe0128ec1d9b565ebeb5f1bdad97c725 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Sun, 7 Apr 2024 16:03:15 +0800 Subject: [PATCH 3/3] =?UTF-8?q?1.=E9=85=8D=E9=80=81bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DistributionDeliveryListServiceImpl.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java index 3ea6ff745..f685eda07 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java +++ b/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 map = new HashMap<>(); map.put("orderPackageCode",parcelListEntity.getOrderPackageCode()); - map.put("warehouseId",, myCurrentWarehouse.getId()); + map.put("warehouseId", myCurrentWarehouse.getId()); //包件配送下架 warehouseUpdownTypeClient.downDeliveryPackage(map); //维护订单的信息