From b29811e7daaa30c85a4da03cfb351533e70834f7 Mon Sep 17 00:00:00 2001 From: xs Date: Thu, 31 Oct 2024 08:48:05 +0800 Subject: [PATCH] =?UTF-8?q?3.3.9=20PDA=E6=8E=A5=E5=8F=A3=EF=BC=9A=20?= =?UTF-8?q?=E5=8E=9F=E6=9D=90=E6=96=99=E8=B4=A8=E6=A3=80=EF=BC=9A=E6=A0=B9?= =?UTF-8?q?=E6=8D=AE=E6=9D=A1=E7=A0=81=E7=B1=BB=E5=9E=8B=EF=BC=8C=E5=A6=82?= =?UTF-8?q?=E6=9E=9C=E6=98=AF=E5=90=88=E5=B9=B6=E6=9D=A1=E7=A0=81=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E9=9C=80=E8=A6=81=E6=89=BE=E5=88=B0=E4=BB=BB=E6=84=8F?= =?UTF-8?q?=E4=B8=80=E4=B8=AA=E7=89=A9=E6=96=99=E7=9A=84=E8=B4=A8=E6=A3=80?= =?UTF-8?q?=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/hw/mes/api/RemoteMesService.java | 13 ++++++++++++- .../mes/api/factory/RemoteMesFallbackFactory.java | 5 +++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/hw-api/hw-api-mes/src/main/java/com/hw/mes/api/RemoteMesService.java b/hw-api/hw-api-mes/src/main/java/com/hw/mes/api/RemoteMesService.java index 526ea6c..f41b2ce 100644 --- a/hw-api/hw-api-mes/src/main/java/com/hw/mes/api/RemoteMesService.java +++ b/hw-api/hw-api-mes/src/main/java/com/hw/mes/api/RemoteMesService.java @@ -195,10 +195,21 @@ public interface RemoteMesService { /** * 通过条码查询条码信息 * - * @param dateStr 时间字符串(yyyy-MM-dd) + * @param saleOrderId 销售订单ID * @param source 请求来源 * @return 结果 */ @GetMapping("/saleOrder/getRelateProductsBySaleOrderId/{saleOrderId}") public R> getRelateProductsBySaleOrderId(@PathVariable("saleOrderId") Long saleOrderId, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); + + /** + * 通过条码查询条码信息 + * + * @param saleOrderId 销售订单ID + * @param source 请求来源 + * @return 结果 + */ + @GetMapping("/saleOrder/getRelateMaterialsBySaleOrderId/{saleOrderId}") + public R> getRelateMaterialsBySaleOrderId(@PathVariable("saleOrderId") Long saleOrderId, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); + } diff --git a/hw-api/hw-api-mes/src/main/java/com/hw/mes/api/factory/RemoteMesFallbackFactory.java b/hw-api/hw-api-mes/src/main/java/com/hw/mes/api/factory/RemoteMesFallbackFactory.java index b560bcb..0537260 100644 --- a/hw-api/hw-api-mes/src/main/java/com/hw/mes/api/factory/RemoteMesFallbackFactory.java +++ b/hw-api/hw-api-mes/src/main/java/com/hw/mes/api/factory/RemoteMesFallbackFactory.java @@ -111,6 +111,11 @@ public class RemoteMesFallbackFactory implements FallbackFactory> getRelateMaterialsBySaleOrderId(Long saleOrderId, String source) { + return R.fail("根据销售订单ID获取关联原材料信息失败:" + throwable.getMessage()); + } }; } }