From 8c70cced656556d005f49ba80f9f7a1d42260d85 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Fri, 28 Jul 2023 18:06:19 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E5=9B=A0=E4=B8=BA=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=BA=86=E5=AD=97=E6=AE=B5=E7=B1=BB=E5=9E=8B=E5=BC=95?= =?UTF-8?q?=E5=8F=91=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/logpm/warehouse/feign/IWarehouseWaybillClient.java | 2 +- .../logpm/warehouse/controller/WarehouseWaybillController.java | 2 +- .../warehouse/service/impl/WarehouseWaybillServiceImpl.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseWaybillClient.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseWaybillClient.java index 11f06f9ad..64711e57b 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseWaybillClient.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseWaybillClient.java @@ -55,6 +55,6 @@ public interface IWarehouseWaybillClient { @PostMapping(API_PREFIX + "/addEnntity") void addEnntity(@RequestBody WarehouseWaybillEntity warehouseWaybill); - @PostMapping(API_PREFIX + "/addEnntity") + @PostMapping(API_PREFIX + "/updateEntity") void updateEntity(@RequestBody WarehouseWaybillEntity warehouseWaybill); } 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 4e4065d15..213cb9b55 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 @@ -168,7 +168,7 @@ public class WarehouseWaybillController extends BladeController { log.warn("################splitOrder: 当前在库订单已转库存品，不能拆单 waybillNo={}",waybillNo); return R.fail(405,"当前在库订单已转库存品"); } - Integer state = distributionStockArticleEntity.getState();//订单状态 + Integer state = Integer.parseInt(distributionStockArticleEntity.getState());//订单状态 Long orderId = distributionStockArticleEntity.getId();//订单id if(!state.equals(1)){ log.warn("################splitOrder: 当前在库订单已进入配送流程，不能拆单 waybillNo={}",waybillNo); diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java index a9ee8cfbc..aafa0a361 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java @@ -294,7 +294,7 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl