From 3c8e49b9673f96a50581a89ccba615d58c2d3458 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Mon, 11 Dec 2023 11:27:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=9D=E8=AF=95=E6=89=93=E5=8D=B0=E6=AC=A7?= =?UTF-8?q?=E6=B4=BE=E8=A7=A3=E6=9E=90=E6=8A=A5=E9=94=99=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/logpm/factory/oupai/service/IFactoryOrderService.java | 2 +- .../factory/oupai/service/impl/FactoryOrderServiceImpl.java | 3 ++- .../factory/oupai/service/impl/OuPaiFactoryServiceImpl.java | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/IFactoryOrderService.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/IFactoryOrderService.java index 60876c839..465ed771e 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/IFactoryOrderService.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/IFactoryOrderService.java @@ -39,7 +39,7 @@ public interface IFactoryOrderService extends BaseService { IPage selectFactoryOrderPage(IPage page, FactoryOrderVO factoryOrder); - FactoryOrderEntity selectEntityBySelfCode(String selfCode); + FactoryOrderEntity selectEntityBySelfCode(String selfCode,Long receivingId); /** * 根据包件查询订单 diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/FactoryOrderServiceImpl.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/FactoryOrderServiceImpl.java index a992aee7a..cfafd5d1b 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/FactoryOrderServiceImpl.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/FactoryOrderServiceImpl.java @@ -40,10 +40,11 @@ public class FactoryOrderServiceImpl extends BaseServiceImpl queryWrapper = new QueryWrapper<>(); queryWrapper.select("self_code","id"); queryWrapper.eq("self_code",selfCode); + queryWrapper.eq("receiving_id",receivingId); return baseMapper.selectOne(queryWrapper); } diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java index ac92e1057..2d7f7db07 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java @@ -738,7 +738,7 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService { } String selfCode = orderEntity.getString("SelfCode");//订单自编码 //先查询是否存在订单自编码 - FactoryOrderEntity factoryOrderEntity = factoryOrderService.selectEntityBySelfCode(selfCode); + FactoryOrderEntity factoryOrderEntity = factoryOrderService.selectEntityBySelfCode(selfCode,receivingId); if (Objects.isNull(factoryOrderEntity)) { factoryOrderEntity = new FactoryOrderEntity(); @@ -844,7 +844,7 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService { boolean save = factoryOrderService.save(factoryOrderEntity); if (!save) { - log.warn("############handleData: 保存订单失败 selfCode={}", selfCode); + log.error("############handleData: 保存订单失败 selfCode={}", selfCode); throw new CustomerException(403, "保存订单失败"); } }