diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseUpdownStockupAreaEntity.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseUpdownStockupAreaEntity.java index 427b8dd9d..9c2a40abb 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseUpdownStockupAreaEntity.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseUpdownStockupAreaEntity.java @@ -8,7 +8,7 @@ import lombok.EqualsAndHashCode; import org.springblade.core.tenant.mp.TenantEntity; @Data -@TableName("logpm_warehouse_updown_goods") +@TableName("logpm_warehouse_updown_stockup_area") @ApiModel(value = "UpdownGoods对象", description = "货位货物绑定表") @EqualsAndHashCode(callSuper = true) public class WarehouseUpdownStockupAreaEntity extends TenantEntity { diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseUpdownStockupAreaLogEntity.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseUpdownStockupAreaLogEntity.java index 3a6cb59b3..6bf605b4a 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseUpdownStockupAreaLogEntity.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseUpdownStockupAreaLogEntity.java @@ -8,7 +8,7 @@ import lombok.EqualsAndHashCode; import org.springblade.core.tenant.mp.TenantEntity; @Data -@TableName("logpm_warehouse_updown_goods_log") +@TableName("logpm_warehouse_updown_stockup_area_log") @ApiModel(value = "UpdownGoodsLog对象", description = "上下架记录表") @EqualsAndHashCode(callSuper = true) public class WarehouseUpdownStockupAreaLogEntity extends TenantEntity { diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseUpdownStockupAreaApiController.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseUpdownStockupAreaApiController.java index 9b9162ae8..e8b3b0944 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseUpdownStockupAreaApiController.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseUpdownStockupAreaApiController.java @@ -64,7 +64,6 @@ public class WarehouseUpdownStockupAreaApiController { log.warn(method+"库位信息不能为空 allocationId={}",allocationId); return R.fail(403,"库位信息不能为空"); } - //查询该库位的货物信息 return warehouseUpdownStockupAreaService.upStockupAreaPackage(upStockupAreaPackageDTOS,allocationId,myCurrentWarehouse.getId()); }catch (CustomerException e){ @@ -87,7 +86,6 @@ public class WarehouseUpdownStockupAreaApiController { String method = "###########upShelfScanPackage: "; log.info(method + "上架扫描备货库位 updownTypeDTO={}", updownTypeDTO); try{ - BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); if(Objects.isNull(myCurrentWarehouse)){ log.warn(method+"仓库信息不能为空"); @@ -108,7 +106,7 @@ public class WarehouseUpdownStockupAreaApiController { //已经在备货库位进行上架了 return Resp.scanFail("该包件已上架","该包件已上架"); } - return R.data(updownStockupAreaEntity); + return R.data(upDownStockupAreaVO); }else { return Resp.scanFail("该包件不存在","该包件不存在");