From 485a7e122737f2eca6d6eac7353632fa24f4eb6a Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Sat, 19 Oct 2024 14:41:50 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E8=BF=90=E5=8D=95=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/logpm/warehouse/entity/WarehouseWaybillEntity.java | 4 +++- .../warehouse/controller/WarehouseWaybillController.java | 6 ++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseWaybillEntity.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseWaybillEntity.java index 01ef13cea..dd53a1933 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseWaybillEntity.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseWaybillEntity.java @@ -274,7 +274,9 @@ public class WarehouseWaybillEntity extends TenantEntity { @ApiModelProperty(value = "预留5") private String reserve5; - private Integer stats = 0; //运单状态 弃用 + + @ApiModelProperty(value = "运单状态") + private Integer stats; //运单状态 弃用 @TableField(exist = false) private String statsStr; diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseWaybillController.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseWaybillController.java index 5d293fb95..b0b00e91b 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseWaybillController.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseWaybillController.java @@ -87,8 +87,9 @@ public class WarehouseWaybillController extends BladeController { @ApiOperationSupport(order = 1) @ApiOperation(value = "详情", notes = "传入warehouseWaybill") public R detail(WarehouseWaybillEntity warehouseWaybill) { - WarehouseWaybillEntity detail = warehouseWaybillService.getOne(Condition.getQueryWrapper(warehouseWaybill)); - return R.data(WarehouseWaybillWrapper.build().entityVO(detail)); +// WarehouseWaybillEntity detail = warehouseWaybillService.getOne(Condition.getQueryWrapper(warehouseWaybill)); + WarehouseWaybillEntity byWaybillNo = warehouseWaybillService.findByWaybillNo(warehouseWaybill.getWaybillNo()); + return R.data(WarehouseWaybillWrapper.build().entityVO(byWaybillNo)); } /** @@ -117,6 +118,7 @@ public class WarehouseWaybillController extends BladeController { @ApiOperationSupport(order = 3) @ApiOperation(value = "分页", notes = "传入warehouseWaybill") public R> page(WarehouseWaybillVO warehouseWaybill, Query query) { + IPage pages = warehouseWaybillService.selectWarehouseWaybillPage(Condition.getPage(query), warehouseWaybill); return R.data(pages); }